From 33e03074c36d85de87e9032a2583b04ce8ddcd6b Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 14 Jan 2021 13:43:40 +0000 Subject: Cycle estimate-based kernel selection for dot product quantized s8/u8 kernels Resolves: COMPMID-3990 Signed-off-by: Georgios Pinitas Change-Id: If840c79209940535450f4ea1cbf6b0ec646a168e Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4866 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- .../kernels/sve_hybrid_u8u32_dot_6x4VL/generic.cpp | 55 ++++++---------------- 1 file changed, 14 insertions(+), 41 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_u8u32_dot_6x4VL') diff --git a/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_u8u32_dot_6x4VL/generic.cpp b/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_u8u32_dot_6x4VL/generic.cpp index fc8ce636dd..6ee636d7f6 100644 --- a/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_u8u32_dot_6x4VL/generic.cpp +++ b/src/core/NEON/kernels/arm_gemm/kernels/sve_hybrid_u8u32_dot_6x4VL/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 Arm Limited. + * Copyright (c) 2019-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -228,16 +228,14 @@ void sve_hybrid_u8u32_dot_6x4VL ( "ldr w19, [%x[args_ptr], %[offsetof_num_strings]]\n" "cmp x12, x19\n" "bne 6b\n" - "prfm pstl1keep, [x13, #0x0]\n" "st1w { z8.s }, p4, [x13]\n" "st1w { z9.s }, p3, [x13, #1, MUL VL]\n" "st1w { z10.s }, p2, [x13, #2, MUL VL]\n" "st1w { z11.s }, p1, [x13, #3, MUL VL]\n" "addvl x13, x13, #4\n" "12:" // Height 1: Writeback done - "mov x19, #0x0\n" - "incw x19, ALL, MUL #4\n" - "subs x15, x15, x19\n" + "decw x15, ALL, MUL #4\n" + "cmp x15, XZR\n" "bgt 3b\n" "b 74f\n" "13:" // Height 2 @@ -434,8 +432,6 @@ void sve_hybrid_u8u32_dot_6x4VL ( "ldr w19, [%x[args_ptr], %[offsetof_num_strings]]\n" "cmp x12, x19\n" "bne 18b\n" - "prfm pstl1keep, [x13, #0x0]\n" - "prfm pstl1keep, [x9, #0x0]\n" "st1w { z8.s }, p4, [x13]\n" "st1w { z9.s }, p3, [x13, #1, MUL VL]\n" "st1w { z10.s }, p2, [x13, #2, MUL VL]\n" @@ -447,9 +443,8 @@ void sve_hybrid_u8u32_dot_6x4VL ( "st1w { z15.s }, p1, [x9, #3, MUL VL]\n" "addvl x9, x9, #4\n" "24:" // Height 2: Writeback done - "mov x19, #0x0\n" - "incw x19, ALL, MUL #4\n" - "subs x15, x15, x19\n" + "decw x15, ALL, MUL #4\n" + "cmp x15, XZR\n" "bgt 15b\n" "b 74f\n" "25:" // Height 3 @@ -698,9 +693,6 @@ void sve_hybrid_u8u32_dot_6x4VL ( "ldr w19, [%x[args_ptr], %[offsetof_num_strings]]\n" "cmp x12, x19\n" "bne 30b\n" - "prfm pstl1keep, [x13, #0x0]\n" - "prfm pstl1keep, [x9, #0x0]\n" - "prfm pstl1keep, [x27, #0x0]\n" "st1w { z8.s }, p4, [x13]\n" "st1w { z9.s }, p3, [x13, #1, MUL VL]\n" "st1w { z10.s }, p2, [x13, #2, MUL VL]\n" @@ -717,9 +709,8 @@ void sve_hybrid_u8u32_dot_6x4VL ( "st1w { z19.s }, p1, [x27, #3, MUL VL]\n" "addvl x27, x27, #4\n" "36:" // Height 3: Writeback done - "mov x19, #0x0\n" - "incw x19, ALL, MUL #4\n" - "subs x15, x15, x19\n" + "decw x15, ALL, MUL #4\n" + "cmp x15, XZR\n" "bgt 27b\n" "b 74f\n" "37:" // Height 4 @@ -1020,10 +1011,6 @@ void sve_hybrid_u8u32_dot_6x4VL ( "ldr w19, [%x[args_ptr], %[offsetof_num_strings]]\n" "cmp x12, x19\n" "bne 42b\n" - "prfm pstl1keep, [x13, #0x0]\n" - "prfm pstl1keep, [x9, #0x0]\n" - "prfm pstl1keep, [x27, #0x0]\n" - "prfm pstl1keep, [x25, #0x0]\n" "st1w { z8.s }, p4, [x13]\n" "st1w { z9.s }, p3, [x13, #1, MUL VL]\n" "st1w { z10.s }, p2, [x13, #2, MUL VL]\n" @@ -1045,9 +1032,8 @@ void sve_hybrid_u8u32_dot_6x4VL ( "st1w { z23.s }, p1, [x25, #3, MUL VL]\n" "addvl x25, x25, #4\n" "48:" // Height 4: Writeback done - "mov x19, #0x0\n" - "incw x19, ALL, MUL #4\n" - "subs x15, x15, x19\n" + "decw x15, ALL, MUL #4\n" + "cmp x15, XZR\n" "bgt 39b\n" "b 74f\n" "49:" // Height 5 @@ -1400,11 +1386,6 @@ void sve_hybrid_u8u32_dot_6x4VL ( "ldr w19, [%x[args_ptr], %[offsetof_num_strings]]\n" "cmp x12, x19\n" "bne 54b\n" - "prfm pstl1keep, [x13, #0x0]\n" - "prfm pstl1keep, [x9, #0x0]\n" - "prfm pstl1keep, [x27, #0x0]\n" - "prfm pstl1keep, [x25, #0x0]\n" - "prfm pstl1keep, [x23, #0x0]\n" "st1w { z8.s }, p4, [x13]\n" "st1w { z9.s }, p3, [x13, #1, MUL VL]\n" "st1w { z10.s }, p2, [x13, #2, MUL VL]\n" @@ -1431,9 +1412,8 @@ void sve_hybrid_u8u32_dot_6x4VL ( "st1w { z27.s }, p1, [x23, #3, MUL VL]\n" "addvl x23, x23, #4\n" "60:" // Height 5: Writeback done - "mov x19, #0x0\n" - "incw x19, ALL, MUL #4\n" - "subs x15, x15, x19\n" + "decw x15, ALL, MUL #4\n" + "cmp x15, XZR\n" "bgt 51b\n" "b 74f\n" "61:" // Height 6 @@ -1840,12 +1820,6 @@ void sve_hybrid_u8u32_dot_6x4VL ( "ldr w19, [%x[args_ptr], %[offsetof_num_strings]]\n" "cmp x12, x19\n" "bne 66b\n" - "prfm pstl1keep, [x13, #0x0]\n" - "prfm pstl1keep, [x9, #0x0]\n" - "prfm pstl1keep, [x27, #0x0]\n" - "prfm pstl1keep, [x25, #0x0]\n" - "prfm pstl1keep, [x23, #0x0]\n" - "prfm pstl1keep, [x21, #0x0]\n" "st1w { z8.s }, p4, [x13]\n" "st1w { z9.s }, p3, [x13, #1, MUL VL]\n" "st1w { z10.s }, p2, [x13, #2, MUL VL]\n" @@ -1877,9 +1851,8 @@ void sve_hybrid_u8u32_dot_6x4VL ( "st1w { z31.s }, p1, [x21, #3, MUL VL]\n" "addvl x21, x21, #4\n" "72:" // Height 6: Writeback done - "mov x19, #0x0\n" - "incw x19, ALL, MUL #4\n" - "subs x15, x15, x19\n" + "decw x15, ALL, MUL #4\n" + "cmp x15, XZR\n" "bgt 63b\n" "subs %x[M], %x[M], #0x6\n" "beq 74f\n" @@ -1894,7 +1867,7 @@ void sve_hybrid_u8u32_dot_6x4VL ( "b 1b\n" "74:" // Exit - : [M] "+r" (M), [input_ptr] "+r" (input_ptr), [output_ptr] "+r" (output_ptr) + : [M] "+&r" (M), [input_ptr] "+&r" (input_ptr), [output_ptr] "+&r" (output_ptr) : [args_ptr] "r" (&ka), [flags] "r" (flags), [offsetof_B_ptr] "I" (offsetof(KernelArgs, B_ptr)), [offsetof_N] "I" (offsetof(KernelArgs, N)), [offsetof_input_initial_col] "I" (offsetof(KernelArgs, input_initial_col)), [offsetof_input_offset] "I" (offsetof(KernelArgs, input_offset)), [offsetof_num_strings] "I" (offsetof(KernelArgs, num_strings)), [offsetof_output_offset] "I" (offsetof(KernelArgs, output_offset)), [offsetof_string_lengths] "I" (offsetof(KernelArgs, string_lengths)) : "cc", "memory", "p0", "p1", "p2", "p3", "p4", "p5", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "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