From 7d9a626aaba9837cb82d189a9c4f0bcef58825bb Mon Sep 17 00:00:00 2001 From: Michael Tyler Date: Wed, 1 Feb 2023 16:37:07 +0000 Subject: Update CPU kernels to remove x19 and w19 Resolves: COMPMID-5805 Change-Id: Idf720bbb136474810086f5089c5ed23b3f79835a Signed-off-by: Michael Tyler Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9081 Benchmark: Arm Jenkins Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Gunes Bayir Reviewed-by: Viet-Hoa Do --- .../a64_transpose_interleave_24_fp16fp32.hpp | 369 ++++++++++----------- 1 file changed, 184 insertions(+), 185 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24_fp16fp32.hpp') diff --git a/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24_fp16fp32.hpp b/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24_fp16fp32.hpp index 7bac8173e7..621c5f99ff 100644 --- a/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24_fp16fp32.hpp +++ b/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24_fp16fp32.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021, 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. */ #pragma once @@ -36,245 +36,244 @@ void a64_transpose_interleave_24_fp16fp32(float *out, const __fp16 *in, size_t w "cmp %x[height], #0x4\n" "blt 10f\n" "1:" // Main row loop: Head - "mov x24, %x[in]\n" - "mov x23, %x[out]\n" - "add x22, x24, %x[in_stride]\n" - "add x21, x22, %x[in_stride]\n" - "add x20, x21, %x[in_stride]\n" + "mov x25, %x[in]\n" + "mov x24, %x[width]\n" + "add x23, x25, %x[in_stride]\n" + "add x22, x23, %x[in_stride]\n" + "add x20, x22, %x[in_stride]\n" + "cmp x24, #0x18\n" "add %x[in], x20, %x[in_stride]\n" + "mov x21, %x[out]\n" "sub %x[height], %x[height], #0x4\n" - "mov x19, %x[width]\n" - "cmp x19, #0x18\n" "blt 3f\n" "2:" // Main row loop: Unroll column loop - "ldr q17, [x24], #0x10\n" - "fcvtl v3.4s, v17.4h\n" - "ldr q16, [x24], #0x10\n" - "sub x19, x19, #0x18\n" - "fcvtl2 v23.4s, v17.8h\n" - "ldr q17, [x22], #0x10\n" - "cmp x19, #0x18\n" - "fcvtl v22.4s, v16.4h\n" - "ldr q19, [x24], #0x10\n" - "fcvtl2 v2.4s, v16.8h\n" + "ldr q18, [x25], #0x10\n" + "ldr q17, [x23], #0x10\n" + "sub x24, x24, #0x18\n" + "fcvtl v26.4s, v18.4h\n" "ldr q16, [x22], #0x10\n" - "fcvtl v21.4s, v17.4h\n" - "ldr q18, [x21], #0x10\n" - "fcvtl2 v1.4s, v17.8h\n" - "ldr q0, [x20], #0x10\n" - "fcvtl v31.4s, v19.4h\n" + "ldr q25, [x20], #0x10\n" + "fcvtl2 v24.4s, v18.8h\n" + "fcvtl v5.4s, v17.4h\n" + "ldr q23, [x25], #0x10\n" + "ldr q22, [x23], #0x10\n" + "fcvtl v21.4s, v23.4h\n" + "fcvtl2 v4.4s, v17.8h\n" + "ldr q20, [x22], #0x10\n" + "ldr q3, [x20], #0x10\n" + "fcvtl v2.4s, v22.4h\n" + "fcvtl v1.4s, v16.4h\n" + "ldr q19, [x25], #0x10\n" + "ldr q18, [x23], #0x10\n" + "fcvtl2 v0.4s, v16.8h\n" + "fcvtl v31.4s, v20.4h\n" "ldr q17, [x22], #0x10\n" - "fcvtl2 v30.4s, v19.8h\n" - "fcvtl v29.4s, v16.4h\n" - "ldr q20, [x21], #0x10\n" - "fcvtl2 v28.4s, v16.8h\n" - "ldr q27, [x20], #0x10\n" - "fcvtl v19.4s, v18.4h\n" - "ldr q16, [x21], #0x10\n" - "fcvtl v26.4s, v17.4h\n" - "fcvtl2 v25.4s, v17.8h\n" - "ldr q24, [x20], #0x10\n" - "fcvtl2 v18.4s, v18.8h\n" - "str q3, [x23, #0x0]\n" - "fcvtl v17.4s, v20.4h\n" - "str q23, [x23, #0x10]\n" - "fcvtl2 v23.4s, v20.8h\n" - "str q22, [x23, #0x20]\n" - "fcvtl v22.4s, v16.4h\n" - "str q21, [x23, #0x30]\n" - "fcvtl2 v21.4s, v16.8h\n" - "str q1, [x23, #0x40]\n" - "fcvtl v16.4s, v0.4h\n" - "str q29, [x23, #0x50]\n" - "fcvtl2 v20.4s, v0.8h\n" - "str q19, [x23, #0x60]\n" - "fcvtl v19.4s, v27.4h\n" - "str q18, [x23, #0x70]\n" - "fcvtl2 v18.4s, v27.8h\n" - "str q17, [x23, #0x80]\n" - "fcvtl v17.4s, v24.4h\n" - "str q16, [x23, #0x90]\n" - "fcvtl2 v16.4s, v24.8h\n" - "str q20, [x23, #0xa0]\n" - "str q19, [x23, #0xb0]\n" - "add x23, x23, %x[out_stride]\n" - "str q2, [x23, #0x0]\n" - "str q31, [x23, #0x10]\n" - "str q30, [x23, #0x20]\n" - "str q28, [x23, #0x30]\n" - "str q26, [x23, #0x40]\n" - "str q25, [x23, #0x50]\n" - "str q23, [x23, #0x60]\n" - "str q22, [x23, #0x70]\n" - "str q21, [x23, #0x80]\n" - "str q18, [x23, #0x90]\n" - "str q17, [x23, #0xa0]\n" - "str q16, [x23, #0xb0]\n" - "add x23, x23, %x[out_stride]\n" + "ldr q16, [x20], #0x10\n" + "fcvtl v30.4s, v25.4h\n" + "fcvtl2 v29.4s, v25.8h\n" + "fcvtl v28.4s, v3.4h\n" + "str q26, [x21, #0x0]\n" + "cmp x24, #0x18\n" + "fcvtl2 v27.4s, v23.8h\n" + "str q24, [x21, #0x10]\n" + "fcvtl v26.4s, v19.4h\n" + "fcvtl2 v25.4s, v19.8h\n" + "str q21, [x21, #0x20]\n" + "fcvtl2 v24.4s, v22.8h\n" + "fcvtl v23.4s, v18.4h\n" + "str q5, [x21, #0x30]\n" + "fcvtl2 v22.4s, v18.8h\n" + "fcvtl2 v21.4s, v20.8h\n" + "str q4, [x21, #0x40]\n" + "fcvtl v20.4s, v17.4h\n" + "fcvtl2 v19.4s, v17.8h\n" + "str q2, [x21, #0x50]\n" + "fcvtl2 v18.4s, v3.8h\n" + "fcvtl v17.4s, v16.4h\n" + "str q1, [x21, #0x60]\n" + "fcvtl2 v16.4s, v16.8h\n" + "str q0, [x21, #0x70]\n" + "str q31, [x21, #0x80]\n" + "str q30, [x21, #0x90]\n" + "str q29, [x21, #0xa0]\n" + "str q28, [x21, #0xb0]\n" + "add x21, x21, %x[out_stride]\n" + "str q27, [x21, #0x0]\n" + "str q26, [x21, #0x10]\n" + "str q25, [x21, #0x20]\n" + "str q24, [x21, #0x30]\n" + "str q23, [x21, #0x40]\n" + "str q22, [x21, #0x50]\n" + "str q21, [x21, #0x60]\n" + "str q20, [x21, #0x70]\n" + "str q19, [x21, #0x80]\n" + "str q18, [x21, #0x90]\n" + "str q17, [x21, #0xa0]\n" + "str q16, [x21, #0xb0]\n" + "add x21, x21, %x[out_stride]\n" "bge 2b\n" "3:" // Main row loop: Unroll column loop skip - "cmp x19, #0xc\n" + "cmp x24, #0xc\n" "blt 5f\n" "4:" // Main row loop: Column loop - "ldr q17, [x24], #0x10\n" - "fcvtl v19.4s, v17.4h\n" - "ldr d16, [x24], #0x8\n" - "sub x19, x19, #0xc\n" - "fcvtl2 v27.4s, v17.8h\n" - "ldr q17, [x22], #0x10\n" - "cmp x19, #0xc\n" - "fcvtl v26.4s, v16.4h\n" - "ldr q16, [x21], #0x10\n" - "ldr q25, [x20], #0x10\n" - "fcvtl v24.4s, v17.4h\n" - "fcvtl2 v23.4s, v17.8h\n" - "ldr d18, [x22], #0x8\n" - "fcvtl v22.4s, v16.4h\n" - "ldr d17, [x21], #0x8\n" - "fcvtl2 v21.4s, v16.8h\n" + "ldr q16, [x25], #0x10\n" + "ldr q21, [x23], #0x10\n" + "sub x24, x24, #0xc\n" + "cmp x24, #0xc\n" + "ldr q20, [x22], #0x10\n" + "ldr q27, [x20], #0x10\n" + "fcvtl v19.4s, v16.4h\n" + "fcvtl2 v26.4s, v16.8h\n" + "ldr d16, [x25], #0x8\n" + "ldr d18, [x23], #0x8\n" + "fcvtl v25.4s, v16.4h\n" + "fcvtl v24.4s, v21.4h\n" + "ldr d17, [x22], #0x8\n" "ldr d16, [x20], #0x8\n" - "fcvtl v20.4s, v25.4h\n" - "str q19, [x23, #0x0]\n" - "fcvtl v19.4s, v18.4h\n" - "str q27, [x23, #0x10]\n" - "fcvtl2 v18.4s, v25.8h\n" - "str q26, [x23, #0x20]\n" - "fcvtl v17.4s, v17.4h\n" - "str q24, [x23, #0x30]\n" + "fcvtl2 v23.4s, v21.8h\n" + "fcvtl v22.4s, v18.4h\n" + "fcvtl v21.4s, v20.4h\n" + "fcvtl2 v20.4s, v20.8h\n" + "str q19, [x21, #0x0]\n" + "fcvtl v19.4s, v17.4h\n" + "fcvtl v18.4s, v27.4h\n" + "str q26, [x21, #0x10]\n" + "fcvtl2 v17.4s, v27.8h\n" "fcvtl v16.4s, v16.4h\n" - "str q23, [x23, #0x40]\n" - "str q19, [x23, #0x50]\n" - "str q22, [x23, #0x60]\n" - "str q21, [x23, #0x70]\n" - "str q17, [x23, #0x80]\n" - "str q20, [x23, #0x90]\n" - "str q18, [x23, #0xa0]\n" - "str q16, [x23, #0xb0]\n" - "add x23, x23, %x[out_stride]\n" + "str q25, [x21, #0x20]\n" + "str q24, [x21, #0x30]\n" + "str q23, [x21, #0x40]\n" + "str q22, [x21, #0x50]\n" + "str q21, [x21, #0x60]\n" + "str q20, [x21, #0x70]\n" + "str q19, [x21, #0x80]\n" + "str q18, [x21, #0x90]\n" + "str q17, [x21, #0xa0]\n" + "str q16, [x21, #0xb0]\n" + "add x21, x21, %x[out_stride]\n" "bge 4b\n" "5:" // Main row loop: Column loop skip - "cmp x19, #0x4\n" + "cmp x24, #0x4\n" "blt 7f\n" "6:" // Main row loop: width 4 loop: loop - "ldr d16, [x24], #0x8\n" - "fcvtl v19.4s, v16.4h\n" - "ldr d16, [x22], #0x8\n" - "sub x19, x19, #0x4\n" - "fcvtl v18.4s, v16.4h\n" - "ldr d16, [x21], #0x8\n" - "cmp x19, #0x4\n" - "fcvtl v17.4s, v16.4h\n" + "ldr d19, [x25], #0x8\n" + "ldr d18, [x23], #0x8\n" + "sub x24, x24, #0x4\n" + "cmp x24, #0x4\n" + "ldr d17, [x22], #0x8\n" "ldr d16, [x20], #0x8\n" - "str q19, [x23, #0x0]\n" + "fcvtl v19.4s, v19.4h\n" + "fcvtl v18.4s, v18.4h\n" + "fcvtl v17.4s, v17.4h\n" "fcvtl v16.4s, v16.4h\n" - "str q18, [x23, #0x30]\n" - "str q17, [x23, #0x60]\n" - "str q16, [x23, #0x90]\n" - "add x23, x23, #0x10\n" + "str q19, [x21, #0x0]\n" + "str q18, [x21, #0x30]\n" + "str q17, [x21, #0x60]\n" + "str q16, [x21, #0x90]\n" + "add x21, x21, #0x10\n" "bge 6b\n" "7:" // Main row loop: width 4 loop: skip - "cmp x19, #0x1\n" + "cmp x24, #0x1\n" "blt 9f\n" "8:" // Main row loop: width 1 loop: loop - "ldr h16, [x24], #0x2\n" - "fcvtl v19.4s, v16.4h\n" - "ldr h16, [x22], #0x2\n" - "sub x19, x19, #0x1\n" - "fcvtl v18.4s, v16.4h\n" - "ldr h16, [x21], #0x2\n" - "cmp x19, #0x1\n" - "fcvtl v17.4s, v16.4h\n" + "ldr h19, [x25], #0x2\n" + "ldr h18, [x23], #0x2\n" + "sub x24, x24, #0x1\n" + "cmp x24, #0x1\n" + "ldr h17, [x22], #0x2\n" "ldr h16, [x20], #0x2\n" - "str s19, [x23, #0x0]\n" + "fcvtl v19.4s, v19.4h\n" + "fcvtl v18.4s, v18.4h\n" + "fcvtl v17.4s, v17.4h\n" "fcvtl v16.4s, v16.4h\n" - "str s18, [x23, #0x30]\n" - "str s17, [x23, #0x60]\n" - "str s16, [x23, #0x90]\n" - "add x23, x23, #0x4\n" + "str s19, [x21, #0x0]\n" + "str s18, [x21, #0x30]\n" + "str s17, [x21, #0x60]\n" + "str s16, [x21, #0x90]\n" + "add x21, x21, #0x4\n" "bge 8b\n" "9:" // Main row loop: width 1 loop: skip - "add %x[out], %x[out], #0xc0\n" "cmp %x[height], #0x4\n" + "add %x[out], %x[out], #0xc0\n" "bge 1b\n" "cbz %x[height], 20f\n" "10:" // Main loop skip - "11:" // Tail row loop: Head - "mov x24, %x[in]\n" - "mov x23, %x[out]\n" - "add %x[in], x24, %x[in_stride]\n" + "mov x20, %x[width]\n" + "mov x25, %x[in]\n" + "cmp x20, #0x18\n" + "add %x[in], x25, %x[in_stride]\n" + "mov x21, %x[out]\n" "sub %x[height], %x[height], #0x1\n" - "mov x19, %x[width]\n" - "cmp x19, #0x18\n" "blt 13f\n" "12:" // Tail row loop: Unroll column loop - "ldr q16, [x24], #0x10\n" - "fcvtl v20.4s, v16.4h\n" - "ldr q18, [x24], #0x10\n" - "sub x19, x19, #0x18\n" + "ldr q16, [x25], #0x10\n" + "ldr q20, [x25], #0x10\n" + "sub x20, x20, #0x18\n" + "fcvtl v18.4s, v16.4h\n" + "ldr q19, [x25], #0x10\n" "fcvtl2 v17.4s, v16.8h\n" - "ldr q19, [x24], #0x10\n" - "fcvtl v16.4s, v18.4h\n" - "cmp x19, #0x18\n" - "fcvtl2 v18.4s, v18.8h\n" - "str q20, [x23, #0x0]\n" - "str q17, [x23, #0x10]\n" + "fcvtl v16.4s, v20.4h\n" + "str q18, [x21, #0x0]\n" + "str q17, [x21, #0x10]\n" + "cmp x20, #0x18\n" + "fcvtl2 v18.4s, v20.8h\n" "fcvtl v17.4s, v19.4h\n" - "str q16, [x23, #0x20]\n" - "add x23, x23, %x[out_stride]\n" + "str q16, [x21, #0x20]\n" + "add x21, x21, %x[out_stride]\n" "fcvtl2 v16.4s, v19.8h\n" - "str q18, [x23, #0x0]\n" - "str q17, [x23, #0x10]\n" - "str q16, [x23, #0x20]\n" - "add x23, x23, %x[out_stride]\n" + "str q18, [x21, #0x0]\n" + "str q17, [x21, #0x10]\n" + "str q16, [x21, #0x20]\n" + "add x21, x21, %x[out_stride]\n" "bge 12b\n" "13:" // Tail row loop: Unroll column loop skip - "cmp x19, #0xc\n" + "cmp x20, #0xc\n" "blt 15f\n" "14:" // Tail row loop: Column loop - "ldr q17, [x24], #0x10\n" - "fcvtl v18.4s, v17.4h\n" - "ldr d16, [x24], #0x8\n" - "sub x19, x19, #0xc\n" + "ldr q17, [x25], #0x10\n" + "ldr d18, [x25], #0x8\n" + "sub x20, x20, #0xc\n" + "cmp x20, #0xc\n" + "fcvtl v16.4s, v17.4h\n" "fcvtl2 v17.4s, v17.8h\n" - "str q18, [x23, #0x0]\n" - "fcvtl v16.4s, v16.4h\n" - "str q17, [x23, #0x10]\n" - "cmp x19, #0xc\n" - "str q16, [x23, #0x20]\n" - "add x23, x23, %x[out_stride]\n" + "str q16, [x21, #0x0]\n" + "fcvtl v16.4s, v18.4h\n" + "str q17, [x21, #0x10]\n" + "str q16, [x21, #0x20]\n" + "add x21, x21, %x[out_stride]\n" "bge 14b\n" "15:" // Tail row loop: Column loop skip - "cmp x19, #0x4\n" + "cmp x20, #0x4\n" "blt 17f\n" "16:" // Tail row loop: width 4 loop: loop - "ldr d16, [x24], #0x8\n" + "ldr d16, [x25], #0x8\n" + "sub x20, x20, #0x4\n" + "cmp x20, #0x4\n" "fcvtl v16.4s, v16.4h\n" - "str q16, [x23, #0x0]\n" - "sub x19, x19, #0x4\n" - "add x23, x23, #0x10\n" - "cmp x19, #0x4\n" + "str q16, [x21, #0x0]\n" + "add x21, x21, #0x10\n" "bge 16b\n" "17:" // Tail row loop: width 4 loop: skip - "cmp x19, #0x1\n" + "cmp x20, #0x1\n" "blt 19f\n" "18:" // Tail row loop: width 1 loop: loop - "ldr h16, [x24], #0x2\n" + "ldr h16, [x25], #0x2\n" + "sub x20, x20, #0x1\n" + "cmp x20, #0x1\n" "fcvtl v16.4s, v16.4h\n" - "str s16, [x23, #0x0]\n" - "sub x19, x19, #0x1\n" - "add x23, x23, #0x4\n" - "cmp x19, #0x1\n" + "str s16, [x21, #0x0]\n" + "add x21, x21, #0x4\n" "bge 18b\n" "19:" // Tail row loop: width 1 loop: skip - "add %x[out], %x[out], #0x30\n" "cmp %x[height], #0x1\n" + "add %x[out], %x[out], #0x30\n" "bge 11b\n" "20:" // Done : [height] "+&r" (height), [in] "+&r" (in), [out] "+&r" (out) : [in_stride] "r" (in_stride), [out_stride] "r" (out_stride), [width] "r" (width) - : "cc", "memory", "v0", "v1", "v2", "v3", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31", "x19", "x20", "x21", "x22", "x23", "x24" + : "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31", "x20", "x21", "x22", "x23", "x24", "x25" ); } -- cgit v1.2.1