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 2d213c745fbefcd1cb5dbc3fd5c996790756bcfe..c0a3cb54dc83e8f89e9c0cabbbc3d1217a84c0f0 100644 |
--- a/test/cctest/wasm/test-run-wasm-simd.cc |
+++ b/test/cctest/wasm/test-run-wasm-simd.cc |
@@ -752,9 +752,7 @@ |
CHECK_EQ(1, r.Call(1, 2)); |
} |
-#endif // V8_TARGET_ARCH_ARM |
- |
-#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
+ |
// Determines if conversion from float to int will be valid. |
bool CanRoundToZeroAndConvert(double val, bool unsigned_integer) { |
const double max_uint = static_cast<double>(0xffffffffu); |
@@ -818,7 +816,9 @@ |
CHECK_EQ(1, r.Call(*i, signed_value, unsigned_value)); |
} |
} |
- |
+#endif // V8_TARGET_ARCH_ARM |
+ |
+#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
void RunI32x4UnOpTest(WasmOpcode simd_op, Int32UnOp expected_op) { |
FLAG_wasm_simd_prototype = true; |
WasmRunner<int32_t, int32_t, int32_t> r(kExecuteCompiled); |
@@ -868,7 +868,9 @@ |
WASM_EXEC_COMPILED_TEST(S128Or) { RunI32x4BinOpTest(kExprS128Or, Or); } |
WASM_EXEC_COMPILED_TEST(S128Xor) { RunI32x4BinOpTest(kExprS128Xor, Xor); } |
- |
+#endif // V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
+ |
+#if V8_TARGET_ARCH_ARM |
WASM_EXEC_COMPILED_TEST(I32x4Min) { |
RunI32x4BinOpTest(kExprI32x4MinS, Minimum); |
} |
@@ -884,9 +886,9 @@ |
WASM_EXEC_COMPILED_TEST(Ui32x4Max) { |
RunI32x4BinOpTest(kExprI32x4MaxU, UnsignedMaximum); |
} |
-#endif // V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
- |
-#if V8_TARGET_ARCH_ARM |
+ |
+ |
+ |
void RunI32x4CompareOpTest(WasmOpcode simd_op, Int32BinOp expected_op) { |
FLAG_wasm_simd_prototype = true; |
WasmRunner<int32_t, int32_t, int32_t, int32_t> r(kExecuteCompiled); |
@@ -947,9 +949,7 @@ |
WASM_EXEC_COMPILED_TEST(Ui32x4LessEqual) { |
RunI32x4CompareOpTest(kExprI32x4LeU, UnsignedLessEqual); |
} |
-#endif // V8_TARGET_ARCH_ARM |
- |
-#if V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
+ |
void RunI32x4ShiftOpTest(WasmOpcode simd_op, Int32ShiftOp expected_op, |
int shift) { |
FLAG_wasm_simd_prototype = true; |
@@ -976,9 +976,6 @@ |
WASM_EXEC_COMPILED_TEST(I32x4ShrU) { |
RunI32x4ShiftOpTest(kExprI32x4ShrU, LogicalShiftRight, 1); |
} |
-#endif // V8_TARGET_ARCH_ARM || SIMD_LOWERING_TARGET |
- |
-#if V8_TARGET_ARCH_ARM |
void RunI16x8UnOpTest(WasmOpcode simd_op, Int16UnOp expected_op) { |
FLAG_wasm_simd_prototype = true; |