diff options
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8q_nhwc_avg_generic_depthfirst/generic.cpp')
| -rw-r--r-- | src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8q_nhwc_avg_generic_depthfirst/generic.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8q_nhwc_avg_generic_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8q_nhwc_avg_generic_depthfirst/generic.cpp index e2cb9d7320..a57fe6df68 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8q_nhwc_avg_generic_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/kernels/a64_u8q_nhwc_avg_generic_depthfirst/generic.cpp @@ -42,10 +42,10 @@ namespace { constexpr RescaleParams rescale_params[8] = { {0x40000000, -0}, // 1/2 - {0x55555555, -1}, // 1/3 + {0x55555556, -1}, // 1/3 {0x40000000, -1}, // 1/4 {0x66666666, -2}, // 1/5 - {0x55555555, -2}, // 1/6 + {0x55555556, -2}, // 1/6 {0x49249249, -2}, // 1/7 {0x40000000, -2}, // 1/8 {0x71c71c72, -3}, // 1/9 @@ -145,10 +145,10 @@ void a64_u8q_nhwc_avg_generic_depthfirst_impl( "mov v0.16b, v15.16b\n" "cbz x22, 4f\n" "ldp x21, x20, [x19, #0x0]\n" - "add x19, x19, #0x10\n" - "subs x22, x22, #0x1\n" "ldr q31, [x21, x26]\n" + "add x19, x19, #0x10\n" "ldr q30, [x20, x26]\n" + "subs x22, x22, #0x1\n" "ldr q29, [x21, x25]\n" "ldr q28, [x20, x25]\n" "ldr q27, [x21, x24]\n" @@ -161,24 +161,24 @@ void a64_u8q_nhwc_avg_generic_depthfirst_impl( "ldp x21, x20, [x19, #0x0]\n" "add x19, x19, #0x10\n" "uaddl2 v22.8h, v31.16b, v30.16b\n" - "subs x22, x22, #0x1\n" - "uaddl v21.8h, v29.8b, v28.8b\n" "ldr q31, [x21, x26]\n" + "uaddl v21.8h, v29.8b, v28.8b\n" + "subs x22, x22, #0x1\n" "uaddl2 v20.8h, v29.16b, v28.16b\n" - "uaddl v19.8h, v27.8b, v26.8b\n" "ldr q30, [x20, x26]\n" - "uaddl2 v18.8h, v27.16b, v26.16b\n" + "uaddl v19.8h, v27.8b, v26.8b\n" "ldr q29, [x21, x25]\n" - "uaddl v17.8h, v25.8b, v24.8b\n" + "uaddl2 v18.8h, v27.16b, v26.16b\n" "ldr q28, [x20, x25]\n" - "uaddl2 v16.8h, v25.16b, v24.16b\n" + "uaddl v17.8h, v25.8b, v24.8b\n" "ldr q27, [x21, x24]\n" - "uaddw v15.4s, v15.4s, v23.4h\n" + "uaddl2 v16.8h, v25.16b, v24.16b\n" "ldr q26, [x20, x24]\n" - "uaddw2 v14.4s, v14.4s, v23.8h\n" + "uaddw v15.4s, v15.4s, v23.4h\n" "ldr q25, [x21, x23]\n" - "uaddw v13.4s, v13.4s, v22.4h\n" + "uaddw2 v14.4s, v14.4s, v23.8h\n" "ldr q24, [x20, x23]\n" + "uaddw v13.4s, v13.4s, v22.4h\n" "uaddw2 v12.4s, v12.4s, v22.8h\n" "uaddw v11.4s, v11.4s, v21.4h\n" "uaddw2 v10.4s, v10.4s, v21.8h\n" @@ -225,19 +225,19 @@ void a64_u8q_nhwc_avg_generic_depthfirst_impl( "ldr x21, [x19], #0x8\n" "subs x20, x20, #0x1\n" "ldr q31, [x21, x26]\n" - "uxtl v16.8h, v31.8b\n" + "uxtl v23.8h, v31.8b\n" "ldr q29, [x21, x25]\n" "uxtl2 v22.8h, v31.16b\n" "ldr q27, [x21, x24]\n" "ldr q25, [x21, x23]\n" - "uaddw v15.4s, v15.4s, v16.4h\n" - "uaddw2 v14.4s, v14.4s, v16.8h\n" "uxtl v21.8h, v29.8b\n" "uxtl2 v20.8h, v29.16b\n" "uxtl v19.8h, v27.8b\n" "uxtl2 v18.8h, v27.16b\n" "uxtl v17.8h, v25.8b\n" "uxtl2 v16.8h, v25.16b\n" + "uaddw v15.4s, v15.4s, v23.4h\n" + "uaddw2 v14.4s, v14.4s, v23.8h\n" "uaddw v13.4s, v13.4s, v22.4h\n" "uaddw2 v12.4s, v12.4s, v22.8h\n" "uaddw v11.4s, v11.4s, v21.4h\n" @@ -362,22 +362,22 @@ void a64_u8q_nhwc_avg_generic_depthfirst_impl( "uzp1 v16.16b, v13.16b, v12.16b\n" "smin v0.4s, v0.4s, v19.4s\n" "uzp1 v22.16b, v11.16b, v10.16b\n" - "uzp1 v18.16b, v9.16b, v8.16b\n" - "uzp1 v21.16b, v7.16b, v6.16b\n" + "uzp1 v21.16b, v9.16b, v8.16b\n" + "uzp1 v20.16b, v7.16b, v6.16b\n" "uzp1 v17.16b, v5.16b, v4.16b\n" - "uzp1 v20.16b, v3.16b, v2.16b\n" - "uzp1 v19.16b, v1.16b, v0.16b\n" + "uzp1 v19.16b, v3.16b, v2.16b\n" + "uzp1 v18.16b, v1.16b, v0.16b\n" "uzp1 v16.16b, v23.16b, v16.16b\n" "str q16, [%x[outptr], x26]\n" - "uzp1 v18.16b, v22.16b, v18.16b\n" - "uzp1 v17.16b, v21.16b, v17.16b\n" + "uzp1 v16.16b, v22.16b, v21.16b\n" "add x26, x26, #0x40\n" - "uzp1 v16.16b, v20.16b, v19.16b\n" - "str q18, [%x[outptr], x25]\n" - "str q17, [%x[outptr], x24]\n" - "str q16, [%x[outptr], x23]\n" + "uzp1 v17.16b, v20.16b, v17.16b\n" + "str q16, [%x[outptr], x25]\n" + "uzp1 v16.16b, v19.16b, v18.16b\n" "add x25, x25, #0x40\n" + "str q17, [%x[outptr], x24]\n" "add x24, x24, #0x40\n" + "str q16, [%x[outptr], x23]\n" "add x23, x23, #0x40\n" "bge 1b\n" "cbz %x[n_channels], 43f\n" @@ -393,19 +393,19 @@ void a64_u8q_nhwc_avg_generic_depthfirst_impl( "mov v12.16b, v15.16b\n" "cbz x22, 11f\n" "ldp x21, x20, [x19, #0x0]\n" - "add x19, x19, #0x10\n" - "subs x22, x22, #0x1\n" "ldr q31, [x21, x26]\n" + "add x19, x19, #0x10\n" "ldr q30, [x20, x26]\n" + "subs x22, x22, #0x1\n" "beq 10f\n" "9:" // Single vector of channels: Loop: 2 inputs loop "uaddl v23.8h, v31.8b, v30.8b\n" "ldp x21, x20, [x19, #0x0]\n" "add x19, x19, #0x10\n" "uaddl2 v22.8h, v31.16b, v30.16b\n" - "subs x22, x22, #0x1\n" - "uaddw v15.4s, v15.4s, v23.4h\n" "ldr q31, [x21, x26]\n" + "uaddw v15.4s, v15.4s, v23.4h\n" + "subs x22, x22, #0x1\n" "uaddw2 v14.4s, v14.4s, v23.8h\n" "ldr q30, [x20, x26]\n" "uaddw v13.4s, v13.4s, v22.4h\n" @@ -425,10 +425,10 @@ void a64_u8q_nhwc_avg_generic_depthfirst_impl( "ldr x21, [x19], #0x8\n" "subs x20, x20, #0x1\n" "ldr q31, [x21, x26]\n" - "uxtl v16.8h, v31.8b\n" + "uxtl v23.8h, v31.8b\n" "uxtl2 v22.8h, v31.16b\n" - "uaddw v15.4s, v15.4s, v16.4h\n" - "uaddw2 v14.4s, v14.4s, v16.8h\n" + "uaddw v15.4s, v15.4s, v23.4h\n" + "uaddw2 v14.4s, v14.4s, v23.8h\n" "uaddw v13.4s, v13.4s, v22.4h\n" "uaddw2 v12.4s, v12.4s, v22.8h\n" "bgt 12b\n" @@ -609,11 +609,11 @@ void a64_u8q_nhwc_avg_generic_depthfirst_impl( "tbz %x[n_channels], #0, 33f\n" "ldr b31, [x21], #0x1\n" "33:" // Oddments: Single input loop: Load: Bit 3: End - "uxtl v16.8h, v31.8b\n" + "uxtl v23.8h, v31.8b\n" "subs x20, x20, #0x1\n" "uxtl2 v22.8h, v31.16b\n" - "uaddw v15.4s, v15.4s, v16.4h\n" - "uaddw2 v14.4s, v14.4s, v16.8h\n" + "uaddw v15.4s, v15.4s, v23.4h\n" + "uaddw2 v14.4s, v14.4s, v23.8h\n" "uaddw v13.4s, v13.4s, v22.4h\n" "uaddw2 v12.4s, v12.4s, v22.8h\n" "bgt 25b\n" |