Reland "[wasm-simd][liftoff] Check CpuFeatures for SIMD support"

ngzhian · Commit Bot · commit cccbd5f12348 · 2020-02-03T19:43:09.000Z
This relands commit 7c32fa0. Some test cases need to be updated, since we will bail out to TurboFan where previously Liftoff was happy to run, when SIMD is not supported. Original change's description: > [wasm-simd][liftoff] Check CpuFeatures for SIMD support > > If Wasm simd128 is not supported on this particular hardware, we bail > out to TurboFan. > > Bug: v8:9909 > Change-Id: Ie46e154426783ba099b7c0facc906670cda1bdd0 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2029427 > Reviewed-by: Clemens Backes <clemensb@chromium.org> > Commit-Queue: Zhi An Ng <zhin@chromium.org> > Cr-Commit-Position: refs/heads/master@{#66055} Bug: v8:9909 Bug: v8:10169 Change-Id: I850e1fe6bfbd12fb2eec052aa8367624c09f7a08 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2030354 Commit-Queue: Zhi An Ng <zhin@chromium.org> Reviewed-by: Clemens Backes <clemensb@chromium.org> Cr-Commit-Position: refs/heads/master@{#66090}
diff --git a/src/wasm/baseline/liftoff-compiler.cc b/src/wasm/baseline/liftoff-compiler.cc
@@ -357,6 +357,11 @@ class LiftoffCompiler {
   bool CheckSupportedType(FullDecoder* decoder,
                           Vector<const ValueType> supported_types,
                           ValueType type, const char* context) {
+    // Special case for kWasm128 which requires specific hardware support.
+    if (type == kWasmS128 && (!CpuFeatures::SupportsWasmSimd128())) {
+      unsupported(decoder, kSimd, "simd");
+      return false;
+    }
     // Check supported types.
     for (ValueType supported : supported_types) {
       if (type == supported) return true;
@@ -2198,6 +2203,9 @@ class LiftoffCompiler {
 
   void SimdOp(FullDecoder* decoder, WasmOpcode opcode, Vector<Value> args,
               Value* result) {
+    if (!CpuFeatures::SupportsWasmSimd128()) {
+      return unsupported(decoder, kSimd, "simd");
+    }
     switch (opcode) {
       case wasm::kExprF32x4Splat:
         EmitUnOp<kWasmF32, kWasmS128>(
diff --git a/test/cctest/wasm/test-run-wasm-simd-liftoff.cc b/test/cctest/wasm/test-run-wasm-simd-liftoff.cc
@@ -32,7 +32,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Local) {
   byte temp1 = r.AllocateLocal(kWasmS128);
   BUILD(r, WASM_SET_LOCAL(temp1, WASM_GET_LOCAL(temp1)), WASM_ONE);
   CHECK_EQ(1, r.Call());
-  r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);
 }
 
 WASM_SIMD_LIFTOFF_TEST(S128Global) {
@@ -47,7 +46,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Global) {
     WriteLittleEndianValue<int32_t>(&g0[i], expected);
   }
   r.Call();
-  r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);
   for (int i = 0; i < 4; i++) {
     int32_t actual = ReadLittleEndianValue<int32_t>(&g1[i]);
     CHECK_EQ(actual, expected);
@@ -70,7 +68,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Param) {
         WASM_CALL_FUNCTION(simd_func.function_index(), WASM_GET_LOCAL(temp1)));
 
   CHECK_EQ(1, r.Call());
-  r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);
 }
 
 WASM_SIMD_LIFTOFF_TEST(S128Return) {
@@ -85,7 +82,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Return) {
         WASM_ONE);
 
   CHECK_EQ(1, r.Call());
-  r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);
 }
 
 #undef WASM_SIMD_LIFTOFF_TEST
diff --git a/test/message/wasm-trace-memory-liftoff.js b/test/message/wasm-trace-memory-liftoff.js
@@ -4,7 +4,8 @@
 
 // Flags: --no-stress-opt --trace-wasm-memory --liftoff --no-future
 // Flags: --no-wasm-tier-up --experimental-wasm-simd
+// Flags: --enable-sse3 --enable-sse4-1
 
-// liftoff does not support simd128, so the s128 load and store traces are in
-// the turbofan tier and not liftoff
+// Force enable sse3 and sse4-1, since that will determine which execution tier
+// we use, and thus the expected output message will differ.
 load("test/message/wasm-trace-memory.js");
diff --git a/test/mjsunit/wasm/simd-call.js b/test/mjsunit/wasm/simd-call.js
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 // Flags: --experimental-wasm-simd
-// Flags: --nowasm-tier-up
-// TODO(v8/10169)
 
 load('test/mjsunit/wasm/wasm-module-builder.js');
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Local) {`
`32`	`32`	`byte temp1 = r.AllocateLocal(kWasmS128);`
`33`	`33`	`BUILD(r, WASM_SET_LOCAL(temp1, WASM_GET_LOCAL(temp1)), WASM_ONE);`
`34`	`34`	`CHECK_EQ(1, r.Call());`
`35`		`- r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`WASM_SIMD_LIFTOFF_TEST(S128Global) {`
`@@ -47,7 +46,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Global) {`
`47`	`46`	`WriteLittleEndianValue<int32_t>(&g0[i], expected);`
`48`	`47`	`}`
`49`	`48`	`r.Call();`
`50`		`- r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);`
`51`	`49`	`for (int i = 0; i < 4; i++) {`
`52`	`50`	`int32_t actual = ReadLittleEndianValue<int32_t>(&g1[i]);`
`53`	`51`	`CHECK_EQ(actual, expected);`
`@@ -70,7 +68,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Param) {`
`70`	`68`	`WASM_CALL_FUNCTION(simd_func.function_index(), WASM_GET_LOCAL(temp1)));`
`71`	`69`
`72`	`70`	`CHECK_EQ(1, r.Call());`
`73`		`- r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);`
`74`	`71`	`}`
`75`	`72`
`76`	`73`	`WASM_SIMD_LIFTOFF_TEST(S128Return) {`
`@@ -85,7 +82,6 @@ WASM_SIMD_LIFTOFF_TEST(S128Return) {`
`85`	`82`	`WASM_ONE);`
`86`	`83`
`87`	`84`	`CHECK_EQ(1, r.Call());`
`88`		`- r.CheckUsedExecutionTier(ExecutionTier::kLiftoff);`
`89`	`85`	`}`
`90`	`86`
`91`	`87`	`#undef WASM_SIMD_LIFTOFF_TEST`