提交 260923e1 编写于 作者: M Megvii Engine Team

perf(aarch64): optimize aarch64 uint16 relayout with block_w==3

GitOrigin-RevId: fe6aaaac0cbd594ad80dcf2e9763fce9c99f5a4e
上级 b04c3d14
...@@ -363,6 +363,58 @@ static inline void trans_8x4_u16( ...@@ -363,6 +363,58 @@ static inline void trans_8x4_u16(
vst1q_u16(dst_ptr + 3 * dst_step, row_3); vst1q_u16(dst_ptr + 3 * dst_step, row_3);
} }
static inline void trans_8x3_u16(
const void* src, void* dst, const size_t src_step, const size_t dst_step) {
uint16_t* src_ptr = (uint16_t*)src;
uint16_t* dst_ptr = (uint16_t*)dst;
uint16x4_t src0 = vld1_u16(src_ptr + 0 * src_step); // A0A1A2A3
uint16x4_t src1 = vld1_u16(src_ptr + 1 * src_step); // B0B1B2B3
uint16x4_t src2 = vld1_u16(src_ptr + 2 * src_step); // C0C1C2C3
uint16x4_t src3 = vld1_u16(src_ptr + 3 * src_step); // D0D1D2D3
uint16x4_t src4 = vld1_u16(src_ptr + 4 * src_step); // E0E1E2E3
uint16x4_t src5 = vld1_u16(src_ptr + 5 * src_step); // F0F1F2F3
uint16x4_t src6 = vld1_u16(src_ptr + 6 * src_step); // G0G1G2G3
// H0H1H2
uint16x4_t src7 =
vreinterpret_u16_u32(vld1_dup_u32((uint32_t*)(src_ptr + 7 * src_step)));
src7 = vld1_lane_u16(src_ptr + 7 * src_step + 2, src7, 2);
uint16x4_t ab_low = vzip1_u16(src0, src1); // A0B0A1B1
uint16x4_t ab_high = vzip2_u16(src0, src1); // A2B2A3B3
uint16x4_t cd_low = vzip1_u16(src2, src3); // C0D0C1D1
uint16x4_t cd_high = vzip2_u16(src2, src3); // C2D2C3D3
uint16x4_t ef_low = vzip1_u16(src4, src5); // E0F0E1F1
uint16x4_t ef_high = vzip2_u16(src4, src5); // E2F2E3F3
uint16x4_t gh_low = vzip1_u16(src6, src7); // G0H0G1H1
uint16x4_t gh_high = vzip2_u16(src6, src7); // G2H2G3
uint16x4_t abcd_0 = vreinterpret_u16_u32(vzip1_u32(
vreinterpret_u32_u16(ab_low),
vreinterpret_u32_u16(cd_low))); // A0B0C0D0
uint16x4_t abcd_1 = vreinterpret_u16_u32(vzip2_u32(
vreinterpret_u32_u16(ab_low),
vreinterpret_u32_u16(cd_low))); // A1B1C1D1
uint16x4_t abcd_2 = vreinterpret_u16_u32(vzip1_u32(
vreinterpret_u32_u16(ab_high),
vreinterpret_u32_u16(cd_high))); // A2B2C2D2
uint16x4_t efgh_0 = vreinterpret_u16_u32(vzip1_u32(
vreinterpret_u32_u16(ef_low),
vreinterpret_u32_u16(gh_low))); // E0F0G0H0
uint16x4_t efgh_1 = vreinterpret_u16_u32(vzip2_u32(
vreinterpret_u32_u16(ef_low),
vreinterpret_u32_u16(gh_low))); // E1F1G1H1
uint16x4_t efgh_2 = vreinterpret_u16_u32(vzip1_u32(
vreinterpret_u32_u16(ef_high),
vreinterpret_u32_u16(gh_high))); // E2F2G2H2
uint16x8_t row_0 = vcombine_u16(abcd_0, efgh_0);
uint16x8_t row_1 = vcombine_u16(abcd_1, efgh_1);
uint16x8_t row_2 = vcombine_u16(abcd_2, efgh_2);
vst1q_u16(dst_ptr + 0 * dst_step, row_0);
vst1q_u16(dst_ptr + 1 * dst_step, row_1);
vst1q_u16(dst_ptr + 2 * dst_step, row_2);
}
} // anonymous namespace } // anonymous namespace
namespace megdnn { namespace megdnn {
...@@ -410,6 +462,8 @@ void transpose_block<Transpose2Byte>( ...@@ -410,6 +462,8 @@ void transpose_block<Transpose2Byte>(
const size_t dst_stride, size_t block_h, size_t block_w) { const size_t dst_stride, size_t block_h, size_t block_w) {
if (block_h == 8 && block_w == 4) { if (block_h == 8 && block_w == 4) {
trans_8x4_u16(src, dst, src_stride, dst_stride); trans_8x4_u16(src, dst, src_stride, dst_stride);
} else if (block_h == 8 && block_w == 3) {
trans_8x3_u16(src, dst, src_stride, dst_stride);
} else { } else {
transpose_block_fallback(src, dst, src_stride, dst_stride, block_h, block_w); transpose_block_fallback(src, dst, src_stride, dst_stride, block_h, block_w);
} }
......
...@@ -40,6 +40,9 @@ TEST_F(AARCH64, Relayout) { ...@@ -40,6 +40,9 @@ TEST_F(AARCH64, Relayout) {
TensorLayout dst({1, 54, 112, 256}, {1548288, 28672, 256, 1}, dtype); TensorLayout dst({1, 54, 112, 256}, {1548288, 28672, 256, 1}, dtype);
checker.execl({src, dst}); checker.execl({src, dst});
} }
TensorLayout src_4_3({1, 3, 112, 256}, {3, 1, 1024, 4}, dtype::Uint16());
TensorLayout dst_4_3({1, 3, 112, 256}, {86016, 28672, 256, 1}, dtype::Uint16());
checker.execl({src_4_3, dst_4_3});
} }
TEST_F(AARCH64, RelayoutNonContig) { TEST_F(AARCH64, RelayoutNonContig) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册