Revert "Update CPU kernels to remove x19"
This reverts commit 3c59f01c209d2732a15d97d65565ead964787a8b.
Resolves: COMPMID-5817
Change-Id: Ie2443a21854a95db1e3d0cafa2121c0187a5e237
Signed-off-by: Michael Tyler <michael.tyler@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8974
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
diff --git a/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_4VL_2x2.hpp b/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_4VL_2x2.hpp
index 8badde5..d1534db 100644
--- a/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_4VL_2x2.hpp
+++ b/src/core/NEON/kernels/arm_gemm/transforms/sme_transpose_interleave_4VL_2x2.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022-2023 Arm Limited.
+ * Copyright (c) 2022 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
@@ -45,50 +45,50 @@
"ptrue p2.b\n"
"blt 4f\n"
"1:" // Main row loop: Head
- "mov x26, %x[in]\n"
- "add x25, x26, %x[in_stride]\n"
+ "mov x25, %x[in]\n"
"add x24, x25, %x[in_stride]\n"
"add x23, x24, %x[in_stride]\n"
- "add %x[in], x23, %x[in_stride]\n"
- "mov x22, %x[out]\n"
+ "add x22, x23, %x[in_stride]\n"
+ "add %x[in], x22, %x[in_stride]\n"
+ "mov x21, %x[out]\n"
"sub %x[height], %x[height], #0x4\n"
- "mov x21, %x[width]\n"
+ "mov x20, %x[width]\n"
"2:" // Main row loop: Column loop
- "mov x20, x21\n"
- "whilelt p1.h, XZR, x20\n"
- "ld1h { z19.h }, p1/Z, [x26]\n"
- "dech x20\n"
- "whilelt p0.h, XZR, x20\n"
- "ld1h { z18.h }, p0/Z, [x26, #1, MUL VL]\n"
- "ld1h { z17.h }, p1/Z, [x25]\n"
- "decw x21, ALL, MUL #4\n"
- "cmp x21, #0x0\n"
- "zip1 z24.h, z19.h, z17.h\n"
- "ld1h { z16.h }, p0/Z, [x25, #1, MUL VL]\n"
- "addvl x26, x26, #2\n"
- "addvl x25, x25, #2\n"
- "zip2 z23.h, z19.h, z17.h\n"
+ "mov x19, x20\n"
+ "whilelt p1.h, XZR, x19\n"
+ "ld1h { z19.h }, p1/Z, [x25]\n"
+ "dech x19\n"
+ "whilelt p0.h, XZR, x19\n"
+ "ld1h { z18.h }, p0/Z, [x25, #1, MUL VL]\n"
"ld1h { z17.h }, p1/Z, [x24]\n"
+ "decw x20, ALL, MUL #4\n"
+ "cmp x20, #0x0\n"
+ "zip1 z24.h, z19.h, z17.h\n"
+ "ld1h { z16.h }, p0/Z, [x24, #1, MUL VL]\n"
+ "addvl x25, x25, #2\n"
+ "addvl x24, x24, #2\n"
+ "zip2 z23.h, z19.h, z17.h\n"
+ "ld1h { z17.h }, p1/Z, [x23]\n"
"zip1 z22.h, z18.h, z16.h\n"
"zip2 z21.h, z18.h, z16.h\n"
- "ld1h { z20.h }, p0/Z, [x24, #1, MUL VL]\n"
- "addvl x24, x24, #2\n"
- "ld1h { z16.h }, p1/Z, [x23]\n"
+ "ld1h { z20.h }, p0/Z, [x23, #1, MUL VL]\n"
+ "addvl x23, x23, #2\n"
+ "ld1h { z16.h }, p1/Z, [x22]\n"
"zip1 z19.h, z17.h, z16.h\n"
"zip2 z18.h, z17.h, z16.h\n"
- "ld1h { z16.h }, p0/Z, [x23, #1, MUL VL]\n"
- "addvl x23, x23, #2\n"
+ "ld1h { z16.h }, p0/Z, [x22, #1, MUL VL]\n"
+ "addvl x22, x22, #2\n"
"zip1 z17.h, z20.h, z16.h\n"
"zip2 z16.h, z20.h, z16.h\n"
- "st1h { z24.h }, p2, [x22]\n"
- "st1h { z23.h }, p2, [x22, #1, MUL VL]\n"
- "st1h { z22.h }, p2, [x22, #2, MUL VL]\n"
- "st1h { z21.h }, p2, [x22, #3, MUL VL]\n"
- "st1h { z19.h }, p2, [x22, #4, MUL VL]\n"
- "st1h { z18.h }, p2, [x22, #5, MUL VL]\n"
- "st1h { z17.h }, p2, [x22, #6, MUL VL]\n"
- "st1h { z16.h }, p2, [x22, #7, MUL VL]\n"
- "add x22, x22, %x[out_stride]\n"
+ "st1h { z24.h }, p2, [x21]\n"
+ "st1h { z23.h }, p2, [x21, #1, MUL VL]\n"
+ "st1h { z22.h }, p2, [x21, #2, MUL VL]\n"
+ "st1h { z21.h }, p2, [x21, #3, MUL VL]\n"
+ "st1h { z19.h }, p2, [x21, #4, MUL VL]\n"
+ "st1h { z18.h }, p2, [x21, #5, MUL VL]\n"
+ "st1h { z17.h }, p2, [x21, #6, MUL VL]\n"
+ "st1h { z16.h }, p2, [x21, #7, MUL VL]\n"
+ "add x21, x21, %x[out_stride]\n"
"bgt 2b\n"
"3:" // Main row loop: Column loop skip
"cmp %x[height], #0x4\n"
@@ -97,36 +97,36 @@
"cbz %x[height], 8f\n"
"4:" // Main loop skip
"5:" // Tail row loop: Head
- "mov x26, %x[in]\n"
- "add x25, x26, %x[in_stride]\n"
+ "mov x25, %x[in]\n"
+ "add x24, x25, %x[in_stride]\n"
"cmp %x[height], #0x1\n"
- "add %x[in], x25, %x[in_stride]\n"
- "mov x22, %x[out]\n"
- "csel x25, x25, %x[pad_row], GT\n"
+ "add %x[in], x24, %x[in_stride]\n"
+ "mov x21, %x[out]\n"
+ "csel x24, x24, %x[pad_row], GT\n"
"sub %x[height], %x[height], #0x2\n"
- "mov x21, %x[width]\n"
+ "mov x20, %x[width]\n"
"6:" // Tail row loop: Column loop
- "mov x20, x21\n"
- "whilelt p1.h, XZR, x20\n"
- "ld1h { z18.h }, p1/Z, [x26]\n"
- "dech x20\n"
- "whilelt p0.h, XZR, x20\n"
- "ld1h { z20.h }, p0/Z, [x26, #1, MUL VL]\n"
- "ld1h { z17.h }, p1/Z, [x25]\n"
- "decw x21, ALL, MUL #4\n"
- "cmp x21, #0x0\n"
+ "mov x19, x20\n"
+ "whilelt p1.h, XZR, x19\n"
+ "ld1h { z18.h }, p1/Z, [x25]\n"
+ "dech x19\n"
+ "whilelt p0.h, XZR, x19\n"
+ "ld1h { z20.h }, p0/Z, [x25, #1, MUL VL]\n"
+ "ld1h { z17.h }, p1/Z, [x24]\n"
+ "decw x20, ALL, MUL #4\n"
+ "cmp x20, #0x0\n"
"zip1 z19.h, z18.h, z17.h\n"
- "ld1h { z16.h }, p0/Z, [x25, #1, MUL VL]\n"
- "addvl x26, x26, #2\n"
+ "ld1h { z16.h }, p0/Z, [x24, #1, MUL VL]\n"
"addvl x25, x25, #2\n"
+ "addvl x24, x24, #2\n"
"zip2 z18.h, z18.h, z17.h\n"
"zip1 z17.h, z20.h, z16.h\n"
"zip2 z16.h, z20.h, z16.h\n"
- "st1h { z19.h }, p2, [x22]\n"
- "st1h { z18.h }, p2, [x22, #1, MUL VL]\n"
- "st1h { z17.h }, p2, [x22, #2, MUL VL]\n"
- "st1h { z16.h }, p2, [x22, #3, MUL VL]\n"
- "add x22, x22, %x[out_stride]\n"
+ "st1h { z19.h }, p2, [x21]\n"
+ "st1h { z18.h }, p2, [x21, #1, MUL VL]\n"
+ "st1h { z17.h }, p2, [x21, #2, MUL VL]\n"
+ "st1h { z16.h }, p2, [x21, #3, MUL VL]\n"
+ "add x21, x21, %x[out_stride]\n"
"bgt 6b\n"
"7:" // Tail row loop: Column loop skip
"cmp %x[height], #0x1\n"
@@ -136,7 +136,7 @@
".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", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "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", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "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"
);
}