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 --- .../sve_transpose_interleave_6VL_4x2.hpp | 390 ++++++++++----------- 1 file changed, 195 insertions(+), 195 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/transforms/sve_transpose_interleave_6VL_4x2.hpp') diff --git a/src/core/NEON/kernels/arm_gemm/transforms/sve_transpose_interleave_6VL_4x2.hpp b/src/core/NEON/kernels/arm_gemm/transforms/sve_transpose_interleave_6VL_4x2.hpp index c638eaacde..314e3aebbd 100644 --- a/src/core/NEON/kernels/arm_gemm/transforms/sve_transpose_interleave_6VL_4x2.hpp +++ b/src/core/NEON/kernels/arm_gemm/transforms/sve_transpose_interleave_6VL_4x2.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023 Arm Limited. + * Copyright (c) 2021, 2023-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -40,160 +40,160 @@ void sve_transpose_interleave_6VL_4x2(uint32_t *out, const uint32_t *in, size_t __asm__ __volatile__( "cmp %x[height], #0x4\n" - "ptrue p3.b\n" + "ptrue p2.b\n" "blt 6f\n" "1:" // Main row loop: Head "mov x28, %x[in]\n" "mov x27, %x[width]\n" "cntw x26, ALL, MUL #6\n" - "add x25, x28, %x[in_stride]\n" - "add x24, x25, %x[in_stride]\n" + "mov x25, %x[out]\n" + "sub %x[height], %x[height], #0x4\n" + "add x24, x28, %x[in_stride]\n" "add x23, x24, %x[in_stride]\n" + "add x22, x23, %x[in_stride]\n" "cmp x27, x26\n" - "add %x[in], x23, %x[in_stride]\n" - "mov x22, %x[out]\n" - "sub %x[height], %x[height], #0x4\n" + "add %x[in], x22, %x[in_stride]\n" "blt 3f\n" "2:" // Main row loop: Unroll column loop - "ld1w { z18.s }, p3/Z, [x28]\n" - "ld1w { z17.s }, p3/Z, [x28, #1, MUL VL]\n" - "mov x21, x22\n" - "add x22, x22, %x[out_stride]\n" - "ld1w { z19.s }, p3/Z, [x28, #2, MUL VL]\n" - "ld1w { z16.s }, p3/Z, [x25]\n" - "zip1 z9.s, z18.s, z16.s\n" - "zip2 z8.s, z18.s, z16.s\n" - "ld1w { z16.s }, p3/Z, [x25, #1, MUL VL]\n" - "ld1w { z18.s }, p3/Z, [x25, #2, MUL VL]\n" - "zip1 z7.s, z17.s, z16.s\n" - "zip2 z6.s, z17.s, z16.s\n" - "ld1w { z17.s }, p3/Z, [x24]\n" - "ld1w { z16.s }, p3/Z, [x23]\n" - "zip1 z5.s, z19.s, z18.s\n" - "zip2 z4.s, z19.s, z18.s\n" - "ld1w { z18.s }, p3/Z, [x28, #3, MUL VL]\n" - "ld1w { z21.s }, p3/Z, [x28, #4, MUL VL]\n" - "zip1 z3.s, z17.s, z16.s\n" - "zip2 z2.s, z17.s, z16.s\n" - "ld1w { z20.s }, p3/Z, [x28, #5, MUL VL]\n" - "ld1w { z17.s }, p3/Z, [x25, #3, MUL VL]\n" - "mov x20, x22\n" - "zip1 z1.s, z18.s, z17.s\n" - "ld1w { z19.s }, p3/Z, [x25, #4, MUL VL]\n" - "ld1w { z16.s }, p3/Z, [x25, #5, MUL VL]\n" - "zip2 z0.s, z18.s, z17.s\n" - "zip1 z31.s, z21.s, z19.s\n" - "ld1w { z18.s }, p3/Z, [x24, #1, MUL VL]\n" - "ld1w { z17.s }, p3/Z, [x24, #2, MUL VL]\n" - "zip2 z30.s, z21.s, z19.s\n" - "zip1 z29.s, z20.s, z16.s\n" - "ld1w { z19.s }, p3/Z, [x24, #3, MUL VL]\n" - "ld1w { z28.s }, p3/Z, [x24, #4, MUL VL]\n" - "zip2 z27.s, z20.s, z16.s\n" + "ld1w { z18.s }, p2/Z, [x28]\n" + "ld1w { z28.s }, p2/Z, [x28, #1, MUL VL]\n" + "mov x21, x25\n" + "add x25, x25, %x[out_stride]\n" + "ld1w { z22.s }, p2/Z, [x28, #2, MUL VL]\n" + "ld1w { z17.s }, p2/Z, [x24]\n" + "mov x20, x25\n" "sub x27, x27, x26\n" - "ld1w { z26.s }, p3/Z, [x24, #5, MUL VL]\n" - "ld1w { z16.s }, p3/Z, [x23, #1, MUL VL]\n" - "zip1 z25.s, z18.s, z16.s\n" - "zip2 z24.s, z18.s, z16.s\n" - "ld1w { z16.s }, p3/Z, [x23, #2, MUL VL]\n" - "ld1w { z18.s }, p3/Z, [x23, #3, MUL VL]\n" - "zip1 z23.s, z17.s, z16.s\n" - "zip2 z22.s, z17.s, z16.s\n" - "ld1w { z17.s }, p3/Z, [x23, #4, MUL VL]\n" - "ld1w { z16.s }, p3/Z, [x23, #5, MUL VL]\n" - "st1w { z9.s }, p3, [x21]\n" - "zip1 z21.s, z19.s, z18.s\n" - "st1w { z8.s }, p3, [x21, #1, MUL VL]\n" - "zip2 z20.s, z19.s, z18.s\n" + "ld1w { z16.s }, p2/Z, [x24, #1, MUL VL]\n" + "ld1w { z21.s }, p2/Z, [x24, #2, MUL VL]\n" "cmp x27, x26\n" + "add x25, x25, %x[out_stride]\n" + "ld1w { z27.s }, p2/Z, [x23]\n" + "ld1w { z26.s }, p2/Z, [x22]\n" + "ld1w { z20.s }, p2/Z, [x28, #3, MUL VL]\n" + "ld1w { z19.s }, p2/Z, [x28, #4, MUL VL]\n" + "zip1 z8.s, z18.s, z17.s\n" + "zip2 z25.s, z18.s, z17.s\n" + "ld1w { z24.s }, p2/Z, [x28, #5, MUL VL]\n" + "ld1w { z18.s }, p2/Z, [x24, #3, MUL VL]\n" + "zip1 z23.s, z28.s, z16.s\n" + "zip2 z7.s, z28.s, z16.s\n" + "ld1w { z17.s }, p2/Z, [x24, #4, MUL VL]\n" + "ld1w { z16.s }, p2/Z, [x24, #5, MUL VL]\n" + "zip1 z6.s, z22.s, z21.s\n" + "zip2 z5.s, z22.s, z21.s\n" + "ld1w { z22.s }, p2/Z, [x23, #1, MUL VL]\n" + "ld1w { z21.s }, p2/Z, [x23, #2, MUL VL]\n" + "zip1 z4.s, z27.s, z26.s\n" + "zip2 z3.s, z27.s, z26.s\n" + "ld1w { z2.s }, p2/Z, [x23, #3, MUL VL]\n" + "ld1w { z1.s }, p2/Z, [x23, #4, MUL VL]\n" + "zip1 z0.s, z20.s, z18.s\n" + "zip2 z31.s, z20.s, z18.s\n" + "ld1w { z30.s }, p2/Z, [x23, #5, MUL VL]\n" + "ld1w { z20.s }, p2/Z, [x22, #1, MUL VL]\n" + "zip1 z29.s, z19.s, z17.s\n" + "zip2 z28.s, z19.s, z17.s\n" + "ld1w { z19.s }, p2/Z, [x22, #2, MUL VL]\n" + "ld1w { z18.s }, p2/Z, [x22, #3, MUL VL]\n" + "zip1 z27.s, z24.s, z16.s\n" + "zip2 z26.s, z24.s, z16.s\n" + "ld1w { z17.s }, p2/Z, [x22, #4, MUL VL]\n" + "ld1w { z16.s }, p2/Z, [x22, #5, MUL VL]\n" + "st1w { z8.s }, p2, [x21]\n" "addvl x28, x28, #6\n" - "st1w { z7.s }, p3, [x21, #2, MUL VL]\n" - "addvl x25, x25, #6\n" + "st1w { z25.s }, p2, [x21, #1, MUL VL]\n" + "zip1 z25.s, z22.s, z20.s\n" + "zip2 z24.s, z22.s, z20.s\n" "addvl x24, x24, #6\n" - "zip1 z19.s, z28.s, z17.s\n" - "st1w { z6.s }, p3, [x21, #3, MUL VL]\n" + "st1w { z23.s }, p2, [x21, #2, MUL VL]\n" + "zip1 z23.s, z21.s, z19.s\n" + "zip2 z22.s, z21.s, z19.s\n" "addvl x23, x23, #6\n" - "zip2 z18.s, z28.s, z17.s\n" - "zip1 z17.s, z26.s, z16.s\n" - "st1w { z5.s }, p3, [x21, #4, MUL VL]\n" - "zip2 z16.s, z26.s, z16.s\n" - "add x22, x22, %x[out_stride]\n" - "st1w { z4.s }, p3, [x21, #5, MUL VL]\n" - "st1w { z3.s }, p3, [x21, #6, MUL VL]\n" - "st1w { z2.s }, p3, [x21, #7, MUL VL]\n" + "st1w { z7.s }, p2, [x21, #3, MUL VL]\n" + "zip1 z21.s, z2.s, z18.s\n" + "zip2 z20.s, z2.s, z18.s\n" + "addvl x22, x22, #6\n" + "st1w { z6.s }, p2, [x21, #4, MUL VL]\n" + "zip1 z19.s, z1.s, z17.s\n" + "zip2 z18.s, z1.s, z17.s\n" + "st1w { z5.s }, p2, [x21, #5, MUL VL]\n" + "zip1 z17.s, z30.s, z16.s\n" + "zip2 z16.s, z30.s, z16.s\n" + "st1w { z4.s }, p2, [x21, #6, MUL VL]\n" + "st1w { z3.s }, p2, [x21, #7, MUL VL]\n" "addvl x21, x21, #12\n" - "st1w { z25.s }, p3, [x21, #-4, MUL VL]\n" - "st1w { z24.s }, p3, [x21, #-3, MUL VL]\n" - "st1w { z23.s }, p3, [x21, #-2, MUL VL]\n" - "st1w { z22.s }, p3, [x21, #-1, MUL VL]\n" - "st1w { z1.s }, p3, [x20]\n" - "st1w { z0.s }, p3, [x20, #1, MUL VL]\n" - "st1w { z31.s }, p3, [x20, #2, MUL VL]\n" - "st1w { z30.s }, p3, [x20, #3, MUL VL]\n" - "st1w { z29.s }, p3, [x20, #4, MUL VL]\n" - "st1w { z27.s }, p3, [x20, #5, MUL VL]\n" - "st1w { z21.s }, p3, [x20, #6, MUL VL]\n" - "st1w { z20.s }, p3, [x20, #7, MUL VL]\n" + "st1w { z25.s }, p2, [x21, #-4, MUL VL]\n" + "st1w { z24.s }, p2, [x21, #-3, MUL VL]\n" + "st1w { z23.s }, p2, [x21, #-2, MUL VL]\n" + "st1w { z22.s }, p2, [x21, #-1, MUL VL]\n" + "st1w { z0.s }, p2, [x20]\n" + "st1w { z31.s }, p2, [x20, #1, MUL VL]\n" + "st1w { z29.s }, p2, [x20, #2, MUL VL]\n" + "st1w { z28.s }, p2, [x20, #3, MUL VL]\n" + "st1w { z27.s }, p2, [x20, #4, MUL VL]\n" + "st1w { z26.s }, p2, [x20, #5, MUL VL]\n" + "st1w { z21.s }, p2, [x20, #6, MUL VL]\n" + "st1w { z20.s }, p2, [x20, #7, MUL VL]\n" "addvl x20, x20, #12\n" - "st1w { z19.s }, p3, [x20, #-4, MUL VL]\n" - "st1w { z18.s }, p3, [x20, #-3, MUL VL]\n" - "st1w { z17.s }, p3, [x20, #-2, MUL VL]\n" - "st1w { z16.s }, p3, [x20, #-1, MUL VL]\n" + "st1w { z19.s }, p2, [x20, #-4, MUL VL]\n" + "st1w { z18.s }, p2, [x20, #-3, MUL VL]\n" + "st1w { z17.s }, p2, [x20, #-2, MUL VL]\n" + "st1w { z16.s }, p2, [x20, #-1, MUL VL]\n" "bge 2b\n" "3:" // Main row loop: Unroll column loop skip "cbz x27, 5f\n" "4:" // Main row loop: Column loop - "mov x20, x27\n" - "whilelt p2.s, XZR, x20\n" - "ld1w { z19.s }, p2/Z, [x28]\n" - "ld1w { z18.s }, p2/Z, [x25]\n" - "decw x20\n" - "whilelt p1.s, XZR, x20\n" - "ld1w { z17.s }, p1/Z, [x28, #1, MUL VL]\n" - "ld1w { z16.s }, p1/Z, [x25, #1, MUL VL]\n" - "decw x20\n" - "whilelt p0.s, XZR, x20\n" - "ld1w { z22.s }, p0/Z, [x28, #2, MUL VL]\n" - "ld1w { z21.s }, p0/Z, [x25, #2, MUL VL]\n" - "ld1w { z28.s }, p2/Z, [x24]\n" - "ld1w { z27.s }, p2/Z, [x23]\n" - "mov x20, x22\n" + "mov x21, x27\n" + "mov x20, x25\n" "decd x27, ALL, MUL #6\n" - "ld1w { z26.s }, p1/Z, [x24, #1, MUL VL]\n" - "ld1w { z25.s }, p0/Z, [x24, #2, MUL VL]\n" + "add x25, x25, %x[out_stride]\n" + "whilelt p0.s, XZR, x21\n" + "decw x21\n" + "whilelt p1.s, XZR, x21\n" + "decw x21\n" + "ld1w { z19.s }, p0/Z, [x28]\n" + "ld1w { z18.s }, p0/Z, [x24]\n" + "ld1w { z22.s }, p0/Z, [x23]\n" + "ld1w { z17.s }, p0/Z, [x22]\n" + "whilelt p0.s, XZR, x21\n" + "cmp x27, #0x0\n" + "ld1w { z21.s }, p1/Z, [x28, #1, MUL VL]\n" + "ld1w { z16.s }, p1/Z, [x24, #1, MUL VL]\n" + "ld1w { z28.s }, p1/Z, [x23, #1, MUL VL]\n" + "ld1w { z27.s }, p1/Z, [x22, #1, MUL VL]\n" "zip1 z20.s, z19.s, z18.s\n" - "zip2 z19.s, z19.s, z18.s\n" - "ld1w { z24.s }, p1/Z, [x23, #1, MUL VL]\n" + "zip2 z26.s, z19.s, z18.s\n" + "ld1w { z19.s }, p0/Z, [x28, #2, MUL VL]\n" + "ld1w { z18.s }, p0/Z, [x24, #2, MUL VL]\n" + "zip1 z25.s, z22.s, z17.s\n" + "zip2 z24.s, z22.s, z17.s\n" "ld1w { z23.s }, p0/Z, [x23, #2, MUL VL]\n" - "zip1 z18.s, z17.s, z16.s\n" - "zip2 z17.s, z17.s, z16.s\n" - "zip1 z16.s, z22.s, z21.s\n" - "zip2 z22.s, z22.s, z21.s\n" - "st1w { z20.s }, p3, [x20]\n" - "cmp x27, #0x0\n" - "zip1 z21.s, z28.s, z27.s\n" - "zip2 z20.s, z28.s, z27.s\n" - "st1w { z19.s }, p3, [x20, #1, MUL VL]\n" + "ld1w { z22.s }, p0/Z, [x22, #2, MUL VL]\n" + "zip1 z17.s, z21.s, z16.s\n" + "zip2 z16.s, z21.s, z16.s\n" + "st1w { z20.s }, p2, [x20]\n" "addvl x28, x28, #3\n" - "st1w { z18.s }, p3, [x20, #2, MUL VL]\n" - "addvl x25, x25, #3\n" "addvl x24, x24, #3\n" - "zip1 z19.s, z26.s, z24.s\n" - "st1w { z17.s }, p3, [x20, #3, MUL VL]\n" + "zip1 z21.s, z28.s, z27.s\n" + "zip1 z20.s, z19.s, z18.s\n" + "zip2 z19.s, z19.s, z18.s\n" + "st1w { z26.s }, p2, [x20, #1, MUL VL]\n" "addvl x23, x23, #3\n" - "zip2 z18.s, z26.s, z24.s\n" - "zip1 z17.s, z25.s, z23.s\n" - "st1w { z16.s }, p3, [x20, #4, MUL VL]\n" - "zip2 z16.s, z25.s, z23.s\n" - "add x22, x22, %x[out_stride]\n" - "st1w { z22.s }, p3, [x20, #5, MUL VL]\n" - "st1w { z21.s }, p3, [x20, #6, MUL VL]\n" - "st1w { z20.s }, p3, [x20, #7, MUL VL]\n" + "st1w { z17.s }, p2, [x20, #2, MUL VL]\n" + "addvl x22, x22, #3\n" + "zip2 z18.s, z28.s, z27.s\n" + "zip1 z17.s, z23.s, z22.s\n" + "st1w { z16.s }, p2, [x20, #3, MUL VL]\n" + "zip2 z16.s, z23.s, z22.s\n" + "st1w { z20.s }, p2, [x20, #4, MUL VL]\n" + "st1w { z19.s }, p2, [x20, #5, MUL VL]\n" + "st1w { z25.s }, p2, [x20, #6, MUL VL]\n" + "st1w { z24.s }, p2, [x20, #7, MUL VL]\n" "addvl x20, x20, #12\n" - "st1w { z19.s }, p3, [x20, #-4, MUL VL]\n" - "st1w { z18.s }, p3, [x20, #-3, MUL VL]\n" - "st1w { z17.s }, p3, [x20, #-2, MUL VL]\n" - "st1w { z16.s }, p3, [x20, #-1, MUL VL]\n" + "st1w { z21.s }, p2, [x20, #-4, MUL VL]\n" + "st1w { z18.s }, p2, [x20, #-3, MUL VL]\n" + "st1w { z17.s }, p2, [x20, #-2, MUL VL]\n" + "st1w { z16.s }, p2, [x20, #-1, MUL VL]\n" "bgt 4b\n" "5:" // Main row loop: Column loop skip "cmp %x[height], #0x4\n" @@ -205,90 +205,90 @@ void sve_transpose_interleave_6VL_4x2(uint32_t *out, const uint32_t *in, size_t "mov x28, %x[in]\n" "mov x21, %x[width]\n" "cntw x20, ALL, MUL #6\n" - "add x25, x28, %x[in_stride]\n" "cmp %x[height], #0x1\n" - "add %x[in], x25, %x[in_stride]\n" - "csel x25, x25, %x[pad_row], GT\n" - "cmp x21, x20\n" - "mov x22, %x[out]\n" + "mov x25, %x[out]\n" "sub %x[height], %x[height], #0x2\n" + "add x24, x28, %x[in_stride]\n" + "add %x[in], x24, %x[in_stride]\n" + "csel x24, x24, %x[pad_row], GT\n" + "cmp x21, x20\n" "blt 9f\n" "8:" // Tail row loop: Unroll column loop - "ld1w { z17.s }, p3/Z, [x28]\n" - "ld1w { z19.s }, p3/Z, [x28, #1, MUL VL]\n" + "ld1w { z17.s }, p2/Z, [x28]\n" + "ld1w { z23.s }, p2/Z, [x28, #1, MUL VL]\n" "sub x21, x21, x20\n" + "ld1w { z29.s }, p2/Z, [x28, #2, MUL VL]\n" + "ld1w { z16.s }, p2/Z, [x24]\n" "cmp x21, x20\n" - "ld1w { z18.s }, p3/Z, [x28, #2, MUL VL]\n" - "ld1w { z16.s }, p3/Z, [x25]\n" - "zip1 z28.s, z17.s, z16.s\n" - "zip2 z20.s, z17.s, z16.s\n" - "ld1w { z17.s }, p3/Z, [x25, #1, MUL VL]\n" - "ld1w { z16.s }, p3/Z, [x25, #2, MUL VL]\n" - "zip1 z27.s, z19.s, z17.s\n" - "zip2 z26.s, z19.s, z17.s\n" - "ld1w { z19.s }, p3/Z, [x28, #3, MUL VL]\n" - "ld1w { z25.s }, p3/Z, [x28, #4, MUL VL]\n" - "zip1 z24.s, z18.s, z16.s\n" - "zip2 z23.s, z18.s, z16.s\n" - "ld1w { z22.s }, p3/Z, [x28, #5, MUL VL]\n" - "ld1w { z18.s }, p3/Z, [x25, #3, MUL VL]\n" + "ld1w { z22.s }, p2/Z, [x24, #1, MUL VL]\n" + "ld1w { z21.s }, p2/Z, [x24, #2, MUL VL]\n" + "ld1w { z28.s }, p2/Z, [x28, #3, MUL VL]\n" + "ld1w { z27.s }, p2/Z, [x28, #4, MUL VL]\n" + "ld1w { z26.s }, p2/Z, [x28, #5, MUL VL]\n" + "ld1w { z20.s }, p2/Z, [x24, #3, MUL VL]\n" + "zip1 z19.s, z17.s, z16.s\n" + "zip2 z18.s, z17.s, z16.s\n" + "ld1w { z17.s }, p2/Z, [x24, #4, MUL VL]\n" + "ld1w { z25.s }, p2/Z, [x24, #5, MUL VL]\n" + "zip1 z16.s, z23.s, z22.s\n" + "zip2 z24.s, z23.s, z22.s\n" + "zip1 z23.s, z29.s, z21.s\n" + "zip2 z22.s, z29.s, z21.s\n" "addvl x28, x28, #6\n" - "zip1 z21.s, z19.s, z18.s\n" - "ld1w { z17.s }, p3/Z, [x25, #4, MUL VL]\n" - "ld1w { z16.s }, p3/Z, [x25, #5, MUL VL]\n" - "st1w { z28.s }, p3, [x22]\n" - "addvl x25, x25, #6\n" - "st1w { z20.s }, p3, [x22, #1, MUL VL]\n" - "zip2 z20.s, z19.s, z18.s\n" - "zip1 z19.s, z25.s, z17.s\n" - "st1w { z27.s }, p3, [x22, #2, MUL VL]\n" - "zip2 z18.s, z25.s, z17.s\n" - "zip1 z17.s, z22.s, z16.s\n" - "st1w { z26.s }, p3, [x22, #3, MUL VL]\n" - "zip2 z16.s, z22.s, z16.s\n" - "st1w { z24.s }, p3, [x22, #4, MUL VL]\n" - "st1w { z23.s }, p3, [x22, #5, MUL VL]\n" - "add x22, x22, %x[out_stride]\n" - "st1w { z21.s }, p3, [x22]\n" - "st1w { z20.s }, p3, [x22, #1, MUL VL]\n" - "st1w { z19.s }, p3, [x22, #2, MUL VL]\n" - "st1w { z18.s }, p3, [x22, #3, MUL VL]\n" - "st1w { z17.s }, p3, [x22, #4, MUL VL]\n" - "st1w { z16.s }, p3, [x22, #5, MUL VL]\n" - "add x22, x22, %x[out_stride]\n" + "addvl x24, x24, #6\n" + "st1w { z19.s }, p2, [x25]\n" + "zip1 z21.s, z28.s, z20.s\n" + "zip2 z20.s, z28.s, z20.s\n" + "st1w { z18.s }, p2, [x25, #1, MUL VL]\n" + "zip1 z19.s, z27.s, z17.s\n" + "zip2 z18.s, z27.s, z17.s\n" + "st1w { z16.s }, p2, [x25, #2, MUL VL]\n" + "zip1 z17.s, z26.s, z25.s\n" + "zip2 z16.s, z26.s, z25.s\n" + "st1w { z24.s }, p2, [x25, #3, MUL VL]\n" + "st1w { z23.s }, p2, [x25, #4, MUL VL]\n" + "st1w { z22.s }, p2, [x25, #5, MUL VL]\n" + "add x25, x25, %x[out_stride]\n" + "st1w { z21.s }, p2, [x25]\n" + "st1w { z20.s }, p2, [x25, #1, MUL VL]\n" + "st1w { z19.s }, p2, [x25, #2, MUL VL]\n" + "st1w { z18.s }, p2, [x25, #3, MUL VL]\n" + "st1w { z17.s }, p2, [x25, #4, MUL VL]\n" + "st1w { z16.s }, p2, [x25, #5, MUL VL]\n" + "add x25, x25, %x[out_stride]\n" "bge 8b\n" "9:" // Tail row loop: Unroll column loop skip "cbz x21, 11f\n" "10:" // Tail row loop: Column loop "mov x20, x21\n" + "decd x21, ALL, MUL #6\n" "whilelt p0.s, XZR, x20\n" - "ld1w { z20.s }, p0/Z, [x28]\n" - "ld1w { z19.s }, p0/Z, [x25]\n" "decw x20\n" - "whilelt p0.s, XZR, x20\n" - "ld1w { z18.s }, p0/Z, [x28, #1, MUL VL]\n" - "ld1w { z17.s }, p0/Z, [x25, #1, MUL VL]\n" + "whilelt p1.s, XZR, x20\n" "decw x20\n" + "ld1w { z17.s }, p0/Z, [x28]\n" + "ld1w { z16.s }, p0/Z, [x24]\n" "whilelt p0.s, XZR, x20\n" - "ld1w { z22.s }, p0/Z, [x28, #2, MUL VL]\n" - "ld1w { z16.s }, p0/Z, [x25, #2, MUL VL]\n" - "decd x21, ALL, MUL #6\n" "cmp x21, #0x0\n" - "zip1 z21.s, z20.s, z19.s\n" - "zip2 z20.s, z20.s, z19.s\n" + "ld1w { z22.s }, p1/Z, [x28, #1, MUL VL]\n" + "ld1w { z18.s }, p1/Z, [x24, #1, MUL VL]\n" + "zip1 z21.s, z17.s, z16.s\n" + "zip2 z17.s, z17.s, z16.s\n" + "ld1w { z20.s }, p0/Z, [x28, #2, MUL VL]\n" "addvl x28, x28, #3\n" - "addvl x25, x25, #3\n" - "zip1 z19.s, z18.s, z17.s\n" - "zip2 z18.s, z18.s, z17.s\n" - "zip1 z17.s, z22.s, z16.s\n" - "zip2 z16.s, z22.s, z16.s\n" - "st1w { z21.s }, p3, [x22]\n" - "st1w { z20.s }, p3, [x22, #1, MUL VL]\n" - "st1w { z19.s }, p3, [x22, #2, MUL VL]\n" - "st1w { z18.s }, p3, [x22, #3, MUL VL]\n" - "st1w { z17.s }, p3, [x22, #4, MUL VL]\n" - "st1w { z16.s }, p3, [x22, #5, MUL VL]\n" - "add x22, x22, %x[out_stride]\n" + "ld1w { z16.s }, p0/Z, [x24, #2, MUL VL]\n" + "addvl x24, x24, #3\n" + "zip1 z19.s, z22.s, z18.s\n" + "zip2 z18.s, z22.s, z18.s\n" + "st1w { z21.s }, p2, [x25]\n" + "st1w { z17.s }, p2, [x25, #1, MUL VL]\n" + "zip1 z17.s, z20.s, z16.s\n" + "zip2 z16.s, z20.s, z16.s\n" + "st1w { z19.s }, p2, [x25, #2, MUL VL]\n" + "st1w { z18.s }, p2, [x25, #3, MUL VL]\n" + "st1w { z17.s }, p2, [x25, #4, MUL VL]\n" + "st1w { z16.s }, p2, [x25, #5, MUL VL]\n" + "add x25, x25, %x[out_stride]\n" "bgt 10b\n" "11:" // Tail row loop: Column loop skip "cmp %x[height], #0x1\n" @@ -297,7 +297,7 @@ void sve_transpose_interleave_6VL_4x2(uint32_t *out, const uint32_t *in, size_t "12:" // Done : [height] "+&r" (height), [in] "+&r" (in), [out] "+&r" (out) : [in_stride] "r" (in_stride), [out_stride] "r" (out_stride), [pad_row] "r" (pad_row), [width] "r" (width) - : "cc", "memory", "p0", "p1", "p2", "p3", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "z0", "z1", "z2", "z3", "z4", "z5", "z6", "z7", "z8", "z9", "z16", "z17", "z18", "z19", "z20", "z21", "z22", "z23", "z24", "z25", "z26", "z27", "z28", "z29", "z30", "z31" + : "cc", "memory", "p0", "p1", "p2", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "z0", "z1", "z2", "z3", "z4", "z5", "z6", "z7", "z8", "z16", "z17", "z18", "z19", "z20", "z21", "z22", "z23", "z24", "z25", "z26", "z27", "z28", "z29", "z30", "z31" ); } -- cgit v1.2.1