From e28cf395b57a091d0850cd28cecc81046153b843 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Sun, 31 Jan 2021 05:18:43 +0000 Subject: Regenerate kernels and update A55 versions Signed-off-by: Georgios Pinitas Change-Id: I9eae76c77db03b8806af65729da34ab2d77f95f2 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4965 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- .../a64_interleave8_block2_bf16_bf16.hpp | 202 ++++++++++----------- 1 file changed, 101 insertions(+), 101 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/indirect-interleaves/a64_interleave8_block2_bf16_bf16.hpp') diff --git a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a64_interleave8_block2_bf16_bf16.hpp b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a64_interleave8_block2_bf16_bf16.hpp index 5377edc1e1..1e5d395667 100644 --- a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a64_interleave8_block2_bf16_bf16.hpp +++ b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a64_interleave8_block2_bf16_bf16.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 Arm Limited. + * Copyright (c) 2019-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -80,45 +80,45 @@ void interleave_block<8, 2, VLType::None, false>( "blt 3f\n" "2:" // Main loop head "ldr q28, [x27], #0x10\n" + "subs %x[width], %x[width], #0x8\n" + "ldr q29, [x26], #0x10\n" + "cmp %x[width], #0x8\n" + "ldr q25, [x25], #0x10\n" + "zip1 v22.4s, v28.4s, v25.4s\n" + "ldr q21, [x24], #0x10\n" + "zip2 v28.4s, v28.4s, v25.4s\n" + "ldr q27, [x23], #0x10\n" + "ldr q26, [x22], #0x10\n" + "zip1 v20.4s, v29.4s, v21.4s\n" + "ldr q19, [x21], #0x10\n" + "zip2 v25.4s, v29.4s, v21.4s\n" + "ldr q24, [x20], #0x10\n" + "zip1 v23.4s, v22.4s, v20.4s\n" "prfm pldl1keep, [x27, #0x70]\n" - "ldr q27, [x26], #0x10\n" - "ldr q26, [x25], #0x10\n" - "zip1 v23.4s, v28.4s, v26.4s\n" + "zip2 v22.4s, v22.4s, v20.4s\n" "prfm pldl1keep, [x26, #0x70]\n" - "ldr q22, [x24], #0x10\n" - "zip2 v26.4s, v28.4s, v26.4s\n" + "zip1 v21.4s, v28.4s, v25.4s\n" "prfm pldl1keep, [x25, #0x70]\n" - "ldr q25, [x23], #0x10\n" - "zip1 v20.4s, v27.4s, v22.4s\n" + "zip1 v18.4s, v27.4s, v19.4s\n" "prfm pldl1keep, [x24, #0x70]\n" - "ldr q24, [x22], #0x10\n" - "zip1 v16.4s, v23.4s, v20.4s\n" + "zip1 v16.4s, v26.4s, v24.4s\n" "prfm pldl1keep, [x23, #0x70]\n" - "ldr q19, [x21], #0x10\n" - "zip2 v23.4s, v23.4s, v20.4s\n" + "zip1 v17.4s, v18.4s, v16.4s\n" "prfm pldl1keep, [x22, #0x70]\n" - "zip2 v22.4s, v27.4s, v22.4s\n" - "ldr q21, [x20], #0x10\n" - "zip1 v18.4s, v25.4s, v19.4s\n" + "zip2 v20.4s, v18.4s, v16.4s\n" "prfm pldl1keep, [x21, #0x70]\n" - "str q16, [%x[out_ptr], #0x0]\n" - "zip1 v20.4s, v26.4s, v22.4s\n" + "zip2 v19.4s, v27.4s, v19.4s\n" "prfm pldl1keep, [x20, #0x70]\n" - "zip1 v16.4s, v24.4s, v21.4s\n" - "subs %x[width], %x[width], #0x8\n" - "zip1 v17.4s, v18.4s, v16.4s\n" - "cmp %x[width], #0x8\n" - "zip2 v16.4s, v18.4s, v16.4s\n" + "zip2 v16.4s, v26.4s, v24.4s\n" + "str q23, [%x[out_ptr], #0x0]\n" + "zip1 v18.4s, v19.4s, v16.4s\n" "str q17, [%x[out_ptr], #0x10]\n" - "zip2 v19.4s, v25.4s, v19.4s\n" - "str q23, [%x[out_ptr], #0x20]\n" - "zip2 v18.4s, v24.4s, v21.4s\n" - "str q16, [%x[out_ptr], #0x30]\n" - "zip1 v16.4s, v19.4s, v18.4s\n" - "str q20, [%x[out_ptr], #0x40]\n" - "zip2 v17.4s, v26.4s, v22.4s\n" - "str q16, [%x[out_ptr], #0x50]\n" - "zip2 v16.4s, v19.4s, v18.4s\n" + "zip2 v17.4s, v28.4s, v25.4s\n" + "str q22, [%x[out_ptr], #0x20]\n" + "zip2 v16.4s, v19.4s, v16.4s\n" + "str q20, [%x[out_ptr], #0x30]\n" + "str q21, [%x[out_ptr], #0x40]\n" + "str q18, [%x[out_ptr], #0x50]\n" "str q17, [%x[out_ptr], #0x60]\n" "str q16, [%x[out_ptr], #0x70]\n" "add %x[out_ptr], %x[out_ptr], #0x80\n" @@ -127,119 +127,119 @@ void interleave_block<8, 2, VLType::None, false>( "cbz %x[width], 8f\n" "tbz %x[width], #2, 5f\n" "ldr d28, [x27], #0x8\n" - "ldr d27, [x26], #0x8\n" - "ldr d26, [x25], #0x8\n" - "ldr d22, [x24], #0x8\n" - "ldr d25, [x23], #0x8\n" - "ldr d24, [x22], #0x8\n" + "ldr d29, [x26], #0x8\n" + "ldr d25, [x25], #0x8\n" + "ldr d21, [x24], #0x8\n" + "ldr d27, [x23], #0x8\n" + "ldr d26, [x22], #0x8\n" "ldr d19, [x21], #0x8\n" - "ldr d21, [x20], #0x8\n" + "ldr d24, [x20], #0x8\n" "tbz %x[width], #1, 4f\n" "ld1 { v28.s }[2], [x27], #0x4\n" - "ld1 { v27.s }[2], [x26], #0x4\n" - "ld1 { v26.s }[2], [x25], #0x4\n" - "ld1 { v22.s }[2], [x24], #0x4\n" - "ld1 { v25.s }[2], [x23], #0x4\n" - "ld1 { v24.s }[2], [x22], #0x4\n" - "ld1 { v19.s }[2], [x21], #0x4\n" - "ld1 { v21.s }[2], [x20], #0x4\n" "mov x19, #0x3\n" + "ld1 { v29.s }[2], [x26], #0x4\n" + "ld1 { v25.s }[2], [x25], #0x4\n" + "ld1 { v21.s }[2], [x24], #0x4\n" + "ld1 { v27.s }[2], [x23], #0x4\n" + "ld1 { v26.s }[2], [x22], #0x4\n" + "ld1 { v19.s }[2], [x21], #0x4\n" + "ld1 { v24.s }[2], [x20], #0x4\n" "tbz %x[width], #0, 7f\n" "ld1 { v28.h }[6], [x27]\n" - "ld1 { v27.h }[6], [x26]\n" - "ld1 { v26.h }[6], [x25]\n" - "ld1 { v22.h }[6], [x24]\n" - "ld1 { v25.h }[6], [x23]\n" - "ld1 { v24.h }[6], [x22]\n" - "ld1 { v19.h }[6], [x21]\n" - "ld1 { v21.h }[6], [x20]\n" "mov x19, #0x4\n" + "ld1 { v29.h }[6], [x26]\n" + "ld1 { v25.h }[6], [x25]\n" + "ld1 { v21.h }[6], [x24]\n" + "ld1 { v27.h }[6], [x23]\n" + "ld1 { v26.h }[6], [x22]\n" + "ld1 { v19.h }[6], [x21]\n" + "ld1 { v24.h }[6], [x20]\n" "b 7f\n" "4:" // odd_loads_1_4 "mov x19, #0x2\n" "tbz %x[width], #0, 7f\n" "ld1 { v28.h }[4], [x27]\n" - "ld1 { v27.h }[4], [x26]\n" - "ld1 { v26.h }[4], [x25]\n" - "ld1 { v22.h }[4], [x24]\n" - "ld1 { v25.h }[4], [x23]\n" - "ld1 { v24.h }[4], [x22]\n" - "ld1 { v19.h }[4], [x21]\n" - "ld1 { v21.h }[4], [x20]\n" + "ld1 { v29.h }[4], [x26]\n" "mov x19, #0x3\n" + "ld1 { v25.h }[4], [x25]\n" + "ld1 { v21.h }[4], [x24]\n" + "ld1 { v27.h }[4], [x23]\n" + "ld1 { v26.h }[4], [x22]\n" + "ld1 { v19.h }[4], [x21]\n" + "ld1 { v24.h }[4], [x20]\n" "b 7f\n" "5:" // odd_loads_2_0 "tbz %x[width], #1, 6f\n" "ldr s28, [x27], #0x4\n" - "ldr s27, [x26], #0x4\n" - "ldr s26, [x25], #0x4\n" - "ldr s22, [x24], #0x4\n" - "ldr s25, [x23], #0x4\n" - "ldr s24, [x22], #0x4\n" - "ldr s19, [x21], #0x4\n" - "ldr s21, [x20], #0x4\n" + "ldr s29, [x26], #0x4\n" "mov x19, #0x1\n" + "ldr s25, [x25], #0x4\n" + "ldr s21, [x24], #0x4\n" + "ldr s27, [x23], #0x4\n" + "ldr s26, [x22], #0x4\n" + "ldr s19, [x21], #0x4\n" + "ldr s24, [x20], #0x4\n" "tbz %x[width], #0, 7f\n" "ld1 { v28.h }[2], [x27]\n" - "ld1 { v27.h }[2], [x26]\n" - "ld1 { v26.h }[2], [x25]\n" - "ld1 { v22.h }[2], [x24]\n" - "ld1 { v25.h }[2], [x23]\n" - "ld1 { v24.h }[2], [x22]\n" - "ld1 { v19.h }[2], [x21]\n" - "ld1 { v21.h }[2], [x20]\n" "mov x19, #0x2\n" + "ld1 { v29.h }[2], [x26]\n" + "ld1 { v25.h }[2], [x25]\n" + "ld1 { v21.h }[2], [x24]\n" + "ld1 { v27.h }[2], [x23]\n" + "ld1 { v26.h }[2], [x22]\n" + "ld1 { v19.h }[2], [x21]\n" + "ld1 { v24.h }[2], [x20]\n" "b 7f\n" "6:" // odd_loads_1_0 "ldr h28, [x27, #0x0]\n" - "ldr h27, [x26, #0x0]\n" - "ldr h26, [x25, #0x0]\n" - "ldr h22, [x24, #0x0]\n" - "ldr h25, [x23, #0x0]\n" - "ldr h24, [x22, #0x0]\n" - "ldr h19, [x21, #0x0]\n" - "ldr h21, [x20, #0x0]\n" "mov x19, #0x1\n" + "ldr h29, [x26, #0x0]\n" + "ldr h25, [x25, #0x0]\n" + "ldr h21, [x24, #0x0]\n" + "ldr h27, [x23, #0x0]\n" + "ldr h26, [x22, #0x0]\n" + "ldr h19, [x21, #0x0]\n" + "ldr h24, [x20, #0x0]\n" "7:" // Odd load end - "zip1 v23.4s, v28.4s, v26.4s\n" + "zip1 v22.4s, v28.4s, v25.4s\n" "subs x19, x19, #0x1\n" - "zip1 v20.4s, v27.4s, v22.4s\n" - "zip1 v16.4s, v23.4s, v20.4s\n" - "str q16, [%x[out_ptr], #0x0]\n" - "zip1 v18.4s, v25.4s, v19.4s\n" - "zip1 v16.4s, v24.4s, v21.4s\n" + "zip1 v20.4s, v29.4s, v21.4s\n" + "zip1 v23.4s, v22.4s, v20.4s\n" + "str q23, [%x[out_ptr], #0x0]\n" + "zip1 v18.4s, v27.4s, v19.4s\n" + "zip1 v16.4s, v26.4s, v24.4s\n" "zip1 v17.4s, v18.4s, v16.4s\n" "str q17, [%x[out_ptr], #0x10]\n" "add %x[out_ptr], %x[out_ptr], #0x20\n" "beq 8f\n" - "zip2 v23.4s, v23.4s, v20.4s\n" - "zip2 v16.4s, v18.4s, v16.4s\n" - "str q23, [%x[out_ptr], #0x0]\n" - "str q16, [%x[out_ptr], #0x10]\n" + "zip2 v22.4s, v22.4s, v20.4s\n" + "str q22, [%x[out_ptr], #0x0]\n" + "zip2 v20.4s, v18.4s, v16.4s\n" "subs x19, x19, #0x1\n" + "str q20, [%x[out_ptr], #0x10]\n" "add %x[out_ptr], %x[out_ptr], #0x20\n" "beq 8f\n" - "zip2 v26.4s, v28.4s, v26.4s\n" - "zip2 v22.4s, v27.4s, v22.4s\n" + "zip2 v28.4s, v28.4s, v25.4s\n" + "zip2 v25.4s, v29.4s, v21.4s\n" "subs x19, x19, #0x1\n" - "zip1 v20.4s, v26.4s, v22.4s\n" - "str q20, [%x[out_ptr], #0x0]\n" - "zip2 v19.4s, v25.4s, v19.4s\n" - "zip2 v18.4s, v24.4s, v21.4s\n" - "zip1 v16.4s, v19.4s, v18.4s\n" - "str q16, [%x[out_ptr], #0x10]\n" + "zip1 v21.4s, v28.4s, v25.4s\n" + "str q21, [%x[out_ptr], #0x0]\n" + "zip2 v19.4s, v27.4s, v19.4s\n" + "zip2 v16.4s, v26.4s, v24.4s\n" + "zip1 v18.4s, v19.4s, v16.4s\n" + "str q18, [%x[out_ptr], #0x10]\n" "add %x[out_ptr], %x[out_ptr], #0x20\n" "beq 8f\n" - "zip2 v17.4s, v26.4s, v22.4s\n" - "zip2 v16.4s, v19.4s, v18.4s\n" + "zip2 v17.4s, v28.4s, v25.4s\n" "str q17, [%x[out_ptr], #0x0]\n" + "zip2 v16.4s, v19.4s, v16.4s\n" "str q16, [%x[out_ptr], #0x10]\n" "add %x[out_ptr], %x[out_ptr], #0x20\n" "8:" // Odds skip - : [out_ptr] "+r" (out_ptr), [width] "+r" (width) + : [out_ptr] "+&r" (out_ptr), [width] "+&r" (width) : [height] "r" (height), [in] "r" (in), [row_offset] "r" (row_offset) - : "cc", "memory", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27" + : "cc", "memory", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27" ); } -- cgit v1.2.1