diff options
| author | Jian Zhou <zhoujian@google.com> | 2015-12-18 01:39:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-18 01:39:20 +0000 |
| commit | 8f8a3b6a7842e82d1bdf61538a0f05c7044060ab (patch) | |
| tree | ca44b9e2c2e603eace9ef31682b5f065fc8ef0e4 /vpx_dsp | |
| parent | 685a6b602b454902188389da37c6f64ca0e15ac5 (diff) | |
| parent | b158d9a649bc36c0ee602ae122606df9bb23a896 (diff) | |
| download | libvpx-8f8a3b6a7842e82d1bdf61538a0f05c7044060ab.tar libvpx-8f8a3b6a7842e82d1bdf61538a0f05c7044060ab.tar.gz libvpx-8f8a3b6a7842e82d1bdf61538a0f05c7044060ab.tar.bz2 libvpx-8f8a3b6a7842e82d1bdf61538a0f05c7044060ab.zip | |
Merge "Code clean of sad4xN(_avg)_sse"
Diffstat (limited to 'vpx_dsp')
| -rw-r--r-- | vpx_dsp/vpx_dsp_rtcd_defs.pl | 8 | ||||
| -rw-r--r-- | vpx_dsp/x86/sad_sse2.asm | 15 |
2 files changed, 12 insertions, 11 deletions
diff --git a/vpx_dsp/vpx_dsp_rtcd_defs.pl b/vpx_dsp/vpx_dsp_rtcd_defs.pl index f71769918..897913571 100644 --- a/vpx_dsp/vpx_dsp_rtcd_defs.pl +++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl @@ -990,10 +990,10 @@ add_proto qw/unsigned int vpx_sad8x4/, "const uint8_t *src_ptr, int src_stride, specialize qw/vpx_sad8x4 msa/, "$sse2_x86inc"; add_proto qw/unsigned int vpx_sad4x8/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride"; -specialize qw/vpx_sad4x8 msa/, "$sse_x86inc"; +specialize qw/vpx_sad4x8 msa/, "$sse2_x86inc"; add_proto qw/unsigned int vpx_sad4x4/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride"; -specialize qw/vpx_sad4x4 mmx neon msa/, "$sse_x86inc"; +specialize qw/vpx_sad4x4 mmx neon msa/, "$sse2_x86inc"; # # Avg @@ -1061,10 +1061,10 @@ add_proto qw/unsigned int vpx_sad8x4_avg/, "const uint8_t *src_ptr, int src_stri specialize qw/vpx_sad8x4_avg msa/, "$sse2_x86inc"; add_proto qw/unsigned int vpx_sad4x8_avg/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred"; -specialize qw/vpx_sad4x8_avg msa/, "$sse_x86inc"; +specialize qw/vpx_sad4x8_avg msa/, "$sse2_x86inc"; add_proto qw/unsigned int vpx_sad4x4_avg/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred"; -specialize qw/vpx_sad4x4_avg msa/, "$sse_x86inc"; +specialize qw/vpx_sad4x4_avg msa/, "$sse2_x86inc"; # # Multi-block SAD, comparing a reference to N blocks 1 pixel apart horizontally diff --git a/vpx_dsp/x86/sad_sse2.asm b/vpx_dsp/x86/sad_sse2.asm index 0defe1b6d..a141999ae 100644 --- a/vpx_dsp/x86/sad_sse2.asm +++ b/vpx_dsp/x86/sad_sse2.asm @@ -222,8 +222,8 @@ SAD8XN 16, 1 ; sad8x16_avg_sse2 SAD8XN 8, 1 ; sad8x8_avg_sse2 SAD8XN 4, 1 ; sad8x4_avg_sse2 -; unsigned int vpx_sad4x{4, 8}_sse(uint8_t *src, int src_stride, -; uint8_t *ref, int ref_stride); +; unsigned int vpx_sad4x{4, 8}_sse2(uint8_t *src, int src_stride, +; uint8_t *ref, int ref_stride); %macro SAD4XN 1-2 0 SAD_FN 4, %1, 7, %2 mov n_rowsd, %1/4 @@ -236,10 +236,10 @@ SAD8XN 4, 1 ; sad8x4_avg_sse2 movd m4, [refq+ref_stride3q] punpckldq m1, m2 punpckldq m3, m4 + movlhps m1, m3 %if %2 == 1 pavgb m1, [second_predq+mmsize*0] - pavgb m3, [second_predq+mmsize*1] - lea second_predq, [second_predq+mmsize*2] + lea second_predq, [second_predq+mmsize*1] %endif movd m2, [srcq] movd m5, [srcq+src_strideq] @@ -247,20 +247,21 @@ SAD8XN 4, 1 ; sad8x4_avg_sse2 movd m6, [srcq+src_stride3q] punpckldq m2, m5 punpckldq m4, m6 + movlhps m2, m4 psadbw m1, m2 - psadbw m3, m4 lea refq, [refq+ref_strideq*4] paddd m0, m1 lea srcq, [srcq+src_strideq*4] - paddd m0, m3 dec n_rowsd jg .loop + movhlps m1, m0 + paddd m0, m1 movd eax, m0 RET %endmacro -INIT_MMX sse +INIT_XMM sse2 SAD4XN 8 ; sad4x8_sse SAD4XN 4 ; sad4x4_sse SAD4XN 8, 1 ; sad4x8_avg_sse |