Update cpu depthwise kernels

Resolves: COMPMID-4688

Signed-off-by: Freddie Liardet <frederick.liardet@arm.com>
Change-Id: I9e22f967f5b7ccaebff2fc49f0253f621d62d820
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6030
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

1 files changed, 72 insertions, 80 deletions

diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst/generic_direct.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst/generic_direct.cpp
index a4c1a40100..955a02de57 100644
--- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst/generic_direct.cpp
+++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst/generic_direct.cpp
@@ -25,7 +25,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FP16_ARGS)
+#if __aarch64__ && defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FP16_ARGS)
 
 namespace arm_conv {
 namespace depthwise {
@@ -113,149 +113,141 @@ void sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst_direct_impl(
     "add x27, x10, x22, LSL #1\n"
     "ld1rh { z17.h }, p3/Z, [%x[params_struct], %[offsetof_args_max]]\n"
     "add x26, x27, x22, LSL #1\n"
-    "ld1h { z16.h }, p3/Z, [x14]\n" // Load from weights and bias
-    "mov z31.d, z16.d\n"
-    "ld1h { z0.h }, p3/Z, [x14, #1, MUL VL]\n" // Load from weights and bias
+    "ld1h { z16.h }, p3/Z, [x14]\n"
     "add x25, x26, x22, LSL #1\n"
-    "mov z30.d, z16.d\n"
-    "ld1h { z1.h }, p3/Z, [x14, #2, MUL VL]\n" // Load from weights and bias
+    "ld1h { z0.h }, p3/Z, [x14, #1, MUL VL]\n"
     "add x24, x11, x11\n"
-    "mov z29.d, z16.d\n"
-    "ld1h { z2.h }, p3/Z, [x14, #3, MUL VL]\n" // Load from weights and bias
+    "ld1h { z1.h }, p3/Z, [x14, #2, MUL VL]\n"
     "add x23, x24, x11\n"
-    "mov z28.d, z16.d\n"
-    "ld1h { z3.h }, p3/Z, [x14, #4, MUL VL]\n" // Load from weights and bias
+    "ld1h { z2.h }, p3/Z, [x14, #3, MUL VL]\n"
     "mul x19, x17, x20\n" // offset = tile_i * ld_output_row
-    "ld1h { z4.h }, p3/Z, [x14, #5, MUL VL]\n" // Load from weights and bias
+    "ld1h { z3.h }, p3/Z, [x14, #4, MUL VL]\n"
     "madd x19, x16, x9, x19\n" // offset += tile_j * ld_output_col
-    "ld1h { z5.h }, p3/Z, [x14, #6, MUL VL]\n" // Load from weights and bias
+    "ld1h { z4.h }, p3/Z, [x14, #5, MUL VL]\n"
     "mul x19, x19, x15\n" // offset *= output_tile_size
-    "ld1h { z6.h }, p3/Z, [x14, #7, MUL VL]\n" // Load from weights and bias
+    "ld1h { z5.h }, p3/Z, [x14, #6, MUL VL]\n"
     "add x28, x28, x19, LSL #1\n" // outptrs[0] += offset * sizeof(__fp16)
-    "whilelt p2.h, XZR, %x[n_channels]\n"
-    "ld1h { z9.h }, p2/Z, [x27, x11, LSL #1]\n" // Load input point (1, 1)
-    "ld1h { z10.h }, p2/Z, [x10]\n" // Load input point (0, 0)
+    "ld1h { z6.h }, p3/Z, [x14, #7, MUL VL]\n"
     "add x22, x28, x20, LSL #1\n"
-    "ld1h { z11.h }, p2/Z, [x10, x23, LSL #1]\n" // Load input point (0, 3)
+    "whilelt p2.h, XZR, %x[n_channels]\n"
+    "ld1h { z9.h }, p2/Z, [x27, x11, LSL #1]\n"
+    "ld1h { z10.h }, p2/Z, [x10]\n"
     "addvl x14, x14, #16\n"
-    "ld1h { z12.h }, p2/Z, [x27, x24, LSL #1]\n" // Load input point (1, 2)
+    "ld1h { z11.h }, p2/Z, [x10, x23, LSL #1]\n"
     "cmp x12, %x[n_channels]\n"
-    "ld1h { z7.h }, p3/Z, [x14, #-8, MUL VL]\n" // Load from weights and bias
-    "ld1h { z8.h }, p3/Z, [x14, #-7, MUL VL]\n" // Load from weights and bias
+    "ld1h { z7.h }, p3/Z, [x14, #-8, MUL VL]\n"
+    "ld1h { z8.h }, p3/Z, [x14, #-7, MUL VL]\n"
     "addvl x14, x14, #-6\n"
-    "ld1h { z13.h }, p2/Z, [x26, x11, LSL #1]\n" // Load input point (2, 1)
+    "ld1h { z12.h }, p2/Z, [x27, x24, LSL #1]\n"
+    "ld1h { z13.h }, p2/Z, [x26, x11, LSL #1]\n"
     "bge 3f\n"
     "2:"  // Tile loop: Channel loop
-    "fmla z31.h, p3/M, z4.h, z9.h\n"
-    "ld1h { z16.h }, p3/Z, [x14]\n" // Load from weights and bias
+    "movprfx z31, z16\n fmla z31.h, p3/M, z4.h, z9.h\n"
     "whilelt p1.h, x12, %x[n_channels]\n"
-    "fmla z30.h, p3/M, z3.h, z9.h\n"
+    "movprfx z30, z16\n fmla z30.h, p3/M, z3.h, z9.h\n"
     "inch x21\n"
-    "fmla z29.h, p3/M, z1.h, z9.h\n"
+    "movprfx z29, z16\n fmla z29.h, p3/M, z1.h, z9.h\n"
     "mov p0.b, p2.b\n"
-    "fmla z28.h, p3/M, z0.h, z9.h\n"
-    "ld1h { z9.h }, p2/Z, [x25]\n" // Load input point (3, 0)
+    "movprfx z28, z16\n fmla z28.h, p3/M, z0.h, z9.h\n"
+    "ld1h { z9.h }, p2/Z, [x25]\n"
     "inch x13\n"
     "fmla z31.h, p3/M, z0.h, z10.h\n"
-    "ld1h { z10.h }, p2/Z, [x26, x24, LSL #1]\n" // Load input point (2, 2)
+    "ld1h { z10.h }, p2/Z, [x26, x24, LSL #1]\n"
     "inch x12\n"
     "fmla z30.h, p3/M, z2.h, z11.h\n"
-    "ld1h { z11.h }, p2/Z, [x25, x23, LSL #1]\n" // Load input point (3, 3)
+    "ld1h { z11.h }, p2/Z, [x25, x23, LSL #1]\n"
     "fmla z29.h, p3/M, z2.h, z12.h\n"
+    "ld1h { z16.h }, p3/Z, [x14]\n"
     "fmla z28.h, p3/M, z1.h, z12.h\n"
     "fmla z31.h, p3/M, z5.h, z12.h\n"
     "fmla z30.h, p3/M, z4.h, z12.h\n"
-    "ld1h { z12.h }, p2/Z, [x10, x11, LSL #1]\n" // Load input point (0, 1)
+    "ld1h { z12.h }, p2/Z, [x10, x11, LSL #1]\n"
     "fmla z29.h, p3/M, z6.h, z9.h\n"
-    "ld1h { z9.h }, p2/Z, [x10, x24, LSL #1]\n" // Load input point (0, 2)
+    "ld1h { z9.h }, p2/Z, [x10, x24, LSL #1]\n"
     "addvl x10, x10, #1\n"
     "fmla z28.h, p3/M, z3.h, z13.h\n"
     "fmla z31.h, p3/M, z7.h, z13.h\n"
     "fmla z30.h, p3/M, z6.h, z13.h\n"
     "fmla z29.h, p3/M, z4.h, z13.h\n"
     "fmla z28.h, p3/M, z8.h, z11.h\n"
-    "ld1h { z11.h }, p2/Z, [x27]\n" // Load input point (1, 0)
+    "ld1h { z11.h }, p2/Z, [x27]\n"
     "fmla z31.h, p3/M, z1.h, z12.h\n"
     "fmla z30.h, p3/M, z0.h, z12.h\n"
-    "ld1h { z12.h }, p2/Z, [x27, x23, LSL #1]\n" // Load input point (1, 3)
+    "ld1h { z12.h }, p2/Z, [x27, x23, LSL #1]\n"
     "addvl x27, x27, #1\n"
     "fmla z29.h, p3/M, z5.h, z10.h\n"
     "fmla z28.h, p3/M, z4.h, z10.h\n"
-    "ld1h { z4.h }, p3/Z, [x14, #5, MUL VL]\n" // Load from weights and bias
+    "ld1h { z4.h }, p3/Z, [x14, #5, MUL VL]\n"
     "fmla z31.h, p3/M, z2.h, z9.h\n"
     "fmla z30.h, p3/M, z1.h, z9.h\n"
-    "ld1h { z9.h }, p2/Z, [x26]\n" // Load input point (2, 0)
-    "ld1h { z1.h }, p3/Z, [x14, #2, MUL VL]\n" // Load from weights and bias
+    "ld1h { z9.h }, p2/Z, [x26]\n"
+    "ld1h { z1.h }, p3/Z, [x14, #2, MUL VL]\n"
     "fmla z29.h, p3/M, z0.h, z11.h\n"
-    "ld1h { z0.h }, p3/Z, [x14, #1, MUL VL]\n" // Load from weights and bias
+    "ld1h { z0.h }, p3/Z, [x14, #1, MUL VL]\n"
     "fmla z28.h, p3/M, z2.h, z12.h\n"
-    "ld1h { z2.h }, p3/Z, [x14, #3, MUL VL]\n" // Load from weights and bias
+    "ld1h { z2.h }, p3/Z, [x14, #3, MUL VL]\n"
     "fmla z31.h, p3/M, z8.h, z10.h\n"
     "fmla z30.h, p3/M, z7.h, z10.h\n"
-    "ld1h { z10.h }, p2/Z, [x26, x23, LSL #1]\n" // Load input point (2, 3)
+    "ld1h { z10.h }, p2/Z, [x26, x23, LSL #1]\n"
     "addvl x26, x26, #1\n"
     "fmla z29.h, p3/M, z3.h, z9.h\n"
-    "ld1h { z13.h }, p1/Z, [x26, x11, LSL #1]\n" // Load input point (2, 1)
+    "ld1h { z13.h }, p1/Z, [x26, x11, LSL #1]\n"
     "fmla z31.h, p3/M, z3.h, z11.h\n"
-    "ld1h { z11.h }, p2/Z, [x25, x11, LSL #1]\n" // Load input point (3, 1)
+    "ld1h { z11.h }, p2/Z, [x25, x11, LSL #1]\n"
     "fmla z28.h, p3/M, z5.h, z10.h\n"
-    "ld1h { z3.h }, p3/Z, [x14, #4, MUL VL]\n" // Load from weights and bias
+    "ld1h { z3.h }, p3/Z, [x14, #4, MUL VL]\n"
     "fmla z30.h, p3/M, z5.h, z12.h\n"
-    "ld1h { z12.h }, p2/Z, [x25, x24, LSL #1]\n" // Load input point (3, 2)
+    "ld1h { z12.h }, p2/Z, [x25, x24, LSL #1]\n"
     "whilelt p2.h, x13, %x[n_channels]\n"
     "fmla z29.h, p3/M, z7.h, z11.h\n"
-    "ld1h { z5.h }, p3/Z, [x14, #6, MUL VL]\n" // Load from weights and bias
+    "ld1h { z5.h }, p3/Z, [x14, #6, MUL VL]\n"
     "addvl x25, x25, #1\n"
     "fmla z31.h, p3/M, z6.h, z9.h\n"
-    "ld1h { z9.h }, p1/Z, [x27, x11, LSL #1]\n" // Load input point (1, 1)
+    "ld1h { z9.h }, p1/Z, [x27, x11, LSL #1]\n"
     "cmp x12, %x[n_channels]\n"
     "fmla z30.h, p3/M, z8.h, z10.h\n"
-    "ld1h { z10.h }, p1/Z, [x10]\n" // Load input point (0, 0)
+    "ld1h { z10.h }, p1/Z, [x10]\n"
     "fmla z28.h, p3/M, z6.h, z11.h\n"
-    "ld1h { z11.h }, p1/Z, [x10, x23, LSL #1]\n" // Load input point (0, 3)
-    "ld1h { z6.h }, p3/Z, [x14, #7, MUL VL]\n" // Load from weights and bias
+    "ld1h { z11.h }, p1/Z, [x10, x23, LSL #1]\n"
+    "ld1h { z6.h }, p3/Z, [x14, #7, MUL VL]\n"
     "fmla z29.h, p3/M, z8.h, z12.h\n"
     "addvl x14, x14, #16\n"
     "fmax z31.h, p3/M, z31.h, z18.h\n"
-    "ld1h { z8.h }, p3/Z, [x14, #-7, MUL VL]\n" // Load from weights and bias
+    "ld1h { z8.h }, p3/Z, [x14, #-7, MUL VL]\n"
     "fmla z28.h, p3/M, z7.h, z12.h\n"
-    "ld1h { z12.h }, p1/Z, [x27, x24, LSL #1]\n" // Load input point (1, 2)
+    "ld1h { z12.h }, p1/Z, [x27, x24, LSL #1]\n"
     "fmax z30.h, p3/M, z30.h, z18.h\n"
-    "ld1h { z7.h }, p3/Z, [x14, #-8, MUL VL]\n" // Load from weights and bias
+    "ld1h { z7.h }, p3/Z, [x14, #-8, MUL VL]\n"
     "addvl x14, x14, #-6\n"
     "fmax z29.h, p3/M, z29.h, z18.h\n"
     "fmin z31.h, p3/M, z31.h, z17.h\n"
-    "st1h { z31.h }, p0, [x28]\n" // Store output point (0, 0)
-    "mov z31.d, z16.d\n"
+    "st1h { z31.h }, p0, [x28]\n"
     "fmin z30.h, p3/M, z30.h, z17.h\n"
-    "st1h { z30.h }, p0, [x28, x9, LSL #1]\n" // Store output point (0, 1)
-    "mov z30.d, z16.d\n"
-    "addvl x28, x28, #1\n"
     "fmin z29.h, p3/M, z29.h, z17.h\n"
-    "st1h { z29.h }, p0, [x22]\n" // Store output point (1, 0)
-    "mov z29.d, z16.d\n"
+    "st1h { z30.h }, p0, [x28, x9, LSL #1]\n"
     "fmax z28.h, p3/M, z28.h, z18.h\n"
+    "addvl x28, x28, #1\n"
     "fmin z28.h, p3/M, z28.h, z17.h\n"
-    "st1h { z28.h }, p0, [x22, x9, LSL #1]\n" // Store output point (1, 1)
-    "mov z28.d, z16.d\n"
+    "st1h { z29.h }, p0, [x22]\n"
+    "st1h { z28.h }, p0, [x22, x9, LSL #1]\n"
     "addvl x22, x22, #1\n"
     "blt 2b\n"
     "3:"  // Tile loop: Channel tail
-    "fmla z31.h, p3/M, z4.h, z9.h\n"
+    "movprfx z31, z16\n fmla z31.h, p3/M, z4.h, z9.h\n"
     "ldr x17, [%x[params_struct], %[offsetof_args_tile_i]]\n"
     "mov p0.b, p2.b\n"
-    "fmla z30.h, p3/M, z3.h, z9.h\n"
+    "movprfx z30, z16\n fmla z30.h, p3/M, z3.h, z9.h\n"
     "ldr x16, [%x[params_struct], %[offsetof_args_tile_j]]\n"
     "add x21, x17, #0x1\n"
-    "fmla z29.h, p3/M, z1.h, z9.h\n"
+    "movprfx z29, z16\n fmla z29.h, p3/M, z1.h, z9.h\n"
     "ldr x20, [%x[params_struct], %[offsetof_args_n_tile_rows]]\n"
-    "fmla z28.h, p3/M, z0.h, z9.h\n"
-    "ld1h { z9.h }, p2/Z, [x25]\n" // Load input point (3, 0)
+    "movprfx z28, z16\n fmla z28.h, p3/M, z0.h, z9.h\n"
+    "ld1h { z9.h }, p2/Z, [x25]\n"
     "add x16, x16, #0x1\n"
     "fmla z31.h, p3/M, z0.h, z10.h\n"
-    "ld1h { z10.h }, p2/Z, [x26, x24, LSL #1]\n" // Load input point (2, 2)
+    "ld1h { z10.h }, p2/Z, [x26, x24, LSL #1]\n"
     "fmla z30.h, p3/M, z2.h, z11.h\n"
-    "ld1h { z11.h }, p2/Z, [x25, x23, LSL #1]\n" // Load input point (3, 3)
+    "ld1h { z11.h }, p2/Z, [x25, x23, LSL #1]\n"
     "ldr x19, [%x[params_struct], %[offsetof_args_n_tile_cols]]\n"
     "fmla z29.h, p3/M, z2.h, z12.h\n"
     "cmp x16, x19\n"
@@ -263,10 +255,10 @@ void sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst_direct_impl(
     "fmla z30.h, p3/M, z4.h, z12.h\n"
     "csel x16, x16, XZR, LT\n"
     "fmla z28.h, p3/M, z1.h, z12.h\n"
-    "ld1h { z12.h }, p2/Z, [x10, x11, LSL #1]\n" // Load input point (0, 1)
+    "ld1h { z12.h }, p2/Z, [x10, x11, LSL #1]\n"
     "csel x17, x17, x21, LT\n"
     "fmla z29.h, p3/M, z6.h, z9.h\n"
-    "ld1h { z9.h }, p2/Z, [x10, x24, LSL #1]\n" // Load input point (0, 2)
+    "ld1h { z9.h }, p2/Z, [x10, x24, LSL #1]\n"
     "cmp x17, x20\n"
     "fmla z31.h, p3/M, z7.h, z13.h\n"
     "fmla z30.h, p3/M, z6.h, z13.h\n"
@@ -274,24 +266,24 @@ void sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst_direct_impl(
     "fmla z29.h, p3/M, z4.h, z13.h\n"
     "fmla z31.h, p3/M, z1.h, z12.h\n"
     "fmla z30.h, p3/M, z0.h, z12.h\n"
-    "ld1h { z12.h }, p2/Z, [x27, x23, LSL #1]\n" // Load input point (1, 3)
+    "ld1h { z12.h }, p2/Z, [x27, x23, LSL #1]\n"
     "fmla z28.h, p3/M, z8.h, z11.h\n"
-    "ld1h { z11.h }, p2/Z, [x27]\n" // Load input point (1, 0)
+    "ld1h { z11.h }, p2/Z, [x27]\n"
     "fmla z29.h, p3/M, z5.h, z10.h\n"
     "fmla z31.h, p3/M, z2.h, z9.h\n"
     "fmla z30.h, p3/M, z1.h, z9.h\n"
-    "ld1h { z9.h }, p2/Z, [x26]\n" // Load input point (2, 0)
+    "ld1h { z9.h }, p2/Z, [x26]\n"
     "fmla z28.h, p3/M, z4.h, z10.h\n"
     "fmla z29.h, p3/M, z0.h, z11.h\n"
     "fmla z31.h, p3/M, z8.h, z10.h\n"
     "fmla z30.h, p3/M, z7.h, z10.h\n"
-    "ld1h { z10.h }, p2/Z, [x26, x23, LSL #1]\n" // Load input point (2, 3)
+    "ld1h { z10.h }, p2/Z, [x26, x23, LSL #1]\n"
     "fmla z28.h, p3/M, z2.h, z12.h\n"
     "fmla z29.h, p3/M, z3.h, z9.h\n"
     "fmla z31.h, p3/M, z3.h, z11.h\n"
-    "ld1h { z11.h }, p2/Z, [x25, x11, LSL #1]\n" // Load input point (3, 1)
+    "ld1h { z11.h }, p2/Z, [x25, x11, LSL #1]\n"
     "fmla z30.h, p3/M, z5.h, z12.h\n"
-    "ld1h { z12.h }, p2/Z, [x25, x24, LSL #1]\n" // Load input point (3, 2)
+    "ld1h { z12.h }, p2/Z, [x25, x24, LSL #1]\n"
     "fmla z28.h, p3/M, z5.h, z10.h\n"
     "fmla z29.h, p3/M, z7.h, z11.h\n"
     "fmla z31.h, p3/M, z6.h, z9.h\n"
@@ -303,14 +295,14 @@ void sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst_direct_impl(
     "fmla z28.h, p3/M, z7.h, z12.h\n"
     "fmax z29.h, p3/M, z29.h, z18.h\n"
     "fmin z31.h, p3/M, z31.h, z17.h\n"
-    "st1h { z31.h }, p0, [x28]\n" // Store output point (0, 0)
+    "st1h { z31.h }, p0, [x28]\n"
     "fmin z30.h, p3/M, z30.h, z17.h\n"
     "fmin z29.h, p3/M, z29.h, z17.h\n"
-    "st1h { z30.h }, p0, [x28, x9, LSL #1]\n" // Store output point (0, 1)
+    "st1h { z30.h }, p0, [x28, x9, LSL #1]\n"
     "fmax z28.h, p3/M, z28.h, z18.h\n"
-    "st1h { z29.h }, p0, [x22]\n" // Store output point (1, 0)
+    "st1h { z29.h }, p0, [x22]\n"
     "fmin z28.h, p3/M, z28.h, z17.h\n"
-    "st1h { z28.h }, p0, [x22, x9, LSL #1]\n" // Store output point (1, 1)
+    "st1h { z28.h }, p0, [x22, x9, LSL #1]\n"
     "blt 1b\n"
     :
     : [n_channels] "r" ((unsigned long) n_channels), [offsetof_args_inptr] "I" (offsetof(Args, inptr)), [offsetof_args_ld_input_col] "I" (offsetof(Args, ld_input_col)), [offsetof_args_ld_input_row] "I" (offsetof(Args, ld_input_row)), [offsetof_args_ld_output_col] "I" (offsetof(Args, ld_output_col)), [offsetof_args_ld_output_row] "I" (offsetof(Args, ld_output_row)), [offsetof_args_max] "I" (offsetof(Args, max)), [offsetof_args_min] "I" (offsetof(Args, min)), [offsetof_args_n_tile_cols] "I" (offsetof(Args, n_tile_cols)), [offsetof_args_n_tile_rows] "I" (offsetof(Args, n_tile_rows)), [offsetof_args_outptr] "I" (offsetof(Args, outptr)), [offsetof_args_params] "I" (offsetof(Args, params)), [offsetof_args_tile_i] "I" (offsetof(Args, tile_i)), [offsetof_args_tile_j] "I" (offsetof(Args, tile_j)), [params_struct] "r" (&params_struct)
@@ -321,4 +313,4 @@ void sve_fp16_nhwc_3x3_s1_output2x2_mla_depthfirst_direct_impl(
 }  // namespace depthwise
 }  // namespace arm_conv
 
-#endif  // defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FP16_ARGS)
+#endif  // __aarch64__ && defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FP16_ARGS)