Skip to content

W
wasm-watermarker
Verified Commit 5b0c3ad2 authored by nagayama15's avatar nagayama15
Browse files
Options

feat: implement expression order and fix the function reordering method to use... 

feat: implement expression order and fix the function reordering method to use it instead of their n
parent d4e25c8d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 612 additions and 3 deletions
lib/kyut/Commutativity.hpp 0 → 100644
View file @ 5b0c3ad2
#ifndef INCLUDE_kyut_Commutativity_hpp
#define INCLUDE_kyut_Commutativity_hpp
#include <boost/optional.hpp>
#include "wasm.h"
namespace kyut {
inline boost::optional<wasm::BinaryOp> swapped_binary_op(wasm::BinaryOp op) {
static_assert(wasm::InvalidBinary == 178);
switch (op) {
// Commutative operators
case wasm::AddInt32:
case wasm::MulInt32:
case wasm::AndInt32:
case wasm::OrInt32:
case wasm::XorInt32:
case wasm::EqInt32:
case wasm::NeInt32:
case wasm::AddInt64:
case wasm::MulInt64:
case wasm::AndInt64:
case wasm::OrInt64:
case wasm::XorInt64:
case wasm::EqInt64:
case wasm::NeInt64:
case wasm::AddFloat32:
case wasm::MulFloat32:
case wasm::MinFloat32:
case wasm::MaxFloat32:
case wasm::EqFloat32:
case wasm::NeFloat32:
case wasm::AddFloat64:
case wasm::MulFloat64:
case wasm::MinFloat64:
case wasm::MaxFloat64:
case wasm::EqFloat64:
case wasm::NeFloat64:
return op;
// Relarational operators
case wasm::LtSInt32:
return wasm::GtSInt32;
case wasm::LtUInt32:
return wasm::GtUInt32;
case wasm::LeSInt32:
return wasm::GeSInt32;
case wasm::LeUInt32:
return wasm::GeUInt32;
case wasm::GtSInt32:
return wasm::LtSInt32;
case wasm::GtUInt32:
return wasm::LtUInt32;
case wasm::GeSInt32:
return wasm::LeSInt32;
case wasm::GeUInt32:
return wasm::LeUInt32;
case wasm::LtSInt64:
return wasm::GtSInt64;
case wasm::LtUInt64:
return wasm::GtUInt64;
case wasm::LeSInt64:
return wasm::GeSInt64;
case wasm::LeUInt64:
return wasm::GeUInt64;
case wasm::GtSInt64:
return wasm::LtSInt64;
case wasm::GtUInt64:
return wasm::LtUInt64;
case wasm::GeSInt64:
return wasm::LeSInt64;
case wasm::GeUInt64:
return wasm::LeUInt64;
case wasm::LtFloat32:
return wasm::GtFloat32;
case wasm::LeFloat32:
return wasm::GeFloat32;
case wasm::GtFloat32:
return wasm::LtFloat32;
case wasm::GeFloat32:
return wasm::LeFloat32;
case wasm::LtFloat64:
return wasm::GtFloat64;
case wasm::LeFloat64:
return wasm::GeFloat64;
case wasm::GtFloat64:
return wasm::LtFloat64;
case wasm::GeFloat64:
return wasm::LeFloat64;
// Commutative SIMD operators
case wasm::EqVecI8x16:
case wasm::NeVecI8x16:
case wasm::EqVecI16x8:
case wasm::NeVecI16x8:
case wasm::EqVecI32x4:
case wasm::NeVecI32x4:
case wasm::EqVecF32x4:
case wasm::NeVecF32x4:
case wasm::EqVecF64x2:
case wasm::NeVecF64x2:
case wasm::AndVec128:
case wasm::OrVec128:
case wasm::XorVec128:
case wasm::AddVecI8x16:
case wasm::AddSatSVecI8x16:
case wasm::AddSatUVecI8x16:
case wasm::MulVecI8x16:
case wasm::MinSVecI8x16:
case wasm::MinUVecI8x16:
case wasm::MaxSVecI8x16:
case wasm::MaxUVecI8x16:
case wasm::AddVecI16x8:
case wasm::AddSatSVecI16x8:
case wasm::AddSatUVecI16x8:
case wasm::MulVecI16x8:
case wasm::MinSVecI16x8:
case wasm::MinUVecI16x8:
case wasm::MaxSVecI16x8:
case wasm::MaxUVecI16x8:
case wasm::AddVecI32x4:
case wasm::MulVecI32x4:
case wasm::MinSVecI32x4:
case wasm::MinUVecI32x4:
case wasm::MaxSVecI32x4:
case wasm::MaxUVecI32x4:
case wasm::AddVecI64x2:
case wasm::MulVecI64x2:
case wasm::AddVecF32x4:
case wasm::MulVecF32x4:
case wasm::MinVecF32x4:
case wasm::MaxVecF32x4:
case wasm::PMinVecF32x4:
case wasm::PMaxVecF32x4:
case wasm::AddVecF64x2:
case wasm::MulVecF64x2:
case wasm::MinVecF64x2:
case wasm::MaxVecF64x2:
case wasm::PMinVecF64x2:
case wasm::PMaxVecF64x2:
return op;
// Relarational SIMD operators
case wasm::LtSVecI8x16:
return wasm::GtSVecI8x16;
case wasm::LtUVecI8x16:
return wasm::GtUVecI8x16;
case wasm::GtSVecI8x16:
return wasm::LtSVecI8x16;
case wasm::GtUVecI8x16:
return wasm::LtUVecI8x16;
case wasm::LeSVecI8x16:
return wasm::GeSVecI8x16;
case wasm::LeUVecI8x16:
return wasm::GeUVecI8x16;
case wasm::GeSVecI8x16:
return wasm::LeSVecI8x16;
case wasm::GeUVecI8x16:
return wasm::LeUVecI8x16;
case wasm::LtSVecI16x8:
return wasm::GtSVecI16x8;
case wasm::LtUVecI16x8:
return wasm::GtUVecI16x8;
case wasm::GtSVecI16x8:
return wasm::LtSVecI16x8;
case wasm::GtUVecI16x8:
return wasm::LtUVecI16x8;
case wasm::LeSVecI16x8:
return wasm::GeSVecI16x8;
case wasm::LeUVecI16x8:
return wasm::GeUVecI16x8;
case wasm::GeSVecI16x8:
return wasm::LeSVecI16x8;
case wasm::GeUVecI16x8:
return wasm::LeUVecI16x8;
case wasm::LtSVecI32x4:
return wasm::GtSVecI32x4;
case wasm::LtUVecI32x4:
return wasm::GtUVecI32x4;
case wasm::GtSVecI32x4:
return wasm::LtSVecI32x4;
case wasm::GtUVecI32x4:
return wasm::LtUVecI32x4;
case wasm::LeSVecI32x4:
return wasm::GeSVecI32x4;
case wasm::LeUVecI32x4:
return wasm::GeUVecI32x4;
case wasm::GeSVecI32x4:
return wasm::LeSVecI32x4;
case wasm::GeUVecI32x4:
return wasm::LeUVecI32x4;
case wasm::LtVecF32x4:
return wasm::GtVecF32x4;
case wasm::GtVecF32x4:
return wasm::LtVecF32x4;
case wasm::LeVecF32x4:
return wasm::GeVecF32x4;
case wasm::GeVecF32x4:
return wasm::LeVecF32x4;
case wasm::LtVecF64x2:
return wasm::GtVecF64x2;
case wasm::GtVecF64x2:
return wasm::LtVecF64x2;
case wasm::LeVecF64x2:
return wasm::GeVecF64x2;
case wasm::GeVecF64x2:
return wasm::LeVecF64x2;
default:
return boost::none;
}
}
inline bool is_commutative(wasm::BinaryOp op) {
return swapped_binary_op(op).has_value();
}
} // namespace kyut
#endif // INCLUDE_kyut_Commutativity_hpp
lib/kyut/methods/FunctionOrdering.hpp
View file @ 5b0c3ad2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define INCLUDE_kyut_methods_FunctionOrdering_hpp #define INCLUDE_kyut_methods_FunctionOrdering_hpp
#include "../Ordering.hpp" #include "../Ordering.hpp"
#include "wasm.h" #include "../wasm-ext/Compare.hpp"
namespace kyut { namespace kyut {
class CircularBitStreamReader; class CircularBitStreamReader;
...@@ -24,7 +24,7 @@ namespace kyut::methods::function_ordering { ...@@ -24,7 +24,7 @@ namespace kyut::methods::function_ordering {
start, start,
end, end,
[](const auto& a, const auto& b) { [](const auto& a, const auto& b) {
return a->name < b->name; // TODO: ordered by body return *a->body < *b->body;
}); });
return size_bits; return size_bits;
...@@ -44,7 +44,7 @@ namespace kyut::methods::function_ordering { ...@@ -44,7 +44,7 @@ namespace kyut::methods::function_ordering {
start, start,
end, end,
[](const auto& a, const auto& b) { [](const auto& a, const auto& b) {
return a->name < b->name; // TODO: ordered by body return *a->body < *b->body;
}); });
return size_bits; return size_bits;
......
lib/kyut/wasm-ext/Compare-inl.hpp 0 → 100644
View file @ 5b0c3ad2
This diff is collapsed.
lib/kyut/wasm-ext/Compare.hpp 0 → 100644
View file @ 5b0c3ad2
#ifndef INCLUDE_kyut_wasm_ext_Compare_hpp
#define INCLUDE_kyut_wasm_ext_Compare_hpp
#include "wasm.h"
namespace wasm {
bool operator<(const Literal& a, const Literal& b);
bool operator<(const Expression& a, const Expression& b);
bool operator<(const ExpressionList& a, const ExpressionList& b);
} // namespace wasm
#include "Compare-inl.hpp"
#endif // INCLUDE_kyut_wasm_ext_Compare_hpp
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