From 9ed07258c77b731eb92742d4cb6b21ad12584a36 Mon Sep 17 00:00:00 2001 From: George Steed Date: Mon, 20 May 2024 16:06:48 +0100 Subject: [PATCH] [AArch64] Add SVE2 implementation of I410ToAR30Row Observed reduction in runtime compared to the existing Neon code: Cortex-A510: -18.1% Cortex-A520: -6.0% Cortex-A715: -22.0% Cortex-A720: -21.1% Cortex-X2: -9.4% Cortex-X3: -12.0% Cortex-X4: -7.6% Cortex-X925: -5.8% Bug: b/42280942 Change-Id: I853a028e08f1f1076ac20cd9c7f4f8ac8a211ac1 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/6023584 Reviewed-by: Justin Green Reviewed-by: Frank Barchard --- include/libyuv/row.h | 7 +++++++ source/convert_argb.cc | 15 ++++++++++++++ source/row_sve.cc | 47 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 945b32458..1953f9fe0 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -560,6 +560,7 @@ extern "C" { #define HAS_I212TOARGBROW_SVE2 #define HAS_I400TOARGBROW_SVE2 #define HAS_I410ALPHATOARGBROW_SVE2 +#define HAS_I410TOAR30ROW_SVE2 #define HAS_I410TOARGBROW_SVE2 #define HAS_I422ALPHATOARGBROW_SVE2 #define HAS_I422TOARGB1555ROW_SVE2 @@ -1157,6 +1158,12 @@ void I410ToAR30Row_NEON(const uint16_t* src_y, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width); +void I410ToAR30Row_SVE2(const uint16_t* src_y, + const uint16_t* src_u, + const uint16_t* src_v, + uint8_t* rgb_buf, + const struct YuvConstants* yuvconstants, + int width); void I212ToARGBRow_NEON(const uint16_t* src_y, const uint16_t* src_u, const uint16_t* src_v, diff --git a/source/convert_argb.cc b/source/convert_argb.cc index 599dcc313..dab0d9644 100644 --- a/source/convert_argb.cc +++ b/source/convert_argb.cc @@ -1389,6 +1389,11 @@ int I410ToAR30Matrix(const uint16_t* src_y, } } #endif +#if defined(HAS_I410TOAR30ROW_SVE2) + if (TestCpuFlag(kCpuHasSVE2)) { + I410ToAR30Row = I410ToAR30Row_SVE2; + } +#endif #if defined(HAS_I410TOAR30ROW_SSSE3) if (TestCpuFlag(kCpuHasSSSE3)) { I410ToAR30Row = I410ToAR30Row_Any_SSSE3; @@ -6977,6 +6982,11 @@ static int I010ToAR30MatrixBilinear(const uint16_t* src_y, } } #endif +#if defined(HAS_I410TOAR30ROW_SVE2) + if (TestCpuFlag(kCpuHasSVE2)) { + I410ToAR30Row = I410ToAR30Row_SVE2; + } +#endif #if defined(HAS_I410TOAR30ROW_SSSE3) if (TestCpuFlag(kCpuHasSSSE3)) { I410ToAR30Row = I410ToAR30Row_Any_SSSE3; @@ -7091,6 +7101,11 @@ static int I210ToAR30MatrixLinear(const uint16_t* src_y, } } #endif +#if defined(HAS_I410TOAR30ROW_SVE2) + if (TestCpuFlag(kCpuHasSVE2)) { + I410ToAR30Row = I410ToAR30Row_SVE2; + } +#endif #if defined(HAS_I410TOAR30ROW_SSSE3) if (TestCpuFlag(kCpuHasSSSE3)) { I410ToAR30Row = I410ToAR30Row_Any_SSSE3; diff --git a/source/row_sve.cc b/source/row_sve.cc index f91e2175c..92b7b23c5 100644 --- a/source/row_sve.cc +++ b/source/row_sve.cc @@ -2235,6 +2235,53 @@ void I410AlphaToARGBRow_SVE2(const uint16_t* src_y, : "cc", "memory", YUVTORGB_SVE_REGS); } +void I410ToAR30Row_SVE2(const uint16_t* src_y, + const uint16_t* src_u, + const uint16_t* src_v, + uint8_t* dst_ar30, + const struct YuvConstants* yuvconstants, + int width) { + uint64_t vl; + asm("cnth %0" : "=r"(vl)); + int width_last_y = width & (vl - 1); + width_last_y = width_last_y == 0 ? vl : width_last_y; + uint16_t limit = 0x3ff0; + asm volatile( + "ptrue p0.b \n" YUVTORGB_SVE_SETUP + "dup z23.h, %w[limit] \n" + "subs %w[width], %w[width], %w[vl] \n" + "b.lt 2f \n" + + // Run bulk of computation with an all-true predicate to avoid predicate + // generation overhead. + "ptrue p1.h \n" + "1: \n" // + READI410_SVE I4XXTORGB_SVE STOREAR30_SVE + "subs %w[width], %w[width], %w[vl] \n" + "b.ge 1b \n" + + "2: \n" + "adds %w[width], %w[width], %w[vl] \n" + "b.eq 99f \n" + + // Calculate a predicate for the final iteration to deal with the tail. + "whilelt p1.h, wzr, %w[width_last_y] \n" // + READI410_SVE I4XXTORGB_SVE STOREAR30_SVE + + "99: \n" + : [src_y] "+r"(src_y), // %[src_y] + [src_u] "+r"(src_u), // %[src_u] + [src_v] "+r"(src_v), // %[src_v] + [dst_ar30] "+r"(dst_ar30), // %[dst_argb] + [width] "+r"(width) // %[width] + : [vl] "r"(vl), // %[vl] + [kUVCoeff] "r"(&yuvconstants->kUVCoeff), // %[kUVCoeff] + [kRGBCoeffBias] "r"(&yuvconstants->kRGBCoeffBias), // %[kRGBCoeffBias] + [width_last_y] "r"(width_last_y), // %[width_last_y] + [limit] "r"(limit) // %[limit] + : "cc", "memory", YUVTORGB_SVE_REGS); +} + void P410ToARGBRow_SVE2(const uint16_t* src_y, const uint16_t* src_uv, uint8_t* dst_argb,