diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-07-13 16:27:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-13 16:27:10 +0000 |
| commit | 0cdc85d8cf376592171607df16c3851999393412 (patch) | |
| tree | 96839e6da3735dd329d6799f098ed52ca2cbecf8 /vp9/common | |
| parent | c243835303f196bab5a4a830a92b2048b836d9e4 (diff) | |
| parent | ae5394b9e29b8638b3877e994b7fbbd3d92a8348 (diff) | |
| download | libvpx-0cdc85d8cf376592171607df16c3851999393412.tar libvpx-0cdc85d8cf376592171607df16c3851999393412.tar.gz libvpx-0cdc85d8cf376592171607df16c3851999393412.tar.bz2 libvpx-0cdc85d8cf376592171607df16c3851999393412.zip | |
Merge "Revert "Add an SSE2 version of vp9_iwht4x4_16_add.""
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.pl | 2 | ||||
| -rw-r--r-- | vp9/common/x86/vp9_idct_sse2.asm | 88 |
2 files changed, 1 insertions, 89 deletions
diff --git a/vp9/common/vp9_rtcd_defs.pl b/vp9/common/vp9_rtcd_defs.pl index 538f1ed7e..524e79f0b 100644 --- a/vp9/common/vp9_rtcd_defs.pl +++ b/vp9/common/vp9_rtcd_defs.pl @@ -475,7 +475,7 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { specialize qw/vp9_iwht4x4_1_add msa/; add_proto qw/void vp9_iwht4x4_16_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride"; - specialize qw/vp9_iwht4x4_16_add msa/, "$sse2_x86inc"; + specialize qw/vp9_iwht4x4_16_add msa/; } } diff --git a/vp9/common/x86/vp9_idct_sse2.asm b/vp9/common/x86/vp9_idct_sse2.asm deleted file mode 100644 index 9619e3704..000000000 --- a/vp9/common/x86/vp9_idct_sse2.asm +++ /dev/null @@ -1,88 +0,0 @@ -; -; Copyright (c) 2015 The WebM project authors. All Rights Reserved. -; -; Use of this source code is governed by a BSD-style license -; that can be found in the LICENSE file in the root of the source -; tree. An additional intellectual property rights grant can be found -; in the file PATENTS. All contributing project authors may -; be found in the AUTHORS file in the root of the source tree. -; -%include "third_party/x86inc/x86inc.asm" - -SECTION .text - -%macro TRANSFORM_COLS 0 - paddw m0, m2 - psubw m3, m1 - psubw m4, m0, m3 - psraw m4, 1 - psubw m5, m4, m1 ;b1 - psubw m4, m2 ;c1 - psubw m0, m5 - paddw m3, m4 - ; m0 a0 - SWAP 1, 4 ; m1 c1 - SWAP 2, 3 ; m2 d1 - SWAP 3, 5 ; m3 b1 -%endmacro - -%macro TRANSPOSE_4X4 0 - SWAP 4, 0 - SWAP 5, 2 - punpcklwd m4, m1 - pshufd m0, m4, 0x0e - punpcklwd m5, m3 - pshufd m2, m5, 0x0e - SWAP 1, 4 - SWAP 3, 0 - punpckldq m1, m5 - pshufd m4, m1, 0x0e - punpckldq m3, m2 - pshufd m0, m3, 0x0e - SWAP 2, 3, 0, 1, 4 -%endmacro - -; transposes a 4x4 int16 matrix in xmm0 and xmm1 to the bottom half of xmm0-xmm3 -%macro TRANSPOSE_4X4_WIDE 0 - mova m3, m0 - punpcklwd m0, m1 - punpckhwd m3, m1 - mova m2, m0 - punpcklwd m0, m3 - punpckhwd m2, m3 - pshufd m1, m0, 0x0e - pshufd m3, m2, 0x0e -%endmacro - -%macro ADD_STORE_4P_2X 5 ; src1, src2, tmp1, tmp2, zero - movq m%3, [outputq] - movq m%4, [outputq + strideq] - punpcklbw m%3, m%5 - punpcklbw m%4, m%5 - paddw m%1, m%3 - paddw m%2, m%4 - packuswb m%1, m%5 - packuswb m%2, m%5 - movd [outputq], m%1 - movd [outputq + strideq], m%2 -%endmacro - -INIT_XMM sse2 -cglobal iwht4x4_16_add, 3, 4, 7, input, output, stride - mova m0, [inputq + 0] ;a1 - mova m1, [inputq + 16] ;c1 - - psraw m0, 2 - psraw m1, 2 - - TRANSPOSE_4X4_WIDE - TRANSFORM_COLS - TRANSPOSE_4X4 - TRANSFORM_COLS - - pxor m4, m4 - ADD_STORE_4P_2X 0, 1, 5, 6, 4 - lea outputq, [outputq + 2 * strideq] - ADD_STORE_4P_2X 2, 3, 5, 6, 4 - - RET |