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_transpose_interleave_16VL_2x2.hpp | 136 ++++++++++----------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_16VL_2x2.hpp') diff --git a/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_16VL_2x2.hpp b/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_16VL_2x2.hpp index af1649fc8a..96128cf9c2 100644 --- a/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_16VL_2x2.hpp +++ b/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_16VL_2x2.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. */ #pragma once @@ -43,86 +43,86 @@ void sme_transpose_interleave_16VL_2x2(uint16_t *out, const uint16_t *in, size_t ".inst 0xd503477f // SMSTART ZA\n" "ptrue p5.b\n" "1:" // Main row loop: Head - "mov x23, %x[in]\n" - "add x22, x23, %x[in_stride]\n" + "mov x24, %x[in]\n" + "add x23, x24, %x[in_stride]\n" "cmp %x[height], #0x1\n" - "add %x[in], x22, %x[in_stride]\n" - "mov x21, %x[out]\n" - "csel x22, x22, %x[pad_row], GT\n" + "add %x[in], x23, %x[in_stride]\n" + "mov x22, %x[out]\n" + "csel x23, x23, %x[pad_row], GT\n" "sub %x[height], %x[height], #0x2\n" - "mov x20, %x[width]\n" + "mov x21, %x[width]\n" "2:" // Main row loop: Column loop - "mov x19, x20\n" - "whilelt p2.h, XZR, x19\n" - "ld1h { z17.h }, p2/Z, [x23]\n" - "dech x19\n" - "whilelt p1.h, XZR, x19\n" - "ld1h { z19.h }, p1/Z, [x23, #1, MUL VL]\n" - "dech x19\n" - "whilelt p0.h, XZR, x19\n" - "ld1h { z21.h }, p0/Z, [x23, #2, MUL VL]\n" - "dech x19\n" - "whilelt p4.h, XZR, x19\n" - "ld1h { z20.h }, p4/Z, [x23, #3, MUL VL]\n" - "dech x19\n" - "whilelt p3.h, XZR, x19\n" - "ld1h { z16.h }, p2/Z, [x22]\n" + "mov x20, x21\n" + "whilelt p2.h, XZR, x20\n" + "ld1h { z17.h }, p2/Z, [x24]\n" + "dech x20\n" + "whilelt p1.h, XZR, x20\n" + "ld1h { z19.h }, p1/Z, [x24, #1, MUL VL]\n" + "dech x20\n" + "whilelt p0.h, XZR, x20\n" + "ld1h { z21.h }, p0/Z, [x24, #2, MUL VL]\n" + "dech x20\n" + "whilelt p4.h, XZR, x20\n" + "ld1h { z20.h }, p4/Z, [x24, #3, MUL VL]\n" + "dech x20\n" + "whilelt p3.h, XZR, x20\n" + "ld1h { z16.h }, p2/Z, [x23]\n" "zip1 z0.h, z17.h, z16.h\n" - "dech x19\n" - "whilelt p2.h, XZR, x19\n" - "ld1h { z18.h }, p1/Z, [x22, #1, MUL VL]\n" + "dech x20\n" + "whilelt p2.h, XZR, x20\n" + "ld1h { z18.h }, p1/Z, [x23, #1, MUL VL]\n" "zip2 z31.h, z17.h, z16.h\n" - "dech x19\n" - "whilelt p1.h, XZR, x19\n" - "ld1h { z17.h }, p0/Z, [x22, #2, MUL VL]\n" + "dech x20\n" + "whilelt p1.h, XZR, x20\n" + "ld1h { z17.h }, p0/Z, [x23, #2, MUL VL]\n" "zip1 z30.h, z19.h, z18.h\n" - "dech x19\n" - "whilelt p0.h, XZR, x19\n" - "ld1h { z16.h }, p4/Z, [x22, #3, MUL VL]\n" + "dech x20\n" + "whilelt p0.h, XZR, x20\n" + "ld1h { z16.h }, p4/Z, [x23, #3, MUL VL]\n" "zip2 z29.h, z19.h, z18.h\n" - "ld1h { z19.h }, p3/Z, [x23, #4, MUL VL]\n" - "mov x19, x21\n" - "decw x20, ALL, MUL #16\n" + "ld1h { z19.h }, p3/Z, [x24, #4, MUL VL]\n" + "mov x20, x22\n" + "decw x21, ALL, MUL #16\n" "zip1 z28.h, z21.h, z17.h\n" - "ld1h { z18.h }, p2/Z, [x23, #5, MUL VL]\n" + "ld1h { z18.h }, p2/Z, [x24, #5, MUL VL]\n" "zip2 z27.h, z21.h, z17.h\n" "zip1 z26.h, z20.h, z16.h\n" - "cmp x20, #0x0\n" - "ld1h { z17.h }, p1/Z, [x23, #6, MUL VL]\n" + "cmp x21, #0x0\n" + "ld1h { z17.h }, p1/Z, [x24, #6, MUL VL]\n" "zip2 z25.h, z20.h, z16.h\n" - "add x21, x21, %x[out_stride]\n" - "ld1h { z24.h }, p0/Z, [x23, #7, MUL VL]\n" - "addvl x23, x23, #8\n" - "ld1h { z16.h }, p3/Z, [x22, #4, MUL VL]\n" + "add x22, x22, %x[out_stride]\n" + "ld1h { z24.h }, p0/Z, [x24, #7, MUL VL]\n" + "addvl x24, x24, #8\n" + "ld1h { z16.h }, p3/Z, [x23, #4, MUL VL]\n" "zip1 z23.h, z19.h, z16.h\n" "zip2 z22.h, z19.h, z16.h\n" - "ld1h { z16.h }, p2/Z, [x22, #5, MUL VL]\n" + "ld1h { z16.h }, p2/Z, [x23, #5, MUL VL]\n" "zip1 z21.h, z18.h, z16.h\n" "zip2 z20.h, z18.h, z16.h\n" - "ld1h { z16.h }, p1/Z, [x22, #6, MUL VL]\n" + "ld1h { z16.h }, p1/Z, [x23, #6, MUL VL]\n" "zip1 z19.h, z17.h, z16.h\n" "zip2 z18.h, z17.h, z16.h\n" - "ld1h { z16.h }, p0/Z, [x22, #7, MUL VL]\n" - "st1h { z0.h }, p5, [x19]\n" - "addvl x22, x22, #8\n" + "ld1h { z16.h }, p0/Z, [x23, #7, MUL VL]\n" + "st1h { z0.h }, p5, [x20]\n" + "addvl x23, x23, #8\n" "zip1 z17.h, z24.h, z16.h\n" - "st1h { z31.h }, p5, [x19, #1, MUL VL]\n" + "st1h { z31.h }, p5, [x20, #1, MUL VL]\n" "zip2 z16.h, z24.h, z16.h\n" - "st1h { z30.h }, p5, [x19, #2, MUL VL]\n" - "st1h { z29.h }, p5, [x19, #3, MUL VL]\n" - "st1h { z28.h }, p5, [x19, #4, MUL VL]\n" - "st1h { z27.h }, p5, [x19, #5, MUL VL]\n" - "st1h { z26.h }, p5, [x19, #6, MUL VL]\n" - "st1h { z25.h }, p5, [x19, #7, MUL VL]\n" - "addvl x19, x19, #16\n" - "st1h { z23.h }, p5, [x19, #-8, MUL VL]\n" - "st1h { z22.h }, p5, [x19, #-7, MUL VL]\n" - "st1h { z21.h }, p5, [x19, #-6, MUL VL]\n" - "st1h { z20.h }, p5, [x19, #-5, MUL VL]\n" - "st1h { z19.h }, p5, [x19, #-4, MUL VL]\n" - "st1h { z18.h }, p5, [x19, #-3, MUL VL]\n" - "st1h { z17.h }, p5, [x19, #-2, MUL VL]\n" - "st1h { z16.h }, p5, [x19, #-1, MUL VL]\n" + "st1h { z30.h }, p5, [x20, #2, MUL VL]\n" + "st1h { z29.h }, p5, [x20, #3, MUL VL]\n" + "st1h { z28.h }, p5, [x20, #4, MUL VL]\n" + "st1h { z27.h }, p5, [x20, #5, MUL VL]\n" + "st1h { z26.h }, p5, [x20, #6, MUL VL]\n" + "st1h { z25.h }, p5, [x20, #7, MUL VL]\n" + "addvl x20, x20, #16\n" + "st1h { z23.h }, p5, [x20, #-8, MUL VL]\n" + "st1h { z22.h }, p5, [x20, #-7, MUL VL]\n" + "st1h { z21.h }, p5, [x20, #-6, MUL VL]\n" + "st1h { z20.h }, p5, [x20, #-5, MUL VL]\n" + "st1h { z19.h }, p5, [x20, #-4, MUL VL]\n" + "st1h { z18.h }, p5, [x20, #-3, MUL VL]\n" + "st1h { z17.h }, p5, [x20, #-2, MUL VL]\n" + "st1h { z16.h }, p5, [x20, #-1, MUL VL]\n" "bgt 2b\n" "3:" // Main row loop: Column loop skip "cmp %x[height], #0x1\n" @@ -131,7 +131,7 @@ void sme_transpose_interleave_16VL_2x2(uint16_t *out, const uint16_t *in, size_t ".inst 0xd503467f // SMSTOP\n" : [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", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", "x19", "x20", "x21", "x22", "x23", "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", "x20", "x21", "x22", "x23", "x24", "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