Re-enable SIMD tests after renumbering (#11081)

Author: tlively

tests/test_core.py

@@ -6003,7 +6003,6 @@ def test_relocatable_void_function(self):
     self.do_run_in_out_file_test('tests', 'core', 'test_relocatable_void_function')
 
   @wasm_simd
-  @unittest.skip("Disabled to allow SIMD opcode renumbering to roll")
   def test_wasm_builtin_simd(self, js_engines):
     # Improves test readability
     self.emcc_args.append('-Wno-c++11-narrowing')
@@ -6014,7 +6013,6 @@ def test_wasm_builtin_simd(self, js_engines):
                self.get_dir(), os.path.join(self.get_dir(), 'src.cpp'))
 
   @wasm_simd
-  @unittest.skip("Disabled to allow SIMD opcode renumbering to roll")
   def test_wasm_intrinsics_simd(self, js_engines):
     def run():
       self.do_run(

tests/test_wasm_builtin_simd.cpp

@@ -359,9 +359,15 @@ i8x16 TESTFN i8x16_sub_saturate_s(i8x16 x, i8x16 y) {
 i8x16 TESTFN i8x16_sub_saturate_u(i8x16 x, i8x16 y) {
   return __builtin_wasm_sub_saturate_u_i8x16(x, y);
 }
+
+#ifdef __wasm_unimplemented_simd128__
+
 i8x16 TESTFN i8x16_mul(i8x16 x, i8x16 y) {
   return x * y;
 }
+
+#endif // __wasm_unimplemented_simd128__
+
 // Skip {min,max}_{s,u} because they do not have short builtin equivalents
 i8x16 TESTFN i8x16_avgr_u(i8x16 x, i8x16 y) {
   return __builtin_wasm_avgr_u_i8x16(x, y);
@@ -1152,13 +1158,19 @@ int EMSCRIPTEN_KEEPALIVE __attribute__((__optnone__)) main(int argc, char** argv
     ),
     ((i8x16){0, 0, 254, 0, 0, 123, 0, 12, 61, 167, 158, 100, 17, 0, 0, 0})
   );
+
+#ifdef __wasm_unimplemented_simd128__
+
   expect_vec(
     i8x16_mul(
       (i8x16){0, 42, 255, 128, 127, 129, 6, 29, 103, 196, 231, 142, 17, 250, 1, 73},
       (i8x16){3, 231, 1, 128, 129, 6, 103, 17, 42, 29, 73, 42, 0, 255, 127, 142}
     ),
     ((i8x16){0, 230, 255, 0, 255, 6, 106, 237, 230, 52, 223, 76, 0, 6, 127, 126})
   );
+
+#endif // __wasm_unimplemented_simd128__
+
   expect_vec(
     i8x16_avgr_u(
       (i8x16){0, 42, 255, 128, 127, 129, 6, 29, 103, 196, 231, 142, 17, 250, 1, 73},

tests/test_wasm_intrinsics_simd.c

@@ -413,9 +413,15 @@ v128_t TESTFN i8x16_sub_saturate_s(v128_t x, v128_t y) {
 v128_t TESTFN i8x16_sub_saturate_u(v128_t x, v128_t y) {
   return wasm_u8x16_sub_saturate(x, y);
 }
+
+#ifdef __wasm_unimplemented_simd128__
+
 v128_t TESTFN i8x16_mul(v128_t x, v128_t y) {
   return wasm_i8x16_mul(x, y);
 }
+
+#endif // __wasm_unimplemented_simd128__
+
 v128_t TESTFN i8x16_min_s(v128_t x, v128_t y) {
   return wasm_i8x16_min(x, y);
 }
@@ -1371,13 +1377,19 @@ int EMSCRIPTEN_KEEPALIVE __attribute__((__optnone__)) main(int argc, char** argv
     ),
     u8x16(0, 0, 254, 0, 0, 123, 0, 12, 61, 167, 158, 100, 17, 0, 0, 0)
   );
+
+#ifdef __wasm_unimplemented_simd128__
+
   expect_vec(
     i8x16_mul(
       (v128_t)i8x16(0, 42, 255, 128, 127, 129, 6, 29, 103, 196, 231, 142, 17, 250, 1, 73),
       (v128_t)i8x16(3, 231, 1, 128, 129, 6, 103, 17, 42, 29, 73, 42, 0, 255, 127, 142)
     ),
     i8x16(0, 230, 255, 0, 255, 6, 106, 237, 230, 52, 223, 76, 0, 6, 127, 126)
   );
+
+#endif // __wasm_unimplemented_simd128__
+
   expect_vec(
     i8x16_min_s(
       (v128_t)i8x16(0, 42, 255, 128, 127, 129, 6, 29, 103, 196, 231, 142, 17, 250, 1, 73),