From fc94f4d23abd4bc427b701f54ad85282e9ec7872 Mon Sep 17 00:00:00 2001 From: Michael Tyler Date: Tue, 4 Jun 2024 15:47:37 +0100 Subject: Update CPU kernels and add mixed sign GEMM support - Add support for mixed sign quantized convolution. - Add support for mixed sign dequantized GEMM. - Add SME FP16 GEMV kernel. - Change SME vector length function to use RDSVL instead of static variable. - Add GEMM dilation support internally (not exposed yet). - Remove unused "get_default_activation_values" functions. - Add SVE fixed format interleaved BF16 DOT kernel. - Updates and optimizations to assembly kernels. Resolves COMPMID-6926 Change-Id: I227f502502611d4cc4111c89e30c53ce94079544 Signed-off-by: Michael Tyler Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/11570 Tested-by: Arm Jenkins Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- .../sme_interleave4VL_block4_s8_s8_summing.hpp | 150 ++++++++++----------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8_summing.hpp') diff --git a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8_summing.hpp b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8_summing.hpp index 21d9378368..a4696816e9 100644 --- a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8_summing.hpp +++ b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8_summing.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Arm Limited. + * Copyright (c) 2022-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -32,118 +32,118 @@ void interleave_block<4, 4, VLType::SME, true>( { __asm__ __volatile__( ".inst 0xd503477f // SMSTART ZA\n" - "cntw x16\n" + "mov x17, %x[row_offset]\n" + "mov x16, %x[out]\n" "cntw x15\n" + "cntw x14\n" "mov z24.b, #0x1\n" - "cntw x14, ALL, MUL #2\n" - "cntw x13, ALL, MUL #3\n" "mov z23.s, #0x0\n" + "cntw x11, ALL, MUL #2\n" + "cntw x10, ALL, MUL #3\n" "mov z22.s, #0x0\n" - "cmp %x[height], x16\n" - "csel x16, %x[height], x16, LT\n" "mov z21.s, #0x0\n" + "cmp %x[height], x15\n" + "ptrue p3.b\n" "mov z20.s, #0x0\n" + "csel x15, %x[height], x15, LT\n" "whilelt p12.b, XZR, %x[height]\n" - "whilelt p10.b, x15, %x[height]\n" - "whilelt p9.b, x14, %x[height]\n" - "whilelt p8.b, x13, %x[height]\n" + "whilelt p10.b, x14, %x[height]\n" + "whilelt p9.b, x11, %x[height]\n" + "whilelt p8.b, x10, %x[height]\n" "zip1 p12.b, p12.b, p9.b\n" "zip1 p10.b, p10.b, p8.b\n" - "ptrue p2.b\n" - "cntb x11\n" + "cntb x9\n" "ptrue p11.s\n" - "sub x16, x16, #0x1\n" + "sub x15, x15, #0x1\n" "zip1 p10.b, p12.b, p10.b\n" - "mov x10, %x[row_offset]\n" - "mov x9, %x[out]\n" "cbnz %x[first], 1f\n" - "addvl x9, x9, #-4\n" - "ld1w { z23.s }, p2/Z, [x9]\n" - "ld1w { z22.s }, p2/Z, [x9, #1, MUL VL]\n" - "ld1w { z21.s }, p2/Z, [x9, #2, MUL VL]\n" - "ld1w { z20.s }, p2/Z, [x9, #3, MUL VL]\n" + "addvl x16, x16, #-4\n" + "ld1w { z23.s }, p3/Z, [x16]\n" + "ld1w { z22.s }, p3/Z, [x16, #1, MUL VL]\n" + "ld1w { z21.s }, p3/Z, [x16, #2, MUL VL]\n" + "ld1w { z20.s }, p3/Z, [x16, #3, MUL VL]\n" "1:" // Initialise row sums: End "mov x28, #0x0\n" "whilelt p9.b, x28, %x[width]\n" "whilelt p8.b, x28, %x[width]\n" "2:" // Width loop "add x27, %x[in], XZR, LSL #3\n" - "add x26, %x[in], x15, LSL #3\n" - "ldr x25, [x27], #0x8\n" - "add x24, %x[in], x14, LSL #3\n" - "add x23, %x[in], x13, LSL #3\n" - "ldr x20, [x26], #0x8\n" - "mov x12, #0x0\n" - "ldr x22, [x24], #0x8\n" - "ldr x21, [x23], #0x8\n" - "cbz x16, 4f\n" + "add x26, %x[in], x14, LSL #3\n" + "add x25, %x[in], x11, LSL #3\n" + "add x20, %x[in], x10, LSL #3\n" + "ldr x24, [x27], #0x8\n" + "mov x13, #0x0\n" + "ldr x23, [x26], #0x8\n" + "ldr x22, [x25], #0x8\n" + "ldr x21, [x20], #0x8\n" + "cbz x15, 4f\n" "3:" // Loads: Loop - ".inst 0x25246140 // psel p0.b, p8.b/Z, p10.b[w12]\n" - ".inst 0xe00a0320 // ld1b { za0h.b[x12] }, p0/Z, [x25, x10]\n" - ".inst 0x252c6140 // psel p0.b, p8.b/Z, p10.b[w12, #1]\n" - "ldr x25, [x27], #0x8\n" - ".inst 0xe00a0281 // ld1b { za0h.b[x12, #1] }, p0/Z, [x20, x10]\n" - ".inst 0x25346141 // psel p1.b, p8.b/Z, p10.b[w12, #2]\n" - ".inst 0x253c6140 // psel p0.b, p8.b/Z, p10.b[w12, #3]\n" - "ldr x20, [x26], #0x8\n" - ".inst 0xe00a06c2 // ld1b { za0h.b[x12, #2] }, p1/Z, [x22, x10]\n" - "ldr x22, [x24], #0x8\n" - ".inst 0xe00a02a3 // ld1b { za0h.b[x12, #3] }, p0/Z, [x21, x10]\n" - "add x12, x12, #0x4\n" - "cmp x12, x16, LSL #2\n" - "ldr x21, [x23], #0x8\n" + ".inst 0x25256140 // psel p0.b, p8.b/Z, p10.b[w13]\n" + ".inst 0x252d6142 // psel p2.b, p8.b/Z, p10.b[w13, #1]\n" + ".inst 0x25356141 // psel p1.b, p8.b/Z, p10.b[w13, #2]\n" + ".inst 0xe0112300 // ld1b { za0h.b[x13] }, p0/Z, [x24, x17]\n" + ".inst 0x253d6140 // psel p0.b, p8.b/Z, p10.b[w13, #3]\n" + "ldr x24, [x27], #0x8\n" + ".inst 0xe0112ae1 // ld1b { za0h.b[x13, #1] }, p2/Z, [x23, x17]\n" + "ldr x23, [x26], #0x8\n" + ".inst 0xe01126c2 // ld1b { za0h.b[x13, #2] }, p1/Z, [x22, x17]\n" + "ldr x22, [x25], #0x8\n" + ".inst 0xe01122a3 // ld1b { za0h.b[x13, #3] }, p0/Z, [x21, x17]\n" + "add x13, x13, #0x4\n" + "ldr x21, [x20], #0x8\n" + "cmp x13, x15, LSL #2\n" "blt 3b\n" "4:" // Loads: Tail - ".inst 0x25246140 // psel p0.b, p8.b/Z, p10.b[w12]\n" - ".inst 0xe00a0320 // ld1b { za0h.b[x12] }, p0/Z, [x25, x10]\n" - ".inst 0x252c6140 // psel p0.b, p8.b/Z, p10.b[w12, #1]\n" - ".inst 0xe00a0281 // ld1b { za0h.b[x12, #1] }, p0/Z, [x20, x10]\n" - ".inst 0x25346140 // psel p0.b, p8.b/Z, p10.b[w12, #2]\n" + ".inst 0x25256140 // psel p0.b, p8.b/Z, p10.b[w13]\n" + ".inst 0x252d6142 // psel p2.b, p8.b/Z, p10.b[w13, #1]\n" + ".inst 0x25356141 // psel p1.b, p8.b/Z, p10.b[w13, #2]\n" "sub x20, %x[width], x28\n" - ".inst 0xe00a02c2 // ld1b { za0h.b[x12, #2] }, p0/Z, [x22, x10]\n" - "cmp x20, x11\n" - "csel x20, x20, x11, LT\n" - ".inst 0x253c6140 // psel p0.b, p8.b/Z, p10.b[w12, #3]\n" - "add x20, x20, #0x3\n" - ".inst 0xe00a02a3 // ld1b { za0h.b[x12, #3] }, p0/Z, [x21, x10]\n" + "cmp x20, x9\n" "mov x12, #0x0\n" + ".inst 0xe0112300 // ld1b { za0h.b[x13] }, p0/Z, [x24, x17]\n" + ".inst 0x253d6140 // psel p0.b, p8.b/Z, p10.b[w13, #3]\n" + "csel x20, x20, x9, LT\n" + ".inst 0xe0112ae1 // ld1b { za0h.b[x13, #1] }, p2/Z, [x23, x17]\n" + "add x20, x20, #0x3\n" + ".inst 0xe01126c2 // ld1b { za0h.b[x13, #2] }, p1/Z, [x22, x17]\n" "lsr x20, x20, #0x2\n" + ".inst 0xe01122a3 // ld1b { za0h.b[x13, #3] }, p0/Z, [x21, x17]\n" "5:" // Stores: Loop ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8120 // st1w { za0v.s[x12] }, p0/Z, [x9, XZR, LSL #2]\n" - ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xc0828811 // mova z17.s, p2/M, za0v.s[x12]\n" - ".inst 0xe0af8124 // st1w { za1v.s[x12] }, p0/Z, [x9, x15, LSL #2]\n" + ".inst 0x25306d22 // psel p2.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xc0828c11 // mova z17.s, p3/M, za0v.s[x12]\n" ".inst 0x25306d21 // psel p1.s, p11.s/Z, p9.s[w12]\n" - ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xc0828893 // mova z19.s, p2/M, za1v.s[x12]\n" - ".inst 0xe0ae8528 // st1w { za2v.s[x12] }, p1/Z, [x9, x14, LSL #2]\n" - ".inst 0xc0828910 // mova z16.s, p2/M, za2v.s[x12]\n" + ".inst 0xc0828c90 // mova z16.s, p3/M, za1v.s[x12]\n" "sdot z23.s, z17.b, z24.b\n" - ".inst 0xe0ad812c // st1w { za3v.s[x12] }, p0/Z, [x9, x13, LSL #2]\n" - ".inst 0xc0828992 // mova z18.s, p2/M, za3v.s[x12]\n" + ".inst 0xc0828d13 // mova z19.s, p3/M, za2v.s[x12]\n" + "sdot z22.s, z16.b, z24.b\n" + ".inst 0xe0bf8200 // st1w { za0v.s[x12] }, p0/Z, [x16, XZR, LSL #2]\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xc0828d92 // mova z18.s, p3/M, za3v.s[x12]\n" + "sdot z21.s, z19.b, z24.b\n" + ".inst 0xe0ae8a04 // st1w { za1v.s[x12] }, p2/Z, [x16, x14, LSL #2]\n" + "sdot z20.s, z18.b, z24.b\n" + ".inst 0xe0ab8608 // st1w { za2v.s[x12] }, p1/Z, [x16, x11, LSL #2]\n" + ".inst 0xe0aa820c // st1w { za3v.s[x12] }, p0/Z, [x16, x10, LSL #2]\n" "add x12, x12, #0x1\n" + "addvl x16, x16, #4\n" "cmp x12, x20\n" - "sdot z22.s, z19.b, z24.b\n" - "sdot z21.s, z16.b, z24.b\n" - "addvl x9, x9, #4\n" - "sdot z20.s, z18.b, z24.b\n" "blt 5b\n" "incb x28\n" + "incb x17\n" "whilelt p9.b, x28, %x[width]\n" "whilelt p8.b, x28, %x[width]\n" - "incb x10\n" "b.any 2b\n" - "st1w { z23.s }, p2, [x9]\n" - "st1w { z22.s }, p2, [x9, #1, MUL VL]\n" - "st1w { z21.s }, p2, [x9, #2, MUL VL]\n" - "st1w { z20.s }, p2, [x9, #3, MUL VL]\n" - "addvl x9, x9, #4\n" - "mov %x[out], x9\n" + "st1w { z23.s }, p3, [x16]\n" + "st1w { z22.s }, p3, [x16, #1, MUL VL]\n" + "st1w { z21.s }, p3, [x16, #2, MUL VL]\n" + "st1w { z20.s }, p3, [x16, #3, MUL VL]\n" + "addvl x16, x16, #4\n" ".inst 0xd503467f // SMSTOP\n" + "mov %x[out], x16\n" : [out] "+&r" (out) : [first] "r" (first), [height] "r" (height), [in] "r" (in), [row_offset] "r" (row_offset), [width] "r" (width) - : "cc", "memory", "p0", "p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "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", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "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