commit 91317c59f34a965cd64e5fa6a56c2c066f627c4f
author Frank Barchard <fbarchard@google.com> Fri Nov 22 10:54:35 2019 -0800
committer XNNPACK Team <xnnpack-github-robot@google.com> Fri Nov 22 11:15:56 2019 -0800
tree c1f92022e921211bcd5f001934cdf49c95464e53
parent 709ac2f888a93dab157f9cd131c19eb7fcf15efb

Rename neon intrinsics to lane.

PiperOrigin-RevId: 282000418

src/f32-gemm/neon-ld64.c.in

diff --git a/src/f32-gemm/neon-ld64.c.in b/src/f32-gemm/neon-ld64.c.in
index 5a89619..76e0d67 100644
--- a/src/f32-gemm/neon-ld64.c.in
+++ b/src/f32-gemm/neon-ld64.c.in
@@ -5,6 +5,9 @@
 
 $assert NR % 4 == 0
 $ABC = "0123456789ABCDEFGHIJKLMN"
+$VMULADDQ_F32 = "vfmaq_f32" if FMA else "vmlaq_f32"
+$VMULADDQ_LANE_F32 = "vfmaq_lane_f32" if FMA else "vmlaq_lane_f32"
+
 #include <assert.h>
 
 #include <arm_neon.h>
@@ -12,7 +15,7 @@
 #include <xnnpack/gemm.h>
 
 
-void xnn_f32_gemm${"inc" if INC else ""}_ukernel_${MR}x${NR}__${"neonfma" if FMA else "neon"}_ld64(
+void xnn_f32_gemm${"inc" if INC else ""}_ukernel_${MR}x${NR}__${"neonfma" if FMA else "neon"}_${"dup" if DUP else "lane"}_ld64(
     size_t mr,
     size_t nc,
     size_t kc,
@@ -79,22 +82,16 @@
         $for N in range(0, NR, 4):
           const float32x4_t vb${ABC[N:N+4]}c${L} = vld1q_f32(w); w += 4;
 
-        $if FMA:
-          #if defined(__aarch64__)
-            $for N in range(0, NR, 4):
-              $for M in range(MR):
-                vacc${M}x${ABC[N:N+4]} = vfmaq_lane_f32(vacc${M}x${ABC[N:N+4]},   vb${ABC[N:N+4]}c${L}, va${M}, ${L});
-          #else
-            $for M in range(MR):
-              const float32x4_t va${M}c${L} = vdupq_lane_f32(va${M}, ${L});
-            $for N in range(0, NR, 4):
-              $for M in range(MR):
-                vacc${M}x${ABC[N:N+4]} = vfmaq_f32(vacc${M}x${ABC[N:N+4]},   va${M}c${L}, vb${ABC[N:N+4]}c${L});
-          #endif
-        $else:
+        $if DUP:
+          $for M in range(MR):
+            const float32x4_t va${M}c${L} = vdupq_lane_f32(va${M}, ${L});
           $for N in range(0, NR, 4):
             $for M in range(MR):
-              vacc${M}x${ABC[N:N+4]} = vmlaq_lane_f32(vacc${M}x${ABC[N:N+4]},   vb${ABC[N:N+4]}c${L}, va${M}, ${L});
+              vacc${M}x${ABC[N:N+4]} = ${VMULADDQ_F32}(vacc${M}x${ABC[N:N+4]}, va${M}c${L}, vb${ABC[N:N+4]}c${L});
+        $else:
+           $for N in range(0, NR, 4):
+             $for M in range(MR):
+               vacc${M}x${ABC[N:N+4]} = ${VMULADDQ_LANE_F32}(vacc${M}x${ABC[N:N+4]}, vb${ABC[N:N+4]}c${L}, va${M}, ${L});
     }
     if XNN_UNLIKELY(k != 0) {
       $for M in range(MR):
@@ -105,10 +102,7 @@
 
       $for N in range(0, NR, 4):
         $for M in range(MR):
-          $if FMA:
-            vacc${M}x${ABC[N:N+4]} = vfmaq_f32(vacc${M}x${ABC[N:N+4]}, va${M},   vb${ABC[N:N+4]});
-          $else:
-            vacc${M}x${ABC[N:N+4]} = vmlaq_f32(vacc${M}x${ABC[N:N+4]}, va${M},   vb${ABC[N:N+4]});
+          vacc${M}x${ABC[N:N+4]} = ${VMULADDQ_F32}(vacc${M}x${ABC[N:N+4]}, va${M}, vb${ABC[N:N+4]});
     }
     const float32x4_t vmax = vld1q_dup_f32(&params->scalar.max);
     $for N in range(0, NR, 4):