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 --- .../sve_interleaved_u8u32_dot_8x3VL/generic.cpp | 78 +++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_u8u32_dot_8x3VL/generic.cpp') diff --git a/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_u8u32_dot_8x3VL/generic.cpp b/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_u8u32_dot_8x3VL/generic.cpp index 99fff4e83d..f1642d0b21 100644 --- a/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_u8u32_dot_8x3VL/generic.cpp +++ b/src/core/NEON/kernels/arm_gemm/kernels/sve_interleaved_u8u32_dot_8x3VL/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, 2023 Arm Limited. + * Copyright (c) 2019-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -10,16 +10,16 @@ * sell copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. */ #ifdef ARM_COMPUTE_ENABLE_SVE @@ -33,44 +33,42 @@ void sve_interleaved_u8u32_dot_8x3VL( uint32_t *Cpanel, int ablocks, int bblocks, int K) { struct KernelArgs { + size_t bblocks = {}; size_t K = {}; const uint8_t *Bpanel = {}; - size_t bblocks = {}; } ka; + ka.bblocks = bblocks; ka.K = (K/4) - 1; ka.Bpanel = Bpanel; - ka.bblocks = bblocks; __asm__ __volatile__( "ptrue p0.b\n" "1:" // Height loop - "ldr x23, [%x[args_ptr], %[offsetof_bblocks]]\n" - "ldr x22, [%x[args_ptr], %[offsetof_Bpanel]]\n" + "ldr x22, [%x[args_ptr], %[offsetof_bblocks]]\n" "mov x21, %x[Apanel]\n" + "ldr x20, [%x[args_ptr], %[offsetof_Bpanel]]\n" "2:" // Width loop - "ldr x20, [%x[args_ptr], %[offsetof_K]]\n" - "mov %x[Apanel], x21\n" - "cmp x20, #0x2\n" "mov z8.s, #0x0\n" "mov z9.s, #0x0\n" - "ld1rqb { z0.b }, p0/Z, [%x[Apanel]]\n" + "ldr x19, [%x[args_ptr], %[offsetof_K]]\n" "mov z10.s, #0x0\n" "mov z11.s, #0x0\n" - "ld1rqb { z1.b }, p0/Z, [%x[Apanel], #16]\n" + "ld1b { z4.b }, p0/Z, [x20]\n" "mov z12.s, #0x0\n" "mov z13.s, #0x0\n" - "ld1b { z4.b }, p0/Z, [x22]\n" + "mov %x[Apanel], x21\n" "mov z14.s, #0x0\n" "mov z15.s, #0x0\n" - "ld1b { z5.b }, p0/Z, [x22, #1, MUL VL]\n" + "cmp x19, #0x2\n" "mov z16.s, #0x0\n" "mov z17.s, #0x0\n" - "ld1b { z6.b }, p0/Z, [x22, #2, MUL VL]\n" "mov z18.s, #0x0\n" "mov z19.s, #0x0\n" + "ld1rqb { z0.b }, p0/Z, [%x[Apanel]]\n" "mov z20.s, #0x0\n" "mov z21.s, #0x0\n" + "ld1rqb { z1.b }, p0/Z, [%x[Apanel], #16]\n" "mov z22.s, #0x0\n" "mov z23.s, #0x0\n" "mov z24.s, #0x0\n" @@ -85,29 +83,31 @@ void sve_interleaved_u8u32_dot_8x3VL( "3:" // main loop head "udot z8.s, z4.b, z0.b[0]\n" "udot z11.s, z4.b, z0.b[1]\n" - "ld1rqb { z2.b }, p0/Z, [%x[Apanel], #32]\n" + "ld1b { z5.b }, p0/Z, [x20, #1, MUL VL]\n" "udot z14.s, z4.b, z0.b[2]\n" "udot z17.s, z4.b, z0.b[3]\n" - "ld1rqb { z3.b }, p0/Z, [%x[Apanel], #48]\n" + "ld1b { z6.b }, p0/Z, [x20, #2, MUL VL]\n" "udot z20.s, z4.b, z1.b[0]\n" "udot z23.s, z4.b, z1.b[1]\n" - "sub x20, x20, #0x2\n" + "ld1rqb { z2.b }, p0/Z, [%x[Apanel], #32]\n" "udot z26.s, z4.b, z1.b[2]\n" "udot z29.s, z4.b, z1.b[3]\n" - "ld1b { z4.b }, p0/Z, [x22, #3, MUL VL]\n" + "ld1rqb { z3.b }, p0/Z, [%x[Apanel], #48]\n" "udot z9.s, z5.b, z0.b[0]\n" "udot z12.s, z5.b, z0.b[1]\n" - "cmp x20, #0x2\n" + "ld1b { z4.b }, p0/Z, [x20, #3, MUL VL]\n" "udot z15.s, z5.b, z0.b[2]\n" "udot z18.s, z5.b, z0.b[3]\n" - "add %x[Apanel], %x[Apanel], #0x40\n" + "sub x19, x19, #0x2\n" "udot z21.s, z5.b, z1.b[0]\n" "udot z24.s, z5.b, z1.b[1]\n" + "cmp x19, #0x2\n" "udot z27.s, z5.b, z1.b[2]\n" "udot z30.s, z5.b, z1.b[3]\n" - "ld1b { z5.b }, p0/Z, [x22, #4, MUL VL]\n" + "ld1b { z5.b }, p0/Z, [x20, #4, MUL VL]\n" "udot z10.s, z6.b, z0.b[0]\n" "udot z13.s, z6.b, z0.b[1]\n" + "add %x[Apanel], %x[Apanel], #0x40\n" "udot z16.s, z6.b, z0.b[2]\n" "udot z19.s, z6.b, z0.b[3]\n" "ld1rqb { z0.b }, p0/Z, [%x[Apanel]]\n" @@ -115,27 +115,26 @@ void sve_interleaved_u8u32_dot_8x3VL( "udot z25.s, z6.b, z1.b[1]\n" "udot z28.s, z6.b, z1.b[2]\n" "udot z31.s, z6.b, z1.b[3]\n" - "ld1b { z6.b }, p0/Z, [x22, #5, MUL VL]\n" - "addvl x22, x22, #6\n" + "ld1b { z6.b }, p0/Z, [x20, #5, MUL VL]\n" "udot z8.s, z4.b, z2.b[0]\n" "udot z11.s, z4.b, z2.b[1]\n" "ld1rqb { z1.b }, p0/Z, [%x[Apanel], #16]\n" "udot z14.s, z4.b, z2.b[2]\n" "udot z17.s, z4.b, z2.b[3]\n" + "addvl x20, x20, #6\n" "udot z20.s, z4.b, z3.b[0]\n" "udot z23.s, z4.b, z3.b[1]\n" "udot z26.s, z4.b, z3.b[2]\n" "udot z29.s, z4.b, z3.b[3]\n" - "ld1b { z4.b }, p0/Z, [x22]\n" "udot z9.s, z5.b, z2.b[0]\n" "udot z12.s, z5.b, z2.b[1]\n" + "ld1b { z4.b }, p0/Z, [x20]\n" "udot z15.s, z5.b, z2.b[2]\n" "udot z18.s, z5.b, z2.b[3]\n" "udot z21.s, z5.b, z3.b[0]\n" "udot z24.s, z5.b, z3.b[1]\n" "udot z27.s, z5.b, z3.b[2]\n" "udot z30.s, z5.b, z3.b[3]\n" - "ld1b { z5.b }, p0/Z, [x22, #1, MUL VL]\n" "udot z10.s, z6.b, z2.b[0]\n" "udot z13.s, z6.b, z2.b[1]\n" "udot z16.s, z6.b, z2.b[2]\n" @@ -144,19 +143,20 @@ void sve_interleaved_u8u32_dot_8x3VL( "udot z25.s, z6.b, z3.b[1]\n" "udot z28.s, z6.b, z3.b[2]\n" "udot z31.s, z6.b, z3.b[3]\n" - "ld1b { z6.b }, p0/Z, [x22, #2, MUL VL]\n" "bge 3b\n" "4:" // main loop skip "udot z8.s, z4.b, z0.b[0]\n" "udot z11.s, z4.b, z0.b[1]\n" - "add %x[Apanel], %x[Apanel], #0x20\n" + "ld1b { z5.b }, p0/Z, [x20, #1, MUL VL]\n" "udot z14.s, z4.b, z0.b[2]\n" "udot z17.s, z4.b, z0.b[3]\n" - "addvl x22, x22, #3\n" + "ld1b { z6.b }, p0/Z, [x20, #2, MUL VL]\n" "udot z20.s, z4.b, z1.b[0]\n" "udot z23.s, z4.b, z1.b[1]\n" + "add %x[Apanel], %x[Apanel], #0x20\n" "udot z26.s, z4.b, z1.b[2]\n" "udot z29.s, z4.b, z1.b[3]\n" + "addvl x20, x20, #3\n" "udot z9.s, z5.b, z0.b[0]\n" "udot z12.s, z5.b, z0.b[1]\n" "udot z15.s, z5.b, z0.b[2]\n" @@ -173,19 +173,19 @@ void sve_interleaved_u8u32_dot_8x3VL( "udot z25.s, z6.b, z1.b[1]\n" "udot z28.s, z6.b, z1.b[2]\n" "udot z31.s, z6.b, z1.b[3]\n" - "cbz x20, 5f\n" + "cbz x19, 5f\n" "ld1rqb { z0.b }, p0/Z, [%x[Apanel]]\n" "ld1rqb { z1.b }, p0/Z, [%x[Apanel], #16]\n" "add %x[Apanel], %x[Apanel], #0x20\n" - "ld1b { z7.b }, p0/Z, [x22]\n" - "ld1b { z4.b }, p0/Z, [x22, #1, MUL VL]\n" + "ld1b { z7.b }, p0/Z, [x20]\n" + "ld1b { z4.b }, p0/Z, [x20, #1, MUL VL]\n" + "ld1b { z5.b }, p0/Z, [x20, #2, MUL VL]\n" + "addvl x20, x20, #3\n" "udot z8.s, z7.b, z0.b[0]\n" - "ld1b { z5.b }, p0/Z, [x22, #2, MUL VL]\n" "udot z11.s, z7.b, z0.b[1]\n" "udot z14.s, z7.b, z0.b[2]\n" "udot z17.s, z7.b, z0.b[3]\n" "udot z20.s, z7.b, z1.b[0]\n" - "addvl x22, x22, #3\n" "udot z23.s, z7.b, z1.b[1]\n" "udot z26.s, z7.b, z1.b[2]\n" "udot z29.s, z7.b, z1.b[3]\n" @@ -207,7 +207,7 @@ void sve_interleaved_u8u32_dot_8x3VL( "udot z31.s, z5.b, z1.b[3]\n" "5:" // multiply loop done "st1w { z8.s }, p0, [%x[Cpanel]]\n" - "subs x23, x23, #0x1\n" + "subs x22, x22, #0x1\n" "st1w { z9.s }, p0, [%x[Cpanel], #1, MUL VL]\n" "st1w { z10.s }, p0, [%x[Cpanel], #2, MUL VL]\n" "st1w { z11.s }, p0, [%x[Cpanel], #3, MUL VL]\n" @@ -238,7 +238,7 @@ void sve_interleaved_u8u32_dot_8x3VL( "bne 1b\n" : [Apanel] "+&r" (Apanel), [Cpanel] "+&r" (Cpanel), [ablocks] "+&r" (ablocks) : [args_ptr] "r" (&ka), [offsetof_Bpanel] "I" (offsetof(KernelArgs, Bpanel)), [offsetof_K] "I" (offsetof(KernelArgs, K)), [offsetof_bblocks] "I" (offsetof(KernelArgs, bblocks)) - : "cc", "memory", "p0", "x20", "x21", "x22", "x23", "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", "x19", "x20", "x21", "x22", "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