From cf87f509fc23d02c56569f794a3fb59e1b8be277 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Tue, 2 Feb 2021 14:59:09 +0000 Subject: Tweak scheduling use of SQDMULH in quantized AVG pooling Resolves COMPMID-4195 Change-Id: Ie5116c1ddddccafba40432fd4b5245bb27890a88 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4997 Reviewed-by: TeresaARM Reviewed-by: Manuel Bottini Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- .../generic.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp') diff --git a/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp index eac1f2dfdb..02c43ccaba 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst/generic.cpp @@ -63,23 +63,24 @@ void a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst_impl( __asm__ __volatile__( "ldr x15, [%x[args], %[offsetof_n_channels]]\n" "mov x14, #0x0\n" - "ldr x19, [%x[args], %[offsetof_outptrs]]\n" + "ldr x20, [%x[args], %[offsetof_outptrs]]\n" "mov x13, #0x0\n" - "ldp x12, x11, [x19, #0x0]\n" - "cmp x15, #0x10\n" - "ldp x10, x9, [x19, #0x10]\n" "ldr x19, [%x[args], %[offsetof_inptrs]]\n" + "cmp x15, #0x10\n" + "ldp x12, x11, [x20, #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" "blt 3f\n" - "lsr x19, x15, #0x4\n" - "sub x15, x15, x19, LSL #4\n" "ldr q30, [x27, x14]\n" + "lsr x19, x15, #0x4\n" "ldr q29, [x24, x14]\n" + "sub x15, x15, x19, LSL #4\n" "ldr q28, [x21, x14]\n" + "subs x19, x19, #0x1\n" "ldr q27, [x25, x14]\n" "ldr q26, [x28, x14]\n" "ldr q25, [x23, x14]\n" @@ -87,11 +88,11 @@ void a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst_impl( "ldr q23, [x22, x14]\n" "ldr q22, [x20, x14]\n" "add x14, x14, #0x10\n" - "subs x19, x19, #0x1\n" "beq 2f\n" "1:" // Vector: Loop "umax v21.16b, v30.16b, v29.16b\n" "ldr q30, [x27, x14]\n" + "subs x19, x19, #0x1\n" "umax v20.16b, v29.16b, v28.16b\n" "ldr q29, [x24, x14]\n" "umax v19.16b, v27.16b, v26.16b\n" @@ -108,14 +109,13 @@ void a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst_impl( "ldr q23, [x22, x14]\n" "umax v17.16b, v20.16b, v17.16b\n" "ldr q22, [x20, x14]\n" - "umax v16.16b, v20.16b, v16.16b\n" "add x14, x14, #0x10\n" + "umax v16.16b, v20.16b, v16.16b\n" "str q19, [x12, x13]\n" "str q18, [x11, x13]\n" "str q17, [x10, x13]\n" "str q16, [x9, x13]\n" "add x13, x13, #0x10\n" - "subs x19, x19, #0x1\n" "bgt 1b\n" "2:" // Vector: Tail "umax v21.16b, v30.16b, v29.16b\n" @@ -136,6 +136,7 @@ void a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst_impl( "cbz x15, 4f\n" "3:" // Oddments "ldr b30, [x27, x14]\n" + "subs x15, x15, #0x1\n" "ldr b29, [x24, x14]\n" "umax v21.16b, v30.16b, v29.16b\n" "ldr b28, [x21, x14]\n" @@ -150,9 +151,8 @@ void a64_u8_nhwc_max_2x2_s1_output2x2_depthfirst_impl( "ldr b22, [x20, x14]\n" "add x14, x14, #0x1\n" "umax v18.16b, v25.16b, v24.16b\n" - "subs x15, x15, #0x1\n" - "umax v17.16b, v23.16b, v27.16b\n" "str b19, [x12, x13]\n" + "umax v17.16b, v23.16b, v27.16b\n" "umax v16.16b, v25.16b, v22.16b\n" "umax v18.16b, v21.16b, v18.16b\n" "str b18, [x11, x13]\n" -- cgit v1.2.1