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 --- .../sme_interleave1VL_block2_bf16_bf16.hpp | 286 ++++++++++----------- 1 file changed, 143 insertions(+), 143 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave1VL_block2_bf16_bf16.hpp') diff --git a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave1VL_block2_bf16_bf16.hpp b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave1VL_block2_bf16_bf16.hpp index 81b346c9ba..d0375de76f 100644 --- a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave1VL_block2_bf16_bf16.hpp +++ b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave1VL_block2_bf16_bf16.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Arm Limited. + * Copyright (c) 2022-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -10,16 +10,16 @@ * sell copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #if defined(__ARM_FEATURE_SVE) @@ -34,186 +34,186 @@ void interleave_block<1, 2, VLType::SME, false>( __asm__ __volatile__( ".inst 0xd503477f // SMSTART ZA\n" - "cnth x20\n" + "cnth x22\n" + "mov x21, %x[width]\n" + "inch x21\n" + "mov x20, %x[width]\n" + "sub x11, x22, #0x1\n" + "sub x21, x21, #0x1\n" + "ands x11, x20, x11\n" "cntw x10\n" - "mov x19, %x[width]\n" - "inch x19\n" - "sub x19, x19, #0x1\n" - "udiv x19, x19, x20\n" // n_passes = ceildiv(width, VL) - "sub x9, x19, #0x1\n" - "lsr x9, x9, #0x1\n" // n_loops = (n_passes - 1) / 2 - "and x28, x19, #0x1\n" // odd_tail = bool(n_passes & 0x1) - "mov x19, %x[width]\n" - "sub x27, x20, #0x1\n" - "ands x27, x19, x27\n" - "csel x27, x27, x20, NE\n" - "add x27, x27, #0x1\n" - "lsr x27, x27, #0x1\n" - "sub x26, x10, #0x2\n" + "udiv x21, x21, x22\n" // n_passes = ceildiv(width, VL) + "csel x11, x11, x22, NE\n" + "sub x9, x21, #0x1\n" + "add x11, x11, #0x1\n" + "sub x28, x10, #0x2\n" + "lsl x20, %x[height], #0x1\n" // height * 2 + "mov x27, #0x0\n" + "mov x26, %x[in]\n" + "ldr x25, [x26, #0x0]\n" + "lsr x9, x9, #0x1\n" // n_loops = (n_passes - 1) / 2 + "and x24, x21, #0x1\n" // odd_tail = bool(n_passes & 0x1) + "ldr x23, [x26, #0x8]\n" + "lsr x11, x11, #0x1\n" "ptrue p11.s\n" - "lsl x19, %x[height], #0x1\n" // height * 2 - "whilelt p10.h, XZR, x19\n" - "mov x25, %x[row_offset]\n" - "mov x24, %x[out]\n" - "mov x23, #0x0\n" - "whilelt p9.h, x23, %x[width]\n" - "whilelt p8.h, x23, %x[width]\n" - "mov x22, %x[in]\n" - "ldr x21, [x22, #0x0]\n" - "ldr x20, [x22, #0x8]\n" - "add x22, x22, #0x10\n" + "whilelt p10.h, XZR, x20\n" + "mov x22, %x[row_offset]\n" + "mov x21, %x[out]\n" + "whilelt p9.h, x27, %x[width]\n" + "whilelt p8.h, x27, %x[width]\n" + "add x26, x26, #0x10\n" "mov x12, #0x0\n" - "cbz x26, 2f\n" + "cbz x28, 2f\n" "1:" // K loop: Charge: Loop - ".inst 0x25286140 // dup p0.h, p8.h/Z, p10.h[w12]\n" - ".inst 0xe05902a0 // ld1h { za0h.h[x12] }, p0/Z, [x21, x25, LSL #1]\n" - ".inst 0x25686140 // dup p0.h, p8.h/Z, p10.h[w12, #2]\n" - "ldr x21, [x22, #0x0]\n" - ".inst 0xe0590282 // ld1h { za0h.h[x12, #2] }, p0/Z, [x20, x25, LSL #1]\n" - "ldr x20, [x22, #0x8]\n" - "add x22, x22, #0x10\n" + ".inst 0x25286140 // psel p0.h, p8.h/Z, p10.h[w12]\n" + ".inst 0xe0560320 // ld1h { za0h.h[x12] }, p0/Z, [x25, x22, LSL #1]\n" + ".inst 0x25686140 // psel p0.h, p8.h/Z, p10.h[w12, #2]\n" + "ldr x25, [x26, #0x0]\n" + ".inst 0xe05602e2 // ld1h { za0h.h[x12, #2] }, p0/Z, [x23, x22, LSL #1]\n" "add x12, x12, #0x4\n" - "cmp x12, x26, LSL #1\n" + "cmp x12, x28, LSL #1\n" + "ldr x23, [x26, #0x8]\n" + "add x26, x26, #0x10\n" "blt 1b\n" "2:" // K loop: Charge: End - ".inst 0x25286140 // dup p0.h, p8.h/Z, p10.h[w12]\n" - ".inst 0xe05902a0 // ld1h { za0h.h[x12] }, p0/Z, [x21, x25, LSL #1]\n" - ".inst 0x25686140 // dup p0.h, p8.h/Z, p10.h[w12, #2]\n" - "mov x22, %x[in]\n" - ".inst 0xe0590282 // ld1h { za0h.h[x12, #2] }, p0/Z, [x20, x25, LSL #1]\n" - "ldr x21, [x22, #0x0]\n" - "ldr x20, [x22, #0x8]\n" - "add x22, x22, #0x10\n" - "inch x25\n" - "inch x23\n" + ".inst 0x25286140 // psel p0.h, p8.h/Z, p10.h[w12]\n" + ".inst 0xe0560320 // ld1h { za0h.h[x12] }, p0/Z, [x25, x22, LSL #1]\n" + ".inst 0x25686140 // psel p0.h, p8.h/Z, p10.h[w12, #2]\n" + "mov x26, %x[in]\n" + ".inst 0xe05602e2 // ld1h { za0h.h[x12, #2] }, p0/Z, [x23, x22, LSL #1]\n" + "ldr x25, [x26, #0x0]\n" + "inch x22\n" + "ldr x23, [x26, #0x8]\n" + "add x26, x26, #0x10\n" + "inch x27\n" "cbz x9, 8f\n" - "mov x19, x9\n" + "mov x20, x9\n" "3:" // K loop: Main loop - "whilelt p8.h, x23, %x[width]\n" + "whilelt p8.h, x27, %x[width]\n" "mov x13, #0x0\n" "mov x12, #0x0\n" - "cbz x26, 5f\n" + "cbz x28, 5f\n" "4:" // K loop: Main loop: First: Loop - ".inst 0x25396140 // dup p0.h, p8.h/Z, p10.h[w13, #1]\n" - ".inst 0xe05922a1 // ld1h { za0h.h[x13, #1] }, p0/Z, [x21, x25, LSL #1]\n" - ".inst 0x25796140 // dup p0.h, p8.h/Z, p10.h[w13, #3]\n" - "ldr x21, [x22, #0x0]\n" - ".inst 0xe0592283 // ld1h { za0h.h[x13, #3] }, p0/Z, [x20, x25, LSL #1]\n" - "ldr x20, [x22, #0x8]\n" - "add x22, x22, #0x10\n" - ".inst 0x25306d20 // dup p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8300 // st1w { za0v.s[x12] }, p0/Z, [x24, XZR, LSL #2]\n" - ".inst 0x25706d20 // dup p0.s, p11.s/Z, p9.s[w12, #1]\n" - "add x13, x13, #0x4\n" - ".inst 0xe0aa8301 // st1w { za0v.s[x12, #1] }, p0/Z, [x24, x10, LSL #2]\n" - "addvl x24, x24, #2\n" + ".inst 0x25396140 // psel p0.h, p8.h/Z, p10.h[w13, #1]\n" + ".inst 0xe0562321 // ld1h { za0h.h[x13, #1] }, p0/Z, [x25, x22, LSL #1]\n" + ".inst 0x25796141 // psel p1.h, p8.h/Z, p10.h[w13, #3]\n" + "ldr x25, [x26, #0x0]\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xe05626e3 // ld1h { za0h.h[x13, #3] }, p1/Z, [x23, x22, LSL #1]\n" + "ldr x23, [x26, #0x8]\n" + ".inst 0xe0bf82a0 // st1w { za0v.s[x12] }, p0/Z, [x21, XZR, LSL #2]\n" + ".inst 0x25706d20 // psel p0.s, p11.s/Z, p9.s[w12, #1]\n" + ".inst 0xe0aa82a1 // st1w { za0v.s[x12, #1] }, p0/Z, [x21, x10, LSL #2]\n" "add x12, x12, #0x2\n" - "cmp x12, x26\n" + "cmp x12, x28\n" + "add x26, x26, #0x10\n" + "addvl x21, x21, #2\n" + "add x13, x13, #0x4\n" "blt 4b\n" "5:" // K loop: Main loop: First: Tail - "mov x22, %x[in]\n" - ".inst 0x25396140 // dup p0.h, p8.h/Z, p10.h[w13, #1]\n" - ".inst 0xe05922a1 // ld1h { za0h.h[x13, #1] }, p0/Z, [x21, x25, LSL #1]\n" - ".inst 0x25796140 // dup p0.h, p8.h/Z, p10.h[w13, #3]\n" - "ldr x21, [x22, #0x0]\n" - ".inst 0xe0592283 // ld1h { za0h.h[x13, #3] }, p0/Z, [x20, x25, LSL #1]\n" - "ldr x20, [x22, #0x8]\n" - "add x22, x22, #0x10\n" - ".inst 0x25306d20 // dup p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8300 // st1w { za0v.s[x12] }, p0/Z, [x24, XZR, LSL #2]\n" - ".inst 0x25706d20 // dup p0.s, p11.s/Z, p9.s[w12, #1]\n" - "whilelt p9.h, x23, %x[width]\n" - ".inst 0xe0aa8301 // st1w { za0v.s[x12, #1] }, p0/Z, [x24, x10, LSL #2]\n" - "addvl x24, x24, #2\n" - "inch x23\n" - "inch x25\n" - "whilelt p8.h, x23, %x[width]\n" + ".inst 0x25396140 // psel p0.h, p8.h/Z, p10.h[w13, #1]\n" + ".inst 0xe0562321 // ld1h { za0h.h[x13, #1] }, p0/Z, [x25, x22, LSL #1]\n" + "mov x26, %x[in]\n" + "ldr x25, [x26, #0x0]\n" + ".inst 0x25796141 // psel p1.h, p8.h/Z, p10.h[w13, #3]\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xe05626e3 // ld1h { za0h.h[x13, #3] }, p1/Z, [x23, x22, LSL #1]\n" + "ldr x23, [x26, #0x8]\n" + ".inst 0xe0bf82a0 // st1w { za0v.s[x12] }, p0/Z, [x21, XZR, LSL #2]\n" + ".inst 0x25706d20 // psel p0.s, p11.s/Z, p9.s[w12, #1]\n" + "whilelt p9.h, x27, %x[width]\n" + "inch x27\n" + "add x26, x26, #0x10\n" + ".inst 0xe0aa82a1 // st1w { za0v.s[x12, #1] }, p0/Z, [x21, x10, LSL #2]\n" + "addvl x21, x21, #2\n" + "inch x22\n" + "whilelt p8.h, x27, %x[width]\n" "mov x13, #0x0\n" "mov x12, #0x0\n" - "cbz x26, 7f\n" + "cbz x28, 7f\n" "6:" // K loop: Main loop: Second: Loop - ".inst 0x25296140 // dup p0.h, p8.h/Z, p10.h[w13]\n" - ".inst 0xe05922a0 // ld1h { za0h.h[x13] }, p0/Z, [x21, x25, LSL #1]\n" - ".inst 0x25696140 // dup p0.h, p8.h/Z, p10.h[w13, #2]\n" - "ldr x21, [x22, #0x0]\n" - ".inst 0xe0592282 // ld1h { za0h.h[x13, #2] }, p0/Z, [x20, x25, LSL #1]\n" - "ldr x20, [x22, #0x8]\n" - "add x22, x22, #0x10\n" - ".inst 0x25306d20 // dup p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8308 // st1w { za2v.s[x12] }, p0/Z, [x24, XZR, LSL #2]\n" - ".inst 0x25706d20 // dup p0.s, p11.s/Z, p9.s[w12, #1]\n" - "add x13, x13, #0x4\n" - ".inst 0xe0aa8309 // st1w { za2v.s[x12, #1] }, p0/Z, [x24, x10, LSL #2]\n" - "addvl x24, x24, #2\n" + ".inst 0x25296140 // psel p0.h, p8.h/Z, p10.h[w13]\n" + ".inst 0xe0562320 // ld1h { za0h.h[x13] }, p0/Z, [x25, x22, LSL #1]\n" + ".inst 0x25696141 // psel p1.h, p8.h/Z, p10.h[w13, #2]\n" + "ldr x25, [x26, #0x0]\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xe05626e2 // ld1h { za0h.h[x13, #2] }, p1/Z, [x23, x22, LSL #1]\n" + "ldr x23, [x26, #0x8]\n" + ".inst 0xe0bf82a8 // st1w { za2v.s[x12] }, p0/Z, [x21, XZR, LSL #2]\n" + ".inst 0x25706d20 // psel p0.s, p11.s/Z, p9.s[w12, #1]\n" + ".inst 0xe0aa82a9 // st1w { za2v.s[x12, #1] }, p0/Z, [x21, x10, LSL #2]\n" "add x12, x12, #0x2\n" - "cmp x12, x26\n" + "cmp x12, x28\n" + "add x26, x26, #0x10\n" + "addvl x21, x21, #2\n" + "add x13, x13, #0x4\n" "blt 6b\n" "7:" // K loop: Main loop: Second: Tail - "mov x22, %x[in]\n" - ".inst 0x25296140 // dup p0.h, p8.h/Z, p10.h[w13]\n" - ".inst 0xe05922a0 // ld1h { za0h.h[x13] }, p0/Z, [x21, x25, LSL #1]\n" - ".inst 0x25696140 // dup p0.h, p8.h/Z, p10.h[w13, #2]\n" - "ldr x21, [x22, #0x0]\n" - ".inst 0xe0592282 // ld1h { za0h.h[x13, #2] }, p0/Z, [x20, x25, LSL #1]\n" - "ldr x20, [x22, #0x8]\n" - "add x22, x22, #0x10\n" - ".inst 0x25306d20 // dup p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8308 // st1w { za2v.s[x12] }, p0/Z, [x24, XZR, LSL #2]\n" - ".inst 0x25706d20 // dup p0.s, p11.s/Z, p9.s[w12, #1]\n" - "whilelt p9.h, x23, %x[width]\n" - ".inst 0xe0aa8309 // st1w { za2v.s[x12, #1] }, p0/Z, [x24, x10, LSL #2]\n" - "addvl x24, x24, #2\n" - "inch x23\n" - "inch x25\n" - "subs x19, x19, #0x1\n" + ".inst 0x25296140 // psel p0.h, p8.h/Z, p10.h[w13]\n" + ".inst 0xe0562320 // ld1h { za0h.h[x13] }, p0/Z, [x25, x22, LSL #1]\n" + "mov x26, %x[in]\n" + "ldr x25, [x26, #0x0]\n" + ".inst 0x25696141 // psel p1.h, p8.h/Z, p10.h[w13, #2]\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xe05626e2 // ld1h { za0h.h[x13, #2] }, p1/Z, [x23, x22, LSL #1]\n" + "ldr x23, [x26, #0x8]\n" + ".inst 0xe0bf82a8 // st1w { za2v.s[x12] }, p0/Z, [x21, XZR, LSL #2]\n" + ".inst 0x25706d20 // psel p0.s, p11.s/Z, p9.s[w12, #1]\n" + "whilelt p9.h, x27, %x[width]\n" + "subs x20, x20, #0x1\n" + "add x26, x26, #0x10\n" + ".inst 0xe0aa82a9 // st1w { za2v.s[x12, #1] }, p0/Z, [x21, x10, LSL #2]\n" + "addvl x21, x21, #2\n" + "inch x27\n" + "inch x22\n" "bgt 3b\n" "8:" // K loop: Tails - "cbnz x28, 11f\n" - "mov x22, %x[in]\n" - "whilelt p8.h, x23, %x[width]\n" + "cbnz x24, 11f\n" + "mov x26, %x[in]\n" + "whilelt p8.h, x27, %x[width]\n" "mov x13, #0x0\n" "mov x12, #0x0\n" "9:" // K loop: Tails: Even: First - ".inst 0x25306d20 // dup p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8300 // st1w { za0v.s[x12] }, p0/Z, [x24, XZR, LSL #2]\n" - ".inst 0x25396140 // dup p0.h, p8.h/Z, p10.h[w13, #1]\n" - "addvl x24, x24, #1\n" - "ldr x21, [x22, #0x0]\n" - ".inst 0xe05922a1 // ld1h { za0h.h[x13, #1] }, p0/Z, [x21, x25, LSL #1]\n" - "add x22, x22, #0x8\n" - "add x13, x13, #0x2\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xe0bf82a0 // st1w { za0v.s[x12] }, p0/Z, [x21, XZR, LSL #2]\n" + "ldr x25, [x26, #0x0]\n" "add x12, x12, #0x1\n" + ".inst 0x25396140 // psel p0.h, p8.h/Z, p10.h[w13, #1]\n" "cmp x12, x10\n" + ".inst 0xe0562321 // ld1h { za0h.h[x13, #1] }, p0/Z, [x25, x22, LSL #1]\n" + "add x26, x26, #0x8\n" + "addvl x21, x21, #1\n" + "add x13, x13, #0x2\n" "blt 9b\n" - "whilelt p9.h, x23, %x[width]\n" - "whilelt p8.h, x23, %x[width]\n" - "mov x19, #0x0\n" + "whilelt p9.h, x27, %x[width]\n" + "whilelt p8.h, x27, %x[width]\n" + "mov x20, #0x0\n" "mov x12, #0x0\n" "10:" // K loop: Tails: Even: Second - ".inst 0x25306d20 // dup p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8308 // st1w { za2v.s[x12] }, p0/Z, [x24, XZR, LSL #2]\n" - "addvl x24, x24, #1\n" - "add x19, x19, #0x2\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xe0bf82a8 // st1w { za2v.s[x12] }, p0/Z, [x21, XZR, LSL #2]\n" "add x12, x12, #0x1\n" - "cmp x12, x27\n" + "cmp x12, x11\n" + "addvl x21, x21, #1\n" + "add x20, x20, #0x2\n" "blt 10b\n" - "whilelt p9.h, x23, %x[width]\n" + "whilelt p9.h, x27, %x[width]\n" "b 13f\n" "11:" // K loop: Tails: Odd "mov x12, #0x0\n" "12:" // K loop: Tails: Odd: Loop - ".inst 0x25306d20 // dup p0.s, p11.s/Z, p9.s[w12]\n" - ".inst 0xe0bf8300 // st1w { za0v.s[x12] }, p0/Z, [x24, XZR, LSL #2]\n" - "addvl x24, x24, #1\n" + ".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n" + ".inst 0xe0bf82a0 // st1w { za0v.s[x12] }, p0/Z, [x21, XZR, LSL #2]\n" "add x12, x12, #0x1\n" - "cmp x12, x27\n" + "cmp x12, x11\n" + "addvl x21, x21, #1\n" "blt 12b\n" "13:" // K loop: End - "mov %x[out], x24\n" + "mov %x[out], x21\n" ".inst 0xd503467f // SMSTOP\n" : [out] "+&r" (out) : [height] "r" (height), [in] "r" (in), [row_offset] "r" (row_offset), [width] "r" (width) - : "cc", "memory", "p0", "p8", "p9", "p10", "p11", "x9", "x10", "x12", "x13", "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" + : "cc", "memory", "p0", "p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", "x9", "x10", "x11", "x12", "x13", "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