Index: test/cctest/wasm/test-run-wasm-simd.cc |
diff --git a/test/cctest/wasm/test-run-wasm-simd.cc b/test/cctest/wasm/test-run-wasm-simd.cc |
index 9b0f474faf307c68da31b02c52834c13374278c2..6b65177a545094514dd6c9f53187ec0063d22bc2 100644 |
--- a/test/cctest/wasm/test-run-wasm-simd.cc |
+++ b/test/cctest/wasm/test-run-wasm-simd.cc |
@@ -1009,19 +1009,13 @@ WASM_EXEC_COMPILED_TEST(I32x4Sub) { RunI32x4BinOpTest(kExprI32x4Sub, Sub); } |
#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || SIMD_LOWERING_TARGET || \ |
V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 |
WASM_EXEC_COMPILED_TEST(I32x4Mul) { RunI32x4BinOpTest(kExprI32x4Mul, Mul); } |
-#endif // V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || SIMD_LOWERING_TARGET || |
- // V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 |
-#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET || V8_TARGET_ARCH_X64 |
WASM_EXEC_COMPILED_TEST(S128And) { RunI32x4BinOpTest(kExprS128And, And); } |
WASM_EXEC_COMPILED_TEST(S128Or) { RunI32x4BinOpTest(kExprS128Or, Or); } |
WASM_EXEC_COMPILED_TEST(S128Xor) { RunI32x4BinOpTest(kExprS128Xor, Xor); } |
-#endif // V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET || V8_TARGET_ARCH_X64 |
-#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || SIMD_LOWERING_TARGET || \ |
- V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 |
WASM_EXEC_COMPILED_TEST(I32x4Min) { |
RunI32x4BinOpTest(kExprI32x4MinS, Minimum); |
} |
@@ -1420,7 +1414,8 @@ WASM_EXEC_COMPILED_TEST(I8x16ConvertI16x8) { |
} |
#endif // V8_TARGET_ARCH_ARM |
-#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || SIMD_LOWERING_TARGET |
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || SIMD_LOWERING_TARGET || \ |
+ V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 |
void RunI8x16BinOpTest(WasmOpcode simd_op, Int8BinOp expected_op) { |
FLAG_wasm_simd_prototype = true; |
WasmRunner<int32_t, int32_t, int32_t, int32_t> r(kExecuteCompiled); |
@@ -1502,14 +1497,18 @@ WASM_EXEC_COMPILED_TEST(I8x16Eq) { RunI8x16CompareOpTest(kExprI8x16Eq, Equal); } |
WASM_EXEC_COMPILED_TEST(I8x16Ne) { |
RunI8x16CompareOpTest(kExprI8x16Ne, NotEqual); |
} |
-#endif // V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || SIMD_LOWERING_TARGET |
+#endif // V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || SIMD_LOWERING_TARGET || |
+ // V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 |
-#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
+#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET || V8_TARGET_ARCH_MIPS || \ |
+ V8_TARGET_ARCH_MIPS64 |
WASM_EXEC_COMPILED_TEST(I8x16Mul) { RunI8x16BinOpTest(kExprI8x16Mul, Mul); } |
-#endif // V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 |
+#endif // V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_MIPS || |
+ // V8_TARGET_ARCH_MIPS64 |
// TODO(gdeepti): Remove special case for ARM64 after v8:6421 is fixed |
-#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET && !V8_TARGET_ARCH_ARM64 |
+#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET && !V8_TARGET_ARCH_ARM64 || \ |
+ V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 |
WASM_EXEC_COMPILED_TEST(I8x16GtS) { |
RunI8x16CompareOpTest(kExprI8x16GtS, Greater); |
} |
@@ -1542,6 +1541,7 @@ WASM_EXEC_COMPILED_TEST(I8x16LeU) { |
RunI8x16CompareOpTest(kExprI8x16LeU, UnsignedLessEqual); |
} |
#endif // V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET && !V8_TARGET_ARCH_ARM64 |
+ // || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 |
void RunI8x16ShiftOpTest(WasmOpcode simd_op, Int8ShiftOp expected_op, |
int shift) { |
@@ -1570,11 +1570,13 @@ WASM_EXEC_COMPILED_TEST(I8x16ShrS) { |
#endif // V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 || |
// SIMD_LOWERING_TARGET |
-#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
+#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET || V8_TARGET_ARCH_MIPS || \ |
+ V8_TARGET_ARCH_MIPS64 |
WASM_EXEC_COMPILED_TEST(I8x16ShrU) { |
RunI8x16ShiftOpTest(kExprI8x16ShrU, LogicalShiftRight, 1); |
} |
-#endif // V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
+#endif // V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET || V8_TARGET_ARCH_MIPS || |
+ // V8_TARGET_ARCH_MIPS64 |
#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_MIPS || \ |
V8_TARGET_ARCH_MIPS64 |