[x265] [PATCH 12/14] AArch64: Add Armv8.4 Neon DotProd implementations of luma_vps
Hari Limaye
hari.limaye at arm.com
Fri Sep 6 13:35:51 UTC 2024
Add implementations of luma_vps primitives using Neon DotProd
instructions, which are mandatory from Armv8.4.
Geomean uplift across all block sizes for luma filters, relative to
Armv8.0 Neon implementation:
Neoverse N1: 1.180x
Neoverse N2: 1.203x
Neoverse V1: 1.037x
Neoverse V2: 1.115x
---
source/common/aarch64/filter-neon-dotprod.cpp | 331 ++++++++++++++++++
1 file changed, 331 insertions(+)
diff --git a/source/common/aarch64/filter-neon-dotprod.cpp b/source/common/aarch64/filter-neon-dotprod.cpp
index 1828440d1..9ed821ec6 100644
--- a/source/common/aarch64/filter-neon-dotprod.cpp
+++ b/source/common/aarch64/filter-neon-dotprod.cpp
@@ -34,6 +34,15 @@ static const uint8_t dotprod_permute_tbl[48] = {
8, 9, 10, 11, 9, 10, 11, 12, 10, 11, 12, 13, 11, 12, 13, 14
};
+static const uint8_t dot_prod_merge_block_tbl[48] = {
+ // Shift left and insert new last column in transposed 4x4 block.
+ 1, 2, 3, 16, 5, 6, 7, 20, 9, 10, 11, 24, 13, 14, 15, 28,
+ // Shift left and insert two new columns in transposed 4x4 block.
+ 2, 3, 16, 17, 6, 7, 20, 21, 10, 11, 24, 25, 14, 15, 28, 29,
+ // Shift left and insert three new columns in transposed 4x4 block.
+ 3, 16, 17, 18, 7, 20, 21, 22, 11, 24, 25, 26, 15, 28, 29, 30
+};
+
uint8x8_t inline filter8_8_pp(uint8x16_t samples, const int8x8_t filter,
const int32x4_t constant, const uint8x16x3_t tbl)
{
@@ -230,6 +239,77 @@ int16x8_t inline filter4_8_ps(uint8x16_t samples, const int8x8_t filter,
// Narrow and combine.
return vcombine_s16(vmovn_s32(dotprod_lo), vmovn_s32(dotprod_hi));
}
+
+void inline transpose_concat_4x4(const int8x8_t *s, int8x16_t &d)
+{
+ // Transpose 8-bit elements and concatenate result rows as follows:
+ // s0: 00, 01, 02, 03, XX, XX, XX, XX
+ // s1: 10, 11, 12, 13, XX, XX, XX, XX
+ // s2: 20, 21, 22, 23, XX, XX, XX, XX
+ // s3: 30, 31, 32, 33, XX, XX, XX, XX
+ //
+ // d: 00, 10, 20, 30, 01, 11, 21, 31, 02, 12, 22, 32, 03, 13, 23, 33
+ int8x16_t s0q = vcombine_s8(s[0], vdup_n_s8(0));
+ int8x16_t s1q = vcombine_s8(s[1], vdup_n_s8(0));
+ int8x16_t s2q = vcombine_s8(s[2], vdup_n_s8(0));
+ int8x16_t s3q = vcombine_s8(s[3], vdup_n_s8(0));
+
+ int8x16_t s01 = vzipq_s8(s0q, s1q).val[0];
+ int8x16_t s23 = vzipq_s8(s2q, s3q).val[0];
+
+ int16x8_t s0123 =
+ vzipq_s16(vreinterpretq_s16_s8(s01), vreinterpretq_s16_s8(s23)).val[0];
+
+ d = vreinterpretq_s8_s16(s0123);
+}
+
+void inline transpose_concat_8x4(const int8x8_t *s, int8x16_t &d0,
+ int8x16_t &d1)
+{
+ // Transpose 8-bit elements and concatenate result rows as follows:
+ // s0: 00, 01, 02, 03, 04, 05, 06, 07
+ // s1: 10, 11, 12, 13, 14, 15, 16, 17
+ // s2: 20, 21, 22, 23, 24, 25, 26, 27
+ // s3: 30, 31, 32, 33, 34, 35, 36, 37
+ //
+ // d0: 00, 10, 20, 30, 01, 11, 21, 31, 02, 12, 22, 32, 03, 13, 23, 33
+ // d1: 04, 14, 24, 34, 05, 15, 25, 35, 06, 16, 26, 36, 07, 17, 27, 37
+ int8x16_t s0q = vcombine_s8(s[0], vdup_n_s8(0));
+ int8x16_t s1q = vcombine_s8(s[1], vdup_n_s8(0));
+ int8x16_t s2q = vcombine_s8(s[2], vdup_n_s8(0));
+ int8x16_t s3q = vcombine_s8(s[3], vdup_n_s8(0));
+
+ int8x16_t s01 = vzipq_s8(s0q, s1q).val[0];
+ int8x16_t s23 = vzipq_s8(s2q, s3q).val[0];
+
+ int16x8x2_t s0123 =
+ vzipq_s16(vreinterpretq_s16_s8(s01), vreinterpretq_s16_s8(s23));
+
+ d0 = vreinterpretq_s8_s16(s0123.val[0]);
+ d1 = vreinterpretq_s8_s16(s0123.val[1]);
+}
+
+int16x4_t inline filter8_4_ps_partial(const int8x16_t s0, const int8x16_t s1,
+ const int8x8_t filter)
+
+{
+ int32x4_t dotprod = vdotq_lane_s32(vdupq_n_s32(0), s0, filter, 0);
+ dotprod = vdotq_lane_s32(dotprod, s1, filter, 1);
+ return vmovn_s32(dotprod);
+}
+
+int16x8_t inline filter8_8_ps_partial(const int8x16_t s0, const int8x16_t s1,
+ const int8x16_t s2, const int8x16_t s3,
+ const int8x8_t filter)
+{
+ int32x4_t dotprod_lo = vdotq_lane_s32(vdupq_n_s32(0), s0, filter, 0);
+ dotprod_lo = vdotq_lane_s32(dotprod_lo, s2, filter, 1);
+ int32x4_t dotpro_hi = vdotq_lane_s32(vdupq_n_s32(0), s1, filter, 0);
+ dotpro_hi = vdotq_lane_s32(dotpro_hi, s3, filter, 1);
+
+ // Narrow and combine.
+ return vcombine_s16(vmovn_s32(dotprod_lo), vmovn_s32(dotpro_hi));
+}
} // Unnamed namespace.
namespace X265_NS {
@@ -642,6 +722,256 @@ void interp4_horiz_ps_dotprod(const uint8_t *src, intptr_t srcStride,
}
}
+template<int width, int height>
+void interp8_vert_ps_dotprod(const uint8_t *src, intptr_t srcStride,
+ int16_t *dst, intptr_t dstStride, int coeffIdx)
+{
+ const int N_TAPS = 8;
+
+ src -= (N_TAPS / 2 - 1) * srcStride;
+
+ const uint8x16x3_t merge_block_tbl = vld1q_u8_x3(dot_prod_merge_block_tbl);
+ const int8x8_t filter = vmovn_s16(vld1q_s16(g_lumaFilter[coeffIdx]));
+
+ if (width % 8 != 0)
+ {
+ uint8x8_t s_u8[11];
+ int8x8_t s_s8[11];
+ int8x16x2_t samples_tbl;
+ int8x16_t s_lo[8];
+ int8x16_t s_hi[8];
+ const uint8_t *src_ptr = src;
+ int16_t *dst_ptr = dst;
+
+ if (width == 12)
+ {
+ load_u8x8xn<7>(src_ptr, srcStride, s_u8);
+
+ // Transform sample range from uint8_t to int8_t.
+ s_s8[0] = vreinterpret_s8_u8(vsub_u8(s_u8[0], vdup_n_u8(128)));
+ s_s8[1] = vreinterpret_s8_u8(vsub_u8(s_u8[1], vdup_n_u8(128)));
+ s_s8[2] = vreinterpret_s8_u8(vsub_u8(s_u8[2], vdup_n_u8(128)));
+ s_s8[3] = vreinterpret_s8_u8(vsub_u8(s_u8[3], vdup_n_u8(128)));
+ s_s8[4] = vreinterpret_s8_u8(vsub_u8(s_u8[4], vdup_n_u8(128)));
+ s_s8[5] = vreinterpret_s8_u8(vsub_u8(s_u8[5], vdup_n_u8(128)));
+ s_s8[6] = vreinterpret_s8_u8(vsub_u8(s_u8[6], vdup_n_u8(128)));
+ s_s8[7] = vdup_n_s8(0);
+ s_s8[8] = vdup_n_s8(0);
+ s_s8[9] = vdup_n_s8(0);
+
+ transpose_concat_8x4(s_s8 + 0, s_lo[0], s_hi[0]);
+ transpose_concat_8x4(s_s8 + 1, s_lo[1], s_hi[1]);
+ transpose_concat_8x4(s_s8 + 2, s_lo[2], s_hi[2]);
+ transpose_concat_8x4(s_s8 + 3, s_lo[3], s_hi[3]);
+ transpose_concat_8x4(s_s8 + 4, s_lo[4], s_hi[4]);
+ transpose_concat_8x4(s_s8 + 5, s_lo[5], s_hi[5]);
+ transpose_concat_8x4(s_s8 + 6, s_lo[6], s_hi[6]);
+
+ src_ptr += 7 * srcStride;
+
+ for (int row = 0; row < height; row += 4)
+ {
+ load_u8x8xn<4>(src_ptr, srcStride, s_u8 + 7);
+
+ // Transform sample range from uint8_t to int8_t.
+ s_s8[7] = vreinterpret_s8_u8(vsub_u8(s_u8[7], vdup_n_u8(128)));
+ s_s8[8] = vreinterpret_s8_u8(vsub_u8(s_u8[8], vdup_n_u8(128)));
+ s_s8[9] = vreinterpret_s8_u8(vsub_u8(s_u8[9], vdup_n_u8(128)));
+ s_s8[10] = vreinterpret_s8_u8(vsub_u8(s_u8[10],
+ vdup_n_u8(128)));
+
+ transpose_concat_8x4(s_s8 + 7, s_lo[7], s_hi[7]);
+
+ // Merge new data into block from previous iteration.
+ samples_tbl.val[0] = s_lo[3]; // rows 3, 4, 5, 6
+ samples_tbl.val[1] = s_lo[7]; // rows 7, 8, 9, 10
+ s_lo[4] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[0]);
+ s_lo[5] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[1]);
+ s_lo[6] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[2]);
+ samples_tbl.val[0] = s_hi[3]; // rows 3, 4, 5, 6
+ samples_tbl.val[1] = s_hi[7]; // rows 7, 8, 9, 10
+ s_hi[4] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[0]);
+ s_hi[5] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[1]);
+ s_hi[6] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[2]);
+
+ int16x8_t d[4];
+ d[0] = filter8_8_ps_partial(s_lo[0], s_hi[0], s_lo[4], s_hi[4],
+ filter);
+ d[1] = filter8_8_ps_partial(s_lo[1], s_hi[1], s_lo[5], s_hi[5],
+ filter);
+ d[2] = filter8_8_ps_partial(s_lo[2], s_hi[2], s_lo[6], s_hi[6],
+ filter);
+ d[3] = filter8_8_ps_partial(s_lo[3], s_hi[3], s_lo[7], s_hi[7],
+ filter);
+
+ store_s16x8xn<4>(dst_ptr, dstStride, d);
+
+ s_lo[0] = s_lo[4];
+ s_lo[1] = s_lo[5];
+ s_lo[2] = s_lo[6];
+ s_lo[3] = s_lo[7];
+ s_hi[0] = s_hi[4];
+ s_hi[1] = s_hi[5];
+ s_hi[2] = s_hi[6];
+ s_hi[3] = s_hi[7];
+
+ src_ptr += 4 * srcStride;
+ dst_ptr += 4 * dstStride;
+ }
+
+ src_ptr = src + 8;
+ dst_ptr = dst + 8;
+ }
+
+ load_u8x8xn<7>(src_ptr, srcStride, s_u8);
+
+ // Transform sample range from uint8_t to int8_t.
+ s_s8[0] = vreinterpret_s8_u8(vsub_u8(s_u8[0], vdup_n_u8(128)));
+ s_s8[1] = vreinterpret_s8_u8(vsub_u8(s_u8[1], vdup_n_u8(128)));
+ s_s8[2] = vreinterpret_s8_u8(vsub_u8(s_u8[2], vdup_n_u8(128)));
+ s_s8[3] = vreinterpret_s8_u8(vsub_u8(s_u8[3], vdup_n_u8(128)));
+ s_s8[4] = vreinterpret_s8_u8(vsub_u8(s_u8[4], vdup_n_u8(128)));
+ s_s8[5] = vreinterpret_s8_u8(vsub_u8(s_u8[5], vdup_n_u8(128)));
+ s_s8[6] = vreinterpret_s8_u8(vsub_u8(s_u8[6], vdup_n_u8(128)));
+ s_s8[7] = vdup_n_s8(0);
+ s_s8[8] = vdup_n_s8(0);
+ s_s8[9] = vdup_n_s8(0);
+
+ transpose_concat_4x4(s_s8 + 0, s_lo[0]);
+ transpose_concat_4x4(s_s8 + 1, s_lo[1]);
+ transpose_concat_4x4(s_s8 + 2, s_lo[2]);
+ transpose_concat_4x4(s_s8 + 3, s_lo[3]);
+ transpose_concat_4x4(s_s8 + 4, s_lo[4]);
+ transpose_concat_4x4(s_s8 + 5, s_lo[5]);
+ transpose_concat_4x4(s_s8 + 6, s_lo[6]);
+
+ src_ptr += 7 * srcStride;
+
+ for (int row = 0; row < height; row += 4)
+ {
+ load_u8x8xn<4>(src_ptr, srcStride, s_u8 + 7);
+
+ // Transform sample range from uint8_t to int8_t.
+ s_s8[7] = vreinterpret_s8_u8(vsub_u8(s_u8[7], vdup_n_u8(128)));
+ s_s8[8] = vreinterpret_s8_u8(vsub_u8(s_u8[8], vdup_n_u8(128)));
+ s_s8[9] = vreinterpret_s8_u8(vsub_u8(s_u8[9], vdup_n_u8(128)));
+ s_s8[10] = vreinterpret_s8_u8(vsub_u8(s_u8[10], vdup_n_u8(128)));
+
+ transpose_concat_4x4(s_s8 + 7, s_lo[7]);
+
+ // Merge new data into block from previous iteration.
+ samples_tbl.val[0] = s_lo[3]; // rows 3, 4, 5, 6
+ samples_tbl.val[1] = s_lo[7]; // rows 7, 8, 9, 10
+ s_lo[4] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[0]);
+ s_lo[5] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[1]);
+ s_lo[6] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[2]);
+
+ int16x4_t d[4];
+ d[0] = filter8_4_ps_partial(s_lo[0], s_lo[4], filter);
+ d[1] = filter8_4_ps_partial(s_lo[1], s_lo[5], filter);
+ d[2] = filter8_4_ps_partial(s_lo[2], s_lo[6], filter);
+ d[3] = filter8_4_ps_partial(s_lo[3], s_lo[7], filter);
+
+ store_s16x4xn<4>(dst_ptr, dstStride, d);
+
+ s_lo[0] = s_lo[4];
+ s_lo[1] = s_lo[5];
+ s_lo[2] = s_lo[6];
+ s_lo[3] = s_lo[7];
+
+ src_ptr += 4 * srcStride;
+ dst_ptr += 4 * dstStride;
+ }
+ }
+ else
+ {
+ for (int col = 0; col < width; col += 8)
+ {
+ const uint8_t *src_ptr = src + col;
+ int16_t *dst_ptr = dst + col;
+ uint8x8_t s_u8[11];
+ int8x8_t s_s8[11];
+ int8x16x2_t samples_tbl;
+ int8x16_t s_lo[8];
+ int8x16_t s_hi[8];
+
+ load_u8x8xn<7>(src_ptr, srcStride, s_u8);
+
+ // Transform sample range from uint8_t to int8_t.
+ s_s8[0] = vreinterpret_s8_u8(vsub_u8(s_u8[0], vdup_n_u8(128)));
+ s_s8[1] = vreinterpret_s8_u8(vsub_u8(s_u8[1], vdup_n_u8(128)));
+ s_s8[2] = vreinterpret_s8_u8(vsub_u8(s_u8[2], vdup_n_u8(128)));
+ s_s8[3] = vreinterpret_s8_u8(vsub_u8(s_u8[3], vdup_n_u8(128)));
+ s_s8[4] = vreinterpret_s8_u8(vsub_u8(s_u8[4], vdup_n_u8(128)));
+ s_s8[5] = vreinterpret_s8_u8(vsub_u8(s_u8[5], vdup_n_u8(128)));
+ s_s8[6] = vreinterpret_s8_u8(vsub_u8(s_u8[6], vdup_n_u8(128)));
+ s_s8[7] = vdup_n_s8(0);
+ s_s8[8] = vdup_n_s8(0);
+ s_s8[9] = vdup_n_s8(0);
+
+ transpose_concat_8x4(s_s8 + 0, s_lo[0], s_hi[0]);
+ transpose_concat_8x4(s_s8 + 1, s_lo[1], s_hi[1]);
+ transpose_concat_8x4(s_s8 + 2, s_lo[2], s_hi[2]);
+ transpose_concat_8x4(s_s8 + 3, s_lo[3], s_hi[3]);
+ transpose_concat_8x4(s_s8 + 4, s_lo[4], s_hi[4]);
+ transpose_concat_8x4(s_s8 + 5, s_lo[5], s_hi[5]);
+ transpose_concat_8x4(s_s8 + 6, s_lo[6], s_hi[6]);
+
+ src_ptr += 7 * srcStride;
+
+ for (int row = 0; row < height; row += 4)
+ {
+ load_u8x8xn<4>(src_ptr, srcStride, s_u8 + 7);
+
+ // Transform sample range from uint8_t to int8_t.
+ s_s8[7] = vreinterpret_s8_u8(vsub_u8(s_u8[7], vdup_n_u8(128)));
+ s_s8[8] = vreinterpret_s8_u8(vsub_u8(s_u8[8], vdup_n_u8(128)));
+ s_s8[9] = vreinterpret_s8_u8(vsub_u8(s_u8[9], vdup_n_u8(128)));
+ s_s8[10] = vreinterpret_s8_u8(vsub_u8(s_u8[10],
+ vdup_n_u8(128)));
+
+ transpose_concat_8x4(s_s8 + 7, s_lo[7], s_hi[7]);
+
+ // Merge new data into block from previous iteration.
+ samples_tbl.val[0] = s_lo[3]; // rows 3, 4, 5, 6
+ samples_tbl.val[1] = s_lo[7]; // rows 7, 8, 9, 10
+ s_lo[4] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[0]);
+ s_lo[5] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[1]);
+ s_lo[6] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[2]);
+ samples_tbl.val[0] = s_hi[3]; // rows 3, 4, 5, 6
+ samples_tbl.val[1] = s_hi[7]; // rows 7, 8, 9, 10
+ s_hi[4] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[0]);
+ s_hi[5] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[1]);
+ s_hi[6] = vqtbl2q_s8(samples_tbl, merge_block_tbl.val[2]);
+
+ int16x8_t d[4];
+ d[0] = filter8_8_ps_partial(s_lo[0], s_hi[0], s_lo[4], s_hi[4],
+ filter);
+ d[1] = filter8_8_ps_partial(s_lo[1], s_hi[1], s_lo[5], s_hi[5],
+ filter);
+ d[2] = filter8_8_ps_partial(s_lo[2], s_hi[2], s_lo[6], s_hi[6],
+ filter);
+ d[3] = filter8_8_ps_partial(s_lo[3], s_hi[3], s_lo[7], s_hi[7],
+ filter);
+
+ store_s16x8xn<4>(dst_ptr, dstStride, d);
+
+ s_lo[0] = s_lo[4];
+ s_lo[1] = s_lo[5];
+ s_lo[2] = s_lo[6];
+ s_lo[3] = s_lo[7];
+ s_hi[0] = s_hi[4];
+ s_hi[1] = s_hi[5];
+ s_hi[2] = s_hi[6];
+ s_hi[3] = s_hi[7];
+
+ src_ptr += 4 * srcStride;
+ dst_ptr += 4 * dstStride;
+ }
+ }
+ }
+}
+
// Declaration for use in interp_hv_pp_dotprod().
template<int N, int width, int height>
void interp_vert_sp_neon(const int16_t *src, intptr_t srcStride, uint8_t *dst,
@@ -665,6 +995,7 @@ void interp_hv_pp_dotprod(const pixel *src, intptr_t srcStride, pixel *dst,
#define LUMA_DOTPROD(W, H) \
p.pu[LUMA_ ## W ## x ## H].luma_hpp = interp8_horiz_pp_dotprod<W, H>; \
p.pu[LUMA_ ## W ## x ## H].luma_hps = interp8_horiz_ps_dotprod<W, H>; \
+ p.pu[LUMA_ ## W ## x ## H].luma_vps = interp8_vert_ps_dotprod<W, H>; \
p.pu[LUMA_ ## W ## x ## H].luma_hvpp = interp_hv_pp_dotprod<W, H>;
#define CHROMA_420_DOTPROD(W, H) \
--
2.42.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0012-AArch64-Add-Armv8.4-Neon-DotProd-implementations-of-.patch
Type: text/x-patch
Size: 16958 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20240906/f09502ad/attachment-0001.bin>
More information about the x265-devel
mailing list