Skip to content

W
wasm-watermarker
Commit 39ff4a29 authored by nagayama15's avatar nagayama15
Browse files
Options

Update Binaryen 

1.38.32 -> 1.39.1
parent 3b144f8b
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 28 deletions
cmake/binaryen.cmake
View file @ 39ff4a29
ExternalProject_Add(
binaryen
URL https://github.com/WebAssembly/binaryen/archive/1.38.32.tar.gz
URL https://github.com/WebAssembly/binaryen/archive/1.39.1.tar.gz
PREFIX binaryen
INSTALL_COMMAND ""
TEST_COMMAND ""
......
src/kyut/Commutativity.hpp
View file @ 39ff4a29
......@@ -9,7 +9,7 @@
namespace kyut {
[[nodiscard]]
inline boost::optional<wasm::BinaryOp> getSwappedPredicate(wasm::BinaryOp op) {
static_assert(wasm::InvalidBinary == 152);
static_assert(wasm::InvalidBinary == 158);
switch (op) {
// Commutative instructions
......
src/kyut/Comparator.inl.hpp
View file @ 39ff4a29
......@@ -24,7 +24,8 @@ namespace wasm {
return a.getf64() < b.getf64();
case v128:
return a.getv128() < b.getv128();
case except_ref:
case anyref:
case exnref:
return false;
case unreachable:
return false;
......@@ -34,7 +35,7 @@ namespace wasm {
}
[[nodiscard]] inline bool operator<(const Expression &a, const Expression &b) {
static_assert(Expression::NumExpressionIds == 36);
static_assert(Expression::NumExpressionIds == 44);
constexpr auto opt = [](const Expression *p) -> boost::optional<const Expression &> {
if (p == nullptr) {
......@@ -94,27 +95,27 @@ namespace wasm {
return std::forward_as_tuple(x.operands, *x.target) < std::forward_as_tuple(y.operands, *y.target);
}
case Expression::GetLocalId: {
const auto &x = *a.cast<GetLocal>();
const auto &y = *b.cast<GetLocal>();
case Expression::LocalGetId: {
const auto &x = *a.cast<LocalGet>();
const auto &y = *b.cast<LocalGet>();
return x.index < y.index;
}
case Expression::SetLocalId: {
const auto &x = *a.cast<SetLocal>();
const auto &y = *b.cast<SetLocal>();
case Expression::LocalSetId: {
const auto &x = *a.cast<LocalSet>();
const auto &y = *b.cast<LocalSet>();
return std::tie(x.index, *x.value) < std::tie(y.index, *y.value);
}
case Expression::GetGlobalId: {
const auto &x = *a.cast<GetGlobal>();
const auto &y = *b.cast<GetGlobal>();
case Expression::GlobalGetId: {
const auto &x = *a.cast<GlobalGet>();
const auto &y = *b.cast<GlobalGet>();
return x.name < y.name;
}
case Expression::SetGlobalId: {
const auto &x = *a.cast<SetGlobal>();
const auto &y = *b.cast<SetGlobal>();
case Expression::GlobalSetId: {
const auto &x = *a.cast<GlobalSet>();
const auto &y = *b.cast<GlobalSet>();
return std::tie(*x.value, x.name) < std::tie(*y.value, y.name);
}
......@@ -221,6 +222,12 @@ namespace wasm {
return std::tie(x.offset.addr, *x.ptr, *x.notifyCount) < std::tie(y.offset.addr, *y.ptr, *y.notifyCount);
}
case Expression::AtomicFenceId: {
[[maybe_unused]] const auto &x = *a.cast<AtomicFence>();
[[maybe_unused]] const auto &y = *b.cast<AtomicFence>();
return false;
}
case Expression::SIMDExtractId: {
const auto &x = *a.cast<SIMDExtract>();
const auto &y = *b.cast<SIMDExtract>();
......@@ -239,11 +246,11 @@ namespace wasm {
return std::tie(*x.left, *x.right, x.mask) < std::tie(*y.left, *y.right, y.mask);
}
case Expression::SIMDBitselectId: {
const auto &x = *a.cast<SIMDBitselect>();
const auto &y = *b.cast<SIMDBitselect>();
case Expression::SIMDTernaryId: {
const auto &x = *a.cast<SIMDTernary>();
const auto &y = *b.cast<SIMDTernary>();
return std::tie(*x.left, *x.right, *x.cond) < std::tie(*y.left, *y.right, *y.cond);
return std::tie(*x.a, *x.b, *x.c) < std::tie(*y.a, *y.b, *y.c);
}
case Expression::SIMDShiftId: {
const auto &x = *a.cast<SIMDShift>();
......@@ -251,6 +258,12 @@ namespace wasm {
return std::tie(x.op, *x.vec, *x.shift) < std::tie(y.op, *y.vec, *y.shift);
}
case Expression::SIMDLoadId: {
const auto &x = *a.cast<SIMDLoad>();
const auto &y = *b.cast<SIMDLoad>();
return std::tie(x.op, x.offset, x.align, *x.ptr) < std::tie(y.op, y.offset, y.align, *y.ptr) ;
}
case Expression::MemoryInitId: {
const auto &x = *a.cast<MemoryInit>();
const auto &y = *b.cast<MemoryInit>();
......@@ -275,6 +288,42 @@ namespace wasm {
return std::tie(*x.dest, *x.value, *x.size) < std::tie(*y.dest, *y.value, *y.size);
}
case Expression::PushId:{
const auto &x = *a.cast<Push>();
const auto &y = *b.cast<Push>();
return std::tie(*x.value) < std::tie(*y.value);
}
case Expression::PopId:{
[[maybe_unused]] const auto &x = *a.cast<Pop>();
[[maybe_unused]] const auto &y = *b.cast<Pop>();
return false;
}
case Expression::TryId:{
const auto &x = *a.cast<Try>();
const auto &y = *b.cast<Try>();
return std::forward_as_tuple(opt(x.body), opt(x.catchBody)) < std::forward_as_tuple(opt(y.body), opt(y.catchBody));
}
case Expression::ThrowId:{
const auto &x = *a.cast<Throw>();
const auto &y = *b.cast<Throw>();
return std::tie(x.operands) < std::tie(y.operands);
}
case Expression::RethrowId:{
const auto &x = *a.cast<Rethrow>();
const auto &y = *b.cast<Rethrow>();
return std::forward_as_tuple(opt(x.exnref)) < std::forward_as_tuple(opt(y.exnref));
}
case Expression::BrOnExnId:{
const auto &x = *a.cast<BrOnExn>();
const auto &y = *b.cast<BrOnExn>();
return std::forward_as_tuple(opt(x.exnref)) < std::forward_as_tuple(opt(y.exnref));
}
default:
WASM_UNREACHABLE();
}
......
src/kyut/watermarker/OperandSwappingWatermarker.cpp
View file @ 39ff4a29
......@@ -88,21 +88,21 @@ namespace kyut::watermarker {
return SideEffect::write;
}
SideEffect visitGetLocal([[maybe_unused]] wasm::GetLocal *expr) {
SideEffect visitLocalGet([[maybe_unused]] wasm::LocalGet *expr) {
return SideEffect::readOnly;
}
SideEffect visitSetLocal(wasm::SetLocal *expr) {
SideEffect visitLocalSet(wasm::LocalSet *expr) {
visit(expr->value);
return SideEffect::write;
}
SideEffect visitGetGlobal([[maybe_unused]] wasm::GetGlobal *expr) {
SideEffect visitGlobalGet([[maybe_unused]] wasm::GlobalGet *expr) {
return SideEffect::readOnly;
}
SideEffect visitSetGlobal(wasm::SetGlobal *expr) {
SideEffect visitGlobalSet(wasm::GlobalSet *expr) {
visit(expr->value);
return SideEffect::write;
......@@ -216,6 +216,10 @@ namespace kyut::watermarker {
return SideEffect::write;
}
SideEffect visitAtomicFence([[maybe_unused]] wasm::AtomicFence *expr) {
return SideEffect::write;
}
SideEffect visitSIMDExtract(wasm::SIMDExtract *expr) {
return visit(expr->vec);
}
......@@ -228,11 +232,11 @@ namespace kyut::watermarker {
return (std::max)(visit(expr->left), visit(expr->right));
}
SideEffect visitSIMDBitselect(wasm::SIMDBitselect *expr) {
SideEffect visitSIMDTernary(wasm::SIMDTernary *expr) {
return (std::max)({
visit(expr->cond),
visit(expr->left),
visit(expr->right),
visit(expr->a),
visit(expr->b),
visit(expr->c),
});
}
......@@ -240,6 +244,13 @@ namespace kyut::watermarker {
return (std::max)(visit(expr->vec), visit(expr->shift));
}
SideEffect visitSIMDLoad(wasm::SIMDLoad *expr) {
return (std::max)({
visit(expr->ptr),
SideEffect::readOnly,
});
}
SideEffect visitMemoryInit(wasm::MemoryInit *expr) {
visit(expr->dest);
visit(expr->offset);
......@@ -268,6 +279,41 @@ namespace kyut::watermarker {
return SideEffect::write;
}
SideEffect visitPush([[maybe_unused]] wasm::Push *expr) {
visit(expr->value);
return SideEffect::write;
}
SideEffect visitPop([[maybe_unused]] wasm::Pop *expr) {
return SideEffect::write;
}
SideEffect visitTry(wasm::Try *expr) {
return (std::max)({
visit(expr->body),
visit(expr->catchBody),
});
}
SideEffect visitThrow(wasm::Throw *expr) {
visitExpressionList(expr->operands);
return SideEffect::write;
}
SideEffect visitRethrow(wasm::Rethrow *expr) {
visit(expr->exnref);
return SideEffect::write;
}
SideEffect visitBrOnExn(wasm::BrOnExn *expr) {
visit(expr->exnref);
return SideEffect::write;
}
SideEffect visit(wasm::Expression *expr) {
if (expr == nullptr) {
return SideEffect::none;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment