From be13cead34e566bdd561ad3ffc3f645b460e482e Mon Sep 17 00:00:00 2001 From: Michael Tyler Date: Tue, 17 Jan 2023 11:04:14 +0000 Subject: Revert "Update CPU kernels to remove x19" This reverts commit 3c59f01c209d2732a15d97d65565ead964787a8b. Resolves: COMPMID-5817 Change-Id: Ie2443a21854a95db1e3d0cafa2121c0187a5e237 Signed-off-by: Michael Tyler Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8974 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice Benchmark: Arm Jenkins --- .../generic.cpp | 186 ++++++++++----------- 1 file changed, 93 insertions(+), 93 deletions(-) (limited to 'src/core/NEON/kernels/arm_conv/pooling/kernels/sme_fp32_nhwc_max_generic_depthfirst/generic.cpp') diff --git a/src/core/NEON/kernels/arm_conv/pooling/kernels/sme_fp32_nhwc_max_generic_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/pooling/kernels/sme_fp32_nhwc_max_generic_depthfirst/generic.cpp index 14c07724a1..b9f90ea2ef 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/kernels/sme_fp32_nhwc_max_generic_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/kernels/sme_fp32_nhwc_max_generic_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Arm Limited. + * Copyright (c) 2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -40,82 +40,82 @@ void sme_fp32_nhwc_max_generic_depthfirst_impl( { __asm__ __volatile__( ".inst 0xd503477f // SMSTART ZA\n" - "mov x9, #0x0\n" - "cntw x28\n" - "cntw x27, ALL, MUL #2\n" - "cntw x26, ALL, MUL #3\n" - "whilelt p4.s, x9, %x[n_channels]\n" - "whilelt p3.s, x28, %x[n_channels]\n" - "whilelt p2.s, x27, %x[n_channels]\n" - "whilelt p1.s, x26, %x[n_channels]\n" + "mov x28, #0x0\n" + "cntw x27\n" + "cntw x26, ALL, MUL #2\n" + "cntw x25, ALL, MUL #3\n" + "whilelt p4.s, x28, %x[n_channels]\n" + "whilelt p3.s, x27, %x[n_channels]\n" + "whilelt p2.s, x26, %x[n_channels]\n" + "whilelt p1.s, x25, %x[n_channels]\n" "ptrue p0.b\n" "b.none 7f\n" "1:" // 4-vectors of channels - "lsr x25, %x[n_valid_cells], #0x2\n" + "lsr x24, %x[n_valid_cells], #0x2\n" "mov z4.s, #0xff800000\n" "mov z3.s, #0xff800000\n" - "mov x20, %x[inptrs]\n" + "mov x19, %x[inptrs]\n" "mov z2.s, #0xff800000\n" "mov z1.s, #0xff800000\n" - "cbz x25, 4f\n" - "ldp x24, x23, [x20, #0x0]\n" - "subs x25, x25, #0x1\n" - "ld1w { z0.s }, p4/Z, [x24, x9, LSL #2]\n" - "ldp x22, x21, [x20, #0x10]\n" - "add x20, x20, #0x20\n" - "ld1w { z31.s }, p4/Z, [x23, x9, LSL #2]\n" - "ld1w { z23.s }, p4/Z, [x22, x9, LSL #2]\n" - "ld1w { z30.s }, p4/Z, [x21, x9, LSL #2]\n" - "ld1w { z18.s }, p3/Z, [x24, x28, LSL #2]\n" - "ld1w { z29.s }, p3/Z, [x23, x28, LSL #2]\n" - "ld1w { z22.s }, p3/Z, [x22, x28, LSL #2]\n" - "ld1w { z28.s }, p3/Z, [x21, x28, LSL #2]\n" - "ld1w { z17.s }, p2/Z, [x24, x27, LSL #2]\n" - "ld1w { z27.s }, p2/Z, [x23, x27, LSL #2]\n" - "ld1w { z21.s }, p2/Z, [x22, x27, LSL #2]\n" - "ld1w { z26.s }, p2/Z, [x21, x27, LSL #2]\n" - "ld1w { z16.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" + "cbz x24, 4f\n" + "ldp x23, x22, [x19, #0x0]\n" + "subs x24, x24, #0x1\n" + "ld1w { z0.s }, p4/Z, [x23, x28, LSL #2]\n" + "ldp x21, x20, [x19, #0x10]\n" + "add x19, x19, #0x20\n" + "ld1w { z31.s }, p4/Z, [x22, x28, LSL #2]\n" + "ld1w { z23.s }, p4/Z, [x21, x28, LSL #2]\n" + "ld1w { z30.s }, p4/Z, [x20, x28, LSL #2]\n" + "ld1w { z18.s }, p3/Z, [x23, x27, LSL #2]\n" + "ld1w { z29.s }, p3/Z, [x22, x27, LSL #2]\n" + "ld1w { z22.s }, p3/Z, [x21, x27, LSL #2]\n" + "ld1w { z28.s }, p3/Z, [x20, x27, LSL #2]\n" + "ld1w { z17.s }, p2/Z, [x23, x26, LSL #2]\n" + "ld1w { z27.s }, p2/Z, [x22, x26, LSL #2]\n" + "ld1w { z21.s }, p2/Z, [x21, x26, LSL #2]\n" + "ld1w { z26.s }, p2/Z, [x20, x26, LSL #2]\n" + "ld1w { z16.s }, p1/Z, [x23, x25, LSL #2]\n" + "ld1w { z25.s }, p1/Z, [x22, x25, LSL #2]\n" + "ld1w { z20.s }, p1/Z, [x21, x25, LSL #2]\n" + "ld1w { z24.s }, p1/Z, [x20, x25, LSL #2]\n" "beq 3f\n" "2:" // 4-vectors of channels: 4 inputs loop "movprfx z19, z0\n fmax z19.s, p0/M, z19.s, z31.s\n" "fmax z23.s, p0/M, z23.s, z30.s\n" - "ldp x24, x23, [x20, #0x0]\n" - "subs x25, x25, #0x1\n" + "ldp x23, x22, [x19, #0x0]\n" + "subs x24, x24, #0x1\n" "fmax z18.s, p0/M, z18.s, z29.s\n" "fmax z22.s, p0/M, z22.s, z28.s\n" - "ldp x22, x21, [x20, #0x10]\n" - "add x20, x20, #0x20\n" + "ldp x21, x20, [x19, #0x10]\n" + "add x19, x19, #0x20\n" "fmax z17.s, p0/M, z17.s, z27.s\n" "fmax z21.s, p0/M, z21.s, z26.s\n" - "ld1w { z0.s }, p4/Z, [x24, x9, LSL #2]\n" + "ld1w { z0.s }, p4/Z, [x23, x28, LSL #2]\n" "fmax z16.s, p0/M, z16.s, z25.s\n" "fmax z20.s, p0/M, z20.s, z24.s\n" - "ld1w { z31.s }, p4/Z, [x23, x9, LSL #2]\n" + "ld1w { z31.s }, p4/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 { z23.s }, p4/Z, [x22, x9, LSL #2]\n" + "ld1w { z23.s }, p4/Z, [x21, 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 { z30.s }, p4/Z, [x21, x9, LSL #2]\n" + "ld1w { z30.s }, p4/Z, [x20, x28, LSL #2]\n" "fmax z4.s, p0/M, z4.s, z19.s\n" "fmax z3.s, p0/M, z3.s, z18.s\n" - "ld1w { z18.s }, p3/Z, [x24, x28, LSL #2]\n" + "ld1w { z18.s }, p3/Z, [x23, x27, LSL #2]\n" "fmax z2.s, p0/M, z2.s, z17.s\n" "fmax z1.s, p0/M, z1.s, z16.s\n" - "ld1w { z29.s }, p3/Z, [x23, x28, LSL #2]\n" - "ld1w { z22.s }, p3/Z, [x22, x28, LSL #2]\n" - "ld1w { z28.s }, p3/Z, [x21, x28, LSL #2]\n" - "ld1w { z17.s }, p2/Z, [x24, x27, LSL #2]\n" - "ld1w { z27.s }, p2/Z, [x23, x27, LSL #2]\n" - "ld1w { z21.s }, p2/Z, [x22, x27, LSL #2]\n" - "ld1w { z26.s }, p2/Z, [x21, x27, LSL #2]\n" - "ld1w { z16.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" + "ld1w { z29.s }, p3/Z, [x22, x27, LSL #2]\n" + "ld1w { z22.s }, p3/Z, [x21, x27, LSL #2]\n" + "ld1w { z28.s }, p3/Z, [x20, x27, LSL #2]\n" + "ld1w { z17.s }, p2/Z, [x23, x26, LSL #2]\n" + "ld1w { z27.s }, p2/Z, [x22, x26, LSL #2]\n" + "ld1w { z21.s }, p2/Z, [x21, x26, LSL #2]\n" + "ld1w { z26.s }, p2/Z, [x20, x26, LSL #2]\n" + "ld1w { z16.s }, p1/Z, [x23, x25, LSL #2]\n" + "ld1w { z25.s }, p1/Z, [x22, x25, LSL #2]\n" + "ld1w { z20.s }, p1/Z, [x21, x25, LSL #2]\n" + "ld1w { z24.s }, p1/Z, [x20, x25, LSL #2]\n" "bgt 2b\n" "3:" // 4-vectors of channels: 4 inputs tail "movprfx z19, z0\n fmax z19.s, p0/M, z19.s, z31.s\n" @@ -135,61 +135,61 @@ void sme_fp32_nhwc_max_generic_depthfirst_impl( "fmax z2.s, p0/M, z2.s, z17.s\n" "fmax z1.s, p0/M, z1.s, z16.s\n" "4:" // 4-vectors of channels: After loop - "ands x21, %x[n_valid_cells], #0x3\n" + "ands x20, %x[n_valid_cells], #0x3\n" "beq 6f\n" "5:" // 4-vectors of channels: Single input loop - "ldr x24, [x20], #0x8\n" - "ld1w { z0.s }, p4/Z, [x24, x9, LSL #2]\n" - "subs x21, x21, #0x1\n" + "ldr x23, [x19], #0x8\n" + "ld1w { z0.s }, p4/Z, [x23, x28, LSL #2]\n" + "subs x20, x20, #0x1\n" "fmax z4.s, p0/M, z4.s, z0.s\n" - "ld1w { z18.s }, p3/Z, [x24, x28, LSL #2]\n" + "ld1w { z18.s }, p3/Z, [x23, x27, LSL #2]\n" "fmax z3.s, p0/M, z3.s, z18.s\n" - "ld1w { z17.s }, p2/Z, [x24, x27, LSL #2]\n" + "ld1w { z17.s }, p2/Z, [x23, x26, LSL #2]\n" "fmax z2.s, p0/M, z2.s, z17.s\n" - "ld1w { z16.s }, p1/Z, [x24, x26, LSL #2]\n" + "ld1w { z16.s }, p1/Z, [x23, x25, LSL #2]\n" "fmax z1.s, p0/M, z1.s, z16.s\n" "bgt 5b\n" "6:" // 4-vectors of channels: Single input loop: End - "st1w { z4.s }, p4, [%x[outptr], x9, LSL #2]\n" - "incw x9, ALL, MUL #4\n" - "st1w { z3.s }, p3, [%x[outptr], x28, LSL #2]\n" + "st1w { z4.s }, p4, [%x[outptr], x28, LSL #2]\n" "incw x28, ALL, MUL #4\n" - "st1w { z2.s }, p2, [%x[outptr], x27, LSL #2]\n" + "st1w { z3.s }, p3, [%x[outptr], x27, LSL #2]\n" "incw x27, ALL, MUL #4\n" - "st1w { z1.s }, p1, [%x[outptr], x26, LSL #2]\n" + "st1w { z2.s }, p2, [%x[outptr], x26, LSL #2]\n" "incw x26, ALL, MUL #4\n" - "whilelt p1.s, x26, %x[n_channels]\n" + "st1w { z1.s }, p1, [%x[outptr], x25, LSL #2]\n" + "incw x25, ALL, MUL #4\n" + "whilelt p1.s, x25, %x[n_channels]\n" "b.any 1b\n" "7:" // Single vector of channels - "whilelt p4.s, x9, %x[n_channels]\n" + "whilelt p4.s, x28, %x[n_channels]\n" "b.none 14f\n" "8:" // Single vector of channels: Loop - "lsr x25, %x[n_valid_cells], #0x2\n" + "lsr x24, %x[n_valid_cells], #0x2\n" "mov z4.s, #0xff800000\n" - "mov x20, %x[inptrs]\n" - "cbz x25, 11f\n" - "ldp x24, x23, [x20, #0x0]\n" - "subs x25, x25, #0x1\n" - "ld1w { z0.s }, p4/Z, [x24, x9, LSL #2]\n" - "ldp x22, x21, [x20, #0x10]\n" - "add x20, x20, #0x20\n" - "ld1w { z31.s }, p4/Z, [x23, x9, LSL #2]\n" - "ld1w { z23.s }, p4/Z, [x22, x9, LSL #2]\n" - "ld1w { z30.s }, p4/Z, [x21, x9, LSL #2]\n" + "mov x19, %x[inptrs]\n" + "cbz x24, 11f\n" + "ldp x23, x22, [x19, #0x0]\n" + "subs x24, x24, #0x1\n" + "ld1w { z0.s }, p4/Z, [x23, x28, LSL #2]\n" + "ldp x21, x20, [x19, #0x10]\n" + "add x19, x19, #0x20\n" + "ld1w { z31.s }, p4/Z, [x22, x28, LSL #2]\n" + "ld1w { z23.s }, p4/Z, [x21, x28, LSL #2]\n" + "ld1w { z30.s }, p4/Z, [x20, x28, LSL #2]\n" "beq 10f\n" "9:" // Single vector of channels: Loop: 4 inputs loop "movprfx z19, z0\n fmax z19.s, p0/M, z19.s, z31.s\n" "fmax z23.s, p0/M, z23.s, z30.s\n" - "ldp x24, x23, [x20, #0x0]\n" - "subs x25, x25, #0x1\n" + "ldp x23, x22, [x19, #0x0]\n" + "subs x24, x24, #0x1\n" "fmax z19.s, p0/M, z19.s, z23.s\n" - "ldp x22, x21, [x20, #0x10]\n" + "ldp x21, x20, [x19, #0x10]\n" "fmax z4.s, p0/M, z4.s, z19.s\n" - "add x20, x20, #0x20\n" - "ld1w { z0.s }, p4/Z, [x24, x9, LSL #2]\n" - "ld1w { z31.s }, p4/Z, [x23, x9, LSL #2]\n" - "ld1w { z23.s }, p4/Z, [x22, x9, LSL #2]\n" - "ld1w { z30.s }, p4/Z, [x21, x9, LSL #2]\n" + "add x19, x19, #0x20\n" + "ld1w { z0.s }, p4/Z, [x23, x28, LSL #2]\n" + "ld1w { z31.s }, p4/Z, [x22, x28, LSL #2]\n" + "ld1w { z23.s }, p4/Z, [x21, x28, LSL #2]\n" + "ld1w { z30.s }, p4/Z, [x20, x28, LSL #2]\n" "bgt 9b\n" "10:" // Single vector of channels: Loop: 4 inputs tail "movprfx z19, z0\n fmax z19.s, p0/M, z19.s, z31.s\n" @@ -197,24 +197,24 @@ void sme_fp32_nhwc_max_generic_depthfirst_impl( "fmax z19.s, p0/M, z19.s, z23.s\n" "fmax z4.s, p0/M, z4.s, z19.s\n" "11:" // Single vector of channels: Loop: After loop - "ands x21, %x[n_valid_cells], #0x3\n" + "ands x20, %x[n_valid_cells], #0x3\n" "beq 13f\n" "12:" // Single vector of channels: Loop: Single input loop - "ldr x24, [x20], #0x8\n" - "ld1w { z0.s }, p4/Z, [x24, x9, LSL #2]\n" - "subs x21, x21, #0x1\n" + "ldr x23, [x19], #0x8\n" + "ld1w { z0.s }, p4/Z, [x23, x28, LSL #2]\n" + "subs x20, x20, #0x1\n" "fmax z4.s, p0/M, z4.s, z0.s\n" "bgt 12b\n" "13:" // Single vector of channels: Loop: Single input loop: End - "st1w { z4.s }, p4, [%x[outptr], x9, LSL #2]\n" - "incw x9\n" - "whilelt p4.s, x9, %x[n_channels]\n" + "st1w { z4.s }, p4, [%x[outptr], x28, LSL #2]\n" + "incw x28\n" + "whilelt p4.s, x28, %x[n_channels]\n" "b.any 8b\n" "14:" // End ".inst 0xd503467f // SMSTOP\n" : : [inptrs] "r" (inptrs), [n_channels] "r" (n_channels), [n_valid_cells] "r" (n_valid_cells), [outptr] "r" (outptr) - : "cc", "memory", "p0", "p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", "x9", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "z0", "z1", "z2", "z3", "z4", "z5", "z6", "z7", "z8", "z9", "z10", "z11", "z12", "z13", "z14", "z15", "z16", "z17", "z18", "z19", "z20", "z21", "z22", "z23", "z24", "z25", "z26", "z27", "z28", "z29", "z30", "z31" + : "cc", "memory", "p0", "p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "z0", "z1", "z2", "z3", "z4", "z5", "z6", "z7", "z8", "z9", "z10", "z11", "z12", "z13", "z14", "z15", "z16", "z17", "z18", "z19", "z20", "z21", "z22", "z23", "z24", "z25", "z26", "z27", "z28", "z29", "z30", "z31" ); } -- cgit v1.2.1