diff options
| author | Michael Tyler <michael.tyler@arm.com> | 2023-04-12 17:43:17 +0100 |
|---|---|---|
| committer | michael.tyler <michael.tyler@arm.com> | 2023-06-05 15:57:58 +0000 |
| commit | 74921eee924625426429044decefe3673561b174 (patch) | |
| tree | 654da1a95e3d42d6af8ad1ff27bb40d77b1fd8c5 /src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp | |
| parent | df5d9878008be9b60586df97ebfff197abb5195e (diff) | |
| download | ComputeLibrary-74921eee924625426429044decefe3673561b174.tar.gz | |
Update CPU kernel implementations and guard directives
Resolves COMPMID-6023
Change-Id: I868975d14c4f98af6716726feda22405a6a4c891
Signed-off-by: Michael Tyler <michael.tyler@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9686
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp')
| -rw-r--r-- | src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp index 838cd3406c..31bbfd085e 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp @@ -66,10 +66,10 @@ void sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst_impl( "ldr x15, [%x[args], %[offsetof_n_channels]]\n" "ldr x21, [%x[args], %[offsetof_outptrs]]\n" "mov x14, #0x0\n" - "whilelt p2.h, x14, x15\n" + "whilelt p0.h, x14, x15\n" "ldr x20, [%x[args], %[offsetof_inptrs]]\n" "ldp x13, x12, [x21, #0x0]\n" - "ptrue p1.b\n" + "ptrue p2.b\n" "mov x11, #0x0\n" "ldp x10, x9, [x21, #0x10]\n" "ldp x28, x27, [x20, #0x0]\n" @@ -77,61 +77,61 @@ void sve_fp16_nhwc_max_2x2_s1_output2x2_depthfirst_impl( "ldp x24, x23, [x20, #0x20]\n" "ldp x22, x21, [x20, #0x30]\n" "ldr x20, [x20, #0x40]\n" - "ld1h { z31.h }, p2/Z, [x27, x14, LSL #1]\n" - "ld1h { z30.h }, p2/Z, [x24, x14, LSL #1]\n" - "ld1h { z29.h }, p2/Z, [x21, x14, LSL #1]\n" - "ld1h { z28.h }, p2/Z, [x25, x14, LSL #1]\n" - "ld1h { z27.h }, p2/Z, [x28, x14, LSL #1]\n" - "ld1h { z26.h }, p2/Z, [x26, x14, LSL #1]\n" - "ld1h { z25.h }, p2/Z, [x23, x14, LSL #1]\n" - "ld1h { z24.h }, p2/Z, [x22, x14, LSL #1]\n" - "ld1h { z23.h }, p2/Z, [x20, x14, LSL #1]\n" + "ld1h { z31.h }, p0/Z, [x27, x14, LSL #1]\n" + "ld1h { z30.h }, p0/Z, [x24, x14, LSL #1]\n" + "ld1h { z29.h }, p0/Z, [x21, x14, LSL #1]\n" + "ld1h { z28.h }, p0/Z, [x25, x14, LSL #1]\n" + "ld1h { z27.h }, p0/Z, [x28, x14, LSL #1]\n" + "ld1h { z26.h }, p0/Z, [x26, x14, LSL #1]\n" + "ld1h { z25.h }, p0/Z, [x23, x14, LSL #1]\n" + "ld1h { z24.h }, p0/Z, [x22, x14, LSL #1]\n" + "ld1h { z23.h }, p0/Z, [x20, x14, LSL #1]\n" "incw x14\n" - "whilelt p2.h, x14, x15\n" + "whilelt p1.h, x14, x15\n" "b.none 2f\n" "1:" // Vector: Loop - "movprfx z22, z31\n fmax z22.h, p1/M, z22.h, z30.h\n" - "movprfx z21, z30\n fmax z21.h, p1/M, z21.h, z29.h\n" - "ld1h { z31.h }, p2/Z, [x27, x14, LSL #1]\n" - "ld1h { z30.h }, p2/Z, [x24, x14, LSL #1]\n" - "movprfx z20, z28\n fmax z20.h, p1/M, z20.h, z27.h\n" - "movprfx z19, z26\n fmax z19.h, p1/M, z19.h, z25.h\n" - "ld1h { z29.h }, p2/Z, [x21, x14, LSL #1]\n" - "ld1h { z27.h }, p2/Z, [x28, x14, LSL #1]\n" - "movprfx z17, z28\n fmax z17.h, p1/M, z17.h, z24.h\n" - "movprfx z18, z25\n fmax z18.h, p1/M, z18.h, z23.h\n" - "ld1h { z28.h }, p2/Z, [x25, x14, LSL #1]\n" - "ld1h { z26.h }, p2/Z, [x26, x14, LSL #1]\n" - "ld1h { z25.h }, p2/Z, [x23, x14, LSL #1]\n" - "ld1h { z24.h }, p2/Z, [x22, x14, LSL #1]\n" + "movprfx z22, z31\n fmax z22.h, p2/M, z22.h, z30.h\n" + "movprfx z21, z30\n fmax z21.h, p2/M, z21.h, z29.h\n" + "ld1h { z31.h }, p1/Z, [x27, x14, LSL #1]\n" + "ld1h { z30.h }, p1/Z, [x24, x14, LSL #1]\n" + "movprfx z20, z28\n fmax z20.h, p2/M, z20.h, z27.h\n" + "movprfx z19, z26\n fmax z19.h, p2/M, z19.h, z25.h\n" + "ld1h { z29.h }, p1/Z, [x21, x14, LSL #1]\n" + "ld1h { z27.h }, p1/Z, [x28, x14, LSL #1]\n" + "movprfx z17, z28\n fmax z17.h, p2/M, z17.h, z24.h\n" + "movprfx z18, z25\n fmax z18.h, p2/M, z18.h, z23.h\n" + "ld1h { z28.h }, p1/Z, [x25, x14, LSL #1]\n" + "ld1h { z26.h }, p1/Z, [x26, x14, LSL #1]\n" + "ld1h { z25.h }, p1/Z, [x23, x14, LSL #1]\n" + "ld1h { z24.h }, p1/Z, [x22, x14, LSL #1]\n" "whilelt p0.h, x11, x15\n" - "movprfx z16, z22\n fmax z16.h, p1/M, z16.h, z20.h\n" - "ld1h { z23.h }, p2/Z, [x20, x14, LSL #1]\n" + "movprfx z16, z22\n fmax z16.h, p2/M, z16.h, z20.h\n" + "ld1h { z23.h }, p1/Z, [x20, x14, LSL #1]\n" "incw x14\n" - "whilelt p2.h, x14, x15\n" + "whilelt p1.h, x14, x15\n" "st1h { z16.h }, p0, [x13, x11, LSL #1]\n" - "movprfx z16, z19\n fmax z16.h, p1/M, z16.h, z22.h\n" - "fmax z17.h, p1/M, z17.h, z21.h\n" + "movprfx z16, z19\n fmax z16.h, p2/M, z16.h, z22.h\n" + "fmax z17.h, p2/M, z17.h, z21.h\n" "st1h { z16.h }, p0, [x12, x11, LSL #1]\n" - "movprfx z16, z18\n fmax z16.h, p1/M, z16.h, z21.h\n" + "movprfx z16, z21\n fmax z16.h, p2/M, z16.h, z18.h\n" "st1h { z17.h }, p0, [x10, x11, LSL #1]\n" "st1h { z16.h }, p0, [x9, x11, LSL #1]\n" "incw x11\n" "b.any 1b\n" "2:" // Vector: Tail - "movprfx z22, z31\n fmax z22.h, p1/M, z22.h, z30.h\n" - "movprfx z21, z30\n fmax z21.h, p1/M, z21.h, z29.h\n" - "movprfx z20, z28\n fmax z20.h, p1/M, z20.h, z27.h\n" - "movprfx z19, z26\n fmax z19.h, p1/M, z19.h, z25.h\n" - "movprfx z17, z28\n fmax z17.h, p1/M, z17.h, z24.h\n" - "movprfx z18, z25\n fmax z18.h, p1/M, z18.h, z23.h\n" + "movprfx z22, z31\n fmax z22.h, p2/M, z22.h, z30.h\n" + "movprfx z21, z30\n fmax z21.h, p2/M, z21.h, z29.h\n" + "movprfx z20, z28\n fmax z20.h, p2/M, z20.h, z27.h\n" + "movprfx z19, z26\n fmax z19.h, p2/M, z19.h, z25.h\n" + "movprfx z17, z28\n fmax z17.h, p2/M, z17.h, z24.h\n" + "movprfx z18, z25\n fmax z18.h, p2/M, z18.h, z23.h\n" "whilelt p0.h, x11, x15\n" - "movprfx z16, z22\n fmax z16.h, p1/M, z16.h, z20.h\n" + "movprfx z16, z22\n fmax z16.h, p2/M, z16.h, z20.h\n" "st1h { z16.h }, p0, [x13, x11, LSL #1]\n" - "movprfx z16, z19\n fmax z16.h, p1/M, z16.h, z22.h\n" - "fmax z17.h, p1/M, z17.h, z21.h\n" + "movprfx z16, z19\n fmax z16.h, p2/M, z16.h, z22.h\n" + "fmax z17.h, p2/M, z17.h, z21.h\n" "st1h { z16.h }, p0, [x12, x11, LSL #1]\n" - "movprfx z16, z18\n fmax z16.h, p1/M, z16.h, z21.h\n" + "movprfx z16, z21\n fmax z16.h, p2/M, z16.h, z18.h\n" "st1h { z17.h }, p0, [x10, x11, LSL #1]\n" "st1h { z16.h }, p0, [x9, x11, LSL #1]\n" : |