From 74921eee924625426429044decefe3673561b174 Mon Sep 17 00:00:00 2001 From: Michael Tyler Date: Wed, 12 Apr 2023 17:43:17 +0100 Subject: Update CPU kernel implementations and guard directives Resolves COMPMID-6023 Change-Id: I868975d14c4f98af6716726feda22405a6a4c891 Signed-off-by: Michael Tyler Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9686 Tested-by: Arm Jenkins Reviewed-by: Viet-Hoa Do Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- .../generic.cpp | 148 ++++++++++----------- 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp32_nhwc_max_generic_depthfirst/generic.cpp') diff --git a/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp32_nhwc_max_generic_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp32_nhwc_max_generic_depthfirst/generic.cpp index ddce2be62c..87fc75adda 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp32_nhwc_max_generic_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/kernels/sve_fp32_nhwc_max_generic_depthfirst/generic.cpp @@ -54,68 +54,68 @@ void sve_fp32_nhwc_max_generic_depthfirst_impl( "lsr x25, %x[n_valid_cells], #0x2\n" "mov z8.s, #0xff800000\n" "mov z7.s, #0xff800000\n" - "mov x20, %x[inptrs]\n" + "mov x24, %x[inptrs]\n" "mov z6.s, #0xff800000\n" "mov z5.s, #0xff800000\n" "cbz x25, 4f\n" - "ldp x24, x23, [x20, #0x0]\n" - "ldp x22, x21, [x20, #0x10]\n" + "ldp x23, x22, [x24, #0x0]\n" + "ldp x21, x20, [x24, #0x10]\n" "subs x25, x25, #0x1\n" - "add x20, x20, #0x20\n" - "ld1w { z4.s }, p4/Z, [x24, x9, LSL #2]\n" - "ld1w { z3.s }, p4/Z, [x23, x9, LSL #2]\n" - "ld1w { z2.s }, p4/Z, [x22, x9, LSL #2]\n" - "ld1w { z1.s }, p4/Z, [x21, x9, LSL #2]\n" - "ld1w { z0.s }, p3/Z, [x24, x28, LSL #2]\n" - "ld1w { z31.s }, p3/Z, [x23, x28, LSL #2]\n" - "ld1w { z22.s }, p3/Z, [x22, x28, LSL #2]\n" - "ld1w { z30.s }, p3/Z, [x21, x28, LSL #2]\n" - "ld1w { z29.s }, p2/Z, [x24, x27, LSL #2]\n" - "ld1w { z28.s }, p2/Z, [x23, x27, LSL #2]\n" - "ld1w { z21.s }, p2/Z, [x22, x27, LSL #2]\n" - "ld1w { z27.s }, p2/Z, [x21, x27, LSL #2]\n" - "ld1w { z26.s }, p1/Z, [x24, x26, LSL #2]\n" - "ld1w { z25.s }, p1/Z, [x23, x26, LSL #2]\n" - "ld1w { z20.s }, p1/Z, [x22, x26, LSL #2]\n" - "ld1w { z24.s }, p1/Z, [x21, x26, LSL #2]\n" + "add x24, x24, #0x20\n" + "ld1w { z4.s }, p4/Z, [x23, x9, LSL #2]\n" + "ld1w { z3.s }, p4/Z, [x22, x9, LSL #2]\n" + "ld1w { z2.s }, p4/Z, [x21, x9, LSL #2]\n" + "ld1w { z1.s }, p4/Z, [x20, x9, LSL #2]\n" + "ld1w { z0.s }, p3/Z, [x23, x28, LSL #2]\n" + "ld1w { z31.s }, p3/Z, [x22, x28, LSL #2]\n" + "ld1w { z22.s }, p3/Z, [x21, x28, LSL #2]\n" + "ld1w { z30.s }, p3/Z, [x20, x28, LSL #2]\n" + "ld1w { z29.s }, p2/Z, [x23, x27, LSL #2]\n" + "ld1w { z28.s }, p2/Z, [x22, x27, LSL #2]\n" + "ld1w { z21.s }, p2/Z, [x21, x27, LSL #2]\n" + "ld1w { z27.s }, p2/Z, [x20, x27, LSL #2]\n" + "ld1w { z26.s }, p1/Z, [x23, x26, LSL #2]\n" + "ld1w { z25.s }, p1/Z, [x22, x26, LSL #2]\n" + "ld1w { z20.s }, p1/Z, [x21, x26, LSL #2]\n" + "ld1w { z24.s }, p1/Z, [x20, x26, LSL #2]\n" "beq 3f\n" "2:" // 4-vectors of channels: 4 inputs loop "movprfx z19, z4\n fmax z19.s, p0/M, z19.s, z3.s\n" "movprfx z23, z2\n fmax z23.s, p0/M, z23.s, z1.s\n" - "ldp x24, x23, [x20, #0x0]\n" - "ldp x22, x21, [x20, #0x10]\n" + "ldp x23, x22, [x24, #0x0]\n" + "ldp x21, x20, [x24, #0x10]\n" "movprfx z18, z0\n fmax z18.s, p0/M, z18.s, z31.s\n" "fmax z22.s, p0/M, z22.s, z30.s\n" - "ld1w { z4.s }, p4/Z, [x24, x9, LSL #2]\n" - "ld1w { z3.s }, p4/Z, [x23, x9, LSL #2]\n" + "ld1w { z4.s }, p4/Z, [x23, x9, LSL #2]\n" + "ld1w { z3.s }, p4/Z, [x22, x9, LSL #2]\n" "movprfx z17, z29\n fmax z17.s, p0/M, z17.s, z28.s\n" "fmax z21.s, p0/M, z21.s, z27.s\n" - "ld1w { z2.s }, p4/Z, [x22, x9, LSL #2]\n" - "ld1w { z1.s }, p4/Z, [x21, x9, LSL #2]\n" + "ld1w { z2.s }, p4/Z, [x21, x9, LSL #2]\n" + "ld1w { z1.s }, p4/Z, [x20, x9, LSL #2]\n" "movprfx z16, z26\n fmax z16.s, p0/M, z16.s, z25.s\n" "fmax z20.s, p0/M, z20.s, z24.s\n" - "ld1w { z0.s }, p3/Z, [x24, x28, LSL #2]\n" - "ld1w { z31.s }, p3/Z, [x23, x28, LSL #2]\n" + "ld1w { z0.s }, p3/Z, [x23, x28, LSL #2]\n" + "ld1w { z31.s }, p3/Z, [x22, x28, LSL #2]\n" "fmax z19.s, p0/M, z19.s, z23.s\n" "fmax z18.s, p0/M, z18.s, z22.s\n" - "ld1w { z22.s }, p3/Z, [x22, x28, LSL #2]\n" - "ld1w { z30.s }, p3/Z, [x21, x28, LSL #2]\n" + "ld1w { z22.s }, p3/Z, [x21, x28, LSL #2]\n" + "ld1w { z30.s }, p3/Z, [x20, x28, LSL #2]\n" "fmax z17.s, p0/M, z17.s, z21.s\n" "fmax z16.s, p0/M, z16.s, z20.s\n" - "ld1w { z29.s }, p2/Z, [x24, x27, LSL #2]\n" - "ld1w { z28.s }, p2/Z, [x23, x27, LSL #2]\n" + "ld1w { z29.s }, p2/Z, [x23, x27, LSL #2]\n" + "ld1w { z28.s }, p2/Z, [x22, x27, LSL #2]\n" "subs x25, x25, #0x1\n" "fmax z8.s, p0/M, z8.s, z19.s\n" - "ld1w { z21.s }, p2/Z, [x22, x27, LSL #2]\n" - "ld1w { z27.s }, p2/Z, [x21, x27, LSL #2]\n" + "ld1w { z21.s }, p2/Z, [x21, x27, LSL #2]\n" + "ld1w { z27.s }, p2/Z, [x20, x27, LSL #2]\n" "fmax z7.s, p0/M, z7.s, z18.s\n" "fmax z6.s, p0/M, z6.s, z17.s\n" - "ld1w { z26.s }, p1/Z, [x24, x26, LSL #2]\n" - "ld1w { z25.s }, p1/Z, [x23, x26, LSL #2]\n" + "ld1w { z26.s }, p1/Z, [x23, x26, LSL #2]\n" + "ld1w { z25.s }, p1/Z, [x22, x26, LSL #2]\n" "fmax z5.s, p0/M, z5.s, z16.s\n" - "add x20, x20, #0x20\n" - "ld1w { z20.s }, p1/Z, [x22, x26, LSL #2]\n" - "ld1w { z24.s }, p1/Z, [x21, x26, LSL #2]\n" + "add x24, x24, #0x20\n" + "ld1w { z20.s }, p1/Z, [x21, x26, LSL #2]\n" + "ld1w { z24.s }, p1/Z, [x20, x26, LSL #2]\n" "bgt 2b\n" "3:" // 4-vectors of channels: 4 inputs tail "movprfx z19, z4\n fmax z19.s, p0/M, z19.s, z3.s\n" @@ -138,16 +138,16 @@ void sve_fp32_nhwc_max_generic_depthfirst_impl( "ands x21, %x[n_valid_cells], #0x3\n" "beq 6f\n" "5:" // 4-vectors of channels: Single input loop - "ldr x24, [x20], #0x8\n" - "ld1w { z4.s }, p4/Z, [x24, x9, LSL #2]\n" + "ldr x20, [x24], #0x8\n" + "ld1w { z16.s }, p4/Z, [x20, x9, LSL #2]\n" "subs x21, x21, #0x1\n" - "fmax z8.s, p0/M, z8.s, z4.s\n" - "ld1w { z0.s }, p3/Z, [x24, x28, LSL #2]\n" - "ld1w { z29.s }, p2/Z, [x24, x27, LSL #2]\n" - "fmax z7.s, p0/M, z7.s, z0.s\n" - "fmax z6.s, p0/M, z6.s, z29.s\n" - "ld1w { z26.s }, p1/Z, [x24, x26, LSL #2]\n" - "fmax z5.s, p0/M, z5.s, z26.s\n" + "fmax z8.s, p0/M, z8.s, z16.s\n" + "ld1w { z17.s }, p3/Z, [x20, x28, LSL #2]\n" + "ld1w { z16.s }, p2/Z, [x20, x27, LSL #2]\n" + "fmax z7.s, p0/M, z7.s, z17.s\n" + "fmax z6.s, p0/M, z6.s, z16.s\n" + "ld1w { z16.s }, p1/Z, [x20, x26, LSL #2]\n" + "fmax z5.s, p0/M, z5.s, z16.s\n" "bgt 5b\n" "6:" // 4-vectors of channels: Single input loop: End "st1w { z8.s }, p4, [%x[outptr], x9, LSL #2]\n" @@ -166,44 +166,44 @@ void sve_fp32_nhwc_max_generic_depthfirst_impl( "8:" // Single vector of channels: Loop "lsr x25, %x[n_valid_cells], #0x2\n" "mov z8.s, #0xff800000\n" - "mov x20, %x[inptrs]\n" + "mov x24, %x[inptrs]\n" "cbz x25, 11f\n" - "ldp x24, x23, [x20, #0x0]\n" - "ldp x22, x21, [x20, #0x10]\n" + "ldp x23, x22, [x24, #0x0]\n" + "ldp x21, x20, [x24, #0x10]\n" "subs x25, x25, #0x1\n" - "add x20, x20, #0x20\n" - "ld1w { z4.s }, p4/Z, [x24, x9, LSL #2]\n" - "ld1w { z3.s }, p4/Z, [x23, x9, LSL #2]\n" - "ld1w { z2.s }, p4/Z, [x22, x9, LSL #2]\n" - "ld1w { z1.s }, p4/Z, [x21, x9, LSL #2]\n" + "add x24, x24, #0x20\n" + "ld1w { z4.s }, p4/Z, [x23, x9, LSL #2]\n" + "ld1w { z3.s }, p4/Z, [x22, x9, LSL #2]\n" + "ld1w { z2.s }, p4/Z, [x21, x9, LSL #2]\n" + "ld1w { z1.s }, p4/Z, [x20, x9, LSL #2]\n" "beq 10f\n" "9:" // Single vector of channels: Loop: 4 inputs loop - "movprfx z19, z4\n fmax z19.s, p0/M, z19.s, z3.s\n" - "movprfx z23, z2\n fmax z23.s, p0/M, z23.s, z1.s\n" - "ldp x24, x23, [x20, #0x0]\n" - "ldp x22, x21, [x20, #0x10]\n" - "fmax z19.s, p0/M, z19.s, z23.s\n" + "movprfx z16, z4\n fmax z16.s, p0/M, z16.s, z3.s\n" + "movprfx z17, z2\n fmax z17.s, p0/M, z17.s, z1.s\n" + "ldp x23, x22, [x24, #0x0]\n" + "ldp x21, x20, [x24, #0x10]\n" + "fmax z16.s, p0/M, z16.s, z17.s\n" "subs x25, x25, #0x1\n" - "ld1w { z4.s }, p4/Z, [x24, x9, LSL #2]\n" - "ld1w { z3.s }, p4/Z, [x23, x9, LSL #2]\n" - "fmax z8.s, p0/M, z8.s, z19.s\n" - "add x20, x20, #0x20\n" - "ld1w { z2.s }, p4/Z, [x22, x9, LSL #2]\n" - "ld1w { z1.s }, p4/Z, [x21, x9, LSL #2]\n" + "ld1w { z4.s }, p4/Z, [x23, x9, LSL #2]\n" + "ld1w { z3.s }, p4/Z, [x22, x9, LSL #2]\n" + "fmax z8.s, p0/M, z8.s, z16.s\n" + "add x24, x24, #0x20\n" + "ld1w { z2.s }, p4/Z, [x21, x9, LSL #2]\n" + "ld1w { z1.s }, p4/Z, [x20, x9, LSL #2]\n" "bgt 9b\n" "10:" // Single vector of channels: Loop: 4 inputs tail - "movprfx z19, z4\n fmax z19.s, p0/M, z19.s, z3.s\n" - "movprfx z23, z2\n fmax z23.s, p0/M, z23.s, z1.s\n" - "fmax z19.s, p0/M, z19.s, z23.s\n" - "fmax z8.s, p0/M, z8.s, z19.s\n" + "movprfx z16, z4\n fmax z16.s, p0/M, z16.s, z3.s\n" + "movprfx z17, z2\n fmax z17.s, p0/M, z17.s, z1.s\n" + "fmax z16.s, p0/M, z16.s, z17.s\n" + "fmax z8.s, p0/M, z8.s, z16.s\n" "11:" // Single vector of channels: Loop: After loop "ands x21, %x[n_valid_cells], #0x3\n" "beq 13f\n" "12:" // Single vector of channels: Loop: Single input loop - "ldr x24, [x20], #0x8\n" - "ld1w { z4.s }, p4/Z, [x24, x9, LSL #2]\n" + "ldr x20, [x24], #0x8\n" + "ld1w { z16.s }, p4/Z, [x20, x9, LSL #2]\n" "subs x21, x21, #0x1\n" - "fmax z8.s, p0/M, z8.s, z4.s\n" + "fmax z8.s, p0/M, z8.s, z16.s\n" "bgt 12b\n" "13:" // Single vector of channels: Loop: Single input loop: End "st1w { z8.s }, p4, [%x[outptr], x9, LSL #2]\n" -- cgit v1.2.1