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-spmm/gen/16x1-minmax-wasmsimd-x86-x2.c

diff --git a/src/f32-spmm/gen/16x1-minmax-wasmsimd-x86-x2.c b/src/f32-spmm/gen/16x1-minmax-wasmsimd-x86-x2.c
index 8fa9593..d91ea5f 100644
--- a/src/f32-spmm/gen/16x1-minmax-wasmsimd-x86-x2.c
+++ b/src/f32-spmm/gen/16x1-minmax-wasmsimd-x86-x2.c
@@ -29,8 +29,8 @@
   assert(mc % sizeof(float) == 0);
   assert(nc != 0);
 
-  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);
   const v128_t vzero = wasm_f64x2_splat(0.0);
   size_t output_decrement = output_stride * nc - 16 * sizeof(float);
   while XNN_LIKELY(mc >= 16 * sizeof(float)) {
@@ -40,7 +40,7 @@
     size_t n = nc;
     do {
       uint32_t nnz = *nnzmap++;
-      v128_t vacc0123x0 = wasm_v32x4_load_splat(w);
+      v128_t vacc0123x0 = wasm_v128_load32_splat(w);
       w += 1;
       v128_t vacc0123x1 = vzero;
       v128_t vacc4567x0 = vacc0123x0;
@@ -58,7 +58,7 @@
         const v128_t vi89ABx0 = wasm_v128_load(input + 8);
         const v128_t viCDEFx0 = wasm_v128_load(input + 12);
         input = (const float*restrict) ((uintptr_t) input + (uintptr_t) diff0);
-        const v128_t vw0 = wasm_v32x4_load_splat(w);
+        const v128_t vw0 = wasm_v128_load32_splat(w);
         w += 1;
         vacc0123x0 = wasm_f32x4_add(vacc0123x0, wasm_f32x4_mul(vi0123x0, vw0));
         vacc4567x0 = wasm_f32x4_add(vacc4567x0, wasm_f32x4_mul(vi4567x0, vw0));
@@ -69,7 +69,7 @@
         const v128_t vi89ABx1 = wasm_v128_load(input + 8);
         const v128_t viCDEFx1 = wasm_v128_load(input + 12);
         input = (const float*restrict) ((uintptr_t) input + (uintptr_t) diff1);
-        const v128_t vw1 = wasm_v32x4_load_splat(w);
+        const v128_t vw1 = wasm_v128_load32_splat(w);
         w += 1;
         vacc0123x1 = wasm_f32x4_add(vacc0123x1, wasm_f32x4_mul(vi0123x1, vw1));
         vacc4567x1 = wasm_f32x4_add(vacc4567x1, wasm_f32x4_mul(vi4567x1, vw1));
@@ -92,7 +92,7 @@
           const v128_t vi89AB = wasm_v128_load(input + 8);
           const v128_t viCDEF = wasm_v128_load(input + 12);
           input = (const float*restrict) ((uintptr_t) input + (uintptr_t) diff);
-          const v128_t vw = wasm_v32x4_load_splat(w); w += 1;
+          const v128_t vw = wasm_v128_load32_splat(w); w += 1;
           vacc0123 = wasm_f32x4_add(vacc0123, wasm_f32x4_mul(vi0123, vw));
           vacc4567 = wasm_f32x4_add(vacc4567, wasm_f32x4_mul(vi4567, vw));
           vacc89AB = wasm_f32x4_add(vacc89AB, wasm_f32x4_mul(vi89AB, vw));
@@ -126,7 +126,7 @@
       size_t n = nc;
       do {
         uint32_t nnz = *nnzmap++;
-        v128_t vacc0123 = wasm_v32x4_load_splat(w); w += 1;
+        v128_t vacc0123 = wasm_v128_load32_splat(w); w += 1;
         v128_t vacc4567 = vacc0123;
         if XNN_LIKELY(nnz != 0) {
           do {
@@ -134,7 +134,7 @@
             const v128_t vi0123 = wasm_v128_load(input);
             const v128_t vi4567 = wasm_v128_load(input + 4);
             input = (const float*restrict) ((uintptr_t) input + (uintptr_t) diff);
-            const v128_t vw = wasm_v32x4_load_splat(w); w += 1;
+            const v128_t vw = wasm_v128_load32_splat(w); w += 1;
             vacc0123 = wasm_f32x4_add(vacc0123, wasm_f32x4_mul(vi0123, vw));
             vacc4567 = wasm_f32x4_add(vacc4567, wasm_f32x4_mul(vi4567, vw));
           } while (--nnz != 0);
@@ -159,13 +159,13 @@
       size_t n = nc;
       do {
         uint32_t nnz = *nnzmap++;
-        v128_t vacc0123 = wasm_v32x4_load_splat(w); w += 1;
+        v128_t vacc0123 = wasm_v128_load32_splat(w); w += 1;
         if XNN_LIKELY(nnz != 0) {
           do {
             const intptr_t diff = *dmap++;
             const v128_t vi0123 = wasm_v128_load(input);
             input = (const float*restrict) ((uintptr_t) input + (uintptr_t) diff);
-            const v128_t vw = wasm_v32x4_load_splat(w); w += 1;
+            const v128_t vw = wasm_v128_load32_splat(w); w += 1;
             vacc0123 = wasm_f32x4_add(vacc0123, wasm_f32x4_mul(vi0123, vw));
           } while (--nnz != 0);
         }
@@ -186,13 +186,13 @@
       size_t n = nc;
       do {
         uint32_t nnz = *nnzmap++;
-        v128_t vacc01 = wasm_v32x4_load_splat(w); w += 1;
+        v128_t vacc01 = wasm_v128_load32_splat(w); w += 1;
         if XNN_LIKELY(nnz != 0) {
           do {
             const intptr_t diff = *dmap++;
-            const v128_t vi01 = wasm_v64x2_load_splat(input);
+            const v128_t vi01 = wasm_v128_load64_splat(input);
             input = (const float*restrict) ((uintptr_t) input + (uintptr_t) diff);
-            const v128_t vw = wasm_v32x4_load_splat(w); w += 1;
+            const v128_t vw = wasm_v128_load32_splat(w); w += 1;
             vacc01 = wasm_f32x4_add(vacc01, wasm_f32x4_mul(vi01, vw));
           } while (--nnz != 0);
         }
@@ -213,13 +213,13 @@
       size_t n = nc;
       do {
         uint32_t nnz = *nnzmap++;
-        v128_t vacc0 = wasm_v32x4_load_splat(w); w += 1;
+        v128_t vacc0 = wasm_v128_load32_splat(w); w += 1;
         if XNN_LIKELY(nnz != 0) {
           do {
             const intptr_t diff = *dmap++;
-            const v128_t vi0 = wasm_v32x4_load_splat(input);
+            const v128_t vi0 = wasm_v128_load32_splat(input);
             input = (const float*restrict) ((uintptr_t) input + (uintptr_t) diff);
-            const v128_t vw = wasm_v32x4_load_splat(w); w += 1;
+            const v128_t vw = wasm_v128_load32_splat(w); w += 1;
             vacc0 = wasm_f32x4_add(vacc0, wasm_f32x4_mul(vi0, vw));
           } while (--nnz != 0);
         }