commit ee029b28ad3cf2908f869d789de396f6a83a68d9
author Marat Dukhan <maratek@google.com> Wed Jun 30 12:47:02 2021 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Wed Jun 30 12:47:57 2021 -0700
tree 8aa9e1943127d2aa580e61008da4d304a5b20b59
parent f10af6ca0a400409e3b45660c1d27877cdda0062

Replace deprecated wasm_simd128.h intrinsics with new versions

The final version of wasm_simd128.h renamed and deprecated some of the
intrinsics used in XNNPACK WAsm SIMD microkernels. Update them to the new names
of these intrinsics.

PiperOrigin-RevId: 382364703

src/f32-gemm/wasmsimd-s4.c.in

diff --git a/src/f32-gemm/wasmsimd-s4.c.in b/src/f32-gemm/wasmsimd-s4.c.in
index c9b8f88..a7302d2 100644
--- a/src/f32-gemm/wasmsimd-s4.c.in
+++ b/src/f32-gemm/wasmsimd-s4.c.in
@@ -63,8 +63,8 @@
       }
 
   $if ACTIVATION == "MINMAX" and not X86:
-    const v128_t vmin = wasm_v32x4_load_splat(&params->scalar.min);
-    const v128_t vmax = wasm_v32x4_load_splat(&params->scalar.max);
+    const v128_t vmin = wasm_v128_load32_splat(&params->scalar.min);
+    const v128_t vmax = wasm_v128_load32_splat(&params->scalar.max);
   do {
     $if INC:
       $for M in range(MR):
@@ -104,7 +104,7 @@
     if XNN_UNLIKELY(k != 0) {
       do {
         $for M in range(MR):
-          const v128_t va${M} = wasm_v32x4_load_splat(a${M});
+          const v128_t va${M} = wasm_v128_load32_splat(a${M});
           a${M} += 1;
 
         const v128_t vb${ABC[0:4]} = wasm_v128_load(w);
@@ -122,12 +122,12 @@
 
     $if ACTIVATION == "MINMAX":
       $if X86:
-        const v128_t vmin = wasm_v32x4_load_splat(&params->scalar.min);
+        const v128_t vmin = wasm_v128_load32_splat(&params->scalar.min);
         $for N in range(0, NR, 4):
           $for M in range(MR):
             vacc${M}x${ABC[N:N+4]} = wasm_v128_bitselect(vmin, vacc${M}x${ABC[N:N+4]}, wasm_f32x4_lt(vacc${M}x${ABC[N:N+4]}, vmin));
 
-        const v128_t vmax = wasm_v32x4_load_splat(&params->scalar.max);
+        const v128_t vmax = wasm_v128_load32_splat(&params->scalar.max);
         $for N in range(0, NR, 4):
           $for M in range(MR):
             vacc${M}x${ABC[N:N+4]} = wasm_v128_bitselect(vacc${M}x${ABC[N:N+4]}, vmax, wasm_f32x4_le(vacc${M}x${ABC[N:N+4]}, vmax));