From c000955bc0eb386fed258962f180c4debfc985af Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 22 Oct 2014 22:41:39 +0000 Subject: [PATCH] Port I422ToRGBA to AVX. BUG=269 TESTED=intelsde on I422ToRGBA R=brucedawson@google.com Review URL: https://webrtc-codereview.appspot.com/28769004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1136 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/row.h | 11 +++++++++ include/libyuv/version.h | 2 +- source/convert_from.cc | 8 ++++++ source/planar_functions.cc | 8 ++++++ source/row_any.cc | 3 +++ source/row_win.cc | 50 ++++++++++++++++++++++++++++++++++++-- 7 files changed, 80 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index 9121b6b35..a9dc5d468 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1135 +Version: 1136 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 36226cc53..34dccae01 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -201,6 +201,7 @@ extern "C" { #define HAS_ARGBTOYJROW_AVX2 #define HAS_ARGBTOYROW_AVX2 #define HAS_I422TOARGBROW_AVX2 +#define HAS_I422TORGBAROW_AVX2 #define HAS_INTERPOLATEROW_AVX2 #define HAS_MERGEUVROW_AVX2 #define HAS_MIRRORROW_AVX2 @@ -1052,6 +1053,11 @@ void I422ToBGRARow_AVX2(const uint8* src_y, const uint8* src_v, uint8* dst_argb, int width); +void I422ToRGBARow_AVX2(const uint8* src_y, + const uint8* src_u, + const uint8* src_v, + uint8* dst_argb, + int width); void I444ToARGBRow_SSSE3(const uint8* src_y, const uint8* src_u, const uint8* src_v, @@ -1139,6 +1145,11 @@ void I422ToBGRARow_Any_AVX2(const uint8* src_y, const uint8* src_v, uint8* dst_argb, int width); +void I422ToRGBARow_Any_AVX2(const uint8* src_y, + const uint8* src_u, + const uint8* src_v, + uint8* dst_argb, + int width); void I444ToARGBRow_Any_SSSE3(const uint8* src_y, const uint8* src_u, const uint8* src_v, diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 5a3a9ce9f..d9f0aae22 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1135 +#define LIBYUV_VERSION 1136 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/convert_from.cc b/source/convert_from.cc index e044e0342..503ea0e8f 100644 --- a/source/convert_from.cc +++ b/source/convert_from.cc @@ -672,6 +672,14 @@ int I420ToRGBA(const uint8* src_y, int src_stride_y, } } #endif +#if defined(HAS_I422TORGBAROW_AVX2) + if (TestCpuFlag(kCpuHasAVX2) && width >= 16) { + I422ToRGBARow = I422ToRGBARow_Any_AVX2; + if (IS_ALIGNED(width, 16)) { + I422ToRGBARow = I422ToRGBARow_AVX2; + } + } +#endif #if defined(HAS_I422TORGBAROW_NEON) if (TestCpuFlag(kCpuHasNEON) && width >= 8) { I422ToRGBARow = I422ToRGBARow_Any_NEON; diff --git a/source/planar_functions.cc b/source/planar_functions.cc index b21192bc6..78cef68f9 100644 --- a/source/planar_functions.cc +++ b/source/planar_functions.cc @@ -946,6 +946,14 @@ int I422ToRGBA(const uint8* src_y, int src_stride_y, } } #endif +#if defined(HAS_I422TORGBAROW_AVX2) + if (TestCpuFlag(kCpuHasAVX2) && width >= 16) { + I422ToRGBARow = I422ToRGBARow_Any_AVX2; + if (IS_ALIGNED(width, 16)) { + I422ToRGBARow = I422ToRGBARow_AVX2; + } + } +#endif for (y = 0; y < height; ++y) { I422ToRGBARow(src_y, src_u, src_v, dst_rgba, width); diff --git a/source/row_any.cc b/source/row_any.cc index 5bb84f720..dcff09fa1 100644 --- a/source/row_any.cc +++ b/source/row_any.cc @@ -68,6 +68,9 @@ YANY(I422ToARGBRow_Any_AVX2, I422ToARGBRow_AVX2, I422ToARGBRow_C, 1, 4, 15) #ifdef HAS_I422TOBGRAROW_AVX2 YANY(I422ToBGRARow_Any_AVX2, I422ToBGRARow_AVX2, I422ToBGRARow_C, 1, 4, 15) #endif // HAS_I422TOBGRAROW_AVX2 +#ifdef HAS_I422TORGBAROW_AVX2 +YANY(I422ToRGBARow_Any_AVX2, I422ToRGBARow_AVX2, I422ToRGBARow_C, 1, 4, 15) +#endif // HAS_I422TORGBAROW_AVX2 #ifdef HAS_I422TOARGBROW_NEON YANY(I444ToARGBRow_Any_NEON, I444ToARGBRow_NEON, I444ToARGBRow_C, 0, 4, 7) YANY(I422ToARGBRow_Any_NEON, I422ToARGBRow_NEON, I422ToARGBRow_C, 1, 4, 7) diff --git a/source/row_win.cc b/source/row_win.cc index 20bc78f80..9a87a67e0 100644 --- a/source/row_win.cc +++ b/source/row_win.cc @@ -1656,6 +1656,52 @@ void I422ToBGRARow_AVX2(const uint8* y_buf, ret } } + +// 16 pixels +// 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 RGBA (64 bytes). +// TODO(fbarchard): Use macros to reduce duplicate code. See SSSE3. +__declspec(naked) __declspec(align(16)) +void I422ToRGBARow_AVX2(const uint8* y_buf, + const uint8* u_buf, + const uint8* v_buf, + uint8* dst_argb, + int width) { + __asm { + push esi + push edi + mov eax, [esp + 8 + 4] // Y + mov esi, [esp + 8 + 8] // U + mov edi, [esp + 8 + 12] // V + mov edx, [esp + 8 + 16] // argb + mov ecx, [esp + 8 + 20] // width + sub edi, esi + vpxor ymm4, ymm4, ymm4 + + align 4 + convertloop: + READYUV422_AVX2 + YUVTORGB_AVX2 + + // Step 3: Weave into RGBA + vpcmpeqb ymm5, ymm5, ymm5 // generate 0xffffffffffffffff for alpha + vpunpcklbw ymm1, ymm1, ymm2 // GR + vpermq ymm1, ymm1, 0xd8 + vpunpcklbw ymm5, ymm5, ymm0 // AB + vpermq ymm5, ymm5, 0xd8 + vpunpcklwd ymm0, ymm5, ymm1 // ABGR first 8 pixels + vpunpckhwd ymm1, ymm5, ymm1 // ABGR next 8 pixels + vmovdqu [edx], ymm0 + vmovdqu [edx + 32], ymm1 + lea edx, [edx + 64] + sub ecx, 16 + jg convertloop + vzeroupper + + pop edi + pop esi + ret + } +} #endif // HAS_I422TOARGBROW_AVX2 #ifdef HAS_I422TOARGBROW_SSSE3 @@ -1782,8 +1828,8 @@ void I444ToARGBRow_SSSE3(const uint8* y_buf, punpcklbw xmm0, xmm1 // BG punpcklbw xmm2, xmm5 // RA movdqa xmm1, xmm0 - punpcklwd xmm0, xmm2 // BGRA first 4 pixels - punpckhwd xmm1, xmm2 // BGRA next 4 pixels + punpcklwd xmm0, xmm2 // RGBA first 4 pixels + punpckhwd xmm1, xmm2 // RGBA next 4 pixels movdqu [edx], xmm0 movdqu [edx + 16], xmm1 lea edx, [edx + 32]