diff options
Diffstat (limited to 'vp9/common/x86/sadmxn_x86.c')
-rw-r--r-- | vp9/common/x86/sadmxn_x86.c | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/vp9/common/x86/sadmxn_x86.c b/vp9/common/x86/sadmxn_x86.c index 77cd372ac..0b783ccea 100644 --- a/vp9/common/x86/sadmxn_x86.c +++ b/vp9/common/x86/sadmxn_x86.c @@ -11,21 +11,18 @@ #include <emmintrin.h> // SSE2 #include "./vpx_config.h" #include "./vp9_rtcd.h" - +#include "vpx/vpx_integer.h" #if HAVE_SSE2 unsigned int vp9_sad16x3_sse2( const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, - int ref_stride, - int max_sad) { + int ref_stride) { __m128i s0, s1, s2; __m128i r0, r1, r2; __m128i sad; - (void)max_sad; - s0 = _mm_loadu_si128((const __m128i *)(src_ptr + 0 * src_stride)); s1 = _mm_loadu_si128((const __m128i *)(src_ptr + 1 * src_stride)); s2 = _mm_loadu_si128((const __m128i *)(src_ptr + 2 * src_stride)); @@ -46,12 +43,25 @@ unsigned int vp9_sad3x16_sse2( const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, - int ref_stride, - int max_sad) { + int ref_stride) { int r; __m128i s0, s1, s2, s3; __m128i r0, r1, r2, r3; - __m128i sad = _mm_set1_epi16(0); + __m128i sad = _mm_setzero_si128(); + __m128i mask; + const int offset = (uintptr_t)src_ptr & 3; + + /* In current use case, the offset is 1 if CONFIG_SUBPELREFMV is off. + * Here, for offset=1, we adjust src_ptr to be 4-byte aligned. Then, movd + * takes much less time. + */ + if (offset == 1) + src_ptr -= 1; + + /* mask = 0xffffffffffff0000ffffffffffff0000 */ + mask = _mm_cmpeq_epi32(sad, sad); + mask = _mm_slli_epi64(mask, 16); + for (r = 0; r < 16; r += 4) { s0 = _mm_cvtsi32_si128 (*(const int *)(src_ptr + 0 * src_stride)); s1 = _mm_cvtsi32_si128 (*(const int *)(src_ptr + 1 * src_stride)); @@ -69,8 +79,11 @@ unsigned int vp9_sad3x16_sse2( s0 = _mm_unpacklo_epi64(s0, s2); r0 = _mm_unpacklo_epi64(r0, r2); - // throw out byte 3 - s0 = _mm_slli_epi64(s0, 16); + // throw out extra byte + if (offset == 1) + s0 = _mm_and_si128(s0, mask); + else + s0 = _mm_slli_epi64(s0, 16); r0 = _mm_slli_epi64(r0, 16); sad = _mm_add_epi16(sad, _mm_sad_epu8(s0, r0)); @@ -84,5 +97,3 @@ unsigned int vp9_sad3x16_sse2( } #endif - - |