Skip to content

Validation for AtomicRMW and cmpxchg #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dschuff merged 8 commits into from
Jul 15, 2017
Merged

Validation for AtomicRMW and cmpxchg #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ce65293
validate AtomicRMW and cmpxchg
dschuff Jul 13, 2017
d2ddc43
lol templates
dschuff Jul 13, 2017
4f48e96
forgot the cpp
dschuff Jul 13, 2017
e232af5
update test
dschuff Jul 14, 2017
63f17a6
forgot another test file
dschuff Jul 14, 2017
5dbcd06
format switch
dschuff Jul 14, 2017
bb91e6c
remove spurious indent
dschuff Jul 14, 2017
2002aa1
use shouldBeIntOrUnreachable
dschuff Jul 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/wasm-validator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@
namespace wasm {

// Print anything that can be streamed to an ostream
template <typename T>
template <typename T,
typename std::enable_if<
!std::is_base_of<Expression, typename std::remove_pointer<T>::type>::value
>::type* = nullptr>
inline std::ostream& printModuleComponent(T curr, std::ostream& stream) {
stream << curr << std::endl;
return stream;
}
// Specialization for Expressions to print type info too
template <>
// Extra overload for Expressions, to print type info too
inline std::ostream& printModuleComponent(Expression* curr, std::ostream& stream) {
WasmPrinter::printExpression(curr, stream, false, true) << std::endl;
return stream;
Expand Down Expand Up @@ -162,21 +164,21 @@ struct WasmValidator : public PostWalker<WasmValidator> {
// helpers
private:
template <typename T, typename S>
std::ostream& fail(T curr, S text);
std::ostream& fail(S text, T curr);
std::ostream& printFailureHeader();

template<typename T>
bool shouldBeTrue(bool result, T curr, const char* text) {
if (!result) {
fail(curr, "unexpected false: " + std::string(text));
fail("unexpected false: " + std::string(text), curr);
return false;
}
return result;
}
template<typename T>
bool shouldBeFalse(bool result, T curr, const char* text) {
if (result) {
fail(curr, "unexpected true: " + std::string(text));
fail("unexpected true: " + std::string(text), curr);
return false;
}
return result;
Expand All @@ -187,7 +189,7 @@ struct WasmValidator : public PostWalker<WasmValidator> {
if (left != right) {
std::ostringstream ss;
ss << left << " != " << right << ": " << text;
fail(curr, ss.str());
fail(ss.str(), curr);
return false;
}
return true;
Expand All @@ -198,7 +200,7 @@ struct WasmValidator : public PostWalker<WasmValidator> {
if (left != unreachable && left != right) {
std::ostringstream ss;
ss << left << " != " << right << ": " << text;
fail(curr, ss.str());
fail(ss.str(), curr);
return false;
}
return true;
Expand All @@ -209,12 +211,13 @@ struct WasmValidator : public PostWalker<WasmValidator> {
if (left == right) {
std::ostringstream ss;
ss << left << " == " << right << ": " << text;
fail(curr, ss.str());
fail(ss.str(), curr);
return false;
}
return true;
}

void shouldBeIntOrUnreachable(WasmType ty, Expression* curr, const char* text);
void validateAlignment(size_t align, WasmType type, Index bytes, bool isAtomic,
Expression* curr);
void validateMemBytes(uint8_t bytes, WasmType ty, Expression* curr);
Expand Down
26 changes: 25 additions & 1 deletion src/wasm/wasm-validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,22 +220,46 @@ void WasmValidator::visitSetLocal(SetLocal *curr) {
}
}
void WasmValidator::visitLoad(Load *curr) {
if (curr->isAtomic && !getModule()->memory.shared) fail("Atomic operation with non-shared memory", curr);
validateMemBytes(curr->bytes, curr->type, curr);
validateAlignment(curr->align, curr->type, curr->bytes, curr->isAtomic, curr);
shouldBeEqualOrFirstIsUnreachable(curr->ptr->type, i32, curr, "load pointer type must be i32");
}
void WasmValidator::visitStore(Store *curr) {
if (curr->isAtomic && !getModule()->memory.shared) fail("Atomic operation with non-shared memory", curr);
validateMemBytes(curr->bytes, curr->valueType, curr);
validateAlignment(curr->align, curr->type, curr->bytes, curr->isAtomic, curr);
shouldBeEqualOrFirstIsUnreachable(curr->ptr->type, i32, curr, "store pointer type must be i32");
shouldBeUnequal(curr->value->type, none, curr, "store value type must not be none");
shouldBeEqualOrFirstIsUnreachable(curr->value->type, curr->valueType, curr, "store value type must match");
}
void WasmValidator::shouldBeIntOrUnreachable(WasmType ty, Expression* curr, const char* text) {
switch (ty) {
case i32:
case i64:
case unreachable: {
break;
}
default: fail(text, curr);
}
}
void WasmValidator::visitAtomicRMW(AtomicRMW* curr) {
if (!getModule()->memory.shared) fail("Atomic operation with non-shared memory", curr);
validateMemBytes(curr->bytes, curr->type, curr);
shouldBeEqualOrFirstIsUnreachable(curr->ptr->type, i32, curr, "AtomicRMW pointer type must be i32");
shouldBeEqualOrFirstIsUnreachable(curr->value->type, curr->type, curr, "AtomicRMW result type must match operand");
shouldBeIntOrUnreachable(curr->type, curr, "Atomic operations are only valid on int types");
}
void WasmValidator::visitAtomicCmpxchg(AtomicCmpxchg* curr) {
if (!getModule()->memory.shared) fail("Atomic operation with non-shared memory", curr);
validateMemBytes(curr->bytes, curr->type, curr);
shouldBeEqualOrFirstIsUnreachable(curr->ptr->type, i32, curr, "cmpxchg pointer type must be i32");
if (curr->expected->type != unreachable && curr->replacement->type != unreachable) {
shouldBeEqual(curr->expected->type, curr->replacement->type, curr, "cmpxchg operand types must match");
}
shouldBeEqualOrFirstIsUnreachable(curr->expected->type, curr->type, curr, "Cmpxchg result type must match expected");
shouldBeEqualOrFirstIsUnreachable(curr->replacement->type, curr->type, curr, "Cmpxchg result type must match replacement");
shouldBeIntOrUnreachable(curr->expected->type, curr, "Atomic operations are only valid on int types");
}
void WasmValidator::validateMemBytes(uint8_t bytes, WasmType ty, Expression* curr) {
switch (bytes) {
Expand Down Expand Up @@ -655,7 +679,7 @@ void WasmValidator::validateBinaryenIR(Module& wasm) {
}

template <typename T, typename S>
std::ostream& WasmValidator::fail(T curr, S text) {
std::ostream& WasmValidator::fail(S text, T curr) {
valid = false;
auto& ret = printFailureHeader() << text << ", on \n";
return printModuleComponent(curr, ret);
Expand Down
10 changes: 5 additions & 5 deletions test/atomics.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
)
(func $atomic-cmpxchg (type $0)
(local $0 i32)
(local $1 i32)
(local $1 i64)
(drop
(i32.atomic.rmw.cmpxchg offset=4
(get_local $0)
Expand All @@ -122,15 +122,15 @@
(drop
(i64.atomic.rmw.cmpxchg offset=4
(get_local $0)
(get_local $0)
(get_local $0)
(get_local $1)
(get_local $1)
)
)
(drop
(i64.atomic.rmw32_u.cmpxchg align=4
(get_local $0)
(get_local $0)
(get_local $0)
(get_local $1)
(get_local $1)
)
)
)
Expand Down
10 changes: 5 additions & 5 deletions test/atomics.wast.from-wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
)
(func $atomic-cmpxchg (type $0)
(local $0 i32)
(local $1 i32)
(local $1 i64)
(drop
(i32.atomic.rmw.cmpxchg offset=4
(get_local $0)
Expand All @@ -122,15 +122,15 @@
(drop
(i64.atomic.rmw.cmpxchg offset=4
(get_local $0)
(get_local $0)
(get_local $0)
(get_local $1)
(get_local $1)
)
)
(drop
(i64.atomic.rmw32_u.cmpxchg
(get_local $0)
(get_local $0)
(get_local $0)
(get_local $1)
(get_local $1)
)
)
)
Expand Down
10 changes: 5 additions & 5 deletions test/atomics.wast.fromBinary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
)
(func $atomic-cmpxchg (type $0)
(local $var$0 i32)
(local $var$1 i32)
(local $var$1 i64)
(block $label$0
(drop
(i32.atomic.rmw.cmpxchg offset=4
Expand All @@ -127,15 +127,15 @@
(drop
(i64.atomic.rmw.cmpxchg offset=4
(get_local $var$0)
(get_local $var$0)
(get_local $var$0)
(get_local $var$1)
(get_local $var$1)
)
)
(drop
(i64.atomic.rmw32_u.cmpxchg
(get_local $var$0)
(get_local $var$0)
(get_local $var$0)
(get_local $var$1)
(get_local $var$1)
)
)
)
Expand Down
10 changes: 5 additions & 5 deletions test/atomics.wast.fromBinary.noDebugInfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
)
(func $2 (type $0)
(local $var$0 i32)
(local $var$1 i32)
(local $var$1 i64)
(block $label$0
(drop
(i32.atomic.rmw.cmpxchg offset=4
Expand All @@ -127,15 +127,15 @@
(drop
(i64.atomic.rmw.cmpxchg offset=4
(get_local $var$0)
(get_local $var$0)
(get_local $var$0)
(get_local $var$1)
(get_local $var$1)
)
)
(drop
(i64.atomic.rmw32_u.cmpxchg
(get_local $var$0)
(get_local $var$0)
(get_local $var$0)
(get_local $var$1)
(get_local $var$1)
)
)
)
Expand Down