Upgrade V8 to 5.1.281.57 DO NOT MERGE
FPIIM-449
Change-Id: Id981b686b4d587ac31697662eb98bb34be42ad90
(cherry picked from commit 3b9bc31999c9787eb726ecdbfd5796bfdec32a18)
diff --git a/test/cctest/wasm/test-run-wasm-64.cc b/test/cctest/wasm/test-run-wasm-64.cc
new file mode 100644
index 0000000..784f21a
--- /dev/null
+++ b/test/cctest/wasm/test-run-wasm-64.cc
@@ -0,0 +1,1360 @@
+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "src/base/bits.h"
+#include "src/wasm/wasm-macro-gen.h"
+
+#include "test/cctest/cctest.h"
+#include "test/cctest/compiler/value-helper.h"
+#include "test/cctest/wasm/test-signatures.h"
+#include "test/cctest/wasm/wasm-run-utils.h"
+
+#define CHECK_TRAP32(x) \
+ CHECK_EQ(0xdeadbeef, (bit_cast<uint32_t>(x)) & 0xFFFFFFFF)
+#define CHECK_TRAP64(x) \
+ CHECK_EQ(0xdeadbeefdeadbeef, (bit_cast<uint64_t>(x)) & 0xFFFFFFFFFFFFFFFF)
+#define CHECK_TRAP(x) CHECK_TRAP32(x)
+
+#define asi64(x) static_cast<int64_t>(x)
+
+#define asu64(x) static_cast<uint64_t>(x)
+
+#define B2(a, b) kExprBlock, 2, a, b
+#define B1(a) kExprBlock, 1, a
+
+// Can't bridge macro land with nested macros.
+#if V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_X87
+#define MIPS_OR_X87 true
+#else
+#define MIPS_OR_X87 false
+#endif
+
+#if V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_X87 || V8_TARGET_ARCH_ARM
+#define MIPS_OR_ARM_OR_X87 true
+#else
+#define MIPS_OR_ARM_OR_X87 false
+#endif
+
+#define FOREACH_I64_OPERATOR(V) \
+ V(DepthFirst, true) \
+ V(I64Phi, true) \
+ V(I64Const, true) \
+ V(I64Return, true) \
+ V(I64Param, true) \
+ V(I64LoadStore, true) \
+ V(I64Add, !MIPS_OR_X87) \
+ V(I64Sub, !MIPS_OR_X87) \
+ V(I64Mul, !MIPS_OR_X87) \
+ V(I64DivS, true) \
+ V(I64DivU, true) \
+ V(I64RemS, true) \
+ V(I64RemU, true) \
+ V(I64And, true) \
+ V(I64Ior, true) \
+ V(I64Xor, true) \
+ V(I64Shl, !MIPS_OR_X87) \
+ V(I64ShrU, !MIPS_OR_X87) \
+ V(I64ShrS, !MIPS_OR_X87) \
+ V(I64Eq, true) \
+ V(I64Ne, true) \
+ V(I64LtS, true) \
+ V(I64LeS, true) \
+ V(I64LtU, true) \
+ V(I64LeU, true) \
+ V(I64GtS, true) \
+ V(I64GeS, true) \
+ V(I64GtU, true) \
+ V(I64GeU, true) \
+ V(I64Ctz, true) \
+ V(I64Clz, true) \
+ V(I64Popcnt, !MIPS_OR_X87) \
+ V(I32ConvertI64, true) \
+ V(I64SConvertF32, true) \
+ V(I64SConvertF64, true) \
+ V(I64UConvertF32, true) \
+ V(I64UConvertF64, true) \
+ V(I64SConvertI32, true) \
+ V(I64UConvertI32, true) \
+ V(F32SConvertI64, true) \
+ V(F32UConvertI64, true) \
+ V(F64SConvertI64, true) \
+ V(F64UConvertI64, true) \
+ V(F64ReinterpretI64, true) \
+ V(I64ReinterpretF64, true) \
+ V(I64Ror, true) \
+ V(I64Rol, true)
+
+#define DECLARE_CONST(name, cond) static const bool kSupported_##name = cond;
+FOREACH_I64_OPERATOR(DECLARE_CONST)
+#undef DECLARE_CONST
+
+#define REQUIRE(name) \
+ if (!WASM_64 && !kSupported_##name) return
+
+TEST(Run_Wasm_I64Const) {
+ REQUIRE(I64Const);
+ WasmRunner<int64_t> r;
+ const int64_t kExpectedValue = 0x1122334455667788LL;
+ // return(kExpectedValue)
+ BUILD(r, WASM_I64V_9(kExpectedValue));
+ CHECK_EQ(kExpectedValue, r.Call());
+}
+
+TEST(Run_Wasm_I64Const_many) {
+ REQUIRE(I64Const);
+ int cntr = 0;
+ FOR_INT32_INPUTS(i) {
+ WasmRunner<int64_t> r;
+ const int64_t kExpectedValue = (static_cast<int64_t>(*i) << 32) | cntr;
+ // return(kExpectedValue)
+ BUILD(r, WASM_I64V(kExpectedValue));
+ CHECK_EQ(kExpectedValue, r.Call());
+ cntr++;
+ }
+}
+
+TEST(Run_Wasm_Return_I64) {
+ REQUIRE(I64Return);
+ WasmRunner<int64_t> r(MachineType::Int64());
+
+ BUILD(r, WASM_RETURN(WASM_GET_LOCAL(0)));
+
+ FOR_INT64_INPUTS(i) { CHECK_EQ(*i, r.Call(*i)); }
+}
+
+// todo(ahaas): I added a list of missing instructions here to make merging
+// easier when I do them one by one.
+// kExprI64Add:
+TEST(Run_WasmI64Add) {
+ REQUIRE(I64Add);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i + *j, r.Call(*i, *j)); }
+ }
+}
+// kExprI64Sub:
+TEST(Run_Wasm_I64Sub) {
+ REQUIRE(I64Sub);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i - *j, r.Call(*i, *j)); }
+ }
+}
+// kExprI64Mul:
+// kExprI64DivS:
+
+TEST(Run_WasmI64DivS) {
+ REQUIRE(I64DivS);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) {
+ if (*j == 0) {
+ CHECK_TRAP64(r.Call(*i, *j));
+ } else if (*j == -1 && *i == std::numeric_limits<int64_t>::min()) {
+ CHECK_TRAP64(r.Call(*i, *j));
+ } else {
+ CHECK_EQ(*i / *j, r.Call(*i, *j));
+ }
+ }
+ }
+}
+
+TEST(Run_WasmI64DivS_Trap) {
+ REQUIRE(I64DivS);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ CHECK_EQ(0, r.Call(asi64(0), asi64(100)));
+ CHECK_TRAP64(r.Call(asi64(100), asi64(0)));
+ CHECK_TRAP64(r.Call(asi64(-1001), asi64(0)));
+ CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), asi64(-1)));
+ CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), asi64(0)));
+}
+
+TEST(Run_WasmI64DivS_Byzero_Const) {
+ REQUIRE(I64DivS);
+ for (int8_t denom = -2; denom < 8; denom++) {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_I64V_1(denom)));
+ for (int64_t val = -7; val < 8; val++) {
+ if (denom == 0) {
+ CHECK_TRAP64(r.Call(val));
+ } else {
+ CHECK_EQ(val / denom, r.Call(val));
+ }
+ }
+ }
+}
+// kExprI64DivU:
+
+TEST(Run_WasmI64DivU) {
+ REQUIRE(I64DivU);
+ WasmRunner<uint64_t> r(MachineType::Uint64(), MachineType::Uint64());
+ BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) {
+ if (*j == 0) {
+ CHECK_TRAP64(r.Call(*i, *j));
+ } else {
+ CHECK_EQ(*i / *j, r.Call(*i, *j));
+ }
+ }
+ }
+}
+
+TEST(Run_WasmI64DivU_Trap) {
+ REQUIRE(I64DivU);
+ WasmRunner<uint64_t> r(MachineType::Uint64(), MachineType::Uint64());
+ BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ CHECK_EQ(0, r.Call(asu64(0), asu64(100)));
+ CHECK_TRAP64(r.Call(asu64(100), asu64(0)));
+ CHECK_TRAP64(r.Call(asu64(1001), asu64(0)));
+ CHECK_TRAP64(r.Call(std::numeric_limits<uint64_t>::max(), asu64(0)));
+}
+
+TEST(Run_WasmI64DivU_Byzero_Const) {
+ REQUIRE(I64DivU);
+ for (uint64_t denom = 0xfffffffffffffffe; denom < 8; denom++) {
+ WasmRunner<uint64_t> r(MachineType::Uint64());
+ BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_I64V_1(denom)));
+
+ for (uint64_t val = 0xfffffffffffffff0; val < 8; val++) {
+ if (denom == 0) {
+ CHECK_TRAP64(r.Call(val));
+ } else {
+ CHECK_EQ(val / denom, r.Call(val));
+ }
+ }
+ }
+}
+// kExprI64RemS:
+TEST(Run_WasmI64RemS) {
+ REQUIRE(I64RemS);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) {
+ if (*j == 0) {
+ CHECK_TRAP64(r.Call(*i, *j));
+ } else {
+ CHECK_EQ(*i % *j, r.Call(*i, *j));
+ }
+ }
+ }
+}
+
+TEST(Run_WasmI64RemS_Trap) {
+ REQUIRE(I64RemS);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ CHECK_EQ(33, r.Call(asi64(133), asi64(100)));
+ CHECK_EQ(0, r.Call(std::numeric_limits<int64_t>::min(), asi64(-1)));
+ CHECK_TRAP64(r.Call(asi64(100), asi64(0)));
+ CHECK_TRAP64(r.Call(asi64(-1001), asi64(0)));
+ CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), asi64(0)));
+}
+
+// kExprI64RemU:
+TEST(Run_WasmI64RemU) {
+ REQUIRE(I64RemU);
+ WasmRunner<uint64_t> r(MachineType::Uint64(), MachineType::Uint64());
+ BUILD(r, WASM_I64_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) {
+ if (*j == 0) {
+ CHECK_TRAP64(r.Call(*i, *j));
+ } else {
+ CHECK_EQ(*i % *j, r.Call(*i, *j));
+ }
+ }
+ }
+}
+
+TEST(Run_Wasm_I64RemU_Trap) {
+ REQUIRE(I64RemU);
+ WasmRunner<uint64_t> r(MachineType::Uint64(), MachineType::Uint64());
+ BUILD(r, WASM_I64_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ CHECK_EQ(17, r.Call(asu64(217), asu64(100)));
+ CHECK_TRAP64(r.Call(asu64(100), asu64(0)));
+ CHECK_TRAP64(r.Call(asu64(1001), asu64(0)));
+ CHECK_TRAP64(r.Call(std::numeric_limits<uint64_t>::max(), asu64(0)));
+}
+
+// kExprI64And:
+TEST(Run_Wasm_I64And) {
+ REQUIRE(I64And);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_AND(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ((*i) & (*j), r.Call(*i, *j)); }
+ }
+}
+// kExprI64Ior:
+TEST(Run_Wasm_I64Ior) {
+ REQUIRE(I64Ior);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_IOR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ((*i) | (*j), r.Call(*i, *j)); }
+ }
+}
+// kExprI64Xor:
+TEST(Run_Wasm_I64Xor) {
+ REQUIRE(I64Xor);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ((*i) ^ (*j), r.Call(*i, *j)); }
+ }
+}
+// kExprI64Shl:
+TEST(Run_Wasm_I64Shl) {
+ REQUIRE(I64Shl);
+ {
+ WasmRunner<uint64_t> r(MachineType::Uint64(), MachineType::Uint64());
+ BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) {
+ uint64_t expected = (*i) << (*j & 0x3f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
+ }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(0)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i << 0, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(32)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i << 32, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(20)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i << 20, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(40)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i << 40, r.Call(*i)); }
+ }
+}
+// kExprI64ShrU:
+TEST(Run_Wasm_I64ShrU) {
+ REQUIRE(I64ShrU);
+ {
+ WasmRunner<uint64_t> r(MachineType::Uint64(), MachineType::Uint64());
+ BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) {
+ uint64_t expected = (*i) >> (*j & 0x3f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
+ }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(0)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i >> 0, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(32)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i >> 32, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(20)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i >> 20, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(40)));
+ FOR_UINT64_INPUTS(i) { CHECK_EQ(*i >> 40, r.Call(*i)); }
+ }
+}
+// kExprI64ShrS:
+TEST(Run_Wasm_I64ShrS) {
+ REQUIRE(I64ShrS);
+ {
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) {
+ int64_t expected = (*i) >> (*j & 0x3f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
+ }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(0)));
+ FOR_INT64_INPUTS(i) { CHECK_EQ(*i >> 0, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(32)));
+ FOR_INT64_INPUTS(i) { CHECK_EQ(*i >> 32, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(20)));
+ FOR_INT64_INPUTS(i) { CHECK_EQ(*i >> 20, r.Call(*i)); }
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(40)));
+ FOR_INT64_INPUTS(i) { CHECK_EQ(*i >> 40, r.Call(*i)); }
+ }
+}
+// kExprI64Eq:
+TEST(Run_Wasm_I64Eq) {
+ REQUIRE(I64Eq);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_EQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i == *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+// kExprI64Ne:
+TEST(Run_Wasm_I64Ne) {
+ REQUIRE(I64Ne);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_NE(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i != *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+// kExprI64LtS:
+TEST(Run_Wasm_I64LtS) {
+ REQUIRE(I64LtS);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_LTS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i < *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+TEST(Run_Wasm_I64LeS) {
+ REQUIRE(I64LeS);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_LES(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i <= *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+TEST(Run_Wasm_I64LtU) {
+ REQUIRE(I64LtU);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_LTU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) { CHECK_EQ(*i < *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+TEST(Run_Wasm_I64LeU) {
+ REQUIRE(I64LeU);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_LEU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) { CHECK_EQ(*i <= *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+TEST(Run_Wasm_I64GtS) {
+ REQUIRE(I64GtS);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_GTS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i > *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+TEST(Run_Wasm_I64GeS) {
+ REQUIRE(I64GeS);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_GES(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i >= *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+
+TEST(Run_Wasm_I64GtU) {
+ REQUIRE(I64GtU);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_GTU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) { CHECK_EQ(*i > *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+
+TEST(Run_Wasm_I64GeU) {
+ REQUIRE(I64GeU);
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_GEU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) { CHECK_EQ(*i >= *j ? 1 : 0, r.Call(*i, *j)); }
+ }
+}
+// kExprI32ConvertI64:
+TEST(Run_Wasm_I32ConvertI64) {
+ REQUIRE(I32ConvertI64);
+ FOR_INT64_INPUTS(i) {
+ WasmRunner<int32_t> r;
+ BUILD(r, WASM_I32_CONVERT_I64(WASM_I64V(*i)));
+ CHECK_EQ(static_cast<int32_t>(*i), r.Call());
+ }
+}
+// kExprI64SConvertI32:
+TEST(Run_Wasm_I64SConvertI32) {
+ REQUIRE(I64SConvertI32);
+ WasmRunner<int64_t> r(MachineType::Int32());
+ BUILD(r, WASM_I64_SCONVERT_I32(WASM_GET_LOCAL(0)));
+ FOR_INT32_INPUTS(i) { CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i)); }
+}
+
+// kExprI64UConvertI32:
+TEST(Run_Wasm_I64UConvertI32) {
+ REQUIRE(I64UConvertI32);
+ WasmRunner<int64_t> r(MachineType::Uint32());
+ BUILD(r, WASM_I64_UCONVERT_I32(WASM_GET_LOCAL(0)));
+ FOR_UINT32_INPUTS(i) { CHECK_EQ(static_cast<uint64_t>(*i), r.Call(*i)); }
+}
+
+// kExprF64ReinterpretI64:
+// kExprI64ReinterpretF64:
+
+// kExprI64Clz:
+// kExprI64Ctz:
+// kExprI64Popcnt:
+TEST(Run_WasmI64Popcnt) {
+ struct {
+ int64_t expected;
+ uint64_t input;
+ } values[] = {{64, 0xffffffffffffffff},
+ {0, 0x0000000000000000},
+ {2, 0x0000080000008000},
+ {26, 0x1123456782345678},
+ {38, 0xffedcba09edcba09}};
+
+ WasmRunner<int64_t> r(MachineType::Uint64());
+ BUILD(r, WASM_I64_POPCNT(WASM_GET_LOCAL(0)));
+ for (size_t i = 0; i < arraysize(values); i++) {
+ CHECK_EQ(values[i].expected, r.Call(values[i].input));
+ }
+}
+
+// kExprF32SConvertI64:
+TEST(Run_WasmF32SConvertI64) {
+ REQUIRE(F32SConvertI64);
+ WasmRunner<float> r(MachineType::Int64());
+ BUILD(r, WASM_F32_SCONVERT_I64(WASM_GET_LOCAL(0)));
+ FOR_INT64_INPUTS(i) { CHECK_FLOAT_EQ(static_cast<float>(*i), r.Call(*i)); }
+}
+// kExprF32UConvertI64:
+TEST(Run_WasmF32UConvertI64) {
+ REQUIRE(F32UConvertI64);
+ struct {
+ uint64_t input;
+ uint32_t expected;
+ } values[] = {{0x0, 0x0},
+ {0x1, 0x3f800000},
+ {0xffffffff, 0x4f800000},
+ {0x1b09788b, 0x4dd84bc4},
+ {0x4c5fce8, 0x4c98bf9d},
+ {0xcc0de5bf, 0x4f4c0de6},
+ {0x2, 0x40000000},
+ {0x3, 0x40400000},
+ {0x4, 0x40800000},
+ {0x5, 0x40a00000},
+ {0x8, 0x41000000},
+ {0x9, 0x41100000},
+ {0xffffffffffffffff, 0x5f800000},
+ {0xfffffffffffffffe, 0x5f800000},
+ {0xfffffffffffffffd, 0x5f800000},
+ {0x0, 0x0},
+ {0x100000000, 0x4f800000},
+ {0xffffffff00000000, 0x5f800000},
+ {0x1b09788b00000000, 0x5dd84bc4},
+ {0x4c5fce800000000, 0x5c98bf9d},
+ {0xcc0de5bf00000000, 0x5f4c0de6},
+ {0x200000000, 0x50000000},
+ {0x300000000, 0x50400000},
+ {0x400000000, 0x50800000},
+ {0x500000000, 0x50a00000},
+ {0x800000000, 0x51000000},
+ {0x900000000, 0x51100000},
+ {0x273a798e187937a3, 0x5e1ce9e6},
+ {0xece3af835495a16b, 0x5f6ce3b0},
+ {0xb668ecc11223344, 0x5d3668ed},
+ {0x9e, 0x431e0000},
+ {0x43, 0x42860000},
+ {0xaf73, 0x472f7300},
+ {0x116b, 0x458b5800},
+ {0x658ecc, 0x4acb1d98},
+ {0x2b3b4c, 0x4a2ced30},
+ {0x88776655, 0x4f087766},
+ {0x70000000, 0x4ee00000},
+ {0x7200000, 0x4ce40000},
+ {0x7fffffff, 0x4f000000},
+ {0x56123761, 0x4eac246f},
+ {0x7fffff00, 0x4efffffe},
+ {0x761c4761eeeeeeee, 0x5eec388f},
+ {0x80000000eeeeeeee, 0x5f000000},
+ {0x88888888dddddddd, 0x5f088889},
+ {0xa0000000dddddddd, 0x5f200000},
+ {0xddddddddaaaaaaaa, 0x5f5dddde},
+ {0xe0000000aaaaaaaa, 0x5f600000},
+ {0xeeeeeeeeeeeeeeee, 0x5f6eeeef},
+ {0xfffffffdeeeeeeee, 0x5f800000},
+ {0xf0000000dddddddd, 0x5f700000},
+ {0x7fffffdddddddd, 0x5b000000},
+ {0x3fffffaaaaaaaa, 0x5a7fffff},
+ {0x1fffffaaaaaaaa, 0x59fffffd},
+ {0xfffff, 0x497ffff0},
+ {0x7ffff, 0x48ffffe0},
+ {0x3ffff, 0x487fffc0},
+ {0x1ffff, 0x47ffff80},
+ {0xffff, 0x477fff00},
+ {0x7fff, 0x46fffe00},
+ {0x3fff, 0x467ffc00},
+ {0x1fff, 0x45fff800},
+ {0xfff, 0x457ff000},
+ {0x7ff, 0x44ffe000},
+ {0x3ff, 0x447fc000},
+ {0x1ff, 0x43ff8000},
+ {0x3fffffffffff, 0x56800000},
+ {0x1fffffffffff, 0x56000000},
+ {0xfffffffffff, 0x55800000},
+ {0x7ffffffffff, 0x55000000},
+ {0x3ffffffffff, 0x54800000},
+ {0x1ffffffffff, 0x54000000},
+ {0x8000008000000000, 0x5f000000},
+ {0x8000008000000001, 0x5f000001},
+ {0x8000000000000400, 0x5f000000},
+ {0x8000000000000401, 0x5f000000}};
+ WasmRunner<float> r(MachineType::Uint64());
+ BUILD(r, WASM_F32_UCONVERT_I64(WASM_GET_LOCAL(0)));
+ for (size_t i = 0; i < arraysize(values); i++) {
+ CHECK_EQ(bit_cast<float>(values[i].expected), r.Call(values[i].input));
+ }
+}
+// kExprF64SConvertI64:
+TEST(Run_WasmF64SConvertI64) {
+ REQUIRE(F64SConvertI64);
+ WasmRunner<double> r(MachineType::Int64());
+ BUILD(r, WASM_F64_SCONVERT_I64(WASM_GET_LOCAL(0)));
+ FOR_INT64_INPUTS(i) { CHECK_DOUBLE_EQ(static_cast<double>(*i), r.Call(*i)); }
+}
+// kExprF64UConvertI64:
+TEST(Run_Wasm_F64UConvertI64) {
+ REQUIRE(F64UConvertI64);
+ struct {
+ uint64_t input;
+ uint64_t expected;
+ } values[] = {{0x0, 0x0},
+ {0x1, 0x3ff0000000000000},
+ {0xffffffff, 0x41efffffffe00000},
+ {0x1b09788b, 0x41bb09788b000000},
+ {0x4c5fce8, 0x419317f3a0000000},
+ {0xcc0de5bf, 0x41e981bcb7e00000},
+ {0x2, 0x4000000000000000},
+ {0x3, 0x4008000000000000},
+ {0x4, 0x4010000000000000},
+ {0x5, 0x4014000000000000},
+ {0x8, 0x4020000000000000},
+ {0x9, 0x4022000000000000},
+ {0xffffffffffffffff, 0x43f0000000000000},
+ {0xfffffffffffffffe, 0x43f0000000000000},
+ {0xfffffffffffffffd, 0x43f0000000000000},
+ {0x100000000, 0x41f0000000000000},
+ {0xffffffff00000000, 0x43efffffffe00000},
+ {0x1b09788b00000000, 0x43bb09788b000000},
+ {0x4c5fce800000000, 0x439317f3a0000000},
+ {0xcc0de5bf00000000, 0x43e981bcb7e00000},
+ {0x200000000, 0x4200000000000000},
+ {0x300000000, 0x4208000000000000},
+ {0x400000000, 0x4210000000000000},
+ {0x500000000, 0x4214000000000000},
+ {0x800000000, 0x4220000000000000},
+ {0x900000000, 0x4222000000000000},
+ {0x273a798e187937a3, 0x43c39d3cc70c3c9c},
+ {0xece3af835495a16b, 0x43ed9c75f06a92b4},
+ {0xb668ecc11223344, 0x43a6cd1d98224467},
+ {0x9e, 0x4063c00000000000},
+ {0x43, 0x4050c00000000000},
+ {0xaf73, 0x40e5ee6000000000},
+ {0x116b, 0x40b16b0000000000},
+ {0x658ecc, 0x415963b300000000},
+ {0x2b3b4c, 0x41459da600000000},
+ {0x88776655, 0x41e10eeccaa00000},
+ {0x70000000, 0x41dc000000000000},
+ {0x7200000, 0x419c800000000000},
+ {0x7fffffff, 0x41dfffffffc00000},
+ {0x56123761, 0x41d5848dd8400000},
+ {0x7fffff00, 0x41dfffffc0000000},
+ {0x761c4761eeeeeeee, 0x43dd8711d87bbbbc},
+ {0x80000000eeeeeeee, 0x43e00000001dddde},
+ {0x88888888dddddddd, 0x43e11111111bbbbc},
+ {0xa0000000dddddddd, 0x43e40000001bbbbc},
+ {0xddddddddaaaaaaaa, 0x43ebbbbbbbb55555},
+ {0xe0000000aaaaaaaa, 0x43ec000000155555},
+ {0xeeeeeeeeeeeeeeee, 0x43edddddddddddde},
+ {0xfffffffdeeeeeeee, 0x43efffffffbdddde},
+ {0xf0000000dddddddd, 0x43ee0000001bbbbc},
+ {0x7fffffdddddddd, 0x435ffffff7777777},
+ {0x3fffffaaaaaaaa, 0x434fffffd5555555},
+ {0x1fffffaaaaaaaa, 0x433fffffaaaaaaaa},
+ {0xfffff, 0x412ffffe00000000},
+ {0x7ffff, 0x411ffffc00000000},
+ {0x3ffff, 0x410ffff800000000},
+ {0x1ffff, 0x40fffff000000000},
+ {0xffff, 0x40efffe000000000},
+ {0x7fff, 0x40dfffc000000000},
+ {0x3fff, 0x40cfff8000000000},
+ {0x1fff, 0x40bfff0000000000},
+ {0xfff, 0x40affe0000000000},
+ {0x7ff, 0x409ffc0000000000},
+ {0x3ff, 0x408ff80000000000},
+ {0x1ff, 0x407ff00000000000},
+ {0x3fffffffffff, 0x42cfffffffffff80},
+ {0x1fffffffffff, 0x42bfffffffffff00},
+ {0xfffffffffff, 0x42affffffffffe00},
+ {0x7ffffffffff, 0x429ffffffffffc00},
+ {0x3ffffffffff, 0x428ffffffffff800},
+ {0x1ffffffffff, 0x427ffffffffff000},
+ {0x8000008000000000, 0x43e0000010000000},
+ {0x8000008000000001, 0x43e0000010000000},
+ {0x8000000000000400, 0x43e0000000000000},
+ {0x8000000000000401, 0x43e0000000000001}};
+ WasmRunner<double> r(MachineType::Uint64());
+ BUILD(r, WASM_F64_UCONVERT_I64(WASM_GET_LOCAL(0)));
+ for (size_t i = 0; i < arraysize(values); i++) {
+ CHECK_EQ(bit_cast<double>(values[i].expected), r.Call(values[i].input));
+ }
+}
+// kExprI64SConvertF32:
+
+TEST(Run_Wasm_I64SConvertF32a) {
+ WasmRunner<int64_t> r(MachineType::Float32());
+ BUILD(r, WASM_I64_SCONVERT_F32(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT32_INPUTS(i) {
+ if (*i < static_cast<float>(std::numeric_limits<int64_t>::max()) &&
+ *i >= static_cast<float>(std::numeric_limits<int64_t>::min())) {
+ CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+// kExprI64SConvertF64:
+TEST(Run_Wasm_I64SConvertF64a) {
+ WasmRunner<int64_t> r(MachineType::Float64());
+ BUILD(r, WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT64_INPUTS(i) {
+ if (*i < static_cast<double>(std::numeric_limits<int64_t>::max()) &&
+ *i >= static_cast<double>(std::numeric_limits<int64_t>::min())) {
+ CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+
+// kExprI64UConvertF32:
+TEST(Run_Wasm_I64UConvertF32a) {
+ WasmRunner<uint64_t> r(MachineType::Float32());
+ BUILD(r, WASM_I64_UCONVERT_F32(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT32_INPUTS(i) {
+ if (*i < static_cast<float>(std::numeric_limits<uint64_t>::max()) &&
+ *i > -1) {
+ CHECK_EQ(static_cast<uint64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+
+// kExprI64UConvertF64:
+TEST(Run_Wasm_I64UConvertF64a) {
+ WasmRunner<uint64_t> r(MachineType::Float64());
+ BUILD(r, WASM_I64_UCONVERT_F64(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT64_INPUTS(i) {
+ if (*i < static_cast<float>(std::numeric_limits<uint64_t>::max()) &&
+ *i > -1) {
+ CHECK_EQ(static_cast<uint64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+
+TEST(Run_WasmCallI64Parameter) {
+ // Build the target function.
+ LocalType param_types[20];
+ for (int i = 0; i < 20; i++) param_types[i] = kAstI64;
+ param_types[3] = kAstI32;
+ param_types[4] = kAstI32;
+ FunctionSig sig(1, 19, param_types);
+ for (int i = 0; i < 19; i++) {
+ TestingModule module;
+ WasmFunctionCompiler t(&sig, &module);
+ if (i == 2 || i == 3) {
+ continue;
+ } else {
+ BUILD(t, WASM_GET_LOCAL(i));
+ }
+ uint32_t index = t.CompileAndAdd();
+
+ // Build the calling function.
+ WasmRunner<int32_t> r(&module);
+ BUILD(
+ r,
+ WASM_I32_CONVERT_I64(WASM_CALL_FUNCTION(
+ index, WASM_I64V_9(0xbcd12340000000b),
+ WASM_I64V_9(0xbcd12340000000c), WASM_I32V_1(0xd),
+ WASM_I32_CONVERT_I64(WASM_I64V_9(0xbcd12340000000e)),
+ WASM_I64V_9(0xbcd12340000000f), WASM_I64V_10(0xbcd1234000000010),
+ WASM_I64V_10(0xbcd1234000000011), WASM_I64V_10(0xbcd1234000000012),
+ WASM_I64V_10(0xbcd1234000000013), WASM_I64V_10(0xbcd1234000000014),
+ WASM_I64V_10(0xbcd1234000000015), WASM_I64V_10(0xbcd1234000000016),
+ WASM_I64V_10(0xbcd1234000000017), WASM_I64V_10(0xbcd1234000000018),
+ WASM_I64V_10(0xbcd1234000000019), WASM_I64V_10(0xbcd123400000001a),
+ WASM_I64V_10(0xbcd123400000001b), WASM_I64V_10(0xbcd123400000001c),
+ WASM_I64V_10(0xbcd123400000001d))));
+
+ CHECK_EQ(i + 0xb, r.Call());
+ }
+}
+
+void TestI64Binop(WasmOpcode opcode, int64_t expected, int64_t a, int64_t b) {
+ {
+ WasmRunner<int64_t> r;
+ // return K op K
+ BUILD(r, WASM_BINOP(opcode, WASM_I64V(a), WASM_I64V(b)));
+ CHECK_EQ(expected, r.Call());
+ }
+ {
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ // return a op b
+ BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ CHECK_EQ(expected, r.Call(a, b));
+ }
+}
+
+void TestI64Cmp(WasmOpcode opcode, int64_t expected, int64_t a, int64_t b) {
+ {
+ WasmRunner<int32_t> r;
+ // return K op K
+ BUILD(r, WASM_BINOP(opcode, WASM_I64V(a), WASM_I64V(b)));
+ CHECK_EQ(expected, r.Call());
+ }
+ {
+ WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
+ // return a op b
+ BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ CHECK_EQ(expected, r.Call(a, b));
+ }
+}
+
+#define TEST_I64_BINOP(name, expected, a, b) \
+ do { \
+ if (WASM_64 || kSupported_##name) \
+ TestI64Binop(kExpr##name, expected, a, b); \
+ } while (false)
+
+TEST(Run_Wasm_I64Binops) {
+ TEST_I64_BINOP(I64Add, -5586332274295447011, 0x501b72ebabc26847,
+ 0x625de9793d8f79d6);
+ TEST_I64_BINOP(I64Sub, 9001903251710731490, 0xf24fe6474640002e,
+ 0x7562b6f711991b4c);
+ TEST_I64_BINOP(I64Mul, -4569547818546064176, 0x231a263c2cbc6451,
+ 0xead44de6bd3e23d0);
+ TEST_I64_BINOP(I64Mul, -25963122347507043, 0x4da1fa47c9352b73,
+ 0x91fe82317aa035af);
+ TEST_I64_BINOP(I64Mul, 7640290486138131960, 0x185731abe8eea47c,
+ 0x714ec59f1380d4c2);
+ TEST_I64_BINOP(I64DivS, -91517, 0x93b1190a34de56a0, 0x00004d8f68863948);
+ TEST_I64_BINOP(I64DivU, 149016, 0xe15b3727e8a2080a, 0x0000631bfa72db8b);
+ TEST_I64_BINOP(I64RemS, -664128064149968, 0x9a78b4e4fe708692,
+ 0x0003e0b6b3be7609);
+ TEST_I64_BINOP(I64RemU, 1742040017332765, 0x0ce84708c6258c81,
+ 0x000a6fde82016697);
+ TEST_I64_BINOP(I64And, 2531040582801836054, 0xaf257d1602644a16,
+ 0x33b290a91a10d997);
+ TEST_I64_BINOP(I64Ior, 8556201506536114940, 0x169d9be7bd3f0a5c,
+ 0x66bca28d77af40e8);
+ TEST_I64_BINOP(I64Xor, -4605655183785456377, 0xb6ea20a5d48e85b8,
+ 0x76ff4da6c80688bf);
+ TEST_I64_BINOP(I64Shl, -7240704056088331264, 0xef4dc1ed030e8ffe, 9);
+ TEST_I64_BINOP(I64ShrU, 12500673744059159, 0xb1a52fa7deec5d14, 10);
+ TEST_I64_BINOP(I64ShrS, 1725103446999874, 0x3107c791461a112b, 11);
+ TEST_I64_BINOP(I64Ror, -8960135652432576946, 0x73418d1717e4e83a, 12);
+ TEST_I64_BINOP(I64Ror, 7617662827409989779, 0xebff67cf0c126d36, 13);
+ TEST_I64_BINOP(I64Rol, -2097714064174346012, 0x43938b8db0b0f230, 14);
+ TEST_I64_BINOP(I64Rol, 8728493013947314237, 0xe07af243ac4d219d, 15);
+}
+
+#define TEST_I64_CMP(name, expected, a, b) \
+ do { \
+ if (WASM_64 || kSupported_##name) TestI64Cmp(kExpr##name, expected, a, b); \
+ } while (false)
+
+TEST(Run_Wasm_I64Compare) {
+ TEST_I64_CMP(I64Eq, 0, 0xB915D8FA494064F0, 0x04D700B2536019A3);
+ TEST_I64_CMP(I64Ne, 1, 0xC2FAFAAAB0446CDC, 0x52A3328F780C97A3);
+ TEST_I64_CMP(I64LtS, 0, 0x673636E6306B0578, 0x028EC9ECA78F7227);
+ TEST_I64_CMP(I64LeS, 1, 0xAE5214114B86A0FA, 0x7C1D21DA3DFD0CCF);
+ TEST_I64_CMP(I64LtU, 0, 0x7D52166381EC1CE0, 0x59F4A6A9E78CD3D8);
+ TEST_I64_CMP(I64LeU, 1, 0xE4169A385C7EA0E0, 0xFBDBED2C8781E5BC);
+ TEST_I64_CMP(I64GtS, 0, 0x9D08FF8FB5F42E81, 0xD4E5C9D7FE09F621);
+ TEST_I64_CMP(I64GeS, 1, 0x78DA3B2F73264E0F, 0x6FE5E2A67C501CBE);
+ TEST_I64_CMP(I64GtU, 0, 0x8F691284E44F7DA9, 0xD5EA9BC1EE149192);
+ TEST_I64_CMP(I64GeU, 0, 0x0886A0C58C7AA224, 0x5DDBE5A81FD7EE47);
+}
+
+TEST(Run_Wasm_I64Clz) {
+ REQUIRE(I64Clz);
+ struct {
+ int64_t expected;
+ uint64_t input;
+ } values[] = {{0, 0x8000100000000000}, {1, 0x4000050000000000},
+ {2, 0x2000030000000000}, {3, 0x1000000300000000},
+ {4, 0x0805000000000000}, {5, 0x0400600000000000},
+ {6, 0x0200000000000000}, {7, 0x010000a000000000},
+ {8, 0x00800c0000000000}, {9, 0x0040000000000000},
+ {10, 0x0020000d00000000}, {11, 0x00100f0000000000},
+ {12, 0x0008000000000000}, {13, 0x0004100000000000},
+ {14, 0x0002002000000000}, {15, 0x0001030000000000},
+ {16, 0x0000804000000000}, {17, 0x0000400500000000},
+ {18, 0x0000205000000000}, {19, 0x0000170000000000},
+ {20, 0x0000087000000000}, {21, 0x0000040500000000},
+ {22, 0x0000020300000000}, {23, 0x0000010100000000},
+ {24, 0x0000008900000000}, {25, 0x0000004100000000},
+ {26, 0x0000002200000000}, {27, 0x0000001300000000},
+ {28, 0x0000000800000000}, {29, 0x0000000400000000},
+ {30, 0x0000000200000000}, {31, 0x0000000100000000},
+ {32, 0x0000000080001000}, {33, 0x0000000040000500},
+ {34, 0x0000000020000300}, {35, 0x0000000010000003},
+ {36, 0x0000000008050000}, {37, 0x0000000004006000},
+ {38, 0x0000000002000000}, {39, 0x00000000010000a0},
+ {40, 0x0000000000800c00}, {41, 0x0000000000400000},
+ {42, 0x000000000020000d}, {43, 0x0000000000100f00},
+ {44, 0x0000000000080000}, {45, 0x0000000000041000},
+ {46, 0x0000000000020020}, {47, 0x0000000000010300},
+ {48, 0x0000000000008040}, {49, 0x0000000000004005},
+ {50, 0x0000000000002050}, {51, 0x0000000000001700},
+ {52, 0x0000000000000870}, {53, 0x0000000000000405},
+ {54, 0x0000000000000203}, {55, 0x0000000000000101},
+ {56, 0x0000000000000089}, {57, 0x0000000000000041},
+ {58, 0x0000000000000022}, {59, 0x0000000000000013},
+ {60, 0x0000000000000008}, {61, 0x0000000000000004},
+ {62, 0x0000000000000002}, {63, 0x0000000000000001},
+ {64, 0x0000000000000000}};
+
+ WasmRunner<int64_t> r(MachineType::Uint64());
+ BUILD(r, WASM_I64_CLZ(WASM_GET_LOCAL(0)));
+ for (size_t i = 0; i < arraysize(values); i++) {
+ CHECK_EQ(values[i].expected, r.Call(values[i].input));
+ }
+}
+
+TEST(Run_Wasm_I64Ctz) {
+ REQUIRE(I64Ctz);
+ struct {
+ int64_t expected;
+ uint64_t input;
+ } values[] = {{64, 0x0000000000000000}, {63, 0x8000000000000000},
+ {62, 0x4000000000000000}, {61, 0x2000000000000000},
+ {60, 0x1000000000000000}, {59, 0xa800000000000000},
+ {58, 0xf400000000000000}, {57, 0x6200000000000000},
+ {56, 0x9100000000000000}, {55, 0xcd80000000000000},
+ {54, 0x0940000000000000}, {53, 0xaf20000000000000},
+ {52, 0xac10000000000000}, {51, 0xe0b8000000000000},
+ {50, 0x9ce4000000000000}, {49, 0xc792000000000000},
+ {48, 0xb8f1000000000000}, {47, 0x3b9f800000000000},
+ {46, 0xdb4c400000000000}, {45, 0xe9a3200000000000},
+ {44, 0xfca6100000000000}, {43, 0x6c8a780000000000},
+ {42, 0x8ce5a40000000000}, {41, 0xcb7d020000000000},
+ {40, 0xcb4dc10000000000}, {39, 0xdfbec58000000000},
+ {38, 0x27a9db4000000000}, {37, 0xde3bcb2000000000},
+ {36, 0xd7e8a61000000000}, {35, 0x9afdbc8800000000},
+ {34, 0x9afdbc8400000000}, {33, 0x9afdbc8200000000},
+ {32, 0x9afdbc8100000000}, {31, 0x0000000080000000},
+ {30, 0x0000000040000000}, {29, 0x0000000020000000},
+ {28, 0x0000000010000000}, {27, 0x00000000a8000000},
+ {26, 0x00000000f4000000}, {25, 0x0000000062000000},
+ {24, 0x0000000091000000}, {23, 0x00000000cd800000},
+ {22, 0x0000000009400000}, {21, 0x00000000af200000},
+ {20, 0x00000000ac100000}, {19, 0x00000000e0b80000},
+ {18, 0x000000009ce40000}, {17, 0x00000000c7920000},
+ {16, 0x00000000b8f10000}, {15, 0x000000003b9f8000},
+ {14, 0x00000000db4c4000}, {13, 0x00000000e9a32000},
+ {12, 0x00000000fca61000}, {11, 0x000000006c8a7800},
+ {10, 0x000000008ce5a400}, {9, 0x00000000cb7d0200},
+ {8, 0x00000000cb4dc100}, {7, 0x00000000dfbec580},
+ {6, 0x0000000027a9db40}, {5, 0x00000000de3bcb20},
+ {4, 0x00000000d7e8a610}, {3, 0x000000009afdbc88},
+ {2, 0x000000009afdbc84}, {1, 0x000000009afdbc82},
+ {0, 0x000000009afdbc81}};
+
+ WasmRunner<int64_t> r(MachineType::Uint64());
+ BUILD(r, WASM_I64_CTZ(WASM_GET_LOCAL(0)));
+ for (size_t i = 0; i < arraysize(values); i++) {
+ CHECK_EQ(values[i].expected, r.Call(values[i].input));
+ }
+}
+
+TEST(Run_Wasm_I64Popcnt) {
+ REQUIRE(I64Popcnt);
+ struct {
+ int64_t expected;
+ uint64_t input;
+ } values[] = {{64, 0xffffffffffffffff},
+ {0, 0x0000000000000000},
+ {2, 0x0000080000008000},
+ {26, 0x1123456782345678},
+ {38, 0xffedcba09edcba09}};
+
+ WasmRunner<int64_t> r(MachineType::Uint64());
+ BUILD(r, WASM_I64_POPCNT(WASM_GET_LOCAL(0)));
+ for (size_t i = 0; i < arraysize(values); i++) {
+ CHECK_EQ(values[i].expected, r.Call(values[i].input));
+ }
+}
+
+// Test the WasmRunner with an Int64 return value and different numbers of
+// Int64 parameters.
+TEST(Run_TestI64WasmRunner) {
+ REQUIRE(I64Param);
+ REQUIRE(I64Xor);
+ {FOR_INT64_INPUTS(i){WasmRunner<int64_t> r;
+ BUILD(r, WASM_I64V(*i));
+ CHECK_EQ(*i, r.Call());
+}
+}
+{
+ WasmRunner<int64_t> r(MachineType::Int64());
+ BUILD(r, WASM_GET_LOCAL(0));
+ FOR_INT64_INPUTS(i) { CHECK_EQ(*i, r.Call(*i)); }
+}
+{
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) { CHECK_EQ(*i ^ *j, r.Call(*i, *j)); }
+ }
+}
+{
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64(),
+ MachineType::Int64());
+ BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0),
+ WASM_I64_XOR(WASM_GET_LOCAL(1), WASM_GET_LOCAL(2))));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) {
+ CHECK_EQ(*i ^ *j ^ *j, r.Call(*i, *j, *j));
+ CHECK_EQ(*j ^ *i ^ *j, r.Call(*j, *i, *j));
+ CHECK_EQ(*j ^ *j ^ *i, r.Call(*j, *j, *i));
+ }
+ }
+}
+{
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64(),
+ MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0),
+ WASM_I64_XOR(WASM_GET_LOCAL(1),
+ WASM_I64_XOR(WASM_GET_LOCAL(2),
+ WASM_GET_LOCAL(3)))));
+ FOR_INT64_INPUTS(i) {
+ FOR_INT64_INPUTS(j) {
+ CHECK_EQ(*i ^ *j ^ *j ^ *j, r.Call(*i, *j, *j, *j));
+ CHECK_EQ(*j ^ *i ^ *j ^ *j, r.Call(*j, *i, *j, *j));
+ CHECK_EQ(*j ^ *j ^ *i ^ *j, r.Call(*j, *j, *i, *j));
+ CHECK_EQ(*j ^ *j ^ *j ^ *i, r.Call(*j, *j, *j, *i));
+ }
+ }
+}
+}
+
+TEST(Run_WasmCall_Int64Sub) {
+ REQUIRE(I64Sub);
+ // Build the target function.
+ TestSignatures sigs;
+ TestingModule module;
+ WasmFunctionCompiler t(sigs.l_ll(), &module);
+ BUILD(t, WASM_I64_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ uint32_t index = t.CompileAndAdd();
+
+ // Build the caller function.
+ WasmRunner<int64_t> r(&module, MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_CALL_FUNCTION(index, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+
+ FOR_INT32_INPUTS(i) {
+ FOR_INT32_INPUTS(j) {
+ int64_t a = static_cast<int64_t>(*i) << 32 |
+ (static_cast<int64_t>(*j) | 0xFFFFFFFF);
+ int64_t b = static_cast<int64_t>(*j) << 32 |
+ (static_cast<int64_t>(*i) | 0xFFFFFFFF);
+
+ int64_t expected = static_cast<int64_t>(static_cast<uint64_t>(a) -
+ static_cast<uint64_t>(b));
+ CHECK_EQ(expected, r.Call(a, b));
+ }
+ }
+}
+
+TEST(Run_Wasm_LoadStoreI64_sx) {
+ REQUIRE(I64LoadStore);
+ REQUIRE(DepthFirst);
+ byte loads[] = {kExprI64LoadMem8S, kExprI64LoadMem16S, kExprI64LoadMem32S,
+ kExprI64LoadMem};
+
+ for (size_t m = 0; m < arraysize(loads); m++) {
+ TestingModule module;
+ byte* memory = module.AddMemoryElems<byte>(16);
+ WasmRunner<int64_t> r(&module);
+
+ byte code[] = {kExprI64StoreMem, ZERO_ALIGNMENT,
+ ZERO_OFFSET, // --
+ kExprI8Const, 8, // --
+ loads[m], ZERO_ALIGNMENT,
+ ZERO_OFFSET, // --
+ kExprI8Const, 0}; // --
+
+ r.Build(code, code + arraysize(code));
+
+ // Try a bunch of different negative values.
+ for (int i = -1; i >= -128; i -= 11) {
+ int size = 1 << m;
+ module.BlankMemory();
+ memory[size - 1] = static_cast<byte>(i); // set the high order byte.
+
+ int64_t expected = static_cast<int64_t>(i) << ((size - 1) * 8);
+
+ CHECK_EQ(expected, r.Call());
+ CHECK_EQ(static_cast<byte>(i), memory[8 + size - 1]);
+ for (int j = size; j < 8; j++) {
+ CHECK_EQ(255, memory[8 + j]);
+ }
+ }
+ }
+}
+
+TEST(Run_Wasm_I64SConvertF32b) {
+ REQUIRE(I64SConvertF32);
+ WasmRunner<int64_t> r(MachineType::Float32());
+ BUILD(r, WASM_I64_SCONVERT_F32(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT32_INPUTS(i) {
+ if (*i < static_cast<float>(INT64_MAX) &&
+ *i >= static_cast<float>(INT64_MIN)) {
+ CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+
+TEST(Run_Wasm_I64SConvertF64b) {
+ REQUIRE(I64SConvertF64);
+ WasmRunner<int64_t> r(MachineType::Float64());
+ BUILD(r, WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT64_INPUTS(i) {
+ if (*i < static_cast<double>(INT64_MAX) &&
+ *i >= static_cast<double>(INT64_MIN)) {
+ CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+
+TEST(Run_Wasm_I64UConvertF32b) {
+ REQUIRE(I64UConvertF32);
+ WasmRunner<uint64_t> r(MachineType::Float32());
+ BUILD(r, WASM_I64_UCONVERT_F32(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT32_INPUTS(i) {
+ if (*i < static_cast<float>(UINT64_MAX) && *i > -1) {
+ CHECK_EQ(static_cast<uint64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+
+TEST(Run_Wasm_I64UConvertF64b) {
+ REQUIRE(I64UConvertF64);
+ WasmRunner<uint64_t> r(MachineType::Float64());
+ BUILD(r, WASM_I64_UCONVERT_F64(WASM_GET_LOCAL(0)));
+
+ FOR_FLOAT64_INPUTS(i) {
+ if (*i < static_cast<float>(UINT64_MAX) && *i > -1) {
+ CHECK_EQ(static_cast<uint64_t>(*i), r.Call(*i));
+ } else {
+ CHECK_TRAP64(r.Call(*i));
+ }
+ }
+}
+
+TEST(Run_Wasm_I64ReinterpretF64) {
+ REQUIRE(I64ReinterpretF64);
+ TestingModule module;
+ int64_t* memory = module.AddMemoryElems<int64_t>(8);
+ WasmRunner<int64_t> r(&module);
+
+ BUILD(r, WASM_I64_REINTERPRET_F64(
+ WASM_LOAD_MEM(MachineType::Float64(), WASM_ZERO)));
+
+ FOR_INT32_INPUTS(i) {
+ int64_t expected = static_cast<int64_t>(*i) * 0x300010001;
+ memory[0] = expected;
+ CHECK_EQ(expected, r.Call());
+ }
+}
+
+TEST(Run_Wasm_F64ReinterpretI64) {
+ REQUIRE(F64ReinterpretI64);
+ TestingModule module;
+ int64_t* memory = module.AddMemoryElems<int64_t>(8);
+ WasmRunner<int64_t> r(&module, MachineType::Int64());
+
+ BUILD(r, WASM_BLOCK(
+ 2, WASM_STORE_MEM(MachineType::Float64(), WASM_ZERO,
+ WASM_F64_REINTERPRET_I64(WASM_GET_LOCAL(0))),
+ WASM_GET_LOCAL(0)));
+
+ FOR_INT32_INPUTS(i) {
+ int64_t expected = static_cast<int64_t>(*i) * 0x300010001;
+ CHECK_EQ(expected, r.Call(expected));
+ CHECK_EQ(expected, memory[0]);
+ }
+}
+
+TEST(Run_Wasm_LoadMemI64) {
+ REQUIRE(I64LoadStore);
+ TestingModule module;
+ int64_t* memory = module.AddMemoryElems<int64_t>(8);
+ module.RandomizeMemory(1111);
+ WasmRunner<int64_t> r(&module);
+
+ BUILD(r, WASM_LOAD_MEM(MachineType::Int64(), WASM_I8(0)));
+
+ memory[0] = 0xaabbccdd00112233LL;
+ CHECK_EQ(0xaabbccdd00112233LL, r.Call());
+
+ memory[0] = 0x33aabbccdd001122LL;
+ CHECK_EQ(0x33aabbccdd001122LL, r.Call());
+
+ memory[0] = 77777777;
+ CHECK_EQ(77777777, r.Call());
+}
+
+TEST(Run_Wasm_MemI64_Sum) {
+ REQUIRE(I64LoadStore);
+ REQUIRE(I64Add);
+ REQUIRE(I64Sub);
+ REQUIRE(I64Phi);
+ const int kNumElems = 20;
+ TestingModule module;
+ uint64_t* memory = module.AddMemoryElems<uint64_t>(kNumElems);
+ WasmRunner<uint64_t> r(&module, MachineType::Int32());
+ const byte kSum = r.AllocateLocal(kAstI64);
+
+ BUILD(r, WASM_BLOCK(
+ 2, WASM_WHILE(
+ WASM_GET_LOCAL(0),
+ WASM_BLOCK(
+ 2, WASM_SET_LOCAL(
+ kSum, WASM_I64_ADD(
+ WASM_GET_LOCAL(kSum),
+ WASM_LOAD_MEM(MachineType::Int64(),
+ WASM_GET_LOCAL(0)))),
+ WASM_SET_LOCAL(
+ 0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I8(8))))),
+ WASM_GET_LOCAL(1)));
+
+ // Run 4 trials.
+ for (int i = 0; i < 3; i++) {
+ module.RandomizeMemory(i * 33);
+ uint64_t expected = 0;
+ for (size_t j = kNumElems - 1; j > 0; j--) {
+ expected += memory[j];
+ }
+ uint64_t result = r.Call(8 * (kNumElems - 1));
+ CHECK_EQ(expected, result);
+ }
+}
+
+TEST(Run_Wasm_I64Global) {
+ REQUIRE(I64LoadStore);
+ REQUIRE(I64SConvertI32);
+ REQUIRE(I64And);
+ REQUIRE(DepthFirst);
+ TestingModule module;
+ int64_t* global = module.AddGlobal<int64_t>(MachineType::Int64());
+ WasmRunner<int32_t> r(&module, MachineType::Int32());
+ // global = global + p0
+ BUILD(r, B2(WASM_STORE_GLOBAL(
+ 0, WASM_I64_AND(WASM_LOAD_GLOBAL(0),
+ WASM_I64_SCONVERT_I32(WASM_GET_LOCAL(0)))),
+ WASM_ZERO));
+
+ *global = 0xFFFFFFFFFFFFFFFFLL;
+ for (int i = 9; i < 444444; i += 111111) {
+ int64_t expected = *global & i;
+ r.Call(i);
+ CHECK_EQ(expected, *global);
+ }
+}
+
+TEST(Run_Wasm_I64Eqz) {
+ REQUIRE(I64Eq);
+
+ WasmRunner<int32_t> r(MachineType::Int64());
+ BUILD(r, WASM_I64_EQZ(WASM_GET_LOCAL(0)));
+
+ FOR_INT64_INPUTS(i) {
+ int32_t result = *i == 0 ? 1 : 0;
+ CHECK_EQ(result, r.Call(*i));
+ }
+}
+
+TEST(Run_Wasm_I64Ror) {
+ REQUIRE(I64Ror);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_ROR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) {
+ int64_t expected = bits::RotateRight64(*i, *j & 0x3f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
+ }
+}
+
+TEST(Run_Wasm_I64Rol) {
+ REQUIRE(I64Rol);
+ WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
+ BUILD(r, WASM_I64_ROL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+
+ FOR_UINT64_INPUTS(i) {
+ FOR_UINT64_INPUTS(j) {
+ int64_t expected = bits::RotateLeft64(*i, *j & 0x3f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
+ }
+}
diff --git a/test/cctest/wasm/test-run-wasm-js.cc b/test/cctest/wasm/test-run-wasm-js.cc
index 0b33808..6d95d6e 100644
--- a/test/cctest/wasm/test-run-wasm-js.cc
+++ b/test/cctest/wasm/test-run-wasm-js.cc
@@ -54,21 +54,30 @@
Handle<JSFunction> jsfunc = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
*v8::Local<v8::Function>::Cast(CompileRun(source))));
module->AddFunction(sig, Handle<Code>::null());
- uint32_t index = static_cast<uint32_t>(module->module->functions->size() - 1);
+ uint32_t index = static_cast<uint32_t>(module->module->functions.size() - 1);
Isolate* isolate = CcTest::InitIsolateOnce();
- Handle<Code> code =
- CompileWasmToJSWrapper(isolate, module, jsfunc, sig, "test");
- module->instance->function_code->at(index) = code;
+ WasmName module_name = {"test", 4};
+ WasmName function_name = {nullptr, 0};
+ Handle<Code> code = CompileWasmToJSWrapper(isolate, module, jsfunc, sig,
+ module_name, function_name);
+ module->instance->function_code[index] = code;
return index;
}
uint32_t AddJSSelector(TestingModule* module, FunctionSig* sig, int which) {
- const int kMaxParams = 8;
- static const char* formals[kMaxParams] = {
- "", "a", "a,b", "a,b,c",
- "a,b,c,d", "a,b,c,d,e", "a,b,c,d,e,f", "a,b,c,d,e,f,g",
- };
+ const int kMaxParams = 11;
+ static const char* formals[kMaxParams] = {"",
+ "a",
+ "a,b",
+ "a,b,c",
+ "a,b,c,d",
+ "a,b,c,d,e",
+ "a,b,c,d,e,f",
+ "a,b,c,d,e,f,g",
+ "a,b,c,d,e,f,g,h",
+ "a,b,c,d,e,f,g,h,i",
+ "a,b,c,d,e,f,g,h,i,j"};
CHECK_LT(which, static_cast<int>(sig->parameter_count()));
CHECK_LT(static_cast<int>(sig->parameter_count()), kMaxParams);
@@ -86,7 +95,7 @@
// Wrap the code so it can be called as a JS function.
Handle<String> name = isolate->factory()->NewStringFromStaticChars("main");
Handle<JSObject> module_object = Handle<JSObject>(0, isolate);
- Handle<Code> code = module->instance->function_code->at(index);
+ Handle<Code> code = module->instance->function_code[index];
WasmJs::InstallWasmFunctionMap(isolate, isolate->native_context());
return compiler::CompileJSToWasmWrapper(isolate, module, name, code,
module_object, index);
@@ -171,8 +180,6 @@
}
-#if !V8_TARGET_ARCH_ARM64
-// TODO(titzer): dynamic frame alignment on arm64
TEST(Run_CallJS_Add_jswrapped) {
TestSignatures sigs;
TestingModule module;
@@ -187,12 +194,9 @@
EXPECT_CALL(199, jsfunc, 100, -1);
EXPECT_CALL(-666666801, jsfunc, -666666900, -1);
}
-#endif
void RunJSSelectTest(int which) {
-#if !V8_TARGET_ARCH_ARM
- // TODO(titzer): fix tests on arm and reenable
const int kMaxParams = 8;
PredictableInputValues inputs(0x100);
LocalType type = kAstF64;
@@ -223,7 +227,6 @@
double expected = inputs.arg_d(which);
EXPECT_CALL(expected, jsfunc, 0.0, 0.0);
}
-#endif
}
@@ -296,10 +299,11 @@
void RunWASMSelectAlignTest(int num_args, int num_params) {
PredictableInputValues inputs(0x300);
Isolate* isolate = CcTest::InitIsolateOnce();
- const int kMaxParams = 4;
+ const int kMaxParams = 10;
DCHECK_LE(num_args, kMaxParams);
LocalType type = kAstF64;
- LocalType types[kMaxParams + 1] = {type, type, type, type, type};
+ LocalType types[kMaxParams + 1] = {type, type, type, type, type, type,
+ type, type, type, type, type};
FunctionSig sig(1, num_params, types);
for (int which = 0; which < num_params; which++) {
@@ -308,12 +312,16 @@
BUILD(t, WASM_GET_LOCAL(which));
Handle<JSFunction> jsfunc = WrapCode(&module, t.CompileAndAdd());
- Handle<Object> args[] = {
- isolate->factory()->NewNumber(inputs.arg_d(0)),
- isolate->factory()->NewNumber(inputs.arg_d(1)),
- isolate->factory()->NewNumber(inputs.arg_d(2)),
- isolate->factory()->NewNumber(inputs.arg_d(3)),
- };
+ Handle<Object> args[] = {isolate->factory()->NewNumber(inputs.arg_d(0)),
+ isolate->factory()->NewNumber(inputs.arg_d(1)),
+ isolate->factory()->NewNumber(inputs.arg_d(2)),
+ isolate->factory()->NewNumber(inputs.arg_d(3)),
+ isolate->factory()->NewNumber(inputs.arg_d(4)),
+ isolate->factory()->NewNumber(inputs.arg_d(5)),
+ isolate->factory()->NewNumber(inputs.arg_d(6)),
+ isolate->factory()->NewNumber(inputs.arg_d(7)),
+ isolate->factory()->NewNumber(inputs.arg_d(8)),
+ isolate->factory()->NewNumber(inputs.arg_d(9))};
double nan = std::numeric_limits<double>::quiet_NaN();
double expected = which < num_args ? inputs.arg_d(which) : nan;
@@ -351,16 +359,43 @@
RunWASMSelectAlignTest(4, 4);
}
+TEST(Run_WASMSelectAlign_7) {
+ RunWASMSelectAlignTest(7, 5);
+ RunWASMSelectAlignTest(7, 6);
+ RunWASMSelectAlignTest(7, 7);
+}
+
+TEST(Run_WASMSelectAlign_8) {
+ RunWASMSelectAlignTest(8, 5);
+ RunWASMSelectAlignTest(8, 6);
+ RunWASMSelectAlignTest(8, 7);
+ RunWASMSelectAlignTest(8, 8);
+}
+
+TEST(Run_WASMSelectAlign_9) {
+ RunWASMSelectAlignTest(9, 6);
+ RunWASMSelectAlignTest(9, 7);
+ RunWASMSelectAlignTest(9, 8);
+ RunWASMSelectAlignTest(9, 9);
+}
+
+TEST(Run_WASMSelectAlign_10) {
+ RunWASMSelectAlignTest(10, 7);
+ RunWASMSelectAlignTest(10, 8);
+ RunWASMSelectAlignTest(10, 9);
+ RunWASMSelectAlignTest(10, 10);
+}
void RunJSSelectAlignTest(int num_args, int num_params) {
PredictableInputValues inputs(0x400);
Isolate* isolate = CcTest::InitIsolateOnce();
Factory* factory = isolate->factory();
- const int kMaxParams = 4;
+ const int kMaxParams = 10;
CHECK_LE(num_args, kMaxParams);
CHECK_LE(num_params, kMaxParams);
LocalType type = kAstF64;
- LocalType types[kMaxParams + 1] = {type, type, type, type, type};
+ LocalType types[kMaxParams + 1] = {type, type, type, type, type, type,
+ type, type, type, type, type};
FunctionSig sig(1, num_params, types);
// Build the calling code.
@@ -390,6 +425,12 @@
factory->NewNumber(inputs.arg_d(1)),
factory->NewNumber(inputs.arg_d(2)),
factory->NewNumber(inputs.arg_d(3)),
+ factory->NewNumber(inputs.arg_d(4)),
+ factory->NewNumber(inputs.arg_d(5)),
+ factory->NewNumber(inputs.arg_d(6)),
+ factory->NewNumber(inputs.arg_d(7)),
+ factory->NewNumber(inputs.arg_d(8)),
+ factory->NewNumber(inputs.arg_d(9)),
};
double nan = std::numeric_limits<double>::quiet_NaN();
@@ -404,29 +445,50 @@
RunJSSelectAlignTest(0, 2);
}
+TEST(Run_JSSelectAlign_1) {
+ RunJSSelectAlignTest(1, 2);
+ RunJSSelectAlignTest(1, 3);
+}
TEST(Run_JSSelectAlign_2) {
RunJSSelectAlignTest(2, 3);
RunJSSelectAlignTest(2, 4);
}
+TEST(Run_JSSelectAlign_3) {
+ RunJSSelectAlignTest(3, 3);
+ RunJSSelectAlignTest(3, 4);
+}
TEST(Run_JSSelectAlign_4) {
RunJSSelectAlignTest(4, 3);
RunJSSelectAlignTest(4, 4);
}
-
-#if !V8_TARGET_ARCH_ARM64
-// TODO(titzer): dynamic frame alignment on arm64
-TEST(Run_JSSelectAlign_1) {
- RunJSSelectAlignTest(1, 2);
- RunJSSelectAlignTest(1, 3);
+TEST(Run_JSSelectAlign_7) {
+ RunJSSelectAlignTest(7, 3);
+ RunJSSelectAlignTest(7, 4);
+ RunJSSelectAlignTest(7, 4);
+ RunJSSelectAlignTest(7, 4);
}
-
-TEST(Run_JSSelectAlign_3) {
- RunJSSelectAlignTest(3, 3);
- RunJSSelectAlignTest(3, 4);
+TEST(Run_JSSelectAlign_8) {
+ RunJSSelectAlignTest(8, 5);
+ RunJSSelectAlignTest(8, 6);
+ RunJSSelectAlignTest(8, 7);
+ RunJSSelectAlignTest(8, 8);
}
-#endif
+
+TEST(Run_JSSelectAlign_9) {
+ RunJSSelectAlignTest(9, 6);
+ RunJSSelectAlignTest(9, 7);
+ RunJSSelectAlignTest(9, 8);
+ RunJSSelectAlignTest(9, 9);
+}
+
+TEST(Run_JSSelectAlign_10) {
+ RunJSSelectAlignTest(10, 7);
+ RunJSSelectAlignTest(10, 8);
+ RunJSSelectAlignTest(10, 9);
+ RunJSSelectAlignTest(10, 10);
+}
diff --git a/test/cctest/wasm/test-run-wasm-module.cc b/test/cctest/wasm/test-run-wasm-module.cc
index 905e8e4..118a91f 100644
--- a/test/cctest/wasm/test-run-wasm-module.cc
+++ b/test/cctest/wasm/test-run-wasm-module.cc
@@ -19,7 +19,6 @@
using namespace v8::internal::wasm;
-#if !V8_TARGET_ARCH_ARM64
// TODO(titzer): fix arm64 frame alignment.
namespace {
void TestModule(WasmModuleIndex* module, int32_t expected_result) {
@@ -36,19 +35,24 @@
// A raw test that skips the WasmModuleBuilder.
TEST(Run_WasmModule_CallAdd_rev) {
static const byte data[] = {
+ WASM_MODULE_HEADER,
// sig#0 ------------------------------------------
- kDeclSignatures, 2, 0, kLocalI32, // void -> int
- 2, kLocalI32, kLocalI32, kLocalI32, // int,int -> int
+ WASM_SECTION_SIGNATURES_SIZE + 7, // Section size.
+ WASM_SECTION_SIGNATURES, 2, 0, kLocalI32, // void -> int
+ 2, kLocalI32, kLocalI32, kLocalI32, // int,int -> int
// func#0 (main) ----------------------------------
- kDeclFunctions, 2, kDeclFunctionExport, 0, 0, // sig index
- 6, 0, // body size
- kExprCallFunction, 1, // --
- kExprI8Const, 77, // --
- kExprI8Const, 22, // --
+ WASM_SECTION_FUNCTIONS_SIZE + 24, WASM_SECTION_FUNCTIONS, 2,
+ kDeclFunctionExport, 0, 0, // sig index
+ 7, 0, // body size
+ 0, // locals
+ kExprCallFunction, 1, // --
+ kExprI8Const, 77, // --
+ kExprI8Const, 22, // --
// func#1 -----------------------------------------
0, // no name, not exported
1, 0, // sig index
- 5, 0, // body size
+ 6, 0, // body size
+ 0, // locals
kExprI32Add, // --
kExprGetLocal, 0, // --
kExprGetLocal, 1, // --
@@ -65,7 +69,8 @@
TEST(Run_WasmModule_Return114) {
static const int32_t kReturnValue = 114;
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
uint16_t f_index = builder->AddFunction();
WasmFunctionBuilder* f = builder->FunctionAt(f_index);
@@ -79,7 +84,8 @@
TEST(Run_WasmModule_CallAdd) {
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
uint16_t f1_index = builder->AddFunction();
WasmFunctionBuilder* f = builder->FunctionAt(f1_index);
@@ -102,7 +108,8 @@
TEST(Run_WasmModule_ReadLoadedDataSegment) {
static const byte kDataSegmentDest0 = 12;
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
uint16_t f_index = builder->AddFunction();
WasmFunctionBuilder* f = builder->FunctionAt(f_index);
@@ -118,19 +125,10 @@
TestModule(writer->WriteTo(&zone), 0xddccbbaa);
}
-
-#if defined(__has_feature)
-#if __has_feature(address_sanitizer)
-#define V8_WITH_ASAN 1
-#endif
-#endif
-
-
-#if !defined(V8_WITH_ASAN)
-// TODO(bradnelson): Figure out why this crashes under asan.
TEST(Run_WasmModule_CheckMemoryIsZero) {
static const int kCheckSize = 16 * 1024;
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
uint16_t f_index = builder->AddFunction();
WasmFunctionBuilder* f = builder->FunctionAt(f_index);
@@ -140,23 +138,19 @@
byte code[] = {WASM_BLOCK(
2,
WASM_WHILE(
- WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32(kCheckSize)),
+ WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32V_3(kCheckSize)),
WASM_IF_ELSE(
WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(localIndex)),
WASM_BRV(2, WASM_I8(-1)), WASM_INC_LOCAL_BY(localIndex, 4))),
WASM_I8(11))};
- uint32_t local_indices[] = {7, 19, 25, 28};
- f->EmitCode(code, sizeof(code), local_indices, sizeof(local_indices) / 4);
+ f->EmitCode(code, sizeof(code), nullptr, 0);
WasmModuleWriter* writer = builder->Build(&zone);
TestModule(writer->WriteTo(&zone), 11);
}
-#endif
-
-#if !defined(V8_WITH_ASAN)
-// TODO(bradnelson): Figure out why this crashes under asan.
TEST(Run_WasmModule_CallMain_recursive) {
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
uint16_t f_index = builder->AddFunction();
WasmFunctionBuilder* f = builder->FunctionAt(f_index);
@@ -171,18 +165,14 @@
WASM_INC_LOCAL(localIndex)),
WASM_BRV(1, WASM_CALL_FUNCTION0(0))),
WASM_BRV(0, WASM_I8(55))))};
- uint32_t local_indices[] = {3, 11, 21, 24};
- f->EmitCode(code, sizeof(code), local_indices, sizeof(local_indices) / 4);
+ f->EmitCode(code, sizeof(code), nullptr, 0);
WasmModuleWriter* writer = builder->Build(&zone);
TestModule(writer->WriteTo(&zone), 55);
}
-#endif
-
-#if !defined(V8_WITH_ASAN)
-// TODO(bradnelson): Figure out why this crashes under asan.
TEST(Run_WasmModule_Global) {
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
uint32_t global1 = builder->AddGlobal(MachineType::Int32(), 0);
uint32_t global2 = builder->AddGlobal(MachineType::Int32(), 0);
@@ -196,13 +186,10 @@
f = builder->FunctionAt(f2_index);
f->ReturnType(kAstI32);
f->Exported(1);
- byte code2[] = {WASM_STORE_GLOBAL(global1, WASM_I32(56)),
- WASM_STORE_GLOBAL(global2, WASM_I32(41)),
+ byte code2[] = {WASM_STORE_GLOBAL(global1, WASM_I32V_1(56)),
+ WASM_STORE_GLOBAL(global2, WASM_I32V_1(41)),
WASM_RETURN(WASM_CALL_FUNCTION0(f1_index))};
f->EmitCode(code2, sizeof(code2));
WasmModuleWriter* writer = builder->Build(&zone);
TestModule(writer->WriteTo(&zone), 97);
}
-#endif
-
-#endif // !V8_TARGET_ARCH_ARM64
diff --git a/test/cctest/wasm/test-run-wasm.cc b/test/cctest/wasm/test-run-wasm.cc
index a6f07f7..70d461b 100644
--- a/test/cctest/wasm/test-run-wasm.cc
+++ b/test/cctest/wasm/test-run-wasm.cc
@@ -18,12 +18,11 @@
using namespace v8::internal::compiler;
using namespace v8::internal::wasm;
-#define BUILD(r, ...) \
- do { \
- byte code[] = {__VA_ARGS__}; \
- r.Build(code, code + arraysize(code)); \
- } while (false)
-
+// for even shorter tests.
+#define B2(a, b) kExprBlock, 2, a, b
+#define B1(a) kExprBlock, 1, a
+#define RET(x) kExprReturn, x
+#define RET_I8(x) kExprReturn, kExprI8Const, x
TEST(Run_WasmInt8Const) {
WasmRunner<int32_t> r;
@@ -67,7 +66,7 @@
WasmRunner<int32_t> r;
const int32_t kExpectedValue = 0x11223344;
// return(kExpectedValue)
- BUILD(r, WASM_I32(kExpectedValue));
+ BUILD(r, WASM_I32V_5(kExpectedValue));
CHECK_EQ(kExpectedValue, r.Call());
}
@@ -77,7 +76,7 @@
WasmRunner<int32_t> r;
const int32_t kExpectedValue = *i;
// return(kExpectedValue)
- BUILD(r, WASM_I32(kExpectedValue));
+ BUILD(r, WASM_I32V(kExpectedValue));
CHECK_EQ(kExpectedValue, r.Call());
}
}
@@ -92,47 +91,6 @@
}
-#if WASM_64
-TEST(Run_WasmInt64Const) {
- WasmRunner<int64_t> r;
- const int64_t kExpectedValue = 0x1122334455667788LL;
- // return(kExpectedValue)
- BUILD(r, WASM_I64(kExpectedValue));
- CHECK_EQ(kExpectedValue, r.Call());
-}
-
-
-TEST(Run_WasmInt64Const_many) {
- int cntr = 0;
- FOR_INT32_INPUTS(i) {
- WasmRunner<int64_t> r;
- const int64_t kExpectedValue = (static_cast<int64_t>(*i) << 32) | cntr;
- // return(kExpectedValue)
- BUILD(r, WASM_I64(kExpectedValue));
- CHECK_EQ(kExpectedValue, r.Call());
- cntr++;
- }
-}
-#endif
-
-TEST(Run_WasmI32ConvertI64) {
- FOR_INT64_INPUTS(i) {
- WasmRunner<int32_t> r;
- BUILD(r, WASM_I32_CONVERT_I64(WASM_I64(*i)));
- CHECK_EQ(static_cast<int32_t>(*i), r.Call());
- }
-}
-
-TEST(Run_WasmI64AndConstants) {
- FOR_INT64_INPUTS(i) {
- FOR_INT64_INPUTS(j) {
- WasmRunner<int32_t> r;
- BUILD(r, WASM_I32_CONVERT_I64(WASM_I64_AND(WASM_I64(*i), WASM_I64(*j))));
- CHECK_EQ(static_cast<int32_t>(*i & *j), r.Call());
- }
- }
-}
-
TEST(Run_WasmInt32Param0) {
WasmRunner<int32_t> r(MachineType::Int32());
// return(local[0])
@@ -216,7 +174,7 @@
{
WasmRunner<int32_t> r;
// K op K
- BUILD(r, WASM_BINOP(opcode, WASM_I32(a), WASM_I32(b)));
+ BUILD(r, WASM_BINOP(opcode, WASM_I32V(a), WASM_I32V(b)));
CHECK_EQ(expected, r.Call());
}
{
@@ -241,6 +199,10 @@
TestInt32Binop(kExprI32Shl, 0xA0000000, 0xA, 28);
TestInt32Binop(kExprI32ShrU, 0x07000010, 0x70000100, 4);
TestInt32Binop(kExprI32ShrS, 0xFF000000, 0x80000000, 7);
+ TestInt32Binop(kExprI32Ror, 0x01000000, 0x80000000, 7);
+ TestInt32Binop(kExprI32Ror, 0x01000000, 0x80000000, 39);
+ TestInt32Binop(kExprI32Rol, 0x00000040, 0x80000000, 7);
+ TestInt32Binop(kExprI32Rol, 0x00000040, 0x80000000, 39);
TestInt32Binop(kExprI32Eq, 1, -99, -99);
TestInt32Binop(kExprI32Ne, 0, -97, -97);
@@ -260,7 +222,7 @@
{
WasmRunner<int32_t> r;
// return op K
- BUILD(r, WASM_UNOP(opcode, WASM_I32(a)));
+ BUILD(r, WASM_UNOP(opcode, WASM_I32V(a)));
CHECK_EQ(expected, r.Call());
}
{
@@ -354,209 +316,83 @@
TestInt32Unop(kExprI32Popcnt, 19, 0xfedcba09);
}
+TEST(Run_WasmI32Eqz) {
+ TestInt32Unop(kExprI32Eqz, 0, 1);
+ TestInt32Unop(kExprI32Eqz, 0, -1);
+ TestInt32Unop(kExprI32Eqz, 0, -827343);
+ TestInt32Unop(kExprI32Eqz, 0, 8888888);
+ TestInt32Unop(kExprI32Eqz, 1, 0);
+}
-#if WASM_64
-void TestInt64Binop(WasmOpcode opcode, int64_t expected, int64_t a, int64_t b) {
- if (!WasmOpcodes::IsSupported(opcode)) return;
- {
- WasmRunner<int64_t> r;
- // return K op K
- BUILD(r, WASM_BINOP(opcode, WASM_I64(a), WASM_I64(b)));
- CHECK_EQ(expected, r.Call());
- }
- {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
- // return a op b
- BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- CHECK_EQ(expected, r.Call(a, b));
+TEST(Run_WasmI32Shl) {
+ WasmRunner<uint32_t> r(MachineType::Uint32(), MachineType::Uint32());
+ BUILD(r, WASM_I32_SHL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+
+ FOR_UINT32_INPUTS(i) {
+ FOR_UINT32_INPUTS(j) {
+ uint32_t expected = (*i) << (*j & 0x1f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
}
}
+TEST(Run_WasmI32Shr) {
+ WasmRunner<uint32_t> r(MachineType::Uint32(), MachineType::Uint32());
+ BUILD(r, WASM_I32_SHR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
-void TestInt64Cmp(WasmOpcode opcode, int64_t expected, int64_t a, int64_t b) {
- if (!WasmOpcodes::IsSupported(opcode)) return;
- {
- WasmRunner<int32_t> r;
- // return K op K
- BUILD(r, WASM_BINOP(opcode, WASM_I64(a), WASM_I64(b)));
- CHECK_EQ(expected, r.Call());
- }
- {
- WasmRunner<int32_t> r(MachineType::Int64(), MachineType::Int64());
- // return a op b
- BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- CHECK_EQ(expected, r.Call(a, b));
+ FOR_UINT32_INPUTS(i) {
+ FOR_UINT32_INPUTS(j) {
+ uint32_t expected = (*i) >> (*j & 0x1f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
}
}
+TEST(Run_WasmI32Sar) {
+ WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
+ BUILD(r, WASM_I32_SAR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
-TEST(Run_WasmInt64Binops) {
- // TODO(titzer): real 64-bit numbers
- TestInt64Binop(kExprI64Add, 8888888888888LL, 3333333333333LL,
- 5555555555555LL);
- TestInt64Binop(kExprI64Sub, -111111111111LL, 777777777777LL, 888888888888LL);
- TestInt64Binop(kExprI64Mul, 65130756, 88734, 734);
- TestInt64Binop(kExprI64DivS, -66, -4777344, 72384);
- TestInt64Binop(kExprI64DivU, 805306368, 0xF0000000, 5);
- TestInt64Binop(kExprI64RemS, -3, -3003, 1000);
- TestInt64Binop(kExprI64RemU, 4, 4004, 1000);
- TestInt64Binop(kExprI64And, 0xEE, 0xFFEE, 0xFF0000FF);
- TestInt64Binop(kExprI64Ior, 0xF0FF00FF, 0xF0F000EE, 0x000F0011);
- TestInt64Binop(kExprI64Xor, 0xABCDEF01, 0xABCDEFFF, 0xFE);
- TestInt64Binop(kExprI64Shl, 0xA0000000, 0xA, 28);
- TestInt64Binop(kExprI64ShrU, 0x0700001000123456LL, 0x7000010001234567LL, 4);
- TestInt64Binop(kExprI64ShrS, 0xFF00000000000000LL, 0x8000000000000000LL, 7);
- TestInt64Cmp(kExprI64Eq, 1, -9999, -9999);
- TestInt64Cmp(kExprI64Ne, 1, -9199, -9999);
- TestInt64Cmp(kExprI64LtS, 1, -4, 4);
- TestInt64Cmp(kExprI64LeS, 0, -2, -3);
- TestInt64Cmp(kExprI64LtU, 1, 0, -6);
- TestInt64Cmp(kExprI64LeU, 1, 98978, 0xF0000000);
-}
-
-
-TEST(Run_WasmInt64Clz) {
- struct {
- int64_t expected;
- uint64_t input;
- } values[] = {{0, 0x8000100000000000}, {1, 0x4000050000000000},
- {2, 0x2000030000000000}, {3, 0x1000000300000000},
- {4, 0x0805000000000000}, {5, 0x0400600000000000},
- {6, 0x0200000000000000}, {7, 0x010000a000000000},
- {8, 0x00800c0000000000}, {9, 0x0040000000000000},
- {10, 0x0020000d00000000}, {11, 0x00100f0000000000},
- {12, 0x0008000000000000}, {13, 0x0004100000000000},
- {14, 0x0002002000000000}, {15, 0x0001030000000000},
- {16, 0x0000804000000000}, {17, 0x0000400500000000},
- {18, 0x0000205000000000}, {19, 0x0000170000000000},
- {20, 0x0000087000000000}, {21, 0x0000040500000000},
- {22, 0x0000020300000000}, {23, 0x0000010100000000},
- {24, 0x0000008900000000}, {25, 0x0000004100000000},
- {26, 0x0000002200000000}, {27, 0x0000001300000000},
- {28, 0x0000000800000000}, {29, 0x0000000400000000},
- {30, 0x0000000200000000}, {31, 0x0000000100000000},
- {32, 0x0000000080001000}, {33, 0x0000000040000500},
- {34, 0x0000000020000300}, {35, 0x0000000010000003},
- {36, 0x0000000008050000}, {37, 0x0000000004006000},
- {38, 0x0000000002000000}, {39, 0x00000000010000a0},
- {40, 0x0000000000800c00}, {41, 0x0000000000400000},
- {42, 0x000000000020000d}, {43, 0x0000000000100f00},
- {44, 0x0000000000080000}, {45, 0x0000000000041000},
- {46, 0x0000000000020020}, {47, 0x0000000000010300},
- {48, 0x0000000000008040}, {49, 0x0000000000004005},
- {50, 0x0000000000002050}, {51, 0x0000000000001700},
- {52, 0x0000000000000870}, {53, 0x0000000000000405},
- {54, 0x0000000000000203}, {55, 0x0000000000000101},
- {56, 0x0000000000000089}, {57, 0x0000000000000041},
- {58, 0x0000000000000022}, {59, 0x0000000000000013},
- {60, 0x0000000000000008}, {61, 0x0000000000000004},
- {62, 0x0000000000000002}, {63, 0x0000000000000001},
- {64, 0x0000000000000000}};
-
- WasmRunner<int64_t> r(MachineType::Uint64());
- BUILD(r, WASM_I64_CLZ(WASM_GET_LOCAL(0)));
- for (size_t i = 0; i < arraysize(values); i++) {
- CHECK_EQ(values[i].expected, r.Call(values[i].input));
+ FOR_INT32_INPUTS(i) {
+ FOR_INT32_INPUTS(j) {
+ int32_t expected = (*i) >> (*j & 0x1f);
+ CHECK_EQ(expected, r.Call(*i, *j));
+ }
}
}
-
-TEST(Run_WasmInt64Ctz) {
- struct {
- int64_t expected;
- uint64_t input;
- } values[] = {{64, 0x0000000000000000}, {63, 0x8000000000000000},
- {62, 0x4000000000000000}, {61, 0x2000000000000000},
- {60, 0x1000000000000000}, {59, 0xa800000000000000},
- {58, 0xf400000000000000}, {57, 0x6200000000000000},
- {56, 0x9100000000000000}, {55, 0xcd80000000000000},
- {54, 0x0940000000000000}, {53, 0xaf20000000000000},
- {52, 0xac10000000000000}, {51, 0xe0b8000000000000},
- {50, 0x9ce4000000000000}, {49, 0xc792000000000000},
- {48, 0xb8f1000000000000}, {47, 0x3b9f800000000000},
- {46, 0xdb4c400000000000}, {45, 0xe9a3200000000000},
- {44, 0xfca6100000000000}, {43, 0x6c8a780000000000},
- {42, 0x8ce5a40000000000}, {41, 0xcb7d020000000000},
- {40, 0xcb4dc10000000000}, {39, 0xdfbec58000000000},
- {38, 0x27a9db4000000000}, {37, 0xde3bcb2000000000},
- {36, 0xd7e8a61000000000}, {35, 0x9afdbc8800000000},
- {34, 0x9afdbc8400000000}, {33, 0x9afdbc8200000000},
- {32, 0x9afdbc8100000000}, {31, 0x0000000080000000},
- {30, 0x0000000040000000}, {29, 0x0000000020000000},
- {28, 0x0000000010000000}, {27, 0x00000000a8000000},
- {26, 0x00000000f4000000}, {25, 0x0000000062000000},
- {24, 0x0000000091000000}, {23, 0x00000000cd800000},
- {22, 0x0000000009400000}, {21, 0x00000000af200000},
- {20, 0x00000000ac100000}, {19, 0x00000000e0b80000},
- {18, 0x000000009ce40000}, {17, 0x00000000c7920000},
- {16, 0x00000000b8f10000}, {15, 0x000000003b9f8000},
- {14, 0x00000000db4c4000}, {13, 0x00000000e9a32000},
- {12, 0x00000000fca61000}, {11, 0x000000006c8a7800},
- {10, 0x000000008ce5a400}, {9, 0x00000000cb7d0200},
- {8, 0x00000000cb4dc100}, {7, 0x00000000dfbec580},
- {6, 0x0000000027a9db40}, {5, 0x00000000de3bcb20},
- {4, 0x00000000d7e8a610}, {3, 0x000000009afdbc88},
- {2, 0x000000009afdbc84}, {1, 0x000000009afdbc82},
- {0, 0x000000009afdbc81}};
-
- WasmRunner<int64_t> r(MachineType::Uint64());
- BUILD(r, WASM_I64_CTZ(WASM_GET_LOCAL(0)));
- for (size_t i = 0; i < arraysize(values); i++) {
- CHECK_EQ(values[i].expected, r.Call(values[i].input));
- }
-}
-
-
-TEST(Run_WasmInt64Popcnt) {
- struct {
- int64_t expected;
- uint64_t input;
- } values[] = {{64, 0xffffffffffffffff},
- {0, 0x0000000000000000},
- {2, 0x0000080000008000},
- {26, 0x1123456782345678},
- {38, 0xffedcba09edcba09}};
-
- WasmRunner<int64_t> r(MachineType::Uint64());
- BUILD(r, WASM_I64_POPCNT(WASM_GET_LOCAL(0)));
- for (size_t i = 0; i < arraysize(values); i++) {
- CHECK_EQ(values[i].expected, r.Call(values[i].input));
- }
-}
-
-
-#endif
-
TEST(Run_WASM_Int32DivS_trap) {
WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
BUILD(r, WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
CHECK_EQ(0, r.Call(0, 100));
CHECK_TRAP(r.Call(100, 0));
CHECK_TRAP(r.Call(-1001, 0));
- CHECK_TRAP(r.Call(std::numeric_limits<int32_t>::min(), -1));
- CHECK_TRAP(r.Call(std::numeric_limits<int32_t>::min(), 0));
+ CHECK_TRAP(r.Call(kMin, -1));
+ CHECK_TRAP(r.Call(kMin, 0));
}
TEST(Run_WASM_Int32RemS_trap) {
WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
BUILD(r, WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
CHECK_EQ(33, r.Call(133, 100));
- CHECK_EQ(0, r.Call(std::numeric_limits<int32_t>::min(), -1));
+ CHECK_EQ(0, r.Call(kMin, -1));
CHECK_TRAP(r.Call(100, 0));
CHECK_TRAP(r.Call(-1001, 0));
- CHECK_TRAP(r.Call(std::numeric_limits<int32_t>::min(), 0));
+ CHECK_TRAP(r.Call(kMin, 0));
}
TEST(Run_WASM_Int32DivU_trap) {
WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
BUILD(r, WASM_I32_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
CHECK_EQ(0, r.Call(0, 100));
- CHECK_EQ(0, r.Call(std::numeric_limits<int32_t>::min(), -1));
+ CHECK_EQ(0, r.Call(kMin, -1));
CHECK_TRAP(r.Call(100, 0));
CHECK_TRAP(r.Call(-1001, 0));
- CHECK_TRAP(r.Call(std::numeric_limits<int32_t>::min(), 0));
+ CHECK_TRAP(r.Call(kMin, 0));
}
@@ -564,11 +400,63 @@
WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
BUILD(r, WASM_I32_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
CHECK_EQ(17, r.Call(217, 100));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
CHECK_TRAP(r.Call(100, 0));
CHECK_TRAP(r.Call(-1001, 0));
- CHECK_TRAP(r.Call(std::numeric_limits<int32_t>::min(), 0));
- CHECK_EQ(std::numeric_limits<int32_t>::min(),
- r.Call(std::numeric_limits<int32_t>::min(), -1));
+ CHECK_TRAP(r.Call(kMin, 0));
+ CHECK_EQ(kMin, r.Call(kMin, -1));
+}
+
+TEST(Run_WASM_Int32DivS_asmjs) {
+ TestingModule module;
+ module.origin = kAsmJsOrigin;
+ WasmRunner<int32_t> r(&module, MachineType::Int32(), MachineType::Int32());
+ BUILD(r, WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
+ CHECK_EQ(0, r.Call(0, 100));
+ CHECK_EQ(0, r.Call(100, 0));
+ CHECK_EQ(0, r.Call(-1001, 0));
+ CHECK_EQ(kMin, r.Call(kMin, -1));
+ CHECK_EQ(0, r.Call(kMin, 0));
+}
+
+TEST(Run_WASM_Int32RemS_asmjs) {
+ TestingModule module;
+ module.origin = kAsmJsOrigin;
+ WasmRunner<int32_t> r(&module, MachineType::Int32(), MachineType::Int32());
+ BUILD(r, WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
+ CHECK_EQ(33, r.Call(133, 100));
+ CHECK_EQ(0, r.Call(kMin, -1));
+ CHECK_EQ(0, r.Call(100, 0));
+ CHECK_EQ(0, r.Call(-1001, 0));
+ CHECK_EQ(0, r.Call(kMin, 0));
+}
+
+TEST(Run_WASM_Int32DivU_asmjs) {
+ TestingModule module;
+ module.origin = kAsmJsOrigin;
+ WasmRunner<int32_t> r(&module, MachineType::Int32(), MachineType::Int32());
+ BUILD(r, WASM_I32_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
+ CHECK_EQ(0, r.Call(0, 100));
+ CHECK_EQ(0, r.Call(kMin, -1));
+ CHECK_EQ(0, r.Call(100, 0));
+ CHECK_EQ(0, r.Call(-1001, 0));
+ CHECK_EQ(0, r.Call(kMin, 0));
+}
+
+TEST(Run_WASM_Int32RemU_asmjs) {
+ TestingModule module;
+ module.origin = kAsmJsOrigin;
+ WasmRunner<int32_t> r(&module, MachineType::Int32(), MachineType::Int32());
+ BUILD(r, WASM_I32_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
+ CHECK_EQ(17, r.Call(217, 100));
+ CHECK_EQ(0, r.Call(100, 0));
+ CHECK_EQ(0, r.Call(-1001, 0));
+ CHECK_EQ(0, r.Call(kMin, 0));
+ CHECK_EQ(kMin, r.Call(kMin, -1));
}
@@ -590,7 +478,7 @@
TEST(Run_WASM_Int32DivU_byzero_const) {
for (uint32_t denom = 0xfffffffe; denom < 8; denom++) {
WasmRunner<uint32_t> r(MachineType::Uint32());
- BUILD(r, WASM_I32_DIVU(WASM_GET_LOCAL(0), WASM_I32(denom)));
+ BUILD(r, WASM_I32_DIVU(WASM_GET_LOCAL(0), WASM_I32V_1(denom)));
for (uint32_t val = 0xfffffff0; val < 8; val++) {
if (denom == 0) {
@@ -622,86 +510,6 @@
CHECK_TRAP(r.Call(0, 0));
}
-
-#if WASM_64
-#define as64(x) static_cast<int64_t>(x)
-TEST(Run_WASM_Int64DivS_trap) {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- CHECK_EQ(0, r.Call(as64(0), as64(100)));
- CHECK_TRAP64(r.Call(as64(100), as64(0)));
- CHECK_TRAP64(r.Call(as64(-1001), as64(0)));
- CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), as64(-1)));
- CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), as64(0)));
-}
-
-
-TEST(Run_WASM_Int64RemS_trap) {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_I64_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- CHECK_EQ(33, r.Call(as64(133), as64(100)));
- CHECK_EQ(0, r.Call(std::numeric_limits<int64_t>::min(), as64(-1)));
- CHECK_TRAP64(r.Call(as64(100), as64(0)));
- CHECK_TRAP64(r.Call(as64(-1001), as64(0)));
- CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), as64(0)));
-}
-
-
-TEST(Run_WASM_Int64DivU_trap) {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- CHECK_EQ(0, r.Call(as64(0), as64(100)));
- CHECK_EQ(0, r.Call(std::numeric_limits<int64_t>::min(), as64(-1)));
- CHECK_TRAP64(r.Call(as64(100), as64(0)));
- CHECK_TRAP64(r.Call(as64(-1001), as64(0)));
- CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), as64(0)));
-}
-
-
-TEST(Run_WASM_Int64RemU_trap) {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_I64_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- CHECK_EQ(17, r.Call(as64(217), as64(100)));
- CHECK_TRAP64(r.Call(as64(100), as64(0)));
- CHECK_TRAP64(r.Call(as64(-1001), as64(0)));
- CHECK_TRAP64(r.Call(std::numeric_limits<int64_t>::min(), as64(0)));
- CHECK_EQ(std::numeric_limits<int64_t>::min(),
- r.Call(std::numeric_limits<int64_t>::min(), as64(-1)));
-}
-
-
-TEST(Run_WASM_Int64DivS_byzero_const) {
- for (int8_t denom = -2; denom < 8; denom++) {
- WasmRunner<int64_t> r(MachineType::Int64());
- BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_I64(denom)));
- for (int64_t val = -7; val < 8; val++) {
- if (denom == 0) {
- CHECK_TRAP64(r.Call(val));
- } else {
- CHECK_EQ(val / denom, r.Call(val));
- }
- }
- }
-}
-
-
-TEST(Run_WASM_Int64DivU_byzero_const) {
- for (uint64_t denom = 0xfffffffffffffffe; denom < 8; denom++) {
- WasmRunner<uint64_t> r(MachineType::Uint64());
- BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_I64(denom)));
-
- for (uint64_t val = 0xfffffffffffffff0; val < 8; val++) {
- if (denom == 0) {
- CHECK_TRAP64(r.Call(val));
- } else {
- CHECK_EQ(val / denom, r.Call(val));
- }
- }
- }
-}
-#endif
-
-
void TestFloat32Binop(WasmOpcode opcode, int32_t expected, float a, float b) {
{
WasmRunner<int32_t> r;
@@ -892,7 +700,7 @@
TEST(Run_Wasm_Return12) {
WasmRunner<int32_t> r;
- BUILD(r, WASM_RETURN(WASM_I8(12)));
+ BUILD(r, RET_I8(12));
CHECK_EQ(12, r.Call());
}
@@ -900,7 +708,7 @@
TEST(Run_Wasm_Return17) {
WasmRunner<int32_t> r;
- BUILD(r, WASM_BLOCK(1, WASM_RETURN(WASM_I8(17))));
+ BUILD(r, B1(RET_I8(17)));
CHECK_EQ(17, r.Call());
}
@@ -908,27 +716,16 @@
TEST(Run_Wasm_Return_I32) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_RETURN(WASM_GET_LOCAL(0)));
+ BUILD(r, RET(WASM_GET_LOCAL(0)));
FOR_INT32_INPUTS(i) { CHECK_EQ(*i, r.Call(*i)); }
}
-#if WASM_64
-TEST(Run_Wasm_Return_I64) {
- WasmRunner<int64_t> r(MachineType::Int64());
-
- BUILD(r, WASM_RETURN(WASM_GET_LOCAL(0)));
-
- FOR_INT64_INPUTS(i) { CHECK_EQ(*i, r.Call(*i)); }
-}
-#endif
-
-
TEST(Run_Wasm_Return_F32) {
WasmRunner<float> r(MachineType::Float32());
- BUILD(r, WASM_RETURN(WASM_GET_LOCAL(0)));
+ BUILD(r, RET(WASM_GET_LOCAL(0)));
FOR_FLOAT32_INPUTS(i) {
float expect = *i;
@@ -945,7 +742,7 @@
TEST(Run_Wasm_Return_F64) {
WasmRunner<double> r(MachineType::Float64());
- BUILD(r, WASM_RETURN(WASM_GET_LOCAL(0)));
+ BUILD(r, RET(WASM_GET_LOCAL(0)));
FOR_FLOAT64_INPUTS(i) {
double expect = *i;
@@ -973,17 +770,18 @@
TEST(Run_Wasm_Select_strict1) {
WasmRunner<int32_t> r(MachineType::Int32());
// select(a=0, a=1, a=2); return a
- BUILD(r, WASM_BLOCK(2, WASM_SELECT(WASM_SET_LOCAL(0, WASM_I8(0)),
- WASM_SET_LOCAL(0, WASM_I8(1)),
- WASM_SET_LOCAL(0, WASM_I8(2))),
- WASM_GET_LOCAL(0)));
+ BUILD(r, B2(WASM_SELECT(WASM_SET_LOCAL(0, WASM_I8(0)),
+ WASM_SET_LOCAL(0, WASM_I8(1)),
+ WASM_SET_LOCAL(0, WASM_I8(2))),
+ WASM_GET_LOCAL(0)));
FOR_INT32_INPUTS(i) { CHECK_EQ(2, r.Call(*i)); }
}
TEST(Run_Wasm_Select_strict2) {
WasmRunner<int32_t> r(MachineType::Int32());
- r.env()->AddLocals(kAstI32, 2);
+ r.AllocateLocal(kAstI32);
+ r.AllocateLocal(kAstI32);
// select(b=5, c=6, a)
BUILD(r, WASM_SELECT(WASM_SET_LOCAL(1, WASM_I8(5)),
WASM_SET_LOCAL(2, WASM_I8(6)), WASM_GET_LOCAL(0)));
@@ -995,7 +793,8 @@
TEST(Run_Wasm_Select_strict3) {
WasmRunner<int32_t> r(MachineType::Int32());
- r.env()->AddLocals(kAstI32, 2);
+ r.AllocateLocal(kAstI32);
+ r.AllocateLocal(kAstI32);
// select(b=5, c=6, a=b)
BUILD(r, WASM_SELECT(WASM_SET_LOCAL(1, WASM_I8(5)),
WASM_SET_LOCAL(2, WASM_I8(6)),
@@ -1009,55 +808,67 @@
TEST(Run_Wasm_BrIf_strict) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(
- 2, WASM_BLOCK(1, WASM_BRV_IF(0, WASM_GET_LOCAL(0),
- WASM_SET_LOCAL(0, WASM_I8(99)))),
- WASM_GET_LOCAL(0)));
+ BUILD(
+ r,
+ B2(B1(WASM_BRV_IF(0, WASM_GET_LOCAL(0), WASM_SET_LOCAL(0, WASM_I8(99)))),
+ WASM_GET_LOCAL(0)));
FOR_INT32_INPUTS(i) { CHECK_EQ(99, r.Call(*i)); }
}
-TEST(Run_Wasm_TableSwitch0a) {
+TEST(Run_Wasm_BrTable0a) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_TABLESWITCH_OP(0, 1, WASM_CASE_BR(0)),
- WASM_TABLESWITCH_BODY0(WASM_GET_LOCAL(0)), WASM_I8(91)));
+ BUILD(r,
+ B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 0, BR_TARGET(0))), WASM_I8(91)));
FOR_INT32_INPUTS(i) { CHECK_EQ(91, r.Call(*i)); }
}
-TEST(Run_Wasm_TableSwitch0b) {
+TEST(Run_Wasm_BrTable0b) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(
- 2, WASM_TABLESWITCH_OP(0, 2, WASM_CASE_BR(0), WASM_CASE_BR(0)),
- WASM_TABLESWITCH_BODY0(WASM_GET_LOCAL(0)), WASM_I8(92)));
+ BUILD(r,
+ B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 1, BR_TARGET(0), BR_TARGET(0))),
+ WASM_I8(92)));
FOR_INT32_INPUTS(i) { CHECK_EQ(92, r.Call(*i)); }
}
-TEST(Run_Wasm_TableSwitch0c) {
+TEST(Run_Wasm_BrTable0c) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r,
- WASM_BLOCK(2, WASM_BLOCK(2, WASM_TABLESWITCH_OP(0, 2, WASM_CASE_BR(0),
- WASM_CASE_BR(1)),
- WASM_TABLESWITCH_BODY0(WASM_GET_LOCAL(0)),
- WASM_RETURN(WASM_I8(76))),
- WASM_I8(77)));
+ BUILD(
+ r,
+ B2(B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 1, BR_TARGET(0), BR_TARGET(1))),
+ RET_I8(76)),
+ WASM_I8(77)));
FOR_INT32_INPUTS(i) {
int32_t expected = *i == 0 ? 76 : 77;
CHECK_EQ(expected, r.Call(*i));
}
}
-TEST(Run_Wasm_TableSwitch1) {
+TEST(Run_Wasm_BrTable1) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_TABLESWITCH_OP(1, 1, WASM_CASE(0)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0), WASM_RETURN(WASM_I8(93))));
+ BUILD(r, B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 0, BR_TARGET(0))), RET_I8(93));
FOR_INT32_INPUTS(i) { CHECK_EQ(93, r.Call(*i)); }
}
-
-TEST(Run_Wasm_TableSwitch_br) {
+TEST(Run_Wasm_BrTable_loop) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_TABLESWITCH_OP(1, 2, WASM_CASE_BR(0), WASM_CASE(0)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0), WASM_RETURN(WASM_I8(91))),
+ BUILD(r,
+ B2(WASM_LOOP(1, WASM_BR_TABLE(WASM_INC_LOCAL_BY(0, 1), 2, BR_TARGET(2),
+ BR_TARGET(1), BR_TARGET(0))),
+ RET_I8(99)),
+ WASM_I8(98));
+ CHECK_EQ(99, r.Call(0));
+ CHECK_EQ(98, r.Call(-1));
+ CHECK_EQ(98, r.Call(-2));
+ CHECK_EQ(98, r.Call(-3));
+ CHECK_EQ(98, r.Call(-100));
+}
+
+TEST(Run_Wasm_BrTable_br) {
+ WasmRunner<int32_t> r(MachineType::Int32());
+ BUILD(r,
+ B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 1, BR_TARGET(1), BR_TARGET(0))),
+ RET_I8(91)),
WASM_I8(99));
CHECK_EQ(99, r.Call(0));
CHECK_EQ(91, r.Call(1));
@@ -1065,17 +876,14 @@
CHECK_EQ(91, r.Call(3));
}
-
-TEST(Run_Wasm_TableSwitch_br2) {
+TEST(Run_Wasm_BrTable_br2) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(
- 2, WASM_BLOCK(2, WASM_TABLESWITCH_OP(
- 1, 4, WASM_CASE_BR(0), WASM_CASE_BR(1),
- WASM_CASE_BR(2), WASM_CASE(0)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0),
- WASM_RETURN(WASM_I8(85))),
- WASM_RETURN(WASM_I8(86))),
- WASM_RETURN(WASM_I8(87))),
+
+ BUILD(r, B2(B2(B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 3, BR_TARGET(1),
+ BR_TARGET(2), BR_TARGET(3), BR_TARGET(0))),
+ RET_I8(85)),
+ RET_I8(86)),
+ RET_I8(87)),
WASM_I8(88));
CHECK_EQ(86, r.Call(0));
CHECK_EQ(87, r.Call(1));
@@ -1085,95 +893,74 @@
CHECK_EQ(85, r.Call(5));
}
-
-TEST(Run_Wasm_TableSwitch2) {
- WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_TABLESWITCH_OP(2, 2, WASM_CASE(0), WASM_CASE(1)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0), WASM_RETURN(WASM_I8(91)),
- WASM_RETURN(WASM_I8(92))));
- FOR_INT32_INPUTS(i) {
- int32_t expected = *i == 0 ? 91 : 92;
- CHECK_EQ(expected, r.Call(*i));
- }
-}
-
-
-TEST(Run_Wasm_TableSwitch2b) {
- WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_TABLESWITCH_OP(2, 2, WASM_CASE(1), WASM_CASE(0)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0), WASM_RETURN(WASM_I8(81)),
- WASM_RETURN(WASM_I8(82))));
- FOR_INT32_INPUTS(i) {
- int32_t expected = *i == 0 ? 82 : 81;
- CHECK_EQ(expected, r.Call(*i));
- }
-}
-
-
-TEST(Run_Wasm_TableSwitch4) {
+TEST(Run_Wasm_BrTable4) {
for (int i = 0; i < 4; i++) {
- const uint16_t br = 0x8000u;
- uint16_t c = 0;
- uint16_t cases[] = {i == 0 ? br : c++, i == 1 ? br : c++, i == 2 ? br : c++,
- i == 3 ? br : c++};
- byte code[] = {
- WASM_BLOCK(1, WASM_TABLESWITCH_OP(
- 3, 4, WASM_CASE(cases[0]), WASM_CASE(cases[1]),
- WASM_CASE(cases[2]), WASM_CASE(cases[3])),
- WASM_TABLESWITCH_BODY(
- WASM_GET_LOCAL(0), WASM_RETURN(WASM_I8(71)),
- WASM_RETURN(WASM_I8(72)), WASM_RETURN(WASM_I8(73)))),
- WASM_RETURN(WASM_I8(74))};
+ for (int t = 0; t < 4; t++) {
+ uint32_t cases[] = {0, 1, 2, 3};
+ cases[i] = t;
+ byte code[] = {B2(B2(B2(B2(B1(WASM_BR_TABLE(
+ WASM_GET_LOCAL(0), 3, BR_TARGET(cases[0]),
+ BR_TARGET(cases[1]), BR_TARGET(cases[2]),
+ BR_TARGET(cases[3]))),
+ RET_I8(70)),
+ RET_I8(71)),
+ RET_I8(72)),
+ RET_I8(73)),
+ WASM_I8(75)};
- WasmRunner<int32_t> r(MachineType::Int32());
- r.Build(code, code + arraysize(code));
+ WasmRunner<int32_t> r(MachineType::Int32());
+ r.Build(code, code + arraysize(code));
- FOR_INT32_INPUTS(i) {
- int index = (*i < 0 || *i > 3) ? 3 : *i;
- int32_t expected = 71 + cases[index];
- if (expected >= 0x8000) expected = 74;
- CHECK_EQ(expected, r.Call(*i));
+ for (int x = -3; x < 50; x++) {
+ int index = (x > 3 || x < 0) ? 3 : x;
+ int32_t expected = 70 + cases[index];
+ CHECK_EQ(expected, r.Call(x));
+ }
}
}
}
+TEST(Run_Wasm_BrTable4x4) {
+ for (byte a = 0; a < 4; a++) {
+ for (byte b = 0; b < 4; b++) {
+ for (byte c = 0; c < 4; c++) {
+ for (byte d = 0; d < 4; d++) {
+ for (int i = 0; i < 4; i++) {
+ uint32_t cases[] = {a, b, c, d};
+ byte code[] = {
+ B2(B2(B2(B2(B1(WASM_BR_TABLE(
+ WASM_GET_LOCAL(0), 3, BR_TARGET(cases[0]),
+ BR_TARGET(cases[1]), BR_TARGET(cases[2]),
+ BR_TARGET(cases[3]))),
+ RET_I8(50)),
+ RET_I8(51)),
+ RET_I8(52)),
+ RET_I8(53)),
+ WASM_I8(55)};
-TEST(Run_Wasm_TableSwitch4b) {
- for (int a = 0; a < 2; a++) {
- for (int b = 0; b < 2; b++) {
- for (int c = 0; c < 2; c++) {
- for (int d = 0; d < 2; d++) {
- if (a + b + c + d == 0) continue;
- if (a + b + c + d == 4) continue;
+ WasmRunner<int32_t> r(MachineType::Int32());
+ r.Build(code, code + arraysize(code));
- byte code[] = {
- WASM_TABLESWITCH_OP(2, 4, WASM_CASE(a), WASM_CASE(b),
- WASM_CASE(c), WASM_CASE(d)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0), WASM_RETURN(WASM_I8(61)),
- WASM_RETURN(WASM_I8(62)))};
-
- WasmRunner<int32_t> r(MachineType::Int32());
- r.Build(code, code + arraysize(code));
-
- CHECK_EQ(61 + a, r.Call(0));
- CHECK_EQ(61 + b, r.Call(1));
- CHECK_EQ(61 + c, r.Call(2));
- CHECK_EQ(61 + d, r.Call(3));
- CHECK_EQ(61 + d, r.Call(4));
+ for (int x = -6; x < 47; x++) {
+ int index = (x > 3 || x < 0) ? 3 : x;
+ int32_t expected = 50 + cases[index];
+ CHECK_EQ(expected, r.Call(x));
+ }
+ }
}
}
}
}
}
-
-TEST(Run_Wasm_TableSwitch4_fallthru) {
+TEST(Run_Wasm_BrTable4_fallthru) {
byte code[] = {
- WASM_TABLESWITCH_OP(4, 4, WASM_CASE(0), WASM_CASE(1), WASM_CASE(2),
- WASM_CASE(3)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0), WASM_INC_LOCAL_BY(1, 1),
- WASM_INC_LOCAL_BY(1, 2), WASM_INC_LOCAL_BY(1, 4),
- WASM_INC_LOCAL_BY(1, 8)),
+ B2(B2(B2(B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 3, BR_TARGET(0),
+ BR_TARGET(1), BR_TARGET(2), BR_TARGET(3))),
+ WASM_INC_LOCAL_BY(1, 1)),
+ WASM_INC_LOCAL_BY(1, 2)),
+ WASM_INC_LOCAL_BY(1, 4)),
+ WASM_INC_LOCAL_BY(1, 8)),
WASM_GET_LOCAL(1)};
WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
@@ -1192,34 +979,6 @@
CHECK_EQ(108, r.Call(4, 100));
}
-
-TEST(Run_Wasm_TableSwitch4_fallthru_br) {
- byte code[] = {
- WASM_TABLESWITCH_OP(4, 4, WASM_CASE(0), WASM_CASE(1), WASM_CASE(2),
- WASM_CASE(3)),
- WASM_TABLESWITCH_BODY(WASM_GET_LOCAL(0), WASM_INC_LOCAL_BY(1, 1),
- WASM_BRV(0, WASM_INC_LOCAL_BY(1, 2)),
- WASM_INC_LOCAL_BY(1, 4),
- WASM_BRV(0, WASM_INC_LOCAL_BY(1, 8))),
- WASM_GET_LOCAL(1)};
-
- WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
- r.Build(code, code + arraysize(code));
-
- CHECK_EQ(3, r.Call(0, 0));
- CHECK_EQ(2, r.Call(1, 0));
- CHECK_EQ(12, r.Call(2, 0));
- CHECK_EQ(8, r.Call(3, 0));
- CHECK_EQ(8, r.Call(4, 0));
-
- CHECK_EQ(203, r.Call(0, 200));
- CHECK_EQ(202, r.Call(1, 200));
- CHECK_EQ(212, r.Call(2, 200));
- CHECK_EQ(208, r.Call(3, 200));
- CHECK_EQ(208, r.Call(4, 200));
-}
-
-
TEST(Run_Wasm_F32ReinterpretI32) {
TestingModule module;
int32_t* memory = module.AddMemoryElems<int32_t>(8);
@@ -1282,9 +1041,8 @@
const int32_t kExpected = -414444;
// Build the calling function.
- WasmRunner<int32_t> r;
- r.env()->module = &module;
- BUILD(r, WASM_BLOCK(2, WASM_CALL_FUNCTION0(index), WASM_I32(kExpected)));
+ WasmRunner<int32_t> r(&module);
+ BUILD(r, B2(WASM_CALL_FUNCTION0(index), WASM_I32V_3(kExpected)));
int32_t result = r.Call();
CHECK_EQ(kExpected, result);
@@ -1302,9 +1060,8 @@
const int32_t kExpected = -414444;
// Build the calling function.
- WasmRunner<int32_t> r;
- r.env()->module = &module;
- BUILD(r, WASM_BLOCK(2, WASM_CALL_FUNCTION0(index), WASM_I32(kExpected)));
+ WasmRunner<int32_t> r(&module);
+ BUILD(r, B2(WASM_CALL_FUNCTION0(index), WASM_I32V_3(kExpected)));
int32_t result = r.Call();
CHECK_EQ(kExpected, result);
@@ -1314,10 +1071,10 @@
TEST(Run_Wasm_Block_If_P) {
WasmRunner<int32_t> r(MachineType::Int32());
// { if (p0) return 51; return 52; }
- BUILD(r, WASM_BLOCK(2, // --
- WASM_IF(WASM_GET_LOCAL(0), // --
- WASM_BRV(0, WASM_I8(51))), // --
- WASM_I8(52))); // --
+ BUILD(r, B2( // --
+ WASM_IF(WASM_GET_LOCAL(0), // --
+ WASM_BRV(0, WASM_I8(51))), // --
+ WASM_I8(52))); // --
FOR_INT32_INPUTS(i) {
int32_t expected = *i ? 51 : 52;
CHECK_EQ(expected, r.Call(*i));
@@ -1327,8 +1084,7 @@
TEST(Run_Wasm_Block_BrIf_P) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_BRV_IF(0, WASM_I8(51), WASM_GET_LOCAL(0)),
- WASM_I8(52)));
+ BUILD(r, B2(WASM_BRV_IF(0, WASM_I8(51), WASM_GET_LOCAL(0)), WASM_I8(52)));
FOR_INT32_INPUTS(i) {
int32_t expected = *i ? 51 : 52;
CHECK_EQ(expected, r.Call(*i));
@@ -1339,11 +1095,11 @@
TEST(Run_Wasm_Block_IfElse_P_assign) {
WasmRunner<int32_t> r(MachineType::Int32());
// { if (p0) p0 = 71; else p0 = 72; return p0; }
- BUILD(r, WASM_BLOCK(2, // --
- WASM_IF_ELSE(WASM_GET_LOCAL(0), // --
- WASM_SET_LOCAL(0, WASM_I8(71)), // --
- WASM_SET_LOCAL(0, WASM_I8(72))), // --
- WASM_GET_LOCAL(0)));
+ BUILD(r, B2( // --
+ WASM_IF_ELSE(WASM_GET_LOCAL(0), // --
+ WASM_SET_LOCAL(0, WASM_I8(71)), // --
+ WASM_SET_LOCAL(0, WASM_I8(72))), // --
+ WASM_GET_LOCAL(0)));
FOR_INT32_INPUTS(i) {
int32_t expected = *i ? 71 : 72;
CHECK_EQ(expected, r.Call(*i));
@@ -1354,10 +1110,10 @@
TEST(Run_Wasm_Block_IfElse_P_return) {
WasmRunner<int32_t> r(MachineType::Int32());
// if (p0) return 81; else return 82;
- BUILD(r, // --
- WASM_IF_ELSE(WASM_GET_LOCAL(0), // --
- WASM_RETURN(WASM_I8(81)), // --
- WASM_RETURN(WASM_I8(82)))); // --
+ BUILD(r, // --
+ WASM_IF_ELSE(WASM_GET_LOCAL(0), // --
+ RET_I8(81), // --
+ RET_I8(82))); // --
FOR_INT32_INPUTS(i) {
int32_t expected = *i ? 81 : 82;
CHECK_EQ(expected, r.Call(*i));
@@ -1381,8 +1137,7 @@
TEST(Run_Wasm_DanglingAssign) {
WasmRunner<int32_t> r(MachineType::Int32());
// { return 0; p0 = 0; }
- BUILD(r,
- WASM_BLOCK(2, WASM_RETURN(WASM_I8(99)), WASM_SET_LOCAL(0, WASM_ZERO)));
+ BUILD(r, B2(RET_I8(99), WASM_SET_LOCAL(0, WASM_ZERO)));
CHECK_EQ(99, r.Call(1));
}
@@ -1459,9 +1214,9 @@
TEST(Run_Wasm_Loop_if_break1) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_LOOP(2, WASM_IF(WASM_GET_LOCAL(0), WASM_BREAK(0)),
- WASM_SET_LOCAL(0, WASM_I8(99))),
- WASM_GET_LOCAL(0)));
+ BUILD(r, B2(WASM_LOOP(2, WASM_IF(WASM_GET_LOCAL(0), WASM_BREAK(0)),
+ WASM_SET_LOCAL(0, WASM_I8(99))),
+ WASM_GET_LOCAL(0)));
CHECK_EQ(99, r.Call(0));
CHECK_EQ(3, r.Call(3));
CHECK_EQ(10000, r.Call(10000));
@@ -1471,9 +1226,9 @@
TEST(Run_Wasm_Loop_if_break2) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_LOOP(2, WASM_BR_IF(1, WASM_GET_LOCAL(0)),
- WASM_SET_LOCAL(0, WASM_I8(99))),
- WASM_GET_LOCAL(0)));
+ BUILD(r, B2(WASM_LOOP(2, WASM_BR_IF(1, WASM_GET_LOCAL(0)),
+ WASM_SET_LOCAL(0, WASM_I8(99))),
+ WASM_GET_LOCAL(0)));
CHECK_EQ(99, r.Call(0));
CHECK_EQ(3, r.Call(3));
CHECK_EQ(10000, r.Call(10000));
@@ -1483,8 +1238,8 @@
TEST(Run_Wasm_Loop_if_break_fallthru) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(1, WASM_LOOP(2, WASM_IF(WASM_GET_LOCAL(0), WASM_BREAK(1)),
- WASM_SET_LOCAL(0, WASM_I8(93)))),
+ BUILD(r, B1(WASM_LOOP(2, WASM_IF(WASM_GET_LOCAL(0), WASM_BREAK(1)),
+ WASM_SET_LOCAL(0, WASM_I8(93)))),
WASM_GET_LOCAL(0));
CHECK_EQ(93, r.Call(0));
CHECK_EQ(3, r.Call(3));
@@ -1534,7 +1289,7 @@
TEST(Run_Wasm_LoadMemI32_oob_asm) {
TestingModule module;
- module.asm_js = true;
+ module.origin = kAsmJsOrigin;
int32_t* memory = module.AddMemoryElems<int32_t>(8);
WasmRunner<int32_t> r(&module, MachineType::Uint32());
module.RandomizeMemory(1112);
@@ -1665,7 +1420,7 @@
const int32_t kWritten = 0xaabbccdd;
BUILD(r, WASM_STORE_MEM_OFFSET(MachineType::Int32(), 4, WASM_GET_LOCAL(0),
- WASM_I32(kWritten)));
+ WASM_I32V_5(kWritten)));
for (int i = 0; i < 2; i++) {
module.RandomizeMemory(1111);
@@ -1719,61 +1474,6 @@
}
-#if WASM_64
-TEST(Run_Wasm_F64ReinterpretI64) {
- TestingModule module;
- int64_t* memory = module.AddMemoryElems<int64_t>(8);
- WasmRunner<int64_t> r(&module);
-
- BUILD(r, WASM_I64_REINTERPRET_F64(
- WASM_LOAD_MEM(MachineType::Float64(), WASM_ZERO)));
-
- FOR_INT32_INPUTS(i) {
- int64_t expected = static_cast<int64_t>(*i) * 0x300010001;
- memory[0] = expected;
- CHECK_EQ(expected, r.Call());
- }
-}
-
-
-TEST(Run_Wasm_I64ReinterpretF64) {
- TestingModule module;
- int64_t* memory = module.AddMemoryElems<int64_t>(8);
- WasmRunner<int64_t> r(&module, MachineType::Int64());
-
- BUILD(r, WASM_BLOCK(
- 2, WASM_STORE_MEM(MachineType::Float64(), WASM_ZERO,
- WASM_F64_REINTERPRET_I64(WASM_GET_LOCAL(0))),
- WASM_GET_LOCAL(0)));
-
- FOR_INT32_INPUTS(i) {
- int64_t expected = static_cast<int64_t>(*i) * 0x300010001;
- CHECK_EQ(expected, r.Call(expected));
- CHECK_EQ(expected, memory[0]);
- }
-}
-
-
-TEST(Run_Wasm_LoadMemI64) {
- TestingModule module;
- int64_t* memory = module.AddMemoryElems<int64_t>(8);
- module.RandomizeMemory(1111);
- WasmRunner<int64_t> r(&module);
-
- BUILD(r, WASM_LOAD_MEM(MachineType::Int64(), WASM_I8(0)));
-
- memory[0] = 0xaabbccdd00112233LL;
- CHECK_EQ(0xaabbccdd00112233LL, r.Call());
-
- memory[0] = 0x33aabbccdd001122LL;
- CHECK_EQ(0x33aabbccdd001122LL, r.Call());
-
- memory[0] = 77777777;
- CHECK_EQ(77777777, r.Call());
-}
-#endif
-
-
TEST(Run_Wasm_LoadMemI32_P) {
const int kNumElems = 8;
TestingModule module;
@@ -1829,9 +1529,9 @@
WasmRunner<uint32_t> r(&module, MachineType::Int32());
BUILD(r, kExprBlock, 2, kExprLoop, 1, kExprIf, kExprGetLocal, 0, kExprBr, 0,
- kExprIfElse, kExprI32LoadMem, 0, kExprGetLocal, 0, kExprBr, 2,
- kExprI8Const, 255, kExprSetLocal, 0, kExprI32Sub, kExprGetLocal, 0,
- kExprI8Const, 4, kExprI8Const, 0);
+ kExprIfElse, kExprI32LoadMem, ZERO_ALIGNMENT, ZERO_OFFSET,
+ kExprGetLocal, 0, kExprBr, 2, kExprI8Const, 255, kExprSetLocal, 0,
+ kExprI32Sub, kExprGetLocal, 0, kExprI8Const, 4, kExprI8Const, 0);
module.BlankMemory();
CHECK_EQ(0, r.Call((kNumElems - 1) * 4));
@@ -1872,41 +1572,6 @@
}
-#if WASM_64
-TEST(Run_Wasm_MemI64_Sum) {
- const int kNumElems = 20;
- TestingModule module;
- uint64_t* memory = module.AddMemoryElems<uint64_t>(kNumElems);
- WasmRunner<uint64_t> r(&module, MachineType::Int32());
- const byte kSum = r.AllocateLocal(kAstI64);
-
- BUILD(r, WASM_BLOCK(
- 2, WASM_WHILE(
- WASM_GET_LOCAL(0),
- WASM_BLOCK(
- 2, WASM_SET_LOCAL(
- kSum, WASM_I64_ADD(
- WASM_GET_LOCAL(kSum),
- WASM_LOAD_MEM(MachineType::Int64(),
- WASM_GET_LOCAL(0)))),
- WASM_SET_LOCAL(
- 0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I8(8))))),
- WASM_GET_LOCAL(1)));
-
- // Run 4 trials.
- for (int i = 0; i < 3; i++) {
- module.RandomizeMemory(i * 33);
- uint64_t expected = 0;
- for (size_t j = kNumElems - 1; j > 0; j--) {
- expected += memory[j];
- }
- uint64_t result = r.Call(8 * (kNumElems - 1));
- CHECK_EQ(expected, result);
- }
-}
-#endif
-
-
template <typename T>
T GenerateAndRunFold(WasmOpcode binop, T* buffer, size_t size,
LocalType astType, MachineType memType) {
@@ -1966,8 +1631,7 @@
TEST(Run_Wasm_Unreachable0a) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r,
- WASM_BLOCK(2, WASM_BRV(0, WASM_I8(9)), WASM_RETURN(WASM_GET_LOCAL(0))));
+ BUILD(r, B2(WASM_BRV(0, WASM_I8(9)), RET(WASM_GET_LOCAL(0))));
CHECK_EQ(9, r.Call(0));
CHECK_EQ(9, r.Call(1));
}
@@ -1975,7 +1639,7 @@
TEST(Run_Wasm_Unreachable0b) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_BRV(0, WASM_I8(7)), WASM_UNREACHABLE));
+ BUILD(r, B2(WASM_BRV(0, WASM_I8(7)), WASM_UNREACHABLE));
CHECK_EQ(7, r.Call(0));
CHECK_EQ(7, r.Call(1));
}
@@ -2014,8 +1678,8 @@
TEST(Run_Wasm_Unreachable_Load) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_BRV(0, WASM_GET_LOCAL(0)),
- WASM_LOAD_MEM(MachineType::Int8(), WASM_GET_LOCAL(0))));
+ BUILD(r, B2(WASM_BRV(0, WASM_GET_LOCAL(0)),
+ WASM_LOAD_MEM(MachineType::Int8(), WASM_GET_LOCAL(0))));
CHECK_EQ(11, r.Call(11));
CHECK_EQ(21, r.Call(21));
}
@@ -2023,8 +1687,7 @@
TEST(Run_Wasm_Infinite_Loop_not_taken1) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_IF(WASM_GET_LOCAL(0), WASM_INFINITE_LOOP),
- WASM_I8(45)));
+ BUILD(r, B2(WASM_IF(WASM_GET_LOCAL(0), WASM_INFINITE_LOOP), WASM_I8(45)));
// Run the code, but don't go into the infinite loop.
CHECK_EQ(45, r.Call(0));
}
@@ -2032,9 +1695,8 @@
TEST(Run_Wasm_Infinite_Loop_not_taken2) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r,
- WASM_BLOCK(1, WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(45)),
- WASM_INFINITE_LOOP)));
+ BUILD(r, B1(WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(45)),
+ WASM_INFINITE_LOOP)));
// Run the code, but don't go into the infinite loop.
CHECK_EQ(45, r.Call(1));
}
@@ -2042,8 +1704,8 @@
TEST(Run_Wasm_Infinite_Loop_not_taken2_brif) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_BRV_IF(0, WASM_I8(45), WASM_GET_LOCAL(0)),
- WASM_INFINITE_LOOP));
+ BUILD(r,
+ B2(WASM_BRV_IF(0, WASM_I8(45), WASM_GET_LOCAL(0)), WASM_INFINITE_LOOP));
// Run the code, but don't go into the infinite loop.
CHECK_EQ(45, r.Call(1));
}
@@ -2052,8 +1714,8 @@
static void TestBuildGraphForSimpleExpression(WasmOpcode opcode) {
if (!WasmOpcodes::IsSupported(opcode)) return;
- Zone zone;
Isolate* isolate = CcTest::InitIsolateOnce();
+ Zone zone(isolate->allocator());
HandleScope scope(isolate);
// Enable all optional operators.
CommonOperatorBuilder common(&zone);
@@ -2061,18 +1723,19 @@
MachineOperatorBuilder::kAllOptionalOps);
Graph graph(&zone);
JSGraph jsgraph(isolate, &graph, &common, nullptr, nullptr, &machine);
- FunctionEnv env;
FunctionSig* sig = WasmOpcodes::Signature(opcode);
- init_env(&env, sig);
if (sig->parameter_count() == 1) {
- byte code[] = {static_cast<byte>(opcode), kExprGetLocal, 0};
- TestBuildingGraph(&zone, &jsgraph, &env, code, code + arraysize(code));
+ byte code[] = {WASM_NO_LOCALS, static_cast<byte>(opcode), kExprGetLocal, 0};
+ TestBuildingGraph(&zone, &jsgraph, nullptr, sig, code,
+ code + arraysize(code));
} else {
CHECK_EQ(2, sig->parameter_count());
- byte code[] = {static_cast<byte>(opcode), kExprGetLocal, 0, kExprGetLocal,
- 1};
- TestBuildingGraph(&zone, &jsgraph, &env, code, code + arraysize(code));
+ byte code[] = {WASM_NO_LOCALS, static_cast<byte>(opcode),
+ kExprGetLocal, 0,
+ kExprGetLocal, 1};
+ TestBuildingGraph(&zone, &jsgraph, nullptr, sig, code,
+ code + arraysize(code));
}
}
@@ -2196,38 +1859,15 @@
}
-#if WASM_64
-TEST(Run_WasmInt64Global) {
- TestingModule module;
- int64_t* global = module.AddGlobal<int64_t>(MachineType::Int64());
- WasmRunner<int32_t> r(&module, MachineType::Int32());
- // global = global + p0
- BUILD(r, WASM_BLOCK(2, WASM_STORE_GLOBAL(
- 0, WASM_I64_ADD(
- WASM_LOAD_GLOBAL(0),
- WASM_I64_SCONVERT_I32(WASM_GET_LOCAL(0)))),
- WASM_ZERO));
-
- *global = 0xFFFFFFFFFFFFFFFFLL;
- for (int i = 9; i < 444444; i += 111111) {
- int64_t expected = *global + i;
- r.Call(i);
- CHECK_EQ(expected, *global);
- }
-}
-#endif
-
-
TEST(Run_WasmFloat32Global) {
TestingModule module;
float* global = module.AddGlobal<float>(MachineType::Float32());
WasmRunner<int32_t> r(&module, MachineType::Int32());
// global = global + p0
- BUILD(r, WASM_BLOCK(2, WASM_STORE_GLOBAL(
- 0, WASM_F32_ADD(
- WASM_LOAD_GLOBAL(0),
- WASM_F32_SCONVERT_I32(WASM_GET_LOCAL(0)))),
- WASM_ZERO));
+ BUILD(r, B2(WASM_STORE_GLOBAL(
+ 0, WASM_F32_ADD(WASM_LOAD_GLOBAL(0),
+ WASM_F32_SCONVERT_I32(WASM_GET_LOCAL(0)))),
+ WASM_ZERO));
*global = 1.25;
for (int i = 9; i < 4444; i += 1111) {
@@ -2243,11 +1883,10 @@
double* global = module.AddGlobal<double>(MachineType::Float64());
WasmRunner<int32_t> r(&module, MachineType::Int32());
// global = global + p0
- BUILD(r, WASM_BLOCK(2, WASM_STORE_GLOBAL(
- 0, WASM_F64_ADD(
- WASM_LOAD_GLOBAL(0),
- WASM_F64_SCONVERT_I32(WASM_GET_LOCAL(0)))),
- WASM_ZERO));
+ BUILD(r, B2(WASM_STORE_GLOBAL(
+ 0, WASM_F64_ADD(WASM_LOAD_GLOBAL(0),
+ WASM_F64_SCONVERT_I32(WASM_GET_LOCAL(0)))),
+ WASM_ZERO));
*global = 1.25;
for (int i = 9; i < 4444; i += 1111) {
@@ -2313,69 +1952,13 @@
}
-#if WASM_64
-// Test the WasmRunner with an Int64 return value and different numbers of
-// Int64 parameters.
-TEST(Run_TestI64WasmRunner) {
- {
- FOR_INT64_INPUTS(i) {
- WasmRunner<int64_t> r;
- BUILD(r, WASM_I64(*i));
- CHECK_EQ(*i, r.Call());
- }
- }
- {
- WasmRunner<int64_t> r(MachineType::Int64());
- BUILD(r, WASM_GET_LOCAL(0));
- FOR_INT64_INPUTS(i) { CHECK_EQ(*i, r.Call(*i)); }
- }
- {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_I64_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- FOR_INT64_INPUTS(i) {
- FOR_INT64_INPUTS(j) { CHECK_EQ(*i + *j, r.Call(*i, *j)); }
- }
- }
- {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64(),
- MachineType::Int64());
- BUILD(r, WASM_I64_ADD(WASM_GET_LOCAL(0),
- WASM_I64_ADD(WASM_GET_LOCAL(1), WASM_GET_LOCAL(2))));
- FOR_INT64_INPUTS(i) {
- FOR_INT64_INPUTS(j) {
- CHECK_EQ(*i + *j + *j, r.Call(*i, *j, *j));
- CHECK_EQ(*j + *i + *j, r.Call(*j, *i, *j));
- CHECK_EQ(*j + *j + *i, r.Call(*j, *j, *i));
- }
- }
- }
- {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64(),
- MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_I64_ADD(WASM_GET_LOCAL(0),
- WASM_I64_ADD(WASM_GET_LOCAL(1),
- WASM_I64_ADD(WASM_GET_LOCAL(2),
- WASM_GET_LOCAL(3)))));
- FOR_INT64_INPUTS(i) {
- FOR_INT64_INPUTS(j) {
- CHECK_EQ(*i + *j + *j + *j, r.Call(*i, *j, *j, *j));
- CHECK_EQ(*j + *i + *j + *j, r.Call(*j, *i, *j, *j));
- CHECK_EQ(*j + *j + *i + *j, r.Call(*j, *j, *i, *j));
- CHECK_EQ(*j + *j + *j + *i, r.Call(*j, *j, *j, *i));
- }
- }
- }
-}
-#endif
-
-
TEST(Run_WasmCallEmpty) {
const int32_t kExpected = -414444;
// Build the target function.
TestSignatures sigs;
TestingModule module;
WasmFunctionCompiler t(sigs.i_v(), &module);
- BUILD(t, WASM_I32(kExpected));
+ BUILD(t, WASM_I32V_3(kExpected));
uint32_t index = t.CompileAndAdd();
// Build the calling function.
@@ -2436,51 +2019,6 @@
CHECK_EQ(256.5, result);
}
-TEST(Run_WasmCallI64Parameter) {
- // Build the target function.
- LocalType param_types[20];
- for (int i = 0; i < 20; i++) param_types[i] = kAstI64;
- param_types[3] = kAstI32;
- param_types[4] = kAstI32;
- FunctionSig sig(1, 19, param_types);
- for (int i = 0; i < 19; i++) {
- TestingModule module;
- WasmFunctionCompiler t(&sig, &module);
- if (i == 2 || i == 3) {
- continue;
- } else {
- BUILD(t, WASM_GET_LOCAL(i));
- }
- uint32_t index = t.CompileAndAdd();
-
- // Build the calling function.
- WasmRunner<int32_t> r;
- r.env()->module = &module;
- BUILD(r,
- WASM_I32_CONVERT_I64(WASM_CALL_FUNCTION(
- index, WASM_I64(0xbcd12340000000b), WASM_I64(0xbcd12340000000c),
- WASM_I32(0xd), WASM_I32_CONVERT_I64(WASM_I64(0xbcd12340000000e)),
- WASM_I64(0xbcd12340000000f), WASM_I64(0xbcd1234000000010),
- WASM_I64(0xbcd1234000000011), WASM_I64(0xbcd1234000000012),
- WASM_I64(0xbcd1234000000013), WASM_I64(0xbcd1234000000014),
- WASM_I64(0xbcd1234000000015), WASM_I64(0xbcd1234000000016),
- WASM_I64(0xbcd1234000000017), WASM_I64(0xbcd1234000000018),
- WASM_I64(0xbcd1234000000019), WASM_I64(0xbcd123400000001a),
- WASM_I64(0xbcd123400000001b), WASM_I64(0xbcd123400000001c),
- WASM_I64(0xbcd123400000001d))));
-
- CHECK_EQ(i + 0xb, r.Call());
- }
-}
-
-TEST(Run_WasmI64And) {
- WasmRunner<int64_t> r(MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_I64_AND(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- FOR_INT64_INPUTS(i) {
- FOR_INT64_INPUTS(j) { CHECK_EQ((*i) & (*j), r.Call(*i, *j)); }
- }
-}
-
TEST(Run_WasmCallVoid) {
const byte kMemOffset = 8;
const int32_t kElemNum = kMemOffset / sizeof(int32_t);
@@ -2492,7 +2030,7 @@
module.RandomizeMemory();
WasmFunctionCompiler t(sigs.v_v(), &module);
BUILD(t, WASM_STORE_MEM(MachineType::Int32(), WASM_I8(kMemOffset),
- WASM_I32(kExpected)));
+ WASM_I32V_3(kExpected)));
uint32_t index = t.CompileAndAdd();
// Build the calling function.
@@ -2527,36 +2065,6 @@
}
}
-
-#if WASM_64
-TEST(Run_WasmCall_Int64Sub) {
- // Build the target function.
- TestSignatures sigs;
- TestingModule module;
- WasmFunctionCompiler t(sigs.l_ll(), &module);
- BUILD(t, WASM_I64_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
- uint32_t index = t.CompileAndAdd();
-
- // Build the caller function.
- WasmRunner<int64_t> r(&module, MachineType::Int64(), MachineType::Int64());
- BUILD(r, WASM_CALL_FUNCTION(index, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
-
- FOR_INT32_INPUTS(i) {
- FOR_INT32_INPUTS(j) {
- int64_t a = static_cast<int64_t>(*i) << 32 |
- (static_cast<int64_t>(*j) | 0xFFFFFFFF);
- int64_t b = static_cast<int64_t>(*j) << 32 |
- (static_cast<int64_t>(*i) | 0xFFFFFFFF);
-
- int64_t expected = static_cast<int64_t>(static_cast<uint64_t>(a) -
- static_cast<uint64_t>(b));
- CHECK_EQ(expected, r.Call(a, b));
- }
- }
-}
-#endif
-
-
TEST(Run_WasmCall_Float32Sub) {
TestSignatures sigs;
TestingModule module;
@@ -2571,10 +2079,7 @@
BUILD(r, WASM_CALL_FUNCTION(index, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
FOR_FLOAT32_INPUTS(i) {
- FOR_FLOAT32_INPUTS(j) {
- volatile float expected = *i - *j;
- CheckFloatEq(expected, r.Call(*i, *j));
- }
+ FOR_FLOAT32_INPUTS(j) { CHECK_FLOAT_EQ(*i - *j, r.Call(*i, *j)); }
}
}
@@ -2584,7 +2089,6 @@
double* memory = module.AddMemoryElems<double>(16);
WasmRunner<int32_t> r(&module);
- // TODO(titzer): convert to a binop test.
BUILD(r, WASM_BLOCK(
2, WASM_STORE_MEM(
MachineType::Float64(), WASM_ZERO,
@@ -2637,7 +2141,8 @@
int num_params = static_cast<int>(arraysize(mixed)) - start;
for (int which = 0; which < num_params; which++) {
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
TestingModule module;
module.AddMemory(1024);
MachineType* memtypes = &mixed[start];
@@ -2664,7 +2169,7 @@
std::vector<byte> code;
ADD_CODE(code,
static_cast<byte>(WasmOpcodes::LoadStoreOpcodeOf(result, true)),
- WasmOpcodes::LoadStoreAccessOf(false));
+ ZERO_ALIGNMENT, ZERO_OFFSET);
ADD_CODE(code, WASM_ZERO);
ADD_CODE(code, kExprCallFunction, static_cast<byte>(index));
@@ -2673,7 +2178,7 @@
ADD_CODE(code, WASM_LOAD_MEM(memtypes[i], WASM_I8(offset)));
}
- ADD_CODE(code, WASM_I32(kExpected));
+ ADD_CODE(code, WASM_I32V_2(kExpected));
size_t end = code.size();
code.push_back(0);
r.Build(&code[0], &code[end]);
@@ -2709,13 +2214,12 @@
WasmRunner<int32_t> r(&module, MachineType::Int32());
byte local = r.AllocateLocal(kAstI32);
- BUILD(r,
- WASM_BLOCK(2, WASM_SET_LOCAL(local, WASM_I8(99)),
- WASM_I32_ADD(
- WASM_CALL_FUNCTION(t1.function_index_, WASM_GET_LOCAL(0),
- WASM_GET_LOCAL(0)),
- WASM_CALL_FUNCTION(t1.function_index_, WASM_GET_LOCAL(1),
- WASM_GET_LOCAL(local)))));
+ BUILD(r, B2(WASM_SET_LOCAL(local, WASM_I8(99)),
+ WASM_I32_ADD(
+ WASM_CALL_FUNCTION(t1.function_index_, WASM_GET_LOCAL(0),
+ WASM_GET_LOCAL(0)),
+ WASM_CALL_FUNCTION(t1.function_index_, WASM_GET_LOCAL(1),
+ WASM_GET_LOCAL(local)))));
CHECK_EQ(198, r.Call(0));
CHECK_EQ(200, r.Call(1));
@@ -2737,8 +2241,7 @@
TEST(Run_Wasm_ExprBlock2a) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(1))),
- WASM_I8(1)));
+ BUILD(r, B2(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(1))), WASM_I8(1)));
CHECK_EQ(1, r.Call(0));
CHECK_EQ(1, r.Call(1));
}
@@ -2746,8 +2249,7 @@
TEST(Run_Wasm_ExprBlock2b) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(1))),
- WASM_I8(2)));
+ BUILD(r, B2(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(1))), WASM_I8(2)));
CHECK_EQ(2, r.Call(0));
CHECK_EQ(1, r.Call(1));
}
@@ -2755,8 +2257,7 @@
TEST(Run_Wasm_ExprBlock2c) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_BRV_IF(0, WASM_I8(1), WASM_GET_LOCAL(0)),
- WASM_I8(1)));
+ BUILD(r, B2(WASM_BRV_IF(0, WASM_I8(1), WASM_GET_LOCAL(0)), WASM_I8(1)));
CHECK_EQ(1, r.Call(0));
CHECK_EQ(1, r.Call(1));
}
@@ -2764,8 +2265,7 @@
TEST(Run_Wasm_ExprBlock2d) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r, WASM_BLOCK(2, WASM_BRV_IF(0, WASM_I8(1), WASM_GET_LOCAL(0)),
- WASM_I8(2)));
+ BUILD(r, B2(WASM_BRV_IF(0, WASM_I8(1), WASM_GET_LOCAL(0)), WASM_I8(2)));
CHECK_EQ(2, r.Call(0));
CHECK_EQ(1, r.Call(1));
}
@@ -2837,9 +2337,8 @@
TEST(Run_Wasm_ExprBlock_if) {
WasmRunner<int32_t> r(MachineType::Int32());
- BUILD(r,
- WASM_BLOCK(1, WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(11)),
- WASM_BRV(0, WASM_I8(14)))));
+ BUILD(r, B1(WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_BRV(0, WASM_I8(11)),
+ WASM_BRV(0, WASM_I8(14)))));
CHECK_EQ(11, r.Call(1));
CHECK_EQ(14, r.Call(0));
@@ -2884,42 +2383,6 @@
}
-#if WASM_64
-TEST(Run_Wasm_LoadStoreI64_sx) {
- byte loads[] = {kExprI64LoadMem8S, kExprI64LoadMem16S, kExprI64LoadMem32S,
- kExprI64LoadMem};
-
- for (size_t m = 0; m < arraysize(loads); m++) {
- TestingModule module;
- byte* memory = module.AddMemoryElems<byte>(16);
- WasmRunner<int64_t> r(&module);
-
- byte code[] = {kExprI64StoreMem, 0, kExprI8Const, 8,
- loads[m], 0, kExprI8Const, 0};
-
- r.Build(code, code + arraysize(code));
-
- // Try a bunch of different negative values.
- for (int i = -1; i >= -128; i -= 11) {
- int size = 1 << m;
- module.BlankMemory();
- memory[size - 1] = static_cast<byte>(i); // set the high order byte.
-
- int64_t expected = static_cast<int64_t>(i) << ((size - 1) * 8);
-
- CHECK_EQ(expected, r.Call());
- CHECK_EQ(static_cast<byte>(i), memory[8 + size - 1]);
- for (int j = size; j < 8; j++) {
- CHECK_EQ(255, memory[8 + j]);
- }
- }
- }
-}
-
-
-#endif
-
-
TEST(Run_Wasm_SimpleCallIndirect) {
TestSignatures sigs;
TestingModule module;
@@ -3020,56 +2483,56 @@
WasmRunner<float> r(MachineType::Float32());
BUILD(r, WASM_F32_FLOOR(WASM_GET_LOCAL(0)));
- FOR_FLOAT32_INPUTS(i) { CheckFloatEq(floorf(*i), r.Call(*i)); }
+ FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(floorf(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F32Ceil) {
WasmRunner<float> r(MachineType::Float32());
BUILD(r, WASM_F32_CEIL(WASM_GET_LOCAL(0)));
- FOR_FLOAT32_INPUTS(i) { CheckFloatEq(ceilf(*i), r.Call(*i)); }
+ FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(ceilf(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F32Trunc) {
WasmRunner<float> r(MachineType::Float32());
BUILD(r, WASM_F32_TRUNC(WASM_GET_LOCAL(0)));
- FOR_FLOAT32_INPUTS(i) { CheckFloatEq(truncf(*i), r.Call(*i)); }
+ FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(truncf(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F32NearestInt) {
WasmRunner<float> r(MachineType::Float32());
BUILD(r, WASM_F32_NEARESTINT(WASM_GET_LOCAL(0)));
- FOR_FLOAT32_INPUTS(i) { CheckFloatEq(nearbyintf(*i), r.Call(*i)); }
+ FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(nearbyintf(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F64Floor) {
WasmRunner<double> r(MachineType::Float64());
BUILD(r, WASM_F64_FLOOR(WASM_GET_LOCAL(0)));
- FOR_FLOAT64_INPUTS(i) { CheckDoubleEq(floor(*i), r.Call(*i)); }
+ FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(floor(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F64Ceil) {
WasmRunner<double> r(MachineType::Float64());
BUILD(r, WASM_F64_CEIL(WASM_GET_LOCAL(0)));
- FOR_FLOAT64_INPUTS(i) { CheckDoubleEq(ceil(*i), r.Call(*i)); }
+ FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(ceil(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F64Trunc) {
WasmRunner<double> r(MachineType::Float64());
BUILD(r, WASM_F64_TRUNC(WASM_GET_LOCAL(0)));
- FOR_FLOAT64_INPUTS(i) { CheckDoubleEq(trunc(*i), r.Call(*i)); }
+ FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(trunc(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F64NearestInt) {
WasmRunner<double> r(MachineType::Float64());
BUILD(r, WASM_F64_NEARESTINT(WASM_GET_LOCAL(0)));
- FOR_FLOAT64_INPUTS(i) { CheckDoubleEq(nearbyint(*i), r.Call(*i)); }
+ FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(nearbyint(*i), r.Call(*i)); }
}
TEST(Run_Wasm_F32Min) {
@@ -3090,7 +2553,7 @@
expected = *j;
}
- CheckFloatEq(expected, r.Call(*i, *j));
+ CHECK_FLOAT_EQ(expected, r.Call(*i, *j));
}
}
}
@@ -3114,7 +2577,7 @@
expected = *j;
}
- CheckDoubleEq(expected, r.Call(*i, *j));
+ CHECK_DOUBLE_EQ(expected, r.Call(*i, *j));
}
}
}
@@ -3138,7 +2601,7 @@
expected = *j;
}
- CheckFloatEq(expected, r.Call(*i, *j));
+ CHECK_FLOAT_EQ(expected, r.Call(*i, *j));
}
}
}
@@ -3162,13 +2625,14 @@
expected = *j;
}
- CheckDoubleEq(expected, r.Call(*i, *j));
+ CHECK_DOUBLE_EQ(expected, r.Call(*i, *j));
}
}
}
-// TODO(ahaas): Fix on arm and reenable.
-#if !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_ARM64
+// TODO(ahaas): Fix on arm and mips and reenable.
+#if !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_ARM64 && !V8_TARGET_ARCH_MIPS && \
+ !V8_TARGET_ARCH_MIPS64
TEST(Run_Wasm_F32Min_Snan) {
// Test that the instruction does not return a signalling NaN.
@@ -3236,102 +2700,6 @@
#endif
-#if WASM_64
-TEST(Run_Wasm_F32SConvertI64) {
- WasmRunner<float> r(MachineType::Int64());
- BUILD(r, WASM_F32_SCONVERT_I64(WASM_GET_LOCAL(0)));
- FOR_INT64_INPUTS(i) { CHECK_EQ(static_cast<float>(*i), r.Call(*i)); }
-}
-
-
-#if !defined(_WIN64)
-// TODO(ahaas): Fix this failure.
-TEST(Run_Wasm_F32UConvertI64) {
- WasmRunner<float> r(MachineType::Uint64());
- BUILD(r, WASM_F32_UCONVERT_I64(WASM_GET_LOCAL(0)));
- FOR_UINT64_INPUTS(i) { CHECK_EQ(static_cast<float>(*i), r.Call(*i)); }
-}
-#endif
-
-
-TEST(Run_Wasm_F64SConvertI64) {
- WasmRunner<double> r(MachineType::Int64());
- BUILD(r, WASM_F64_SCONVERT_I64(WASM_GET_LOCAL(0)));
- FOR_INT64_INPUTS(i) { CHECK_EQ(static_cast<double>(*i), r.Call(*i)); }
-}
-
-
-#if !defined(_WIN64)
-// TODO(ahaas): Fix this failure.
-TEST(Run_Wasm_F64UConvertI64) {
- WasmRunner<double> r(MachineType::Uint64());
- BUILD(r, WASM_F64_UCONVERT_I64(WASM_GET_LOCAL(0)));
- FOR_UINT64_INPUTS(i) { CHECK_EQ(static_cast<double>(*i), r.Call(*i)); }
-}
-#endif
-
-
-TEST(Run_Wasm_I64SConvertF32) {
- WasmRunner<int64_t> r(MachineType::Float32());
- BUILD(r, WASM_I64_SCONVERT_F32(WASM_GET_LOCAL(0)));
-
- FOR_FLOAT32_INPUTS(i) {
- if (*i < static_cast<float>(INT64_MAX) &&
- *i >= static_cast<float>(INT64_MIN)) {
- CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i));
- } else {
- CHECK_TRAP64(r.Call(*i));
- }
- }
-}
-
-
-TEST(Run_Wasm_I64SConvertF64) {
- WasmRunner<int64_t> r(MachineType::Float64());
- BUILD(r, WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(0)));
-
- FOR_FLOAT64_INPUTS(i) {
- if (*i < static_cast<double>(INT64_MAX) &&
- *i >= static_cast<double>(INT64_MIN)) {
- CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i));
- } else {
- CHECK_TRAP64(r.Call(*i));
- }
- }
-}
-
-
-TEST(Run_Wasm_I64UConvertF32) {
- WasmRunner<uint64_t> r(MachineType::Float32());
- BUILD(r, WASM_I64_UCONVERT_F32(WASM_GET_LOCAL(0)));
-
- FOR_FLOAT32_INPUTS(i) {
- if (*i < static_cast<float>(UINT64_MAX) && *i > -1) {
- CHECK_EQ(static_cast<uint64_t>(*i), r.Call(*i));
- } else {
- CHECK_TRAP64(r.Call(*i));
- }
- }
-}
-
-
-TEST(Run_Wasm_I64UConvertF64) {
- WasmRunner<uint64_t> r(MachineType::Float64());
- BUILD(r, WASM_I64_UCONVERT_F64(WASM_GET_LOCAL(0)));
-
- FOR_FLOAT64_INPUTS(i) {
- if (*i < static_cast<float>(UINT64_MAX) && *i > -1) {
- CHECK_EQ(static_cast<uint64_t>(*i), r.Call(*i));
- } else {
- CHECK_TRAP64(r.Call(*i));
- }
- }
-}
-#endif
-
-
-// TODO(titzer): Fix and re-enable.
-#if 0
TEST(Run_Wasm_I32SConvertF32) {
WasmRunner<int32_t> r(MachineType::Float32());
BUILD(r, WASM_I32_SCONVERT_F32(WASM_GET_LOCAL(0)));
@@ -3352,8 +2720,8 @@
BUILD(r, WASM_I32_SCONVERT_F64(WASM_GET_LOCAL(0)));
FOR_FLOAT64_INPUTS(i) {
- if (*i < static_cast<double>(INT32_MAX) &&
- *i >= static_cast<double>(INT32_MIN)) {
+ if (*i < (static_cast<double>(INT32_MAX) + 1.0) &&
+ *i > (static_cast<double>(INT32_MIN) - 1.0)) {
CHECK_EQ(static_cast<int64_t>(*i), r.Call(*i));
} else {
CHECK_TRAP32(r.Call(*i));
@@ -3367,7 +2735,7 @@
BUILD(r, WASM_I32_UCONVERT_F32(WASM_GET_LOCAL(0)));
FOR_FLOAT32_INPUTS(i) {
- if (*i < static_cast<float>(UINT32_MAX) && *i > -1) {
+ if (*i < (static_cast<float>(UINT32_MAX) + 1.0) && *i > -1) {
CHECK_EQ(static_cast<uint32_t>(*i), r.Call(*i));
} else {
CHECK_TRAP32(r.Call(*i));
@@ -3381,48 +2749,40 @@
BUILD(r, WASM_I32_UCONVERT_F64(WASM_GET_LOCAL(0)));
FOR_FLOAT64_INPUTS(i) {
- if (*i < static_cast<float>(UINT32_MAX) && *i > -1) {
+ if (*i < (static_cast<float>(UINT32_MAX) + 1.0) && *i > -1) {
CHECK_EQ(static_cast<uint32_t>(*i), r.Call(*i));
} else {
CHECK_TRAP32(r.Call(*i));
}
}
}
-#endif
-
TEST(Run_Wasm_F64CopySign) {
WasmRunner<double> r(MachineType::Float64(), MachineType::Float64());
BUILD(r, WASM_F64_COPYSIGN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
FOR_FLOAT64_INPUTS(i) {
- FOR_FLOAT64_INPUTS(j) { CheckDoubleEq(copysign(*i, *j), r.Call(*i, *j)); }
+ FOR_FLOAT64_INPUTS(j) { CHECK_DOUBLE_EQ(copysign(*i, *j), r.Call(*i, *j)); }
}
}
-// TODO(tizer): Fix on arm and reenable.
-#if !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_ARM64
-
TEST(Run_Wasm_F32CopySign) {
WasmRunner<float> r(MachineType::Float32(), MachineType::Float32());
BUILD(r, WASM_F32_COPYSIGN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
FOR_FLOAT32_INPUTS(i) {
- FOR_FLOAT32_INPUTS(j) { CheckFloatEq(copysign(*i, *j), r.Call(*i, *j)); }
+ FOR_FLOAT32_INPUTS(j) { CHECK_FLOAT_EQ(copysignf(*i, *j), r.Call(*i, *j)); }
}
}
-
-#endif
-
-
void CompileCallIndirectMany(LocalType param) {
// Make sure we don't run out of registers when compiling indirect calls
// with many many parameters.
TestSignatures sigs;
for (byte num_params = 0; num_params < 40; num_params++) {
- Zone zone;
+ v8::base::AccountingAllocator allocator;
+ Zone zone(&allocator);
HandleScope scope(CcTest::InitIsolateOnce());
TestingModule module;
FunctionSig* sig = sigs.many(&zone, kAstStmt, param, num_params);
@@ -3458,3 +2818,15 @@
TEST(Compile_Wasm_CallIndirect_Many_f64) { CompileCallIndirectMany(kAstF64); }
+
+TEST(Run_WASM_Int32RemS_dead) {
+ WasmRunner<int32_t> r(MachineType::Int32(), MachineType::Int32());
+ BUILD(r, WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), WASM_ZERO);
+ const int32_t kMin = std::numeric_limits<int32_t>::min();
+ CHECK_EQ(0, r.Call(133, 100));
+ CHECK_EQ(0, r.Call(kMin, -1));
+ CHECK_EQ(0, r.Call(0, 1));
+ CHECK_TRAP(r.Call(100, 0));
+ CHECK_TRAP(r.Call(-1001, 0));
+ CHECK_TRAP(r.Call(kMin, 0));
+}
diff --git a/test/cctest/wasm/wasm-run-utils.h b/test/cctest/wasm/wasm-run-utils.h
index 7ee3981..1e85f46 100644
--- a/test/cctest/wasm/wasm-run-utils.h
+++ b/test/cctest/wasm/wasm-run-utils.h
@@ -51,22 +51,18 @@
#define WASM_RUNNER_MAX_NUM_PARAMETERS 4
#define WASM_WRAPPER_RETURN_VALUE 8754
+#define BUILD(r, ...) \
+ do { \
+ byte code[] = {__VA_ARGS__}; \
+ r.Build(code, code + arraysize(code)); \
+ } while (false)
+
namespace {
using namespace v8::base;
using namespace v8::internal;
using namespace v8::internal::compiler;
using namespace v8::internal::wasm;
-inline void init_env(FunctionEnv* env, FunctionSig* sig) {
- env->module = nullptr;
- env->sig = sig;
- env->local_i32_count = 0;
- env->local_i64_count = 0;
- env->local_f32_count = 0;
- env->local_f64_count = 0;
- env->SumLocals();
-}
-
const uint32_t kMaxGlobalsSize = 128;
// A helper for module environments that adds the ability to allocate memory
@@ -83,9 +79,8 @@
instance->globals_size = kMaxGlobalsSize;
instance->mem_start = nullptr;
instance->mem_size = 0;
- instance->function_code = nullptr;
linker = nullptr;
- asm_js = false;
+ origin = kWasmOrigin;
memset(global_data, 0, sizeof(global_data));
}
@@ -93,9 +88,6 @@
if (instance->mem_start) {
free(instance->mem_start);
}
- if (instance->function_code) {
- delete instance->function_code;
- }
}
byte* AddMemory(size_t size) {
@@ -121,11 +113,8 @@
}
byte AddSignature(FunctionSig* sig) {
- if (!module->signatures) {
- module->signatures = new std::vector<FunctionSig*>();
- }
- module->signatures->push_back(sig);
- size_t size = module->signatures->size();
+ module->signatures.push_back(sig);
+ size_t size = module->signatures.size();
CHECK(size < 127);
return static_cast<byte>(size - 1);
}
@@ -171,23 +160,21 @@
}
int AddFunction(FunctionSig* sig, Handle<Code> code) {
- if (module->functions == nullptr) {
- module->functions = new std::vector<WasmFunction>();
+ if (module->functions.size() == 0) {
// TODO(titzer): Reserving space here to avoid the underlying WasmFunction
// structs from moving.
- module->functions->reserve(kMaxFunctions);
- instance->function_code = new std::vector<Handle<Code>>();
+ module->functions.reserve(kMaxFunctions);
}
- uint32_t index = static_cast<uint32_t>(module->functions->size());
- module->functions->push_back(
- {sig, index, 0, 0, 0, 0, 0, 0, 0, false, false});
- instance->function_code->push_back(code);
+ uint32_t index = static_cast<uint32_t>(module->functions.size());
+ module->functions.push_back(
+ {sig, index, 0, 0, 0, 0, 0, 0, 0, 0, 0, false, false});
+ instance->function_code.push_back(code);
DCHECK_LT(index, kMaxFunctions); // limited for testing.
return index;
}
void SetFunctionCode(uint32_t index, Handle<Code> code) {
- instance->function_code->at(index) = code;
+ instance->function_code[index] = code;
}
void AddIndirectFunctionTable(int* functions, int table_size) {
@@ -195,21 +182,21 @@
Handle<FixedArray> fixed =
isolate->factory()->NewFixedArray(2 * table_size);
instance->function_table = fixed;
- module->function_table = new std::vector<uint16_t>();
+ DCHECK_EQ(0u, module->function_table.size());
for (int i = 0; i < table_size; i++) {
- module->function_table->push_back(functions[i]);
+ module->function_table.push_back(functions[i]);
}
}
void PopulateIndirectFunctionTable() {
if (instance->function_table.is_null()) return;
- int table_size = static_cast<int>(module->function_table->size());
+ int table_size = static_cast<int>(module->function_table.size());
for (int i = 0; i < table_size; i++) {
- int function_index = module->function_table->at(i);
- WasmFunction* function = &module->functions->at(function_index);
+ int function_index = module->function_table[i];
+ WasmFunction* function = &module->functions[function_index];
instance->function_table->set(i, Smi::FromInt(function->sig_index));
- instance->function_table->set(
- i + table_size, *instance->function_code->at(function_index));
+ instance->function_table->set(i + table_size,
+ *instance->function_code[function_index]);
}
}
@@ -220,24 +207,22 @@
V8_ALIGNED(8) byte global_data[kMaxGlobalsSize]; // preallocated global data.
WasmGlobal* AddGlobal(MachineType mem_type) {
- if (!module->globals) {
- module->globals = new std::vector<WasmGlobal>();
- }
byte size = WasmOpcodes::MemSize(mem_type);
global_offset = (global_offset + size - 1) & ~(size - 1); // align
- module->globals->push_back({0, mem_type, global_offset, false});
+ module->globals.push_back({0, 0, mem_type, global_offset, false});
global_offset += size;
// limit number of globals.
CHECK_LT(global_offset, kMaxGlobalsSize);
- return &module->globals->back();
+ return &module->globals.back();
}
};
-
-inline void TestBuildingGraph(Zone* zone, JSGraph* jsgraph, FunctionEnv* env,
- const byte* start, const byte* end) {
- compiler::WasmGraphBuilder builder(zone, jsgraph, env->sig);
- TreeResult result = BuildTFGraph(&builder, env, start, end);
+inline void TestBuildingGraph(Zone* zone, JSGraph* jsgraph, ModuleEnv* module,
+ FunctionSig* sig, const byte* start,
+ const byte* end) {
+ compiler::WasmGraphBuilder builder(zone, jsgraph, sig);
+ TreeResult result =
+ BuildTFGraph(zone->allocator(), &builder, module, sig, start, end);
if (result.failed()) {
ptrdiff_t pc = result.error_pc - result.start;
ptrdiff_t pt = result.error_pt - result.start;
@@ -405,10 +390,9 @@
: GraphAndBuilders(main_zone()),
jsgraph(this->isolate(), this->graph(), this->common(), nullptr,
nullptr, this->machine()),
+ sig(sig),
descriptor_(nullptr),
testing_module_(module) {
- init_env(&env, sig);
- env.module = module;
if (module) {
// Get a new function from the testing module.
function_ = nullptr;
@@ -426,12 +410,13 @@
}
JSGraph jsgraph;
- FunctionEnv env;
+ FunctionSig* sig;
// The call descriptor is initialized when the function is compiled.
CallDescriptor* descriptor_;
TestingModule* testing_module_;
WasmFunction* function_;
int function_index_;
+ LocalDeclEncoder local_decls;
Isolate* isolate() { return main_isolate(); }
Graph* graph() const { return main_graph_; }
@@ -440,31 +425,25 @@
MachineOperatorBuilder* machine() { return &main_machine_; }
void InitializeDescriptor() {
if (descriptor_ == nullptr) {
- descriptor_ = env.module->GetWasmCallDescriptor(main_zone(), env.sig);
+ descriptor_ = testing_module_->GetWasmCallDescriptor(main_zone(), sig);
}
}
CallDescriptor* descriptor() { return descriptor_; }
void Build(const byte* start, const byte* end) {
- // Transfer local counts before compiling.
- function()->local_i32_count = env.local_i32_count;
- function()->local_i64_count = env.local_i64_count;
- function()->local_f32_count = env.local_f32_count;
- function()->local_f64_count = env.local_f64_count;
-
// Build the TurboFan graph.
- TestBuildingGraph(main_zone(), &jsgraph, &env, start, end);
+ local_decls.Prepend(&start, &end);
+ TestBuildingGraph(main_zone(), &jsgraph, testing_module_, sig, start, end);
+ delete[] start;
}
byte AllocateLocal(LocalType type) {
- int result = static_cast<int>(env.total_locals);
- env.AddLocals(type, 1);
- byte b = static_cast<byte>(result);
- CHECK_EQ(result, b);
- return b;
+ uint32_t index = local_decls.AddLocals(1, type, sig);
+ byte result = static_cast<byte>(index);
+ DCHECK_EQ(index, result);
+ return result;
}
- // TODO(titzer): remove me.
Handle<Code> Compile() {
InitializeDescriptor();
CallDescriptor* desc = descriptor_;
@@ -484,7 +463,6 @@
return result;
}
- // TODO(titzer): remove me.
uint32_t CompileAndAdd(uint16_t sig_index = 0) {
CHECK(testing_module_);
function()->sig_index = sig_index;
@@ -495,7 +473,7 @@
WasmFunction* function() {
if (function_) return function_;
- return &testing_module_->module->functions->at(function_index_);
+ return &testing_module_->module->functions[function_index_];
}
};
@@ -508,8 +486,8 @@
MachineType p1 = MachineType::None(),
MachineType p2 = MachineType::None(),
MachineType p3 = MachineType::None())
- : compiled_(false),
-
+ : zone(&allocator_),
+ compiled_(false),
signature_(MachineTypeForC<ReturnType>() == MachineType::None() ? 0 : 1,
GetParameterCount(p0, p1, p2, p3), storage_),
compiler_(&signature_, nullptr) {
@@ -520,7 +498,8 @@
MachineType p1 = MachineType::None(),
MachineType p2 = MachineType::None(),
MachineType p3 = MachineType::None())
- : compiled_(false),
+ : zone(&allocator_),
+ compiled_(false),
signature_(MachineTypeForC<ReturnType>() == MachineType::None() ? 0 : 1,
GetParameterCount(p0, p1, p2, p3), storage_),
compiler_(&signature_, module) {
@@ -548,8 +527,6 @@
wrapper_.Init(compiler_.descriptor(), p0, p1, p2, p3);
}
- FunctionEnv* env() { return &compiler_.env; }
-
// Builds a graph from the given Wasm code and generates the machine
// code and call wrapper for that graph. This method must not be called
// more than once.
@@ -599,15 +576,10 @@
return return_value;
}
- byte AllocateLocal(LocalType type) {
- int result = static_cast<int>(env()->total_locals);
- env()->AddLocals(type, 1);
- byte b = static_cast<byte>(result);
- CHECK_EQ(result, b);
- return b;
- }
+ byte AllocateLocal(LocalType type) { return compiler_.AllocateLocal(type); }
protected:
+ v8::base::AccountingAllocator allocator_;
Zone zone;
bool compiled_;
LocalType storage_[WASM_RUNNER_MAX_NUM_PARAMETERS];