From ba209750abc1ac7e42bab9fef5db284384d70fb3 Mon Sep 17 00:00:00 2001 From: Michael Tyler Date: Thu, 15 Dec 2022 12:39:29 +0000 Subject: Update CPU kernels to remove x19 Resolves: COMPMID-5805 Signed-off-by: Michael Tyler Change-Id: I250f64531e209625e4ff176dd5a552c1c34bc484 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8909 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Gunes Bayir Reviewed-by: Viet-Hoa Do Benchmark: Arm Jenkins --- .../generic.cpp | 156 ++++++++++----------- 1 file changed, 78 insertions(+), 78 deletions(-) (limited to 'src/core/NEON/kernels/arm_conv/pooling/kernels/a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp') diff --git a/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp index 1767e5ce3d..bd14408c74 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Arm Limited. + * Copyright (c) 2021-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -62,111 +62,111 @@ void a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst_impl( pad_left, pad_top, pad_right, pad_bottom); __asm__ __volatile__( - "ldr x15, [%x[args], %[offsetof_n_channels]]\n" - "ldr x20, [%x[args], %[offsetof_outptrs]]\n" - "cmp x15, #0x10\n" - "mov x14, #0x0\n" - "ldr x19, [%x[args], %[offsetof_inptrs]]\n" - "ldp x13, x12, [x20, #0x0]\n" - "mov x11, #0x0\n" - "ldp x10, x9, [x20, #0x10]\n" - "ldp x28, x27, [x19, #0x0]\n" - "ldp x26, x25, [x19, #0x10]\n" - "ldp x24, x23, [x19, #0x20]\n" - "ldp x22, x21, [x19, #0x30]\n" - "ldr x20, [x19, #0x40]\n" + "ldr x16, [%x[args], %[offsetof_n_channels]]\n" + "ldr x21, [%x[args], %[offsetof_outptrs]]\n" + "cmp x16, #0x10\n" + "mov x15, #0x0\n" + "ldr x20, [%x[args], %[offsetof_inptrs]]\n" + "ldp x14, x13, [x21, #0x0]\n" + "mov x12, #0x0\n" + "ldp x11, x10, [x21, #0x10]\n" + "ldp x9, x28, [x20, #0x0]\n" + "ldp x27, x26, [x20, #0x10]\n" + "ldp x25, x24, [x20, #0x20]\n" + "ldp x23, x22, [x20, #0x30]\n" + "ldr x21, [x20, #0x40]\n" "blt 3f\n" - "lsr x19, x15, #0x4\n" - "sub x15, x15, x19, LSL #4\n" - "ldr q30, [x27, x14]\n" - "ldr q29, [x24, x14]\n" - "subs x19, x19, #0x1\n" - "ldr q28, [x21, x14]\n" - "ldr q27, [x25, x14]\n" - "ldr q26, [x28, x14]\n" - "ldr q25, [x23, x14]\n" - "ldr q24, [x26, x14]\n" - "ldr q23, [x22, x14]\n" - "ldr q22, [x20, x14]\n" - "add x14, x14, #0x10\n" + "ldr q30, [x28, x15]\n" + "ldr q29, [x25, x15]\n" + "lsr x20, x16, #0x4\n" + "sub x16, x16, x20, LSL #4\n" + "ldr q28, [x22, x15]\n" + "ldr q27, [x26, x15]\n" + "subs x20, x20, #0x1\n" + "ldr q26, [x9, x15]\n" + "ldr q25, [x27, x15]\n" + "ldr q24, [x24, x15]\n" + "ldr q23, [x23, x15]\n" + "ldr q22, [x21, x15]\n" + "add x15, x15, #0x10\n" "beq 2f\n" "1:" // Vector: Loop "smax v21.16b, v30.16b, v29.16b\n" + "ldr q30, [x28, x15]\n" "smax v20.16b, v29.16b, v28.16b\n" - "subs x19, x19, #0x1\n" - "ldr q30, [x27, x14]\n" + "ldr q29, [x25, x15]\n" + "ldr q28, [x22, x15]\n" "smax v19.16b, v27.16b, v26.16b\n" + "ldr q26, [x9, x15]\n" "smax v18.16b, v25.16b, v24.16b\n" - "ldr q29, [x24, x14]\n" - "ldr q28, [x21, x14]\n" - "smax v17.16b, v23.16b, v27.16b\n" - "smax v16.16b, v25.16b, v22.16b\n" - "ldr q27, [x25, x14]\n" - "ldr q26, [x28, x14]\n" + "ldr q25, [x27, x15]\n" + "smax v17.16b, v27.16b, v23.16b\n" + "ldr q27, [x26, x15]\n" + "smax v16.16b, v24.16b, v22.16b\n" + "ldr q24, [x24, x15]\n" + "ldr q23, [x23, x15]\n" + "subs x20, x20, #0x1\n" "smax v19.16b, v21.16b, v19.16b\n" + "ldr q22, [x21, x15]\n" "smax v18.16b, v18.16b, v21.16b\n" - "ldr q25, [x23, x14]\n" - "ldr q24, [x26, x14]\n" - "smax v17.16b, v20.16b, v17.16b\n" - "smax v16.16b, v20.16b, v16.16b\n" - "ldr q23, [x22, x14]\n" - "ldr q22, [x20, x14]\n" - "add x14, x14, #0x10\n" - "str q19, [x13, x11]\n" - "str q18, [x12, x11]\n" - "str q17, [x10, x11]\n" - "str q16, [x9, x11]\n" - "add x11, x11, #0x10\n" + "smax v17.16b, v17.16b, v20.16b\n" + "add x15, x15, #0x10\n" + "smax v16.16b, v16.16b, v20.16b\n" + "str q19, [x14, x12]\n" + "str q18, [x13, x12]\n" + "str q17, [x11, x12]\n" + "str q16, [x10, x12]\n" + "add x12, x12, #0x10\n" "bgt 1b\n" "2:" // Vector: Tail "smax v21.16b, v30.16b, v29.16b\n" "smax v20.16b, v29.16b, v28.16b\n" "smax v19.16b, v27.16b, v26.16b\n" "smax v18.16b, v25.16b, v24.16b\n" - "smax v17.16b, v23.16b, v27.16b\n" - "smax v16.16b, v25.16b, v22.16b\n" + "smax v17.16b, v27.16b, v23.16b\n" + "smax v16.16b, v24.16b, v22.16b\n" "smax v19.16b, v21.16b, v19.16b\n" "smax v18.16b, v18.16b, v21.16b\n" - "str q19, [x13, x11]\n" - "smax v17.16b, v20.16b, v17.16b\n" - "smax v16.16b, v20.16b, v16.16b\n" - "str q18, [x12, x11]\n" - "str q17, [x10, x11]\n" - "str q16, [x9, x11]\n" - "add x11, x11, #0x10\n" - "cbz x15, 4f\n" + "str q19, [x14, x12]\n" + "smax v17.16b, v17.16b, v20.16b\n" + "smax v16.16b, v16.16b, v20.16b\n" + "str q18, [x13, x12]\n" + "str q17, [x11, x12]\n" + "str q16, [x10, x12]\n" + "add x12, x12, #0x10\n" + "cbz x16, 4f\n" "3:" // Oddments - "ldr b30, [x27, x14]\n" - "ldr b29, [x24, x14]\n" + "ldr b30, [x28, x15]\n" + "ldr b29, [x25, x15]\n" "smax v21.16b, v30.16b, v29.16b\n" - "subs x15, x15, #0x1\n" - "ldr b28, [x21, x14]\n" - "ldr b27, [x25, x14]\n" + "subs x16, x16, #0x1\n" + "ldr b28, [x22, x15]\n" + "ldr b27, [x26, x15]\n" "smax v20.16b, v29.16b, v28.16b\n" - "ldr b26, [x28, x14]\n" - "ldr b25, [x23, x14]\n" + "ldr b26, [x9, x15]\n" + "ldr b25, [x27, x15]\n" "smax v19.16b, v27.16b, v26.16b\n" "smax v19.16b, v21.16b, v19.16b\n" - "ldr b24, [x26, x14]\n" - "ldr b23, [x22, x14]\n" + "ldr b24, [x24, x15]\n" + "ldr b23, [x23, x15]\n" "smax v18.16b, v25.16b, v24.16b\n" - "smax v17.16b, v23.16b, v27.16b\n" - "ldr b22, [x20, x14]\n" - "smax v16.16b, v25.16b, v22.16b\n" - "add x14, x14, #0x1\n" + "smax v17.16b, v27.16b, v23.16b\n" + "ldr b22, [x21, x15]\n" + "smax v16.16b, v24.16b, v22.16b\n" + "add x15, x15, #0x1\n" "smax v18.16b, v18.16b, v21.16b\n" - "smax v17.16b, v20.16b, v17.16b\n" - "smax v16.16b, v20.16b, v16.16b\n" - "str b19, [x13, x11]\n" - "str b18, [x12, x11]\n" - "str b17, [x10, x11]\n" - "str b16, [x9, x11]\n" - "add x11, x11, #0x1\n" + "smax v17.16b, v17.16b, v20.16b\n" + "smax v16.16b, v16.16b, v20.16b\n" + "str b19, [x14, x12]\n" + "str b18, [x13, x12]\n" + "str b17, [x11, x12]\n" + "str b16, [x10, x12]\n" + "add x12, x12, #0x1\n" "bgt 3b\n" "4:" // End : : [args] "r" (&args), [offsetof_inptrs] "I" (offsetof(KernelArgs, inptrs)), [offsetof_n_channels] "I" (offsetof(KernelArgs, n_channels)), [offsetof_outptrs] "I" (offsetof(KernelArgs, outptrs)) - : "cc", "memory", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28" + : "cc", "memory", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28" ); } -- cgit v1.2.1