Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: test/cctest/wasm/test-run-wasm.cc

Issue 2670673002: [wasm] Implement polymorphic checking, matching the reference interpreter. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/wasm/wasm-opcodes.h ('k') | test/cctest/wasm/test-run-wasm-simd.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/wasm/test-run-wasm.cc
diff --git a/test/cctest/wasm/test-run-wasm.cc b/test/cctest/wasm/test-run-wasm.cc
index 5cc6b5a42514629c6d867d09b3575e625fe379a4..ab503b20245a18894d5cee18e2af23a8232261d4 100644
--- a/test/cctest/wasm/test-run-wasm.cc
+++ b/test/cctest/wasm/test-run-wasm.cc
@@ -727,7 +727,7 @@ WASM_EXEC_TEST(Return12) {
WASM_EXEC_TEST(Return17) {
WasmRunner<int32_t> r(execution_mode);
- BUILD(r, WASM_BLOCK(RET_I8(17)));
+ BUILD(r, WASM_BLOCK(RET_I8(17)), WASM_ZERO);
CHECK_EQ(17, r.Call());
}
@@ -836,11 +836,10 @@ WASM_EXEC_TEST(BrIf_strict) {
WASM_EXEC_TEST(Br_height) {
WasmRunner<int32_t, int32_t> r(execution_mode);
- BUILD(r, WASM_BLOCK_I(WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_GET_LOCAL(0),
- WASM_GET_LOCAL(0)),
- WASM_RETURN1(WASM_I32V_1(9)),
- WASM_I32V_1(7), WASM_I32V_1(7)),
- WASM_BRV(0, WASM_I32V_1(8))));
+ BUILD(r, WASM_BLOCK_I(
+ WASM_BLOCK(WASM_BRV_IFD(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)),
+ WASM_RETURN1(WASM_I32V_1(9))),
+ WASM_BRV(0, WASM_I32V_1(8))));
for (int32_t i = 0; i < 5; i++) {
int32_t expected = i != 0 ? 8 : 9;
@@ -1277,7 +1276,8 @@ WASM_EXEC_TEST(Block_IfElse_P_return) {
BUILD(r, // --
WASM_IF_ELSE(WASM_GET_LOCAL(0), // --
RET_I8(81), // --
- RET_I8(82))); // --
+ RET_I8(82)), // --
+ WASM_ZERO); // --
FOR_INT32_INPUTS(i) {
int32_t expected = *i ? 81 : 82;
CHECK_EQ(expected, r.Call(*i));
@@ -1295,12 +1295,12 @@ WASM_EXEC_TEST(Block_If_P_assign) {
}
}
-WASM_EXEC_TEST(DanglingAssign) {
- WasmRunner<int32_t, int32_t> r(execution_mode);
- // { return 0; p0 = 0; }
- BUILD(r, B2(RET_I8(99), WASM_SET_LOCAL(0, WASM_ZERO)));
- CHECK_EQ(99, r.Call(1));
-}
+// WASM_EXEC_TEST(DanglingAssign) {
+// WasmRunner<int32_t, int32_t> r(execution_mode);
+// // { return 0; p0 = 0; }
+// BUILD(r, B2(RET_I8(99), WASM_SET_LOCAL(0, WASM_ZERO)));
bradnelson 2017/02/02 01:55:09 Why?
titzer 2017/02/02 06:50:25 Disabled these tests because this CL was based on
+// CHECK_EQ(99, r.Call(1));
+//}
WASM_EXEC_TEST(ExprIf_P) {
WasmRunner<int32_t, int32_t> r(execution_mode);
@@ -1395,23 +1395,23 @@ WASM_EXEC_TEST(Loop_if_break_fallthru2) {
CHECK_EQ(-22, r.Call(-22));
}
-WASM_EXEC_TEST(IfBreak1) {
- WasmRunner<int32_t, int32_t> r(execution_mode);
- BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), WASM_UNREACHABLE)),
- WASM_I32V_2(91));
- CHECK_EQ(91, r.Call(0));
- CHECK_EQ(91, r.Call(1));
- CHECK_EQ(91, r.Call(-8734));
-}
-
-WASM_EXEC_TEST(IfBreak2) {
- WasmRunner<int32_t, int32_t> r(execution_mode);
- BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), RET_I8(77))),
- WASM_I32V_2(81));
- CHECK_EQ(81, r.Call(0));
- CHECK_EQ(81, r.Call(1));
- CHECK_EQ(81, r.Call(-8734));
-}
+// WASM_EXEC_TEST(IfBreak1) {
+// WasmRunner<int32_t, int32_t> r(execution_mode);
+// BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), WASM_UNREACHABLE)),
+// WASM_I32V_2(91));
+// CHECK_EQ(91, r.Call(0));
+// CHECK_EQ(91, r.Call(1));
+// CHECK_EQ(91, r.Call(-8734));
+//}
+
+// WASM_EXEC_TEST(IfBreak2) {
+// WasmRunner<int32_t, int32_t> r(execution_mode);
+// BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), RET_I8(77))),
+// WASM_I32V_2(81));
+// CHECK_EQ(81, r.Call(0));
+// CHECK_EQ(81, r.Call(1));
+// CHECK_EQ(81, r.Call(-8734));
+//}
WASM_EXEC_TEST(LoadMemI32) {
WasmRunner<int32_t, int32_t> r(execution_mode);
@@ -1764,7 +1764,7 @@ WASM_EXEC_TEST(MemF64_Mul) {
WASM_EXEC_TEST(Build_Wasm_Infinite_Loop) {
WasmRunner<int32_t, int32_t> r(execution_mode);
// Only build the graph and compile, don't run.
- BUILD(r, WASM_INFINITE_LOOP);
+ BUILD(r, WASM_INFINITE_LOOP, WASM_ZERO);
}
WASM_EXEC_TEST(Build_Wasm_Infinite_Loop_effect) {
@@ -1776,53 +1776,60 @@ WASM_EXEC_TEST(Build_Wasm_Infinite_Loop_effect) {
WASM_ZERO);
}
-WASM_EXEC_TEST(Unreachable0a) {
- WasmRunner<int32_t, int32_t> r(execution_mode);
- BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(9)), RET(WASM_GET_LOCAL(0))));
- CHECK_EQ(9, r.Call(0));
- CHECK_EQ(9, r.Call(1));
-}
+// WASM_EXEC_TEST(Unreachable0a) {
+// WasmRunner<int32_t, int32_t> r(execution_mode);
+// BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(9)), RET(WASM_GET_LOCAL(0))));
+// CHECK_EQ(9, r.Call(0));
bradnelson 2017/02/02 01:55:09 Why?
titzer 2017/02/02 06:50:25 Ditto.
+// CHECK_EQ(9, r.Call(1));
+//}
-WASM_EXEC_TEST(Unreachable0b) {
- WasmRunner<int32_t, int32_t> r(execution_mode);
- BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(7)), WASM_UNREACHABLE));
- CHECK_EQ(7, r.Call(0));
- CHECK_EQ(7, r.Call(1));
-}
+// WASM_EXEC_TEST(Unreachable0b) {
+// WasmRunner<int32_t, int32_t> r(execution_mode);
+// BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(7)), WASM_UNREACHABLE));
+// CHECK_EQ(7, r.Call(0));
+// CHECK_EQ(7, r.Call(1));
+//}
TEST(Build_Wasm_Unreachable1) {
WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
BUILD(r, WASM_UNREACHABLE);
}
-TEST(Build_Wasm_Unreachable2) {
- WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
- BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE);
-}
-
-TEST(Build_Wasm_Unreachable3) {
- WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
- BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE, WASM_UNREACHABLE);
-}
-
-TEST(Build_Wasm_UnreachableIf1) {
- WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
- BUILD(r, WASM_UNREACHABLE, WASM_IF(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
-}
-
-TEST(Build_Wasm_UnreachableIf2) {
- WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
- BUILD(r, WASM_UNREACHABLE,
- WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_UNREACHABLE));
-}
-
-WASM_EXEC_TEST(Unreachable_Load) {
- WasmRunner<int32_t, int32_t> r(execution_mode);
- r.module().AddMemory(0L);
- BUILD(r, WASM_BLOCK_I(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));
+// TEST(Build_Wasm_Unreachable2) {
+// WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+// BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE);
+//}
+
+// TEST(Build_Wasm_Unreachable3) {
+// WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+// BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE, WASM_UNREACHABLE);
+//}
+
+// TEST(Build_Wasm_UnreachableIf1) {
+// WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+// BUILD(r, WASM_UNREACHABLE, WASM_IF(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+//}
+
+// TEST(Build_Wasm_UnreachableIf2) {
+// WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+// BUILD(r, WASM_UNREACHABLE,
+// WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_UNREACHABLE));
+//}
+
+// WASM_EXEC_TEST(Unreachable_Load) {
+// WasmRunner<int32_t, int32_t> r(execution_mode);
+// BUILD(r, WASM_BLOCK_I(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));
+//}
+
+WASM_EXEC_TEST(BrV_Fallthrough) {
+ WasmRunner<int32_t> r(execution_mode);
+ BUILD(r, WASM_BLOCK_I(WASM_BLOCK(WASM_BRV(1, WASM_I32V_1(42))),
+ WASM_I32V_1(22)));
+ CHECK_EQ(42, r.Call());
}
WASM_EXEC_TEST(Infinite_Loop_not_taken1) {
@@ -1834,9 +1841,10 @@ WASM_EXEC_TEST(Infinite_Loop_not_taken1) {
WASM_EXEC_TEST(Infinite_Loop_not_taken2) {
WasmRunner<int32_t, int32_t> r(execution_mode);
- BUILD(r, WASM_BLOCK_I(WASM_IF_ELSE(WASM_GET_LOCAL(0),
- WASM_BRV(1, WASM_I32V_1(45)),
- WASM_INFINITE_LOOP)));
+ BUILD(r, WASM_BLOCK_I(
+ WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_I32V_1(45)),
+ WASM_INFINITE_LOOP),
+ WASM_ZERO));
// Run the code, but don't go into the infinite loop.
CHECK_EQ(45, r.Call(1));
}
« no previous file with comments | « src/wasm/wasm-opcodes.h ('k') | test/cctest/wasm/test-run-wasm-simd.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698