Update CPU kernels to remove x19 and w19
Resolves: COMPMID-5805
Change-Id: Idf720bbb136474810086f5089c5ed23b3f79835a
Signed-off-by: Michael Tyler <michael.tyler@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9081
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Reviewed-by: Viet-Hoa Do <viet-hoa.do@arm.com>
diff --git a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8.hpp b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8.hpp
index 49d1aa5..465939c 100644
--- a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8.hpp
+++ b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/sme_interleave4VL_block4_s8_s8.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,92 +34,92 @@
__asm__ __volatile__(
".inst 0xd503477f // SMSTART ZA\n"
+ "cntw x16\n"
"cntw x15\n"
- "cntw x14\n"
- "cntw x13, ALL, MUL #2\n"
- "cntw x11, ALL, MUL #3\n"
- "cmp %x[height], x15\n"
- "csel x15, %x[height], x15, LT\n"
+ "cntw x14, ALL, MUL #2\n"
+ "cntw x13, ALL, MUL #3\n"
+ "cmp %x[height], x16\n"
+ "csel x16, %x[height], x16, LT\n"
"whilelt p12.b, XZR, %x[height]\n"
- "whilelt p10.b, x14, %x[height]\n"
- "whilelt p9.b, x13, %x[height]\n"
- "whilelt p8.b, x11, %x[height]\n"
+ "whilelt p10.b, x15, %x[height]\n"
+ "whilelt p9.b, x14, %x[height]\n"
+ "whilelt p8.b, x13, %x[height]\n"
"zip1 p12.b, p12.b, p9.b\n"
"zip1 p10.b, p10.b, p8.b\n"
- "mov x10, #0x0\n"
- "cntb x9\n"
+ "mov x11, #0x0\n"
+ "cntb x10\n"
"ptrue p11.s\n"
- "sub x15, x15, #0x1\n"
+ "sub x16, x16, #0x1\n"
"zip1 p10.b, p12.b, p10.b\n"
- "mov x28, %x[row_offset]\n"
- "mov x27, %x[out]\n"
- "whilelt p9.b, x10, %x[width]\n"
- "whilelt p8.b, x10, %x[width]\n"
+ "mov x9, %x[row_offset]\n"
+ "mov x28, %x[out]\n"
+ "whilelt p9.b, x11, %x[width]\n"
+ "whilelt p8.b, x11, %x[width]\n"
"1:" // Width loop
- "add x26, %x[in], XZR, LSL #3\n"
- "add x25, %x[in], x14, LSL #3\n"
- "ldr x24, [x26], #0x8\n"
+ "add x27, %x[in], XZR, LSL #3\n"
+ "add x26, %x[in], x15, LSL #3\n"
+ "ldr x25, [x27], #0x8\n"
+ "add x24, %x[in], x14, LSL #3\n"
"add x23, %x[in], x13, LSL #3\n"
- "add x22, %x[in], x11, LSL #3\n"
- "ldr x19, [x25], #0x8\n"
+ "ldr x20, [x26], #0x8\n"
"mov x12, #0x0\n"
+ "ldr x22, [x24], #0x8\n"
"ldr x21, [x23], #0x8\n"
- "ldr x20, [x22], #0x8\n"
- "cbz x15, 3f\n"
+ "cbz x16, 3f\n"
"2:" // Loads: Loop
".inst 0x25246140 // psel p0.b, p8.b/Z, p10.b[w12]\n"
- ".inst 0xe01c0300 // ld1b { za0h.b[x12] }, p0/Z, [x24, x28]\n"
+ ".inst 0xe0090320 // ld1b { za0h.b[x12] }, p0/Z, [x25, x9]\n"
".inst 0x252c6140 // psel p0.b, p8.b/Z, p10.b[w12, #1]\n"
- "ldr x24, [x26], #0x8\n"
- ".inst 0xe01c0261 // ld1b { za0h.b[x12, #1] }, p0/Z, [x19, x28]\n"
+ "ldr x25, [x27], #0x8\n"
+ ".inst 0xe0090281 // ld1b { za0h.b[x12, #1] }, p0/Z, [x20, x9]\n"
".inst 0x25346141 // psel p1.b, p8.b/Z, p10.b[w12, #2]\n"
".inst 0x253c6140 // psel p0.b, p8.b/Z, p10.b[w12, #3]\n"
- "ldr x19, [x25], #0x8\n"
- ".inst 0xe01c06a2 // ld1b { za0h.b[x12, #2] }, p1/Z, [x21, x28]\n"
- "ldr x21, [x23], #0x8\n"
- ".inst 0xe01c0283 // ld1b { za0h.b[x12, #3] }, p0/Z, [x20, x28]\n"
+ "ldr x20, [x26], #0x8\n"
+ ".inst 0xe00906c2 // ld1b { za0h.b[x12, #2] }, p1/Z, [x22, x9]\n"
+ "ldr x22, [x24], #0x8\n"
+ ".inst 0xe00902a3 // ld1b { za0h.b[x12, #3] }, p0/Z, [x21, x9]\n"
"add x12, x12, #0x4\n"
- "cmp x12, x15, LSL #2\n"
- "ldr x20, [x22], #0x8\n"
+ "cmp x12, x16, LSL #2\n"
+ "ldr x21, [x23], #0x8\n"
"blt 2b\n"
"3:" // Loads: Tail
".inst 0x25246140 // psel p0.b, p8.b/Z, p10.b[w12]\n"
- ".inst 0xe01c0300 // ld1b { za0h.b[x12] }, p0/Z, [x24, x28]\n"
+ ".inst 0xe0090320 // ld1b { za0h.b[x12] }, p0/Z, [x25, x9]\n"
".inst 0x252c6140 // psel p0.b, p8.b/Z, p10.b[w12, #1]\n"
- ".inst 0xe01c0261 // ld1b { za0h.b[x12, #1] }, p0/Z, [x19, x28]\n"
+ ".inst 0xe0090281 // ld1b { za0h.b[x12, #1] }, p0/Z, [x20, x9]\n"
".inst 0x25346140 // psel p0.b, p8.b/Z, p10.b[w12, #2]\n"
- "sub x19, %x[width], x10\n"
- ".inst 0xe01c02a2 // ld1b { za0h.b[x12, #2] }, p0/Z, [x21, x28]\n"
- "cmp x19, x9\n"
- "csel x19, x19, x9, LT\n"
+ "sub x20, %x[width], x11\n"
+ ".inst 0xe00902c2 // ld1b { za0h.b[x12, #2] }, p0/Z, [x22, x9]\n"
+ "cmp x20, x10\n"
+ "csel x20, x20, x10, LT\n"
".inst 0x253c6140 // psel p0.b, p8.b/Z, p10.b[w12, #3]\n"
- "add x19, x19, #0x3\n"
- ".inst 0xe01c0283 // ld1b { za0h.b[x12, #3] }, p0/Z, [x20, x28]\n"
+ "add x20, x20, #0x3\n"
+ ".inst 0xe00902a3 // ld1b { za0h.b[x12, #3] }, p0/Z, [x21, x9]\n"
"mov x12, #0x0\n"
- "lsr x19, x19, #0x2\n"
+ "lsr x20, x20, #0x2\n"
"4:" // Stores: Loop
".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n"
- ".inst 0xe0bf8360 // st1w { za0v.s[x12] }, p0/Z, [x27, XZR, LSL #2]\n"
+ ".inst 0xe0bf8380 // st1w { za0v.s[x12] }, p0/Z, [x28, XZR, LSL #2]\n"
".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n"
- ".inst 0xe0ae8364 // st1w { za1v.s[x12] }, p0/Z, [x27, x14, LSL #2]\n"
+ ".inst 0xe0af8384 // st1w { za1v.s[x12] }, p0/Z, [x28, x15, LSL #2]\n"
".inst 0x25306d21 // psel p1.s, p11.s/Z, p9.s[w12]\n"
".inst 0x25306d20 // psel p0.s, p11.s/Z, p9.s[w12]\n"
- ".inst 0xe0ad8768 // st1w { za2v.s[x12] }, p1/Z, [x27, x13, LSL #2]\n"
- ".inst 0xe0ab836c // st1w { za3v.s[x12] }, p0/Z, [x27, x11, LSL #2]\n"
+ ".inst 0xe0ae8788 // st1w { za2v.s[x12] }, p1/Z, [x28, x14, LSL #2]\n"
+ ".inst 0xe0ad838c // st1w { za3v.s[x12] }, p0/Z, [x28, x13, LSL #2]\n"
"add x12, x12, #0x1\n"
- "cmp x12, x19\n"
- "addvl x27, x27, #4\n"
+ "cmp x12, x20\n"
+ "addvl x28, x28, #4\n"
"blt 4b\n"
- "incb x10\n"
- "whilelt p9.b, x10, %x[width]\n"
- "whilelt p8.b, x10, %x[width]\n"
- "incb x28\n"
+ "incb x11\n"
+ "whilelt p9.b, x11, %x[width]\n"
+ "whilelt p8.b, x11, %x[width]\n"
+ "incb x9\n"
"b.any 1b\n"
- "mov %x[out], x27\n"
+ "mov %x[out], x28\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", "p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "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", "x14", "x15", "x16", "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"
);
}