From 87926cec8bf64180a340c630d35b9d1ef2710895 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 2 Nov 2015 10:40:03 -0800 Subject: [PATCH] remove store bgra, abgr, raw unused macros TBR=harryjin@google.com BUG=libyuv:518 Review URL: https://codereview.chromium.org/1420033004 . --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_gcc.cc | 40 ------------------------ source/row_win.cc | 66 ---------------------------------------- 4 files changed, 2 insertions(+), 108 deletions(-) diff --git a/README.chromium b/README.chromium index d6759ba75..ad006667f 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1528 +Version: 1529 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index cd3bc8608..f3f99d74b 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 1528 +#define LIBYUV_VERSION 1529 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_gcc.cc b/source/row_gcc.cc index fa485f1f6..ee0a8d176 100644 --- a/source/row_gcc.cc +++ b/source/row_gcc.cc @@ -136,11 +136,6 @@ static uvec8 kShuffleMaskARGBToRGB24_0 = { 0u, 1u, 2u, 4u, 5u, 6u, 8u, 9u, 128u, 128u, 128u, 128u, 10u, 12u, 13u, 14u }; -// Shuffle table for converting ARGB to RAW. -static uvec8 kShuffleMaskARGBToRAW_0 = { - 2u, 1u, 0u, 6u, 5u, 4u, 10u, 9u, 128u, 128u, 128u, 128u, 8u, 14u, 13u, 12u -}; - // YUY2 shuf 16 Y to 32 Y. static const lvec8 kShuffleYUY2Y = { 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, @@ -1557,29 +1552,6 @@ void RGBAToUVRow_SSSE3(const uint8* src_rgba0, int src_stride_rgba, "movdqu %%xmm1," MEMACCESS2(0x10, [dst_argb]) " \n" \ "lea " MEMLEA(0x20, [dst_argb]) ", %[dst_argb] \n" -// Store 8 BGRA values. -#define STOREBGRA \ - "pcmpeqb %%xmm5,%%xmm5 \n" \ - "punpcklbw %%xmm0,%%xmm1 \n" \ - "punpcklbw %%xmm2,%%xmm5 \n" \ - "movdqa %%xmm5,%%xmm0 \n" \ - "punpcklwd %%xmm1,%%xmm5 \n" \ - "punpckhwd %%xmm1,%%xmm0 \n" \ - "movdqu %%xmm5," MEMACCESS([dst_bgra]) " \n" \ - "movdqu %%xmm0," MEMACCESS2(0x10, [dst_bgra]) " \n" \ - "lea " MEMLEA(0x20, [dst_bgra]) ", %[dst_bgra] \n" - -// Store 8 ABGR values. -#define STOREABGR \ - "punpcklbw %%xmm1,%%xmm2 \n" \ - "punpcklbw %%xmm5,%%xmm0 \n" \ - "movdqa %%xmm2,%%xmm1 \n" \ - "punpcklwd %%xmm0,%%xmm2 \n" \ - "punpckhwd %%xmm0,%%xmm1 \n" \ - "movdqu %%xmm2," MEMACCESS([dst_abgr]) " \n" \ - "movdqu %%xmm1," MEMACCESS2(0x10, [dst_abgr]) " \n" \ - "lea " MEMLEA(0x20, [dst_abgr]) ", %[dst_abgr] \n" - // Store 8 RGBA values. #define STORERGBA \ "pcmpeqb %%xmm5,%%xmm5 \n" \ @@ -1978,18 +1950,6 @@ void OMITFP I422ToRGBARow_SSSE3(const uint8* y_buf, "vmovdqu %%ymm0," MEMACCESS2(0x20, [dst_argb]) " \n" \ "lea " MEMLEA(0x40, [dst_argb]) ", %[dst_argb] \n" -// Store 16 ABGR values. -#define STOREABGR_AVX2 \ - "vpunpcklbw %%ymm1,%%ymm2,%%ymm1 \n" \ - "vpermq $0xd8,%%ymm1,%%ymm1 \n" \ - "vpunpcklbw %%ymm5,%%ymm0,%%ymm2 \n" \ - "vpermq $0xd8,%%ymm2,%%ymm2 \n" \ - "vpunpcklwd %%ymm2,%%ymm1,%%ymm0 \n" \ - "vpunpckhwd %%ymm2,%%ymm1,%%ymm1 \n" \ - "vmovdqu %%ymm0," MEMACCESS([dst_abgr]) " \n" \ - "vmovdqu %%ymm1," MEMACCESS2(0x20, [dst_abgr]) " \n" \ - "lea " MEMLEA(0x40, [dst_abgr]) ", %[dst_abgr] \n" - #if defined(HAS_I422TOARGBROW_AVX2) // 16 pixels // 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes). diff --git a/source/row_win.cc b/source/row_win.cc index f80c17a2e..ad6614eda 100644 --- a/source/row_win.cc +++ b/source/row_win.cc @@ -84,17 +84,6 @@ extern "C" { _mm_storeu_si128((__m128i *)(dst_argb + 16), xmm1); \ dst_argb += 32; -// Store 8 ABGR values. -#define STOREABGR \ - xmm2 = _mm_unpacklo_epi8(xmm2, xmm1); \ - xmm0 = _mm_unpacklo_epi8(xmm0, xmm5); \ - xmm1 = _mm_loadu_si128(&xmm2); \ - xmm2 = _mm_unpacklo_epi16(xmm2, xmm0); \ - xmm1 = _mm_unpackhi_epi16(xmm1, xmm0); \ - _mm_storeu_si128((__m128i *)dst_abgr, xmm2); \ - _mm_storeu_si128((__m128i *)(dst_abgr + 16), xmm1); \ - dst_abgr += 32; - #if defined(HAS_I422TOARGBROW_SSSE3) void I422ToARGBRow_SSSE3(const uint8* y_buf, @@ -2025,19 +2014,6 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb, __asm lea edx, [edx + 64] \ } -// Store 16 ABGR values. -#define STOREBGRA_AVX2 __asm { \ - __asm vpunpcklbw ymm1, ymm1, ymm0 /* GB */ \ - __asm vpermq ymm1, ymm1, 0xd8 \ - __asm vpunpcklbw ymm2, ymm5, ymm2 /* AR */ \ - __asm vpermq ymm2, ymm2, 0xd8 \ - __asm vpunpcklwd ymm0, ymm2, ymm1 /* ARGB first 8 pixels */ \ - __asm vpunpckhwd ymm2, ymm2, ymm1 /* ARGB next 8 pixels */ \ - __asm vmovdqu [edx], ymm0 \ - __asm vmovdqu [edx + 32], ymm2 \ - __asm lea edx, [edx + 64] \ - } - // Store 16 RGBA values. #define STORERGBA_AVX2 __asm { \ __asm vpunpcklbw ymm1, ymm1, ymm2 /* GR */ \ @@ -2051,19 +2027,6 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb, __asm lea edx, [edx + 64] \ } -// Store 16 ABGR values. -#define STOREABGR_AVX2 __asm { \ - __asm vpunpcklbw ymm1, ymm2, ymm1 /* RG */ \ - __asm vpermq ymm1, ymm1, 0xd8 \ - __asm vpunpcklbw ymm2, ymm0, ymm5 /* BA */ \ - __asm vpermq ymm2, ymm2, 0xd8 \ - __asm vpunpcklwd ymm0, ymm1, ymm2 /* RGBA first 8 pixels */ \ - __asm vpunpckhwd ymm1, ymm1, ymm2 /* RGBA next 8 pixels */ \ - __asm vmovdqu [edx], ymm0 \ - __asm vmovdqu [edx + 32], ymm1 \ - __asm lea edx, [edx + 64] \ - } - #ifdef HAS_I422TOARGBROW_AVX2 // 16 pixels // 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes). @@ -2537,18 +2500,6 @@ void I422ToRGBARow_AVX2(const uint8* y_buf, __asm lea edx, [edx + 32] \ } -// Store 8 ABGR values. -#define STOREABGR __asm { \ - __asm punpcklbw xmm2, xmm1 /* RG */ \ - __asm punpcklbw xmm0, xmm5 /* BA */ \ - __asm movdqa xmm1, xmm2 \ - __asm punpcklwd xmm2, xmm0 /* RGBA first 4 pixels */ \ - __asm punpckhwd xmm1, xmm0 /* RGBA next 4 pixels */ \ - __asm movdqu 0[edx], xmm2 \ - __asm movdqu 16[edx], xmm1 \ - __asm lea edx, [edx + 32] \ - } - // Store 8 RGBA values. #define STORERGBA __asm { \ __asm pcmpeqb xmm5, xmm5 /* generate 0xffffffff for alpha */ \ @@ -2579,23 +2530,6 @@ void I422ToRGBARow_AVX2(const uint8* y_buf, __asm lea edx, [edx + 24] \ } -// Store 8 RAW values. -#define STORERAW __asm { \ - /* Weave into RRGB */ \ - __asm punpcklbw xmm0, xmm1 /* BG */ \ - __asm punpcklbw xmm2, xmm2 /* RR */ \ - __asm movdqa xmm1, xmm0 \ - __asm punpcklwd xmm0, xmm2 /* BGRR first 4 pixels */ \ - __asm punpckhwd xmm1, xmm2 /* BGRR next 4 pixels */ \ - /* Step 4: RRGB -> RAW */ \ - __asm pshufb xmm0, xmm5 /* Pack first 8 and last 4 bytes. */ \ - __asm pshufb xmm1, xmm6 /* Pack first 12 bytes. */ \ - __asm palignr xmm1, xmm0, 12 /* last 4 bytes of xmm0 + 12 xmm1 */ \ - __asm movq qword ptr 0[edx], xmm0 /* First 8 bytes */ \ - __asm movdqu 8[edx], xmm1 /* Last 16 bytes */ \ - __asm lea edx, [edx + 24] \ - } - // Store 8 RGB565 values. #define STORERGB565 __asm { \ /* Weave into RRGB */ \