Update CPU kernels to remove x19
Resolves: COMPMID-5805
Signed-off-by: Michael Tyler <michael.tyler@arm.com>
Change-Id: I250f64531e209625e4ff176dd5a552c1c34bc484
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8909
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>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
diff --git a/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24.hpp b/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24.hpp
index 9f3ab95..20f9d39 100644
--- a/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24.hpp
+++ b/src/core/NEON/kernels/arm_gemm/transforms/a64_transpose_interleave_24.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,195 +36,194 @@
"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 q29, [x24], #0x10\n"
- "sub x19, x19, #0x18\n"
- "ldr q18, [x22], #0x10\n"
- "dup v28.2d, v18.d[1]\n"
- "ldr q16, [x24], #0x10\n"
- "cmp x19, #0x18\n"
- "dup v27.2d, v16.d[0]\n"
- "ldr q17, [x24], #0x10\n"
- "dup v26.2d, v16.d[1]\n"
+ "ldr q1, [x25], #0x10\n"
+ "ldr q0, [x22], #0x10\n"
+ "sub x24, x24, #0x18\n"
+ "cmp x24, #0x18\n"
+ "ldr q17, [x25], #0x10\n"
+ "ldr q31, [x23], #0x10\n"
+ "dup v30.2d, v17.d[0]\n"
+ "dup v29.2d, v31.d[1]\n"
"ldr q16, [x22], #0x10\n"
- "mov v27.d[1], v18.d[0]\n"
- "ldr q25, [x21], #0x10\n"
- "ldr q24, [x20], #0x10\n"
- "mov v26.d[1], v17.d[0]\n"
- "ldr q23, [x22], #0x10\n"
- "mov v28.d[1], v16.d[0]\n"
- "dup v22.2d, v17.d[1]\n"
- "ldr q17, [x21], #0x10\n"
- "dup v21.2d, v24.d[1]\n"
+ "ldr q28, [x20], #0x10\n"
+ "dup v27.2d, v16.d[0]\n"
+ "dup v26.2d, v28.d[1]\n"
+ "ldr q25, [x25], #0x10\n"
+ "ldr q24, [x22], #0x10\n"
+ "dup v23.2d, v17.d[1]\n"
+ "dup v22.2d, v25.d[1]\n"
+ "ldr q21, [x23], #0x10\n"
"ldr q20, [x20], #0x10\n"
- "mov v22.d[1], v16.d[1]\n"
- "ldr q16, [x21], #0x10\n"
- "dup v19.2d, v17.d[0]\n"
- "dup v18.2d, v17.d[1]\n"
- "ldr q17, [x20], #0x10\n"
+ "dup v19.2d, v16.d[1]\n"
+ "dup v18.2d, v24.d[1]\n"
+ "ldr q17, [x23], #0x10\n"
+ "ldr q16, [x20], #0x10\n"
+ "mov v30.d[1], v31.d[0]\n"
+ "mov v29.d[1], v21.d[0]\n"
+ "mov v27.d[1], v28.d[0]\n"
+ "mov v26.d[1], v20.d[0]\n"
+ "str q1, [x21, #0x0]\n"
+ "str q30, [x21, #0x10]\n"
+ "mov v23.d[1], v25.d[0]\n"
+ "mov v22.d[1], v21.d[1]\n"
+ "str q29, [x21, #0x20]\n"
"mov v19.d[1], v24.d[0]\n"
- "str q29, [x23, #0x0]\n"
- "mov v21.d[1], v20.d[0]\n"
- "str q27, [x23, #0x10]\n"
- "str q28, [x23, #0x20]\n"
- "mov v18.d[1], v16.d[0]\n"
- "dup v16.2d, v16.d[1]\n"
- "str q25, [x23, #0x30]\n"
- "mov v16.d[1], v20.d[1]\n"
- "str q19, [x23, #0x40]\n"
- "str q21, [x23, #0x50]\n"
- "add x23, x23, %x[out_stride]\n"
- "str q26, [x23, #0x0]\n"
- "str q22, [x23, #0x10]\n"
- "str q23, [x23, #0x20]\n"
- "str q18, [x23, #0x30]\n"
- "str q16, [x23, #0x40]\n"
- "str q17, [x23, #0x50]\n"
- "add x23, x23, %x[out_stride]\n"
+ "mov v18.d[1], v20.d[1]\n"
+ "str q0, [x21, #0x30]\n"
+ "str q27, [x21, #0x40]\n"
+ "str q26, [x21, #0x50]\n"
+ "add x21, x21, %x[out_stride]\n"
+ "str q23, [x21, #0x0]\n"
+ "str q22, [x21, #0x10]\n"
+ "str q17, [x21, #0x20]\n"
+ "str q19, [x21, #0x30]\n"
+ "str q18, [x21, #0x40]\n"
+ "str q16, [x21, #0x50]\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 q22, [x24], #0x10\n"
- "sub x19, x19, #0xc\n"
- "ldr q16, [x22], #0x10\n"
- "dup v21.2d, v16.d[1]\n"
- "ldr d20, [x24], #0x8\n"
- "cmp x19, #0xc\n"
- "mov v20.d[1], v16.d[0]\n"
- "ldr d16, [x22], #0x8\n"
- "ldr q19, [x21], #0x10\n"
+ "ldr q17, [x23], #0x10\n"
+ "ldr q23, [x20], #0x10\n"
+ "dup v22.2d, v17.d[1]\n"
+ "dup v21.2d, v23.d[1]\n"
+ "ldr q20, [x25], #0x10\n"
+ "ldr q19, [x22], #0x10\n"
+ "sub x24, x24, #0xc\n"
+ "cmp x24, #0xc\n"
+ "ldr d18, [x25], #0x8\n"
+ "ldr d16, [x23], #0x8\n"
+ "mov v18.d[1], v17.d[0]\n"
+ "mov v22.d[1], v16.d[0]\n"
+ "ldr d17, [x22], #0x8\n"
+ "ldr d16, [x20], #0x8\n"
+ "mov v17.d[1], v23.d[0]\n"
"mov v21.d[1], v16.d[0]\n"
- "ldr d18, [x21], #0x8\n"
- "ldr q16, [x20], #0x10\n"
- "mov v18.d[1], v16.d[0]\n"
- "ldr d17, [x20], #0x8\n"
- "dup v16.2d, v16.d[1]\n"
- "str q22, [x23, #0x0]\n"
- "str q20, [x23, #0x10]\n"
- "mov v16.d[1], v17.d[0]\n"
- "str q21, [x23, #0x20]\n"
- "str q19, [x23, #0x30]\n"
- "str q18, [x23, #0x40]\n"
- "str q16, [x23, #0x50]\n"
- "add x23, x23, %x[out_stride]\n"
+ "str q20, [x21, #0x0]\n"
+ "str q18, [x21, #0x10]\n"
+ "str q22, [x21, #0x20]\n"
+ "str q19, [x21, #0x30]\n"
+ "str q17, [x21, #0x40]\n"
+ "str q21, [x21, #0x50]\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 d19, [x24], #0x8\n"
- "sub x19, x19, #0x4\n"
- "ldr d18, [x22], #0x8\n"
- "cmp x19, #0x4\n"
- "ldr d17, [x21], #0x8\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 d19, [x23, #0x0]\n"
- "str d18, [x23, #0x18]\n"
- "str d17, [x23, #0x30]\n"
- "str d16, [x23, #0x48]\n"
- "add x23, x23, #0x8\n"
+ "str d19, [x21, #0x0]\n"
+ "str d18, [x21, #0x18]\n"
+ "str d17, [x21, #0x30]\n"
+ "str d16, [x21, #0x48]\n"
+ "add x21, x21, #0x8\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 h19, [x24], #0x2\n"
- "sub x19, x19, #0x1\n"
- "ldr h18, [x22], #0x2\n"
- "cmp x19, #0x1\n"
- "ldr h17, [x21], #0x2\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 h19, [x23, #0x0]\n"
- "str h18, [x23, #0x18]\n"
- "str h17, [x23, #0x30]\n"
- "str h16, [x23, #0x48]\n"
- "add x23, x23, #0x2\n"
+ "str h19, [x21, #0x0]\n"
+ "str h18, [x21, #0x18]\n"
+ "str h17, [x21, #0x30]\n"
+ "str h16, [x21, #0x48]\n"
+ "add x21, x21, #0x2\n"
"bge 8b\n"
"9:" // Main row loop: width 1 loop: skip
- "add %x[out], %x[out], #0x60\n"
"cmp %x[height], #0x4\n"
+ "add %x[out], %x[out], #0x60\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 q19, [x24], #0x10\n"
- "sub x19, x19, #0x18\n"
- "cmp x19, #0x18\n"
- "ldr q16, [x24], #0x10\n"
- "dup v18.2d, v16.d[0]\n"
- "ldr q17, [x24], #0x10\n"
- "dup v16.2d, v16.d[1]\n"
- "str q19, [x23, #0x0]\n"
- "str d18, [x23, #0x10]\n"
- "mov v16.d[1], v17.d[0]\n"
- "add x23, x23, %x[out_stride]\n"
- "str q16, [x23, #0x0]\n"
+ "ldr q19, [x25], #0x10\n"
+ "ldr q16, [x25], #0x10\n"
+ "dup v18.2d, v16.d[1]\n"
+ "sub x20, x20, #0x18\n"
+ "ldr q17, [x25], #0x10\n"
+ "dup v16.2d, v16.d[0]\n"
+ "str q19, [x21, #0x0]\n"
+ "cmp x20, #0x18\n"
+ "str d16, [x21, #0x10]\n"
+ "add x21, x21, %x[out_stride]\n"
+ "mov v18.d[1], v17.d[0]\n"
"dup v16.2d, v17.d[1]\n"
- "str d16, [x23, #0x10]\n"
- "add x23, x23, %x[out_stride]\n"
+ "str q18, [x21, #0x0]\n"
+ "str d16, [x21, #0x10]\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"
- "sub x19, x19, #0xc\n"
- "cmp x19, #0xc\n"
- "ldr d16, [x24], #0x8\n"
- "str q17, [x23, #0x0]\n"
- "str d16, [x23, #0x10]\n"
- "add x23, x23, %x[out_stride]\n"
+ "ldr q17, [x25], #0x10\n"
+ "ldr d16, [x25], #0x8\n"
+ "sub x20, x20, #0xc\n"
+ "cmp x20, #0xc\n"
+ "str q17, [x21, #0x0]\n"
+ "str d16, [x21, #0x10]\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"
- "sub x19, x19, #0x4\n"
- "cmp x19, #0x4\n"
- "str d16, [x23, #0x0]\n"
- "add x23, x23, #0x8\n"
+ "ldr d16, [x25], #0x8\n"
+ "sub x20, x20, #0x4\n"
+ "cmp x20, #0x4\n"
+ "str d16, [x21, #0x0]\n"
+ "add x21, x21, #0x8\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"
- "sub x19, x19, #0x1\n"
- "cmp x19, #0x1\n"
- "str h16, [x23, #0x0]\n"
- "add x23, x23, #0x2\n"
+ "ldr h16, [x25], #0x2\n"
+ "sub x20, x20, #0x1\n"
+ "cmp x20, #0x1\n"
+ "str h16, [x21, #0x0]\n"
+ "add x21, x21, #0x2\n"
"bge 18b\n"
"19:" // Tail row loop: width 1 loop: skip
- "add %x[out], %x[out], #0x18\n"
"cmp %x[height], #0x1\n"
+ "add %x[out], %x[out], #0x18\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", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "x19", "x20", "x21", "x22", "x23", "x24"
+ : "cc", "memory", "v0", "v1", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31", "x20", "x21", "x22", "x23", "x24", "x25"
);
}