aboutsummaryrefslogtreecommitdiff
path: root/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp')
-rw-r--r--src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp2595
1 files changed, 1503 insertions, 1092 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp
index fcdca59bdd..0c5aa7eae8 100644
--- a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp
+++ b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp
@@ -26,11 +26,33 @@
#ifdef __aarch64__
template<>
-inline void MergeResults<12, 8, false>(float *out, const float *in, const int ldout, const int y0, const int ymax, const int x0, const int xmax, const float alpha, const float beta)
+void MergeResults<12, 8, false>(float *out, const float *in, const int ldout, const int y0, const int ymax, const int x0, const int xmax, const float *bias, Activation act, bool append)
{
const float *inptr = in;
+ float nullbias[12] = { 0 };
+ float minval = - std::numeric_limits<float>::infinity();
+ float maxval = std::numeric_limits<float>::infinity();
- for (int y=y0; y<ymax; y+=8) {
+ switch(act.type)
+ {
+ default:
+ case Activation::Type::None:
+ break;
+ case Activation::Type::BoundedReLU:
+ maxval = static_cast<float>(act.param1);
+ /* fall through */
+ case Activation::Type::ReLU:
+ minval = 0.0f;
+ break;
+ }
+
+ if (!append && !bias)
+ {
+ memset(nullbias, 0, (12 * sizeof(float)));
+ }
+
+ for (int y=y0; y<ymax; y+=8)
+ {
float *outptr0 = out + (y * ldout) + x0;
float *outptr1 = outptr0 + ldout;
float *outptr2 = outptr1 + ldout;
@@ -42,19 +64,21 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
const int height = ymax - y;
- for (int i=x0; i<xmax; i+=12) {
- if (beta==0.0f)
+ for (int i=x0; i<xmax; i+=12)
+ {
+ if (append)
{
- switch(height) {
+ switch(height)
+ {
case 1:
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
}
}
@@ -62,23 +86,34 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x10]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr0], #0x10]\n"
- "ldr q6, [%[inptr], #0x20]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"add %[inptr], %[inptr], #0x180\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "str q11, [%[outptr0], #0x10]\n"
+ "str q12, [%[outptr0], #0x20]\n"
"add %[outptr0], %[outptr0], #0x30\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -88,13 +123,13 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + *outptr1), maxval);
outptr1++;
}
}
@@ -102,35 +137,55 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x30]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q6, [%[inptr], #0x10]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x10]\n"
- "ldr q7, [%[inptr], #0x40]\n"
- "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x10]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q5, [%[inptr], #0x50]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q5, [%[outptr1]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x30]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q6, [%[outptr1], #0x10]\n"
+ "ldr q14, [%[inptr], #0x40]\n"
+ "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q7, [%[outptr1], #0x20]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q15, [%[inptr], #0x50]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q11, [%[outptr0], #0x10]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q12, [%[outptr0], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "str q13, [%[outptr1]]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr1], #0x10]\n"
+ "str q15, [%[outptr1], #0x20]\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -140,15 +195,15 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + *outptr1), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + *outptr2), maxval);
outptr2++;
}
}
@@ -156,47 +211,76 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x30]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q7, [%[inptr], #0x10]\n"
- "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q5, [%[outptr1]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x30]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q6, [%[outptr1], #0x10]\n"
+ "ldr q14, [%[inptr], #0x40]\n"
+ "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q7, [%[outptr1], #0x20]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q15, [%[inptr], #0x50]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "ldr q8, [%[outptr2]]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q16, [%[inptr], #0x60]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "ldr q9, [%[outptr2], #0x10]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x70]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr2], #0x20]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"str q11, [%[outptr0], #0x10]\n"
- "ldr q4, [%[inptr], #0x40]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x80]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
"prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr1], #0x10]\n"
- "ldr q5, [%[inptr], #0x70]\n"
- "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr2], #0x10]\n"
- "ldr q6, [%[inptr], #0x20]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
- "ldr q7, [%[inptr], #0x50]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr0], #0x20]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x20]\n"
- "ldr q4, [%[inptr], #0x80]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr1]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "str q14, [%[outptr1], #0x10]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "str q15, [%[outptr1], #0x20]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x20]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr2]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q17, [%[outptr2], #0x10]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "str q10, [%[outptr2], #0x20]\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -206,17 +290,17 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + *outptr1), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + *outptr2), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + *outptr3), maxval);
outptr3++;
}
}
@@ -224,58 +308,96 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x30]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q4, [%[inptr], #0x10]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x10]\n"
- "ldr q5, [%[inptr], #0x40]\n"
- "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x10]\n"
- "ldr q6, [%[inptr], #0x70]\n"
- "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x10]\n"
- "ldr q7, [%[inptr], #0xa0]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x10]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q5, [%[inptr], #0x50]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q5, [%[outptr1]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x30]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q6, [%[outptr1], #0x10]\n"
+ "ldr q14, [%[inptr], #0x40]\n"
+ "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q7, [%[outptr1], #0x20]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q15, [%[inptr], #0x50]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "ldr q8, [%[outptr2]]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q16, [%[inptr], #0x60]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "ldr q9, [%[outptr2], #0x10]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x70]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr2], #0x20]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q11, [%[outptr0], #0x10]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x80]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr3]]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr0], #0x20]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x90]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q4, [%[outptr3], #0x10]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr1]]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "ldr q12, [%[inptr], #0xa0]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q5, [%[outptr3], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr1], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q13, [%[inptr], #0xb0]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
- "ldr q6, [%[inptr], #0x80]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q15, [%[outptr1], #0x20]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr2]]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "str q17, [%[outptr2], #0x10]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
"str q10, [%[outptr2], #0x20]\n"
- "ldr q7, [%[inptr], #0xb0]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x20]\n"
- "add %[outptr3], %[outptr3], #0x30\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q11, [%[outptr3]]\n"
"add %[inptr], %[inptr], #0x180\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr3], #0x10]\n"
+ "str q13, [%[outptr3], #0x20]\n"
+ "add %[outptr3], %[outptr3], #0x30\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -285,19 +407,19 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + *outptr1), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + *outptr2), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + *outptr3), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + *outptr4), maxval);
outptr4++;
}
}
@@ -305,70 +427,117 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q6, [%[inptr], #0x60]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q5, [%[inptr], #0x10]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr0], #0x10]\n"
- "ldr q6, [%[inptr], #0x40]\n"
- "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr1], #0x10]\n"
- "ldr q7, [%[inptr], #0x70]\n"
- "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr2], #0x10]\n"
- "ldr q4, [%[inptr], #0xa0]\n"
- "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr3], #0x10]\n"
- "ldr q5, [%[inptr], #0xd0]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr4], #0x10]\n"
- "ldr q6, [%[inptr], #0x20]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
- "ldr q7, [%[inptr], #0x50]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q5, [%[outptr1]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x30]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q6, [%[outptr1], #0x10]\n"
+ "ldr q14, [%[inptr], #0x40]\n"
+ "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q7, [%[outptr1], #0x20]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q15, [%[inptr], #0x50]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "ldr q8, [%[outptr2]]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q16, [%[inptr], #0x60]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "ldr q9, [%[outptr2], #0x10]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x70]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr2], #0x20]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q11, [%[outptr0], #0x10]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x80]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr3]]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr0], #0x20]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x90]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q4, [%[outptr3], #0x10]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr1]]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "ldr q12, [%[inptr], #0xa0]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q5, [%[outptr3], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr1], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q13, [%[inptr], #0xb0]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q6, [%[outptr4]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q15, [%[outptr1], #0x20]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q14, [%[inptr], #0xc0]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q7, [%[outptr4], #0x10]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr2]]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q15, [%[inptr], #0xd0]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q8, [%[outptr4], #0x20]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "str q17, [%[outptr2], #0x10]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "ldr q16, [%[inptr], #0xe0]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x20]\n"
- "ldr q4, [%[inptr], #0x80]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "str q10, [%[outptr2], #0x20]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x20]\n"
- "ldr q5, [%[inptr], #0xb0]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q11, [%[outptr3]]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "str q12, [%[outptr3], #0x10]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr3], #0x20]\n"
- "ldr q6, [%[inptr], #0xe0]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr3], #0x20]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr4], #0x20]\n"
- "add %[outptr4], %[outptr4], #0x30\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr4]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
+ "str q15, [%[outptr4], #0x10]\n"
"add %[inptr], %[inptr], #0x180\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "str q16, [%[outptr4], #0x20]\n"
+ "add %[outptr4], %[outptr4], #0x30\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -378,21 +547,21 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + *outptr1), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + *outptr2), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + *outptr3), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + *outptr4), maxval);
outptr4++;
- *outptr5 = (alpha * inptr[xi + 60]);
+ *outptr5 = std::min(std::max(minval, inptr[xi + 60] + *outptr5), maxval);
outptr5++;
}
}
@@ -400,82 +569,138 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q6, [%[inptr], #0x60]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q5, [%[outptr1]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x30]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q6, [%[outptr1], #0x10]\n"
+ "ldr q14, [%[inptr], #0x40]\n"
+ "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q7, [%[outptr1], #0x20]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q15, [%[inptr], #0x50]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "ldr q8, [%[outptr2]]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q16, [%[inptr], #0x60]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "ldr q9, [%[outptr2], #0x10]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x70]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr2], #0x20]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q11, [%[outptr0], #0x10]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x80]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr3]]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr0], #0x20]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x90]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q4, [%[outptr3], #0x10]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr1]]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "ldr q12, [%[inptr], #0xa0]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q5, [%[outptr3], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr1], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q13, [%[inptr], #0xb0]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q6, [%[outptr4]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q15, [%[outptr1], #0x20]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q14, [%[inptr], #0xc0]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q7, [%[outptr4], #0x10]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr2]]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q15, [%[inptr], #0xd0]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q8, [%[outptr4], #0x20]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "str q17, [%[outptr2], #0x10]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "ldr q16, [%[inptr], #0xe0]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q9, [%[outptr5]]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "str q10, [%[outptr2], #0x20]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0xf0]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr5], #0x10]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"str q11, [%[outptr3]]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q5, [%[inptr], #0xf0]\n"
- "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5]]\n"
- "ldr q6, [%[inptr], #0x10]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x10]\n"
- "ldr q7, [%[inptr], #0x40]\n"
- "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x10]\n"
- "ldr q4, [%[inptr], #0x70]\n"
- "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x10]\n"
- "ldr q5, [%[inptr], #0xa0]\n"
- "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr3], #0x10]\n"
- "ldr q6, [%[inptr], #0xd0]\n"
- "prfm PSTL1KEEP, [%[outptr5], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr4], #0x10]\n"
- "ldr q7, [%[inptr], #0x100]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr5], #0x10]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q5, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x100]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr5], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr3], #0x10]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x110]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
- "ldr q6, [%[inptr], #0x80]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr3], #0x20]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x20]\n"
- "ldr q7, [%[inptr], #0xb0]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr4]]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "str q15, [%[outptr4], #0x10]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "str q16, [%[outptr4], #0x20]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x20]\n"
- "ldr q4, [%[inptr], #0xe0]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "str q17, [%[outptr5]]\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4], #0x20]\n"
- "ldr q5, [%[inptr], #0x110]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
+ "str q10, [%[outptr5], #0x10]\n"
"add %[outptr4], %[outptr4], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5], #0x20]\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
+ "prfm PLDL1KEEP, [%[outptr5], #0x60]\n"
+ "str q11, [%[outptr5], #0x20]\n"
"add %[outptr5], %[outptr5], #0x30\n"
"add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -485,23 +710,23 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + *outptr1), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + *outptr2), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + *outptr3), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + *outptr4), maxval);
outptr4++;
- *outptr5 = (alpha * inptr[xi + 60]);
+ *outptr5 = std::min(std::max(minval, inptr[xi + 60] + *outptr5), maxval);
outptr5++;
- *outptr6 = (alpha * inptr[xi + 72]);
+ *outptr6 = std::min(std::max(minval, inptr[xi + 72] + *outptr6), maxval);
outptr6++;
}
}
@@ -509,94 +734,159 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q6, [%[inptr], #0x60]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q5, [%[inptr], #0xf0]\n"
- "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5]]\n"
- "ldr q6, [%[inptr], #0x120]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6]]\n"
- "ldr q7, [%[inptr], #0x10]\n"
- "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q5, [%[outptr1]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x30]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q6, [%[outptr1], #0x10]\n"
+ "ldr q14, [%[inptr], #0x40]\n"
+ "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q7, [%[outptr1], #0x20]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q15, [%[inptr], #0x50]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "ldr q8, [%[outptr2]]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q16, [%[inptr], #0x60]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "ldr q9, [%[outptr2], #0x10]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x70]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr2], #0x20]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"str q11, [%[outptr0], #0x10]\n"
- "ldr q4, [%[inptr], #0x40]\n"
- "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr1], #0x10]\n"
- "ldr q5, [%[inptr], #0x70]\n"
- "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr2], #0x10]\n"
- "ldr q6, [%[inptr], #0xa0]\n"
- "prfm PSTL1KEEP, [%[outptr5], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr3], #0x10]\n"
- "ldr q7, [%[inptr], #0xd0]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr4], #0x10]\n"
- "ldr q4, [%[inptr], #0x100]\n"
- "prfm PSTL1KEEP, [%[outptr6], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr5], #0x10]\n"
- "ldr q5, [%[inptr], #0x130]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr6], #0x10]\n"
- "ldr q6, [%[inptr], #0x20]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
- "ldr q7, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x80]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr3]]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr0], #0x20]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x90]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q4, [%[outptr3], #0x10]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr1]]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "ldr q12, [%[inptr], #0xa0]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q5, [%[outptr3], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr1], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q13, [%[inptr], #0xb0]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q6, [%[outptr4]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q15, [%[outptr1], #0x20]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q14, [%[inptr], #0xc0]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q7, [%[outptr4], #0x10]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr2]]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q15, [%[inptr], #0xd0]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q8, [%[outptr4], #0x20]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "str q17, [%[outptr2], #0x10]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "ldr q16, [%[inptr], #0xe0]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q9, [%[outptr5]]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "str q10, [%[outptr2], #0x20]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0xf0]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr5], #0x10]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q11, [%[outptr3]]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x100]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr5], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr3], #0x10]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x110]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q4, [%[outptr6]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr3], #0x20]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "ldr q12, [%[inptr], #0x120]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q5, [%[outptr6], #0x10]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr4]]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q13, [%[inptr], #0x130]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q6, [%[outptr6], #0x20]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q15, [%[outptr4], #0x10]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q14, [%[inptr], #0x140]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x20]\n"
- "ldr q4, [%[inptr], #0x80]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr4], #0x20]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x20]\n"
- "ldr q5, [%[inptr], #0xb0]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "str q17, [%[outptr5]]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr5], #0x10]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr3], #0x20]\n"
- "ldr q6, [%[inptr], #0xe0]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q11, [%[outptr5], #0x20]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr4], #0x20]\n"
- "ldr q7, [%[inptr], #0x110]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr6]]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
+ "str q13, [%[outptr6], #0x10]\n"
"add %[outptr4], %[outptr4], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr5], #0x20]\n"
- "ldr q4, [%[inptr], #0x140]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
+ "prfm PLDL1KEEP, [%[outptr5], #0x60]\n"
"add %[outptr5], %[outptr5], #0x30\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr6], #0x20]\n"
+ "str q14, [%[outptr6], #0x20]\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
+ "prfm PLDL1KEEP, [%[outptr6], #0x60]\n"
"add %[outptr6], %[outptr6], #0x30\n"
"add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -607,25 +897,25 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + *outptr0), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + *outptr1), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + *outptr2), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + *outptr3), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + *outptr4), maxval);
outptr4++;
- *outptr5 = (alpha * inptr[xi + 60]);
+ *outptr5 = std::min(std::max(minval, inptr[xi + 60] + *outptr5), maxval);
outptr5++;
- *outptr6 = (alpha * inptr[xi + 72]);
+ *outptr6 = std::min(std::max(minval, inptr[xi + 72] + *outptr6), maxval);
outptr6++;
- *outptr7 = (alpha * inptr[xi + 84]);
+ *outptr7 = std::min(std::max(minval, inptr[xi + 84] + *outptr7), maxval);
outptr7++;
}
}
@@ -633,105 +923,179 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q4, [%[inptr]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[outptr0]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q10, [%[inptr]]\n"
+ "ldr q3, [%[outptr0], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q6, [%[inptr], #0x60]\n"
+ "ldr q11, [%[inptr], #0x10]\n"
+ "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q4, [%[outptr0], #0x20]\n"
+ "ldr q12, [%[inptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q5, [%[outptr1]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x30]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q6, [%[outptr1], #0x10]\n"
+ "ldr q14, [%[inptr], #0x40]\n"
+ "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q7, [%[outptr1], #0x20]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q15, [%[inptr], #0x50]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "ldr q8, [%[outptr2]]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "str q10, [%[outptr0]]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q16, [%[inptr], #0x60]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "ldr q9, [%[outptr2], #0x10]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x70]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr2], #0x20]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q11, [%[outptr0], #0x10]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x80]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr3]]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr0], #0x20]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x90]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q4, [%[outptr3], #0x10]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr1]]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "ldr q12, [%[inptr], #0xa0]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q5, [%[outptr3], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr1], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q13, [%[inptr], #0xb0]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q6, [%[outptr4]]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q15, [%[outptr1], #0x20]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q14, [%[inptr], #0xc0]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q7, [%[outptr4], #0x10]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr2]]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q15, [%[inptr], #0xd0]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q8, [%[outptr4], #0x20]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "str q17, [%[outptr2], #0x10]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "ldr q16, [%[inptr], #0xe0]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q9, [%[outptr5]]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "str q10, [%[outptr2], #0x20]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0xf0]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q2, [%[outptr5], #0x10]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"str q11, [%[outptr3]]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q5, [%[inptr], #0xf0]\n"
- "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5]]\n"
- "ldr q6, [%[inptr], #0x120]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6]]\n"
- "ldr q7, [%[inptr], #0x150]\n"
- "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr7]]\n"
- "ldr q4, [%[inptr], #0x10]\n"
- "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x10]\n"
- "ldr q5, [%[inptr], #0x40]\n"
- "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x10]\n"
- "ldr q6, [%[inptr], #0x70]\n"
- "prfm PSTL1KEEP, [%[outptr5], #0x60]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x10]\n"
- "ldr q7, [%[inptr], #0xa0]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x10]\n"
- "ldr q4, [%[inptr], #0xd0]\n"
- "prfm PSTL1KEEP, [%[outptr6], #0x60]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4], #0x10]\n"
- "ldr q5, [%[inptr], #0x100]\n"
- "prfm PSTL1KEEP, [%[outptr7], #0x60]\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5], #0x10]\n"
- "ldr q6, [%[inptr], #0x130]\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6], #0x10]\n"
- "ldr q7, [%[inptr], #0x160]\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr7], #0x10]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q5, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
+ "ldr q10, [%[inptr], #0x100]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "ldr q3, [%[outptr5], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr3], #0x10]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q11, [%[inptr], #0x110]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q4, [%[outptr6]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr3], #0x20]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "ldr q12, [%[inptr], #0x120]\n"
+ "fadd v10.4s, v10.4s, v2.4s\n"
+ "ldr q5, [%[outptr6], #0x10]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr4]]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q13, [%[inptr], #0x130]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q6, [%[outptr6], #0x20]\n"
+ "fmin v10.4s, v10.4s, v0.4s\n"
+ "str q15, [%[outptr4], #0x10]\n"
+ "fadd v11.4s, v11.4s, v3.4s\n"
+ "ldr q14, [%[inptr], #0x140]\n"
+ "fadd v12.4s, v12.4s, v4.4s\n"
+ "ldr q7, [%[outptr7]]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr4], #0x20]\n"
+ "fmax v10.4s, v10.4s, v1.4s\n"
+ "ldr q15, [%[inptr], #0x150]\n"
+ "fmin v11.4s, v11.4s, v0.4s\n"
+ "ldr q8, [%[outptr7], #0x10]\n"
+ "fmin v12.4s, v12.4s, v0.4s\n"
+ "str q17, [%[outptr5]]\n"
+ "fadd v13.4s, v13.4s, v5.4s\n"
+ "ldr q16, [%[inptr], #0x160]\n"
+ "fadd v14.4s, v14.4s, v6.4s\n"
+ "ldr q9, [%[outptr7], #0x20]\n"
+ "fmax v11.4s, v11.4s, v1.4s\n"
+ "str q10, [%[outptr5], #0x10]\n"
+ "fmax v12.4s, v12.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x170]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
- "ldr q6, [%[inptr], #0x80]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q11, [%[outptr5], #0x20]\n"
+ "fadd v15.4s, v15.4s, v7.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x20]\n"
- "ldr q7, [%[inptr], #0xb0]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q12, [%[outptr6]]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x200]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr6], #0x10]\n"
+ "fadd v16.4s, v16.4s, v8.4s\n"
+ "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
+ "fadd v17.4s, v17.4s, v9.4s\n"
+ "str q14, [%[outptr6], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x20]\n"
- "ldr q4, [%[inptr], #0xe0]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "str q15, [%[outptr7]]\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4], #0x20]\n"
- "ldr q5, [%[inptr], #0x110]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
+ "str q16, [%[outptr7], #0x10]\n"
"add %[outptr4], %[outptr4], #0x30\n"
- "fmul v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5], #0x20]\n"
- "ldr q6, [%[inptr], #0x140]\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
+ "prfm PLDL1KEEP, [%[outptr5], #0x60]\n"
+ "str q17, [%[outptr7], #0x20]\n"
"add %[outptr5], %[outptr5], #0x30\n"
- "fmul v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6], #0x20]\n"
- "ldr q7, [%[inptr], #0x170]\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
+ "prfm PLDL1KEEP, [%[outptr6], #0x60]\n"
"add %[outptr6], %[outptr6], #0x30\n"
- "fmul v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr7], #0x20]\n"
+ "prfm PLDL1KEEP, [%[outptr7], #0x60]\n"
"add %[outptr7], %[outptr7], #0x30\n"
"add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -742,16 +1106,23 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
}
else
{
- switch(height) {
+ const float *biasptr = nullbias;
+ if (bias)
+ {
+ biasptr = bias + i;
+ }
+
+ switch(height)
+ {
case 1:
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
}
}
@@ -759,29 +1130,34 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr0], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x10]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr0], #0x10]\n"
- "ldr q10, [%[outptr0], #0x20]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x20]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
- "add %[outptr0], %[outptr0], #0x30\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
+ "ldr q15, [%[inptr], #0x20]\n"
"add %[inptr], %[inptr], #0x180\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "add %[outptr0], %[outptr0], #0x30\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -791,13 +1167,13 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]) + (*outptr1 * beta);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + biasptr[xi]), maxval);
outptr1++;
}
}
@@ -805,47 +1181,52 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr1]]\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q10, [%[outptr0], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x10]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x10]\n"
- "ldr q11, [%[outptr1], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x40]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x10]\n"
- "ldr q8, [%[outptr0], #0x20]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q9, [%[outptr1], #0x20]\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0x20]\n"
+ "ldr q16, [%[inptr], #0x30]\n"
+ "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "ldr q17, [%[inptr], #0x40]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q18, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "fadd v16.4s, v16.4s, v2.4s\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "fadd v17.4s, v17.4s, v3.4s\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "fadd v18.4s, v18.4s, v4.4s\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x50]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr1]]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "str q17, [%[outptr1], #0x10]\n"
+ "str q18, [%[outptr1], #0x20]\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -855,15 +1236,15 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]) + (*outptr1 * beta);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + biasptr[xi]), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]) + (*outptr2 * beta);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + biasptr[xi]), maxval);
outptr2++;
}
}
@@ -871,65 +1252,70 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr1]]\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q10, [%[outptr2]]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q11, [%[outptr0], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x10]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr0], #0x10]\n"
- "ldr q8, [%[outptr1], #0x10]\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0x20]\n"
+ "ldr q16, [%[inptr], #0x30]\n"
+ "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "ldr q17, [%[inptr], #0x40]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q18, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "ldr q19, [%[inptr], #0x60]\n"
+ "fadd v16.4s, v16.4s, v2.4s\n"
+ "ldr q20, [%[inptr], #0x70]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x40]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr1], #0x10]\n"
- "ldr q9, [%[outptr2], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x70]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr2], #0x10]\n"
- "ldr q10, [%[outptr0], #0x20]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x20]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
- "ldr q11, [%[outptr1], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x80]\n"
+ "fadd v17.4s, v17.4s, v3.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "fadd v18.4s, v18.4s, v4.4s\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "fadd v19.4s, v19.4s, v2.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x50]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x20]\n"
- "ldr q8, [%[outptr2], #0x20]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr1]]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "fadd v20.4s, v20.4s, v3.4s\n"
+ "str q17, [%[outptr1], #0x10]\n"
+ "fadd v13.4s, v13.4s, v4.4s\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q18, [%[outptr1], #0x20]\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x80]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x20]\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
+ "str q19, [%[outptr2]]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q20, [%[outptr2], #0x10]\n"
+ "str q13, [%[outptr2], #0x20]\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -939,17 +1325,17 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]) + (*outptr1 * beta);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + biasptr[xi]), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]) + (*outptr2 * beta);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + biasptr[xi]), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]) + (*outptr3 * beta);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + biasptr[xi]), maxval);
outptr3++;
}
}
@@ -957,82 +1343,87 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr1]]\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q10, [%[outptr2]]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q11, [%[outptr3]]\n"
- "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q8, [%[outptr0], #0x10]\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0x20]\n"
+ "ldr q16, [%[inptr], #0x30]\n"
+ "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "ldr q17, [%[inptr], #0x40]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q18, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "ldr q19, [%[inptr], #0x60]\n"
+ "fadd v16.4s, v16.4s, v2.4s\n"
+ "ldr q20, [%[inptr], #0x70]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x10]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x10]\n"
- "ldr q9, [%[outptr1], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x40]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x10]\n"
- "ldr q10, [%[outptr2], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x70]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x10]\n"
- "ldr q11, [%[outptr3], #0x10]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0xa0]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x10]\n"
- "ldr q8, [%[outptr0], #0x20]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q9, [%[outptr1], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x80]\n"
+ "fadd v17.4s, v17.4s, v3.4s\n"
+ "fadd v18.4s, v18.4s, v4.4s\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "ldr q14, [%[inptr], #0x90]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "fadd v19.4s, v19.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0xa0]\n"
+ "fadd v20.4s, v20.4s, v3.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x50]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
- "ldr q10, [%[outptr2], #0x20]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr1]]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "ldr q16, [%[inptr], #0xb0]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "str q17, [%[outptr1], #0x10]\n"
+ "fadd v13.4s, v13.4s, v4.4s\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "fadd v14.4s, v14.4s, v2.4s\n"
+ "str q18, [%[outptr1], #0x20]\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x80]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x20]\n"
- "ldr q11, [%[outptr3], #0x20]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q19, [%[outptr2]]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "fadd v15.4s, v15.4s, v3.4s\n"
+ "fadd v16.4s, v16.4s, v4.4s\n"
+ "str q20, [%[outptr2], #0x10]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr2], #0x20]\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0xb0]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr3]]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "str q15, [%[outptr3], #0x10]\n"
+ "str q16, [%[outptr3], #0x20]\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -1042,19 +1433,19 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]) + (*outptr1 * beta);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + biasptr[xi]), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]) + (*outptr2 * beta);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + biasptr[xi]), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]) + (*outptr3 * beta);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + biasptr[xi]), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]) + (*outptr4 * beta);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + biasptr[xi]), maxval);
outptr4++;
}
}
@@ -1062,100 +1453,105 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr1]]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q10, [%[outptr2]]\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q11, [%[outptr3]]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q8, [%[outptr4]]\n"
- "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q9, [%[outptr0], #0x10]\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0x20]\n"
+ "ldr q16, [%[inptr], #0x30]\n"
+ "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "ldr q17, [%[inptr], #0x40]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q18, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "ldr q19, [%[inptr], #0x60]\n"
+ "fadd v16.4s, v16.4s, v2.4s\n"
+ "ldr q20, [%[inptr], #0x70]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x10]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr0], #0x10]\n"
- "ldr q10, [%[outptr1], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x40]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr1], #0x10]\n"
- "ldr q11, [%[outptr2], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x70]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr2], #0x10]\n"
- "ldr q8, [%[outptr3], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xa0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr3], #0x10]\n"
- "ldr q9, [%[outptr4], #0x10]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0xd0]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr4], #0x10]\n"
- "ldr q10, [%[outptr0], #0x20]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x20]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
- "ldr q11, [%[outptr1], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x80]\n"
+ "fadd v17.4s, v17.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q14, [%[inptr], #0x90]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
+ "fadd v18.4s, v18.4s, v4.4s\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "fadd v19.4s, v19.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0xa0]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x50]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x20]\n"
- "ldr q8, [%[outptr2], #0x20]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "str q16, [%[outptr1]]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "ldr q16, [%[inptr], #0xb0]\n"
+ "fadd v20.4s, v20.4s, v3.4s\n"
+ "fadd v13.4s, v13.4s, v4.4s\n"
+ "str q17, [%[outptr1], #0x10]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0xc0]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q18, [%[outptr1], #0x20]\n"
+ "fadd v14.4s, v14.4s, v2.4s\n"
+ "ldr q18, [%[inptr], #0xd0]\n"
+ "fadd v15.4s, v15.4s, v3.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x80]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x20]\n"
- "ldr q9, [%[outptr3], #0x20]\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
+ "str q19, [%[outptr2]]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "ldr q19, [%[inptr], #0xe0]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q20, [%[outptr2], #0x10]\n"
+ "fadd v16.4s, v16.4s, v4.4s\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "fadd v17.4s, v17.4s, v2.4s\n"
+ "str q13, [%[outptr2], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0xb0]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr3], #0x20]\n"
- "ldr q10, [%[outptr4], #0x20]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q14, [%[outptr3]]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "fadd v18.4s, v18.4s, v3.4s\n"
+ "fadd v19.4s, v19.4s, v4.4s\n"
+ "str q15, [%[outptr3], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "str q16, [%[outptr3], #0x20]\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0xe0]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr4], #0x20]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "str q17, [%[outptr4]]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "str q18, [%[outptr4], #0x10]\n"
+ "str q19, [%[outptr4], #0x20]\n"
"add %[outptr4], %[outptr4], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -1165,21 +1561,21 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]) + (*outptr1 * beta);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + biasptr[xi]), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]) + (*outptr2 * beta);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + biasptr[xi]), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]) + (*outptr3 * beta);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + biasptr[xi]), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]) + (*outptr4 * beta);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + biasptr[xi]), maxval);
outptr4++;
- *outptr5 = (alpha * inptr[xi + 60]) + (*outptr5 * beta);
+ *outptr5 = std::min(std::max(minval, inptr[xi + 60] + biasptr[xi]), maxval);
outptr5++;
}
}
@@ -1187,118 +1583,123 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr1]]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q10, [%[outptr2]]\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q11, [%[outptr3]]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q8, [%[outptr4]]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q9, [%[outptr5]]\n"
- "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0xf0]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5]]\n"
- "ldr q10, [%[outptr0], #0x10]\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0x20]\n"
+ "ldr q16, [%[inptr], #0x30]\n"
+ "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "ldr q17, [%[inptr], #0x40]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q18, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "ldr q19, [%[inptr], #0x60]\n"
+ "fadd v16.4s, v16.4s, v2.4s\n"
+ "ldr q20, [%[inptr], #0x70]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x10]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x10]\n"
- "ldr q11, [%[outptr1], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x40]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x10]\n"
- "ldr q8, [%[outptr2], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x70]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x10]\n"
- "ldr q9, [%[outptr3], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0xa0]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr3], #0x10]\n"
- "ldr q10, [%[outptr4], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr5], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0xd0]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr4], #0x10]\n"
- "ldr q11, [%[outptr5], #0x10]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x100]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr5], #0x10]\n"
- "ldr q8, [%[outptr0], #0x20]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q9, [%[outptr1], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x80]\n"
+ "fadd v17.4s, v17.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q14, [%[inptr], #0x90]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
+ "fadd v18.4s, v18.4s, v4.4s\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "fadd v19.4s, v19.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0xa0]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x50]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
- "ldr q10, [%[outptr2], #0x20]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "str q16, [%[outptr1]]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "ldr q16, [%[inptr], #0xb0]\n"
+ "fadd v20.4s, v20.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "str q17, [%[outptr1], #0x10]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0xc0]\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr5], #0x60]\n"
+ "fadd v13.4s, v13.4s, v4.4s\n"
+ "str q18, [%[outptr1], #0x20]\n"
+ "fadd v14.4s, v14.4s, v2.4s\n"
+ "ldr q18, [%[inptr], #0xd0]\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x80]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x20]\n"
- "ldr q11, [%[outptr3], #0x20]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q19, [%[outptr2]]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "ldr q19, [%[inptr], #0xe0]\n"
+ "fadd v15.4s, v15.4s, v3.4s\n"
+ "fadd v16.4s, v16.4s, v4.4s\n"
+ "str q20, [%[outptr2], #0x10]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "ldr q20, [%[inptr], #0xf0]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q13, [%[outptr2], #0x20]\n"
+ "fadd v17.4s, v17.4s, v2.4s\n"
+ "ldr q13, [%[inptr], #0x100]\n"
+ "fadd v18.4s, v18.4s, v3.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0xb0]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x20]\n"
- "ldr q8, [%[outptr4], #0x20]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr3]]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q14, [%[inptr], #0x110]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "str q15, [%[outptr3], #0x10]\n"
+ "fadd v19.4s, v19.4s, v4.4s\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "fadd v20.4s, v20.4s, v2.4s\n"
+ "str q16, [%[outptr3], #0x20]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xe0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4], #0x20]\n"
- "ldr q9, [%[outptr5], #0x20]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "str q17, [%[outptr4]]\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "fadd v13.4s, v13.4s, v3.4s\n"
+ "fadd v14.4s, v14.4s, v4.4s\n"
+ "str q18, [%[outptr4], #0x10]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q19, [%[outptr4], #0x20]\n"
"add %[outptr4], %[outptr4], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x110]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q20, [%[outptr5]]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "str q13, [%[outptr5], #0x10]\n"
+ "str q14, [%[outptr5], #0x20]\n"
"add %[outptr5], %[outptr5], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -1308,23 +1709,23 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]) + (*outptr1 * beta);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + biasptr[xi]), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]) + (*outptr2 * beta);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + biasptr[xi]), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]) + (*outptr3 * beta);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + biasptr[xi]), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]) + (*outptr4 * beta);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + biasptr[xi]), maxval);
outptr4++;
- *outptr5 = (alpha * inptr[xi + 60]) + (*outptr5 * beta);
+ *outptr5 = std::min(std::max(minval, inptr[xi + 60] + biasptr[xi]), maxval);
outptr5++;
- *outptr6 = (alpha * inptr[xi + 72]) + (*outptr6 * beta);
+ *outptr6 = std::min(std::max(minval, inptr[xi + 72] + biasptr[xi]), maxval);
outptr6++;
}
}
@@ -1332,136 +1733,141 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr1]]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q10, [%[outptr2]]\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q11, [%[outptr3]]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q8, [%[outptr4]]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q9, [%[outptr5]]\n"
- "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0xf0]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5]]\n"
- "ldr q10, [%[outptr6]]\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0x20]\n"
+ "ldr q16, [%[inptr], #0x30]\n"
+ "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "ldr q17, [%[inptr], #0x40]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q18, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "ldr q19, [%[inptr], #0x60]\n"
+ "fadd v16.4s, v16.4s, v2.4s\n"
+ "ldr q20, [%[inptr], #0x70]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x120]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6]]\n"
- "ldr q11, [%[outptr0], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x10]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr0], #0x10]\n"
- "ldr q8, [%[outptr1], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x40]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr1], #0x10]\n"
- "ldr q9, [%[outptr2], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x70]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr2], #0x10]\n"
- "ldr q10, [%[outptr3], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr5], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0xa0]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr3], #0x10]\n"
- "ldr q11, [%[outptr4], #0x10]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0xd0]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr4], #0x10]\n"
- "ldr q8, [%[outptr5], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr6], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x100]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr5], #0x10]\n"
- "ldr q9, [%[outptr6], #0x10]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x130]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr6], #0x10]\n"
- "ldr q10, [%[outptr0], #0x20]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x20]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr0], #0x20]\n"
- "ldr q11, [%[outptr1], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x80]\n"
+ "fadd v17.4s, v17.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q14, [%[inptr], #0x90]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
+ "fadd v18.4s, v18.4s, v4.4s\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "fadd v19.4s, v19.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0xa0]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x50]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr1], #0x20]\n"
- "ldr q8, [%[outptr2], #0x20]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "str q16, [%[outptr1]]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "ldr q16, [%[inptr], #0xb0]\n"
+ "fadd v20.4s, v20.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "str q17, [%[outptr1], #0x10]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0xc0]\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr5], #0x60]\n"
+ "fadd v13.4s, v13.4s, v4.4s\n"
+ "str q18, [%[outptr1], #0x20]\n"
+ "fadd v14.4s, v14.4s, v2.4s\n"
+ "ldr q18, [%[inptr], #0xd0]\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x80]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr2], #0x20]\n"
- "ldr q9, [%[outptr3], #0x20]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q19, [%[outptr2]]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "ldr q19, [%[inptr], #0xe0]\n"
+ "fadd v15.4s, v15.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q20, [%[outptr2], #0x10]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q20, [%[inptr], #0xf0]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr6], #0x60]\n"
+ "fadd v16.4s, v16.4s, v4.4s\n"
+ "str q13, [%[outptr2], #0x20]\n"
+ "fadd v17.4s, v17.4s, v2.4s\n"
+ "ldr q13, [%[inptr], #0x100]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0xb0]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr3], #0x20]\n"
- "ldr q10, [%[outptr4], #0x20]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q14, [%[outptr3]]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q14, [%[inptr], #0x110]\n"
+ "fadd v18.4s, v18.4s, v3.4s\n"
+ "fadd v19.4s, v19.4s, v4.4s\n"
+ "str q15, [%[outptr3], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q15, [%[inptr], #0x120]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "str q16, [%[outptr3], #0x20]\n"
+ "fadd v20.4s, v20.4s, v2.4s\n"
+ "ldr q16, [%[inptr], #0x130]\n"
+ "fadd v13.4s, v13.4s, v3.4s\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0xe0]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr4], #0x20]\n"
- "ldr q11, [%[outptr5], #0x20]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "str q17, [%[outptr4]]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0x140]\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q18, [%[outptr4], #0x10]\n"
+ "fadd v14.4s, v14.4s, v4.4s\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
+ "fadd v15.4s, v15.4s, v2.4s\n"
+ "str q19, [%[outptr4], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
"add %[outptr4], %[outptr4], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x110]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr5], #0x20]\n"
- "ldr q8, [%[outptr6], #0x20]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q20, [%[outptr5]]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "fadd v16.4s, v16.4s, v3.4s\n"
+ "fadd v17.4s, v17.4s, v4.4s\n"
+ "str q13, [%[outptr5], #0x10]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "str q14, [%[outptr5], #0x20]\n"
"add %[outptr5], %[outptr5], #0x30\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x140]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr6], #0x20]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "str q15, [%[outptr6]]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "str q16, [%[outptr6], #0x10]\n"
+ "str q17, [%[outptr6], #0x20]\n"
"add %[outptr6], %[outptr6], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}
@@ -1472,25 +1878,25 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
{
if ((i+11) >= xmax)
{
- for (int xi=0; xi<12; xi++)
+ for (int xi=0; xi<11; xi++)
{
if ((i+xi) < xmax)
{
- *outptr0 = (alpha * inptr[xi]) + (*outptr0 * beta);
+ *outptr0 = std::min(std::max(minval, inptr[xi] + biasptr[xi]), maxval);
outptr0++;
- *outptr1 = (alpha * inptr[xi + 12]) + (*outptr1 * beta);
+ *outptr1 = std::min(std::max(minval, inptr[xi + 12] + biasptr[xi]), maxval);
outptr1++;
- *outptr2 = (alpha * inptr[xi + 24]) + (*outptr2 * beta);
+ *outptr2 = std::min(std::max(minval, inptr[xi + 24] + biasptr[xi]), maxval);
outptr2++;
- *outptr3 = (alpha * inptr[xi + 36]) + (*outptr3 * beta);
+ *outptr3 = std::min(std::max(minval, inptr[xi + 36] + biasptr[xi]), maxval);
outptr3++;
- *outptr4 = (alpha * inptr[xi + 48]) + (*outptr4 * beta);
+ *outptr4 = std::min(std::max(minval, inptr[xi + 48] + biasptr[xi]), maxval);
outptr4++;
- *outptr5 = (alpha * inptr[xi + 60]) + (*outptr5 * beta);
+ *outptr5 = std::min(std::max(minval, inptr[xi + 60] + biasptr[xi]), maxval);
outptr5++;
- *outptr6 = (alpha * inptr[xi + 72]) + (*outptr6 * beta);
+ *outptr6 = std::min(std::max(minval, inptr[xi + 72] + biasptr[xi]), maxval);
outptr6++;
- *outptr7 = (alpha * inptr[xi + 84]) + (*outptr7 * beta);
+ *outptr7 = std::min(std::max(minval, inptr[xi + 84] + biasptr[xi]), maxval);
outptr7++;
}
}
@@ -1498,153 +1904,158 @@ inline void MergeResults<12, 8, false>(float *out, const float *in, const int ld
} else {
/* Optimized routine to copy an entire block */
__asm __volatile (
- "ldr q8, [%[outptr0]]\n"
+ "dup v0.4s, %[maxval].s[0]\n"
+ "ldr q2, [%[biasptr]]\n"
+ "dup v1.4s, %[minval].s[0]\n"
+ "ldr q3, [%[biasptr], #0x10]\n"
+ "ldr q4, [%[biasptr], #0x20]\n"
"prfm PLDL1KEEP, [%[inptr], #0x180]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr]]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0]]\n"
- "ldr q9, [%[outptr1]]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x30]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1]]\n"
- "ldr q10, [%[outptr2]]\n"
+ "ldr q13, [%[inptr]]\n"
+ "prfm PSTL1KEEP, [%[outptr0], #0x60]\n"
+ "ldr q14, [%[inptr], #0x10]\n"
"prfm PLDL1KEEP, [%[inptr], #0x1c0]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x60]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2]]\n"
- "ldr q11, [%[outptr3]]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x90]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3]]\n"
- "ldr q8, [%[outptr4]]\n"
- "prfm PLDL1KEEP, [%[outptr0], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xc0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4]]\n"
- "ldr q9, [%[outptr5]]\n"
- "prfm PLDL1KEEP, [%[outptr1], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0xf0]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5]]\n"
- "ldr q10, [%[outptr6]]\n"
+ "fadd v13.4s, v13.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0x20]\n"
+ "ldr q16, [%[inptr], #0x30]\n"
+ "prfm PSTL1KEEP, [%[outptr1], #0x60]\n"
+ "fadd v14.4s, v14.4s, v3.4s\n"
+ "ldr q17, [%[inptr], #0x40]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "ldr q18, [%[inptr], #0x50]\n"
+ "fadd v15.4s, v15.4s, v4.4s\n"
+ "ldr q19, [%[inptr], #0x60]\n"
+ "fadd v16.4s, v16.4s, v2.4s\n"
+ "ldr q20, [%[inptr], #0x70]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
"prfm PLDL1KEEP, [%[inptr], #0x200]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x120]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6]]\n"
- "ldr q11, [%[outptr7]]\n"
- "prfm PLDL1KEEP, [%[outptr2], #0x60]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x150]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr7]]\n"
- "ldr q8, [%[outptr0], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr3], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x10]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x10]\n"
- "ldr q9, [%[outptr1], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr4], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x40]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x10]\n"
- "ldr q10, [%[outptr2], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr5], #0x60]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x70]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x10]\n"
- "ldr q11, [%[outptr3], #0x10]\n"
- "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0xa0]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x10]\n"
- "ldr q8, [%[outptr4], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr6], #0x60]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xd0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4], #0x10]\n"
- "ldr q9, [%[outptr5], #0x10]\n"
- "prfm PLDL1KEEP, [%[outptr7], #0x60]\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x100]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5], #0x10]\n"
- "ldr q10, [%[outptr6], #0x10]\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x130]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6], #0x10]\n"
- "ldr q11, [%[outptr7], #0x10]\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x160]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr7], #0x10]\n"
- "ldr q8, [%[outptr0], #0x20]\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0x20]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr0], #0x20]\n"
- "ldr q9, [%[outptr1], #0x20]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr2], #0x60]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "prfm PSTL1KEEP, [%[outptr3], #0x60]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "str q13, [%[outptr0]]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "ldr q13, [%[inptr], #0x80]\n"
+ "fadd v17.4s, v17.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x240]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "str q14, [%[outptr0], #0x10]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "ldr q14, [%[inptr], #0x90]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr4], #0x60]\n"
+ "fadd v18.4s, v18.4s, v4.4s\n"
+ "str q15, [%[outptr0], #0x20]\n"
+ "fadd v19.4s, v19.4s, v2.4s\n"
+ "ldr q15, [%[inptr], #0xa0]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
"add %[outptr0], %[outptr0], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x50]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr1], #0x20]\n"
- "ldr q10, [%[outptr2], #0x20]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "str q16, [%[outptr1]]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "ldr q16, [%[inptr], #0xb0]\n"
+ "fadd v20.4s, v20.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x280]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "str q17, [%[outptr1], #0x10]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "ldr q17, [%[inptr], #0xc0]\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr5], #0x60]\n"
+ "fadd v13.4s, v13.4s, v4.4s\n"
+ "str q18, [%[outptr1], #0x20]\n"
+ "fadd v14.4s, v14.4s, v2.4s\n"
+ "ldr q18, [%[inptr], #0xd0]\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
"add %[outptr1], %[outptr1], #0x30\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x80]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr2], #0x20]\n"
- "ldr q11, [%[outptr3], #0x20]\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q19, [%[outptr2]]\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "ldr q19, [%[inptr], #0xe0]\n"
+ "fadd v15.4s, v15.4s, v3.4s\n"
+ "prfm PLDL1KEEP, [%[inptr], #0x2c0]\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "str q20, [%[outptr2], #0x10]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "ldr q20, [%[inptr], #0xf0]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "prfm PSTL1KEEP, [%[outptr6], #0x60]\n"
+ "fadd v16.4s, v16.4s, v4.4s\n"
+ "str q13, [%[outptr2], #0x20]\n"
+ "fadd v17.4s, v17.4s, v2.4s\n"
+ "ldr q13, [%[inptr], #0x100]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
"add %[outptr2], %[outptr2], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0xb0]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr3], #0x20]\n"
- "ldr q8, [%[outptr4], #0x20]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "str q14, [%[outptr3]]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
+ "ldr q14, [%[inptr], #0x110]\n"
+ "fadd v18.4s, v18.4s, v3.4s\n"
+ "prfm PSTL1KEEP, [%[outptr7], #0x60]\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "str q15, [%[outptr3], #0x10]\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "ldr q15, [%[inptr], #0x120]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "fadd v19.4s, v19.4s, v4.4s\n"
+ "str q16, [%[outptr3], #0x20]\n"
+ "fadd v20.4s, v20.4s, v2.4s\n"
+ "ldr q16, [%[inptr], #0x130]\n"
+ "fadd v13.4s, v13.4s, v3.4s\n"
"add %[outptr3], %[outptr3], #0x30\n"
- "fmul v8.4s, v8.4s, %[beta].s[0]\n"
- "ldr q4, [%[inptr], #0xe0]\n"
- "fmla v8.4s, v4.4s, %[alpha].s[0]\n"
- "str q8, [%[outptr4], #0x20]\n"
- "ldr q9, [%[outptr5], #0x20]\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "str q17, [%[outptr4]]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "ldr q17, [%[inptr], #0x140]\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "fmin v13.4s, v13.4s, v0.4s\n"
+ "str q18, [%[outptr4], #0x10]\n"
+ "fadd v14.4s, v14.4s, v4.4s\n"
+ "ldr q18, [%[inptr], #0x150]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
+ "fmax v13.4s, v13.4s, v1.4s\n"
+ "fmin v14.4s, v14.4s, v0.4s\n"
+ "str q19, [%[outptr4], #0x20]\n"
+ "fadd v15.4s, v15.4s, v2.4s\n"
+ "ldr q19, [%[inptr], #0x160]\n"
+ "fadd v16.4s, v16.4s, v3.4s\n"
"add %[outptr4], %[outptr4], #0x30\n"
- "fmul v9.4s, v9.4s, %[beta].s[0]\n"
- "ldr q5, [%[inptr], #0x110]\n"
- "fmla v9.4s, v5.4s, %[alpha].s[0]\n"
- "str q9, [%[outptr5], #0x20]\n"
- "ldr q10, [%[outptr6], #0x20]\n"
+ "fmax v14.4s, v14.4s, v1.4s\n"
+ "str q20, [%[outptr5]]\n"
+ "fmin v15.4s, v15.4s, v0.4s\n"
+ "ldr q20, [%[inptr], #0x170]\n"
+ "fmin v16.4s, v16.4s, v0.4s\n"
+ "add %[inptr], %[inptr], #0x180\n"
+ "fadd v17.4s, v17.4s, v4.4s\n"
+ "str q13, [%[outptr5], #0x10]\n"
+ "fmax v15.4s, v15.4s, v1.4s\n"
+ "fmax v16.4s, v16.4s, v1.4s\n"
+ "fadd v18.4s, v18.4s, v2.4s\n"
+ "str q14, [%[outptr5], #0x20]\n"
+ "fmin v17.4s, v17.4s, v0.4s\n"
"add %[outptr5], %[outptr5], #0x30\n"
- "fmul v10.4s, v10.4s, %[beta].s[0]\n"
- "ldr q6, [%[inptr], #0x140]\n"
- "fmla v10.4s, v6.4s, %[alpha].s[0]\n"
- "str q10, [%[outptr6], #0x20]\n"
- "ldr q11, [%[outptr7], #0x20]\n"
+ "fadd v19.4s, v19.4s, v3.4s\n"
+ "str q15, [%[outptr6]]\n"
+ "fmin v18.4s, v18.4s, v0.4s\n"
+ "fmax v17.4s, v17.4s, v1.4s\n"
+ "fadd v20.4s, v20.4s, v4.4s\n"
+ "str q16, [%[outptr6], #0x10]\n"
+ "fmin v19.4s, v19.4s, v0.4s\n"
+ "fmax v18.4s, v18.4s, v1.4s\n"
+ "fmin v20.4s, v20.4s, v0.4s\n"
+ "str q17, [%[outptr6], #0x20]\n"
+ "fmax v19.4s, v19.4s, v1.4s\n"
"add %[outptr6], %[outptr6], #0x30\n"
- "fmul v11.4s, v11.4s, %[beta].s[0]\n"
- "ldr q7, [%[inptr], #0x170]\n"
- "fmla v11.4s, v7.4s, %[alpha].s[0]\n"
- "str q11, [%[outptr7], #0x20]\n"
+ "fmax v20.4s, v20.4s, v1.4s\n"
+ "str q18, [%[outptr7]]\n"
+ "str q19, [%[outptr7], #0x10]\n"
+ "str q20, [%[outptr7], #0x20]\n"
"add %[outptr7], %[outptr7], #0x30\n"
- "add %[inptr], %[inptr], #0x180\n"
: [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [outptr6] "+r" (outptr6), [outptr7] "+r" (outptr7),
[inptr] "+r" (inptr)
- : [alpha] "w" (alpha), [beta] "w" (beta)
- : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "memory"
+ : [biasptr] "r" (biasptr), [minval] "w" (minval), [maxval] "w" (maxval)
+ : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "memory"
);
}
}