ref: 67c4c8244aaed91487ef3cce9a1c192b7da9f026
parent: 8040a8a6c9098d8bd816799e284146bbc5dabae0
author: Scott LaVarnway <slavarnway@google.com>
date: Mon Mar 7 23:24:47 EST 2016
VPX: loopfilter_mmx.asm using x86inc 2 This reverts commit 9aa083d164e0d39086aa0c83f0d1a0d0f0d1ba61. Fixes a decoder mismatch with 32bit PIC builds. Change-Id: I94717df662834810302fe3594b38c53084a4e284
--- a/test/lpf_8_test.cc
+++ b/test/lpf_8_test.cc
@@ -430,7 +430,7 @@
using std::tr1::make_tuple;
-#if HAVE_MMX && !CONFIG_VP9_HIGHBITDEPTH
+#if HAVE_MMX && CONFIG_USE_X86INC && !CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(
MMX, Loop8Test6Param,
::testing::Values(
--- a/vpx_dsp/vpx_dsp.mk
+++ b/vpx_dsp/vpx_dsp.mk
@@ -39,6 +39,7 @@
DSP_SRCS-yes += intrapred.c
ifeq ($(CONFIG_USE_X86INC),yes)
+DSP_SRCS-$(HAVE_MMX) += x86/loopfilter_mmx.asm
DSP_SRCS-$(HAVE_SSE) += x86/intrapred_sse2.asm
DSP_SRCS-$(HAVE_SSE2) += x86/intrapred_sse2.asm
DSP_SRCS-$(HAVE_SSSE3) += x86/intrapred_ssse3.asm
@@ -128,7 +129,6 @@
DSP_SRCS-$(ARCH_X86)$(ARCH_X86_64) += x86/loopfilter_sse2.c
DSP_SRCS-$(HAVE_AVX2) += x86/loopfilter_avx2.c
-DSP_SRCS-$(HAVE_MMX) += x86/loopfilter_mmx.asm
DSP_SRCS-$(HAVE_NEON) += arm/loopfilter_neon.c
ifeq ($(HAVE_NEON_ASM),yes)
--- a/vpx_dsp/vpx_dsp_rtcd_defs.pl
+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl
@@ -543,7 +543,7 @@
$vpx_lpf_vertical_8_dual_neon_asm=vpx_lpf_vertical_8_dual_neon;
add_proto qw/void vpx_lpf_vertical_4/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";
-specialize qw/vpx_lpf_vertical_4 mmx neon dspr2 msa/;
+specialize qw/vpx_lpf_vertical_4 neon dspr2 msa/, "$mmx_x86inc";
add_proto qw/void vpx_lpf_vertical_4_dual/, "uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1";
specialize qw/vpx_lpf_vertical_4_dual sse2 neon dspr2 msa/;
@@ -564,7 +564,7 @@
$vpx_lpf_horizontal_8_dual_neon_asm=vpx_lpf_horizontal_8_dual_neon;
add_proto qw/void vpx_lpf_horizontal_4/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";
-specialize qw/vpx_lpf_horizontal_4 mmx neon dspr2 msa/;
+specialize qw/vpx_lpf_horizontal_4 neon dspr2 msa/, "$mmx_x86inc";
add_proto qw/void vpx_lpf_horizontal_4_dual/, "uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1";
specialize qw/vpx_lpf_horizontal_4_dual sse2 neon dspr2 msa/;
--- a/vpx_dsp/x86/loopfilter_mmx.asm
+++ b/vpx_dsp/x86/loopfilter_mmx.asm
@@ -1,5 +1,5 @@
;
-; Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+; Copyright (c) 2016 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
@@ -8,589 +8,429 @@
; be found in the AUTHORS file in the root of the source tree.
;
+%include "third_party/x86inc/x86inc.asm"
-%include "vpx_ports/x86_abi_support.asm"
+SECTION_RODATA
+align 16
+tfe:
+ times 8 db 0xfe
+t80:
+ times 8 db 0x80
+t3:
+ times 8 db 0x03
+t4:
+ times 8 db 0x04
+ones:
+ times 4 dw 0x0001
+SECTION .text
-;void vpx_lpf_horizontal_4_mmx
-;(
-; unsigned char *src_ptr,
-; int src_pixel_step,
-; const char *blimit,
-; const char *limit,
-; const char *thresh
-;)
-global sym(vpx_lpf_horizontal_4_mmx) PRIVATE
-sym(vpx_lpf_horizontal_4_mmx):
- push rbp
- mov rbp, rsp
- SHADOW_ARGS_TO_STACK 5
- GET_GOT rbx
- push rsi
- push rdi
- ; end prolog
+%define stkreg rsp
- ALIGN_STACK 16, rax
- sub rsp, 32 ; reserve 32 bytes
- %define t0 [rsp + 0] ;__declspec(align(16)) char t0[8];
- %define t1 [rsp + 16] ;__declspec(align(16)) char t1[8];
+%define t0 0
+%define t1 t0 + 16
+%define p1 t1 + 16
+%define p0 p1 + 16
+%define q0 p0 + 16
+%define q1 q0 + 16
+%define lstacksize q1 + 16
- mov rsi, arg(0) ;src_ptr
- movsxd rax, dword ptr arg(1) ;src_pixel_step ; destination pitch?
+%define goffsetq _limitq
- mov rdx, arg(3) ;limit
- movq mm7, [rdx]
- mov rdi, rsi ; rdi points to row +1 for indirect addressing
- add rdi, rax
+;void vpx_lpf_horizontal_4_mmx(unsigned char *src_ptr, int src_pixel_step,
+; const char *blimit, const char *limit,
+; const char *thresh);
+INIT_MMX mmx
+cglobal lpf_horizontal_4, 5, 6, 8, 0 - lstacksize, \
+ s, p, _blimit, _limit, _thresh, s1
+ movq m7, [_limitq]
+ GET_GOT goffsetq
+%if GET_GOT_DEFINED=1
+ add rsp, gprsize ; restore stack
+%endif
+ lea s1q, [sq + pq] ; s1q points to row +1
- ; calculate breakout conditions
- movq mm2, [rdi+2*rax] ; q3
- movq mm1, [rsi+2*rax] ; q2
- movq mm6, mm1 ; q2
- psubusb mm1, mm2 ; q2-=q3
- psubusb mm2, mm6 ; q3-=q2
- por mm1, mm2 ; abs(q3-q2)
- psubusb mm1, mm7 ;
-
-
- movq mm4, [rsi+rax] ; q1
- movq mm3, mm4 ; q1
- psubusb mm4, mm6 ; q1-=q2
- psubusb mm6, mm3 ; q2-=q1
- por mm4, mm6 ; abs(q2-q1)
-
- psubusb mm4, mm7
- por mm1, mm4
-
- movq mm4, [rsi] ; q0
- movq mm0, mm4 ; q0
- psubusb mm4, mm3 ; q0-=q1
- psubusb mm3, mm0 ; q1-=q0
- por mm4, mm3 ; abs(q0-q1)
- movq t0, mm4 ; save to t0
- psubusb mm4, mm7
- por mm1, mm4
-
-
- neg rax ; negate pitch to deal with above border
-
- movq mm2, [rsi+4*rax] ; p3
- movq mm4, [rdi+4*rax] ; p2
- movq mm5, mm4 ; p2
- psubusb mm4, mm2 ; p2-=p3
- psubusb mm2, mm5 ; p3-=p2
- por mm4, mm2 ; abs(p3 - p2)
- psubusb mm4, mm7
- por mm1, mm4
-
-
- movq mm4, [rsi+2*rax] ; p1
- movq mm3, mm4 ; p1
- psubusb mm4, mm5 ; p1-=p2
- psubusb mm5, mm3 ; p2-=p1
- por mm4, mm5 ; abs(p2 - p1)
- psubusb mm4, mm7
- por mm1, mm4
-
- movq mm2, mm3 ; p1
-
- movq mm4, [rsi+rax] ; p0
- movq mm5, mm4 ; p0
- psubusb mm4, mm3 ; p0-=p1
- psubusb mm3, mm5 ; p1-=p0
- por mm4, mm3 ; abs(p1 - p0)
- movq t1, mm4 ; save to t1
- psubusb mm4, mm7
- por mm1, mm4
-
- movq mm3, [rdi] ; q1
- movq mm4, mm3 ; q1
- psubusb mm3, mm2 ; q1-=p1
- psubusb mm2, mm4 ; p1-=q1
- por mm2, mm3 ; abs(p1-q1)
- pand mm2, [GLOBAL(tfe)] ; set lsb of each byte to zero
- psrlw mm2, 1 ; abs(p1-q1)/2
-
- movq mm6, mm5 ; p0
- movq mm3, [rsi] ; q0
- psubusb mm5, mm3 ; p0-=q0
- psubusb mm3, mm6 ; q0-=p0
- por mm5, mm3 ; abs(p0 - q0)
- paddusb mm5, mm5 ; abs(p0-q0)*2
- paddusb mm5, mm2 ; abs (p0 - q0) *2 + abs(p1-q1)/2
-
- mov rdx, arg(2) ;blimit ; get blimit
- movq mm7, [rdx] ; blimit
-
- psubusb mm5, mm7 ; abs (p0 - q0) *2 + abs(p1-q1)/2 > blimit
- por mm1, mm5
- pxor mm5, mm5
- pcmpeqb mm1, mm5 ; mask mm1
-
- ; calculate high edge variance
- mov rdx, arg(4) ;thresh ; get thresh
- movq mm7, [rdx] ;
- movq mm4, t0 ; get abs (q1 - q0)
- psubusb mm4, mm7
- movq mm3, t1 ; get abs (p1 - p0)
- psubusb mm3, mm7
- paddb mm4, mm3 ; abs(q1 - q0) > thresh || abs(p1 - p0) > thresh
-
- pcmpeqb mm4, mm5
-
- pcmpeqb mm5, mm5
- pxor mm4, mm5
-
-
- ; start work on filters
- movq mm2, [rsi+2*rax] ; p1
- movq mm7, [rdi] ; q1
- pxor mm2, [GLOBAL(t80)] ; p1 offset to convert to signed values
- pxor mm7, [GLOBAL(t80)] ; q1 offset to convert to signed values
- psubsb mm2, mm7 ; p1 - q1
- pand mm2, mm4 ; high var mask (hvm)(p1 - q1)
- pxor mm6, [GLOBAL(t80)] ; offset to convert to signed values
- pxor mm0, [GLOBAL(t80)] ; offset to convert to signed values
- movq mm3, mm0 ; q0
- psubsb mm0, mm6 ; q0 - p0
- paddsb mm2, mm0 ; 1 * (q0 - p0) + hvm(p1 - q1)
- paddsb mm2, mm0 ; 2 * (q0 - p0) + hvm(p1 - q1)
- paddsb mm2, mm0 ; 3 * (q0 - p0) + hvm(p1 - q1)
- pand mm1, mm2 ; mask filter values we don't care about
- movq mm2, mm1
- paddsb mm1, [GLOBAL(t4)] ; 3* (q0 - p0) + hvm(p1 - q1) + 4
- paddsb mm2, [GLOBAL(t3)] ; 3* (q0 - p0) + hvm(p1 - q1) + 3
-
- pxor mm0, mm0 ;
- pxor mm5, mm5
- punpcklbw mm0, mm2 ;
- punpckhbw mm5, mm2 ;
- psraw mm0, 11 ;
- psraw mm5, 11
- packsswb mm0, mm5
- movq mm2, mm0 ; (3* (q0 - p0) + hvm(p1 - q1) + 3) >> 3;
-
- pxor mm0, mm0 ; 0
- movq mm5, mm1 ; abcdefgh
- punpcklbw mm0, mm1 ; e0f0g0h0
- psraw mm0, 11 ; sign extended shift right by 3
- pxor mm1, mm1 ; 0
- punpckhbw mm1, mm5 ; a0b0c0d0
- psraw mm1, 11 ; sign extended shift right by 3
- movq mm5, mm0 ; save results
-
- packsswb mm0, mm1 ; (3* (q0 - p0) + hvm(p1 - q1) + 4) >>3
- paddsw mm5, [GLOBAL(ones)]
- paddsw mm1, [GLOBAL(ones)]
- psraw mm5, 1 ; partial shifted one more time for 2nd tap
- psraw mm1, 1 ; partial shifted one more time for 2nd tap
- packsswb mm5, mm1 ; (3* (q0 - p0) + hvm(p1 - q1) + 4) >>4
- pandn mm4, mm5 ; high edge variance additive
-
- paddsb mm6, mm2 ; p0+= p0 add
- pxor mm6, [GLOBAL(t80)] ; unoffset
- movq [rsi+rax], mm6 ; write back
-
- movq mm6, [rsi+2*rax] ; p1
- pxor mm6, [GLOBAL(t80)] ; reoffset
- paddsb mm6, mm4 ; p1+= p1 add
- pxor mm6, [GLOBAL(t80)] ; unoffset
- movq [rsi+2*rax], mm6 ; write back
-
- psubsb mm3, mm0 ; q0-= q0 add
- pxor mm3, [GLOBAL(t80)] ; unoffset
- movq [rsi], mm3 ; write back
-
- psubsb mm7, mm4 ; q1-= q1 add
- pxor mm7, [GLOBAL(t80)] ; unoffset
- movq [rdi], mm7 ; write back
-
- add rsp, 32
- pop rsp
- ; begin epilog
- pop rdi
- pop rsi
- RESTORE_GOT
- UNSHADOW_ARGS
- pop rbp
- ret
-
-
-;void vpx_lpf_vertical_4_mmx
-;(
-; unsigned char *src_ptr,
-; int src_pixel_step,
-; const char *blimit,
-; const char *limit,
-; const char *thresh
-;)
-global sym(vpx_lpf_vertical_4_mmx) PRIVATE
-sym(vpx_lpf_vertical_4_mmx):
- push rbp
- mov rbp, rsp
- SHADOW_ARGS_TO_STACK 5
- GET_GOT rbx
- push rsi
- push rdi
- ; end prolog
-
- ALIGN_STACK 16, rax
- sub rsp, 64 ; reserve 64 bytes
- %define t0 [rsp + 0] ;__declspec(align(16)) char t0[8];
- %define t1 [rsp + 16] ;__declspec(align(16)) char t1[8];
- %define srct [rsp + 32] ;__declspec(align(16)) char srct[32];
-
- mov rsi, arg(0) ;src_ptr
- movsxd rax, dword ptr arg(1) ;src_pixel_step ; destination pitch?
-
- lea rsi, [rsi + rax*4 - 4]
-
- mov rdi, rsi ; rdi points to row +1 for indirect addressing
- add rdi, rax
-
-
- ;transpose
- movq mm6, [rsi+2*rax] ; 67 66 65 64 63 62 61 60
- movq mm7, mm6 ; 77 76 75 74 73 72 71 70
-
- punpckhbw mm7, [rdi+2*rax] ; 77 67 76 66 75 65 74 64
- punpcklbw mm6, [rdi+2*rax] ; 73 63 72 62 71 61 70 60
-
- movq mm4, [rsi] ; 47 46 45 44 43 42 41 40
- movq mm5, mm4 ; 47 46 45 44 43 42 41 40
-
- punpckhbw mm5, [rsi+rax] ; 57 47 56 46 55 45 54 44
- punpcklbw mm4, [rsi+rax] ; 53 43 52 42 51 41 50 40
-
- movq mm3, mm5 ; 57 47 56 46 55 45 54 44
- punpckhwd mm5, mm7 ; 77 67 57 47 76 66 56 46
-
- punpcklwd mm3, mm7 ; 75 65 55 45 74 64 54 44
- movq mm2, mm4 ; 53 43 52 42 51 41 50 40
-
- punpckhwd mm4, mm6 ; 73 63 53 43 72 62 52 42
- punpcklwd mm2, mm6 ; 71 61 51 41 70 60 50 40
-
- neg rax
- movq mm6, [rsi+rax*2] ; 27 26 25 24 23 22 21 20
-
- movq mm1, mm6 ; 27 26 25 24 23 22 21 20
- punpckhbw mm6, [rsi+rax] ; 37 27 36 36 35 25 34 24
-
- punpcklbw mm1, [rsi+rax] ; 33 23 32 22 31 21 30 20
- movq mm7, [rsi+rax*4]; ; 07 06 05 04 03 02 01 00
-
- punpckhbw mm7, [rdi+rax*4] ; 17 07 16 06 15 05 14 04
- movq mm0, mm7 ; 17 07 16 06 15 05 14 04
-
- punpckhwd mm7, mm6 ; 37 27 17 07 36 26 16 06
- punpcklwd mm0, mm6 ; 35 25 15 05 34 24 14 04
-
- movq mm6, mm7 ; 37 27 17 07 36 26 16 06
- punpckhdq mm7, mm5 ; 77 67 57 47 37 27 17 07 = q3
-
- punpckldq mm6, mm5 ; 76 66 56 46 36 26 16 06 = q2
-
- movq mm5, mm6 ; 76 66 56 46 36 26 16 06
- psubusb mm5, mm7 ; q2-q3
-
- psubusb mm7, mm6 ; q3-q2
- por mm7, mm5; ; mm7=abs (q3-q2)
-
- movq mm5, mm0 ; 35 25 15 05 34 24 14 04
- punpckhdq mm5, mm3 ; 75 65 55 45 35 25 15 05 = q1
-
- punpckldq mm0, mm3 ; 74 64 54 44 34 24 15 04 = q0
- movq mm3, mm5 ; 75 65 55 45 35 25 15 05 = q1
-
- psubusb mm3, mm6 ; q1-q2
- psubusb mm6, mm5 ; q2-q1
+ ; calculate breakout conditions
+ movq m2, [s1q + 2 * pq] ; q3
+ movq m1, [ sq + 2 * pq] ; q2
+ movq m6, m1 ; q2
+ psubusb m1, m2 ; q2-=q3
+ psubusb m2, m6 ; q3-=q2
+ por m1, m2 ; abs(q3-q2)
+ psubusb m1, m7
+ movq m4, [sq + pq] ; q1
+ movq m3, m4 ; q1
+ psubusb m4, m6 ; q1-=q2
+ psubusb m6, m3 ; q2-=q1
+ por m4, m6 ; abs(q2-q1)
+ psubusb m4, m7
+ por m1, m4
+ movq m4, [sq] ; q0
+ movq m0, m4 ; q0
+ psubusb m4, m3 ; q0-=q1
+ psubusb m3, m0 ; q1-=q0
+ por m4, m3 ; abs(q0-q1)
+ movq [stkreg + t0], m4 ; save to t0
+ psubusb m4, m7
+ por m1, m4
+ neg pq ; negate pitch to deal with
+ ; above border
+ movq m2, [ sq + 4 * pq] ; p3
+ movq m4, [s1q + 4 * pq] ; p2
+ movq m5, m4 ; p2
+ psubusb m4, m2 ; p2-=p3
+ psubusb m2, m5 ; p3-=p2
+ por m4, m2 ; abs(p3 - p2)
+ psubusb m4, m7
+ por m1, m4
+ movq m4, [sq + 2 * pq] ; p1
+ movq m3, m4 ; p1
+ psubusb m4, m5 ; p1-=p2
+ psubusb m5, m3 ; p2-=p1
+ por m4, m5 ; abs(p2 - p1)
+ psubusb m4, m7
+ por m1, m4
+ movq m2, m3 ; p1
+ movq m4, [sq + pq] ; p0
+ movq m5, m4 ; p0
+ psubusb m4, m3 ; p0-=p1
+ psubusb m3, m5 ; p1-=p0
+ por m4, m3 ; abs(p1 - p0)
+ movq [stkreg + t1], m4 ; save to t1
+ psubusb m4, m7
+ por m1, m4
+ movq m3, [s1q] ; q1
+ movq m4, m3 ; q1
+ psubusb m3, m2 ; q1-=p1
+ psubusb m2, m4 ; p1-=q1
+ por m2, m3 ; abs(p1-q1)
+ pand m2, [GLOBAL(tfe)] ; set lsb of each byte to zero
+ psrlw m2, 1 ; abs(p1-q1)/2
+ movq m6, m5 ; p0
+ movq m3, [sq] ; q0
+ psubusb m5, m3 ; p0-=q0
+ psubusb m3, m6 ; q0-=p0
+ por m5, m3 ; abs(p0 - q0)
+ paddusb m5, m5 ; abs(p0-q0)*2
+ paddusb m5, m2 ; abs (p0 - q0) * 2 + abs(p1-q1)/2
+ movq m7, [_blimitq] ; blimit
+ psubusb m5, m7 ; abs (p0 - q0) * 2 +
+ ; abs(p1-q1)/2 > blimit
+ por m1, m5
+ pxor m5, m5
+ pcmpeqb m1, m5 ; mask m1
- por mm6, mm3 ; mm6=abs(q2-q1)
- lea rdx, srct
+ ; calculate high edge variance
+ movq m7, [_threshq]
+ movq m4, [stkreg + t0] ; get abs (q1 - q0)
+ psubusb m4, m7
+ movq m3, [stkreg + t1] ; get abs (p1 - p0)
+ psubusb m3, m7
+ paddb m4, m3 ; abs(q1 - q0) > thresh ||
+ ; abs(p1 - p0) > thresh
+ pcmpeqb m4, m5
+ pcmpeqb m5, m5
+ movq m3, [GLOBAL(t80)]
+ pxor m4, m5
- movq [rdx+24], mm5 ; save q1
- movq [rdx+16], mm0 ; save q0
+ ; start work on filters
+ movq m2, [sq + 2 * pq] ; p1
+ movq m7, [s1q] ; q1
+ pxor m2, m3 ; p1 converted to signed values
+ pxor m7, m3 ; q1 converted to signed values
+ psubsb m2, m7 ; p1 - q1
+ pand m2, m4 ; high var mask (hvm)(p1 - q1)
+ pxor m6, m3 ; p0 converted to signed values
+ pxor m0, m3 ; q0 converted to signed values
+ movq m3, m0 ; q0
+ psubsb m0, m6 ; q0 - p0
+ paddsb m2, m0 ; 1 * (q0 - p0) + hvm(p1 - q1)
+ paddsb m2, m0 ; 2 * (q0 - p0) + hvm(p1 - q1)
+ paddsb m2, m0 ; 3 * (q0 - p0) + hvm(p1 - q1)
+ pand m1, m2 ; mask filter values we don't
+ ; care about
+ movq m2, m1
+ paddsb m1, [GLOBAL(t4)] ; 3* (q0 - p0) + hvm(p1 - q1) + 4
+ paddsb m2, [GLOBAL(t3)] ; 3* (q0 - p0) + hvm(p1 - q1) + 3
- movq mm3, [rsi+rax*4] ; 07 06 05 04 03 02 01 00
- punpcklbw mm3, [rdi+rax*4] ; 13 03 12 02 11 01 10 00
+ pxor m0, m0
+ pxor m5, m5
+ punpcklbw m0, m2
+ punpckhbw m5, m2
+ psraw m0, 11
+ psraw m5, 11
+ packsswb m0, m5
+ movq m2, m0 ; (3* (q0 - p0) + hvm(p1 - q1)
+ ; + 3) >> 3;
+ pxor m0, m0
+ movq m5, m1 ; abcdefgh
+ punpcklbw m0, m1 ; e0f0g0h0
+ psraw m0, 11 ; sign extended shift right by 3
+ pxor m1, m1
+ punpckhbw m1, m5 ; a0b0c0d0
+ psraw m1, 11 ; sign extended shift right by 3
+ movq m5, m0 ; save results
- movq mm0, mm3 ; 13 03 12 02 11 01 10 00
- punpcklwd mm0, mm1 ; 31 21 11 01 30 20 10 00
+ packsswb m0, m1 ; (3* (q0 - p0) + hvm(p1 - q1)
+ ; + 4) >>3
+ paddsw m5, [GLOBAL(ones)]
+ paddsw m1, [GLOBAL(ones)]
+ psraw m5, 1
+ psraw m1, 1
+ packsswb m5, m1 ; (3* (q0 - p0) + hvm(p1 - q1)
+ ; + 4) >>4
+ movq m1, [GLOBAL(t80)]
+ pandn m4, m5 ; high edge variance additive
+ paddsb m6, m2 ; p0+= p0 add
+ pxor m6, m1 ; unoffset
+ movq [sq + pq], m6 ; write back
+ movq m6, [sq + 2 * pq] ; p1
+ pxor m6, m1 ; reoffset
+ paddsb m6, m4 ; p1+= p1 add
+ pxor m6, m1 ; unoffset
+ movq [sq + 2 * pq], m6 ; write back
+ psubsb m3, m0 ; q0-= q0 add
+ pxor m3, m1 ; unoffset
+ movq [sq], m3 ; write back
+ psubsb m7, m4 ; q1-= q1 add
+ pxor m7, m1 ; unoffset
+ movq [s1q], m7 ; write back
+ RET
- punpckhwd mm3, mm1 ; 33 23 13 03 32 22 12 02
- movq mm1, mm0 ; 31 21 11 01 30 20 10 00
+;void vpx_lpf_vertical_4_mmx(unsigned char *src_ptr, int src_pixel_step,
+; const char *blimit, const char *limit,
+; const char *thresh);
+INIT_MMX mmx
+cglobal lpf_vertical_4, 5, 6, 8, 0 - lstacksize, \
+ s, p, _blimit, _limit, _thresh, s1
+ lea sq, [sq + pq * 4 - 4]
+ lea s1q, [sq + pq] ; s1q points to row +1
+ ;transpose
+ movq m6, [ sq + 2 * pq] ; 67 66 65 64 63 62 61 60
+ movq m7, m6 ; 77 76 75 74 73 72 71 70
+ punpckhbw m7, [s1q + 2 * pq] ; 77 67 76 66 75 65 74 64
+ punpcklbw m6, [s1q + 2 * pq] ; 73 63 72 62 71 61 70 60
+ movq m4, [sq] ; 47 46 45 44 43 42 41 40
+ movq m5, m4 ; 47 46 45 44 43 42 41 40
+ punpckhbw m5, [sq + pq] ; 57 47 56 46 55 45 54 44
+ punpcklbw m4, [sq + pq] ; 53 43 52 42 51 41 50 40
+ movq m3, m5 ; 57 47 56 46 55 45 54 44
+ punpckhwd m5, m7 ; 77 67 57 47 76 66 56 46
+ punpcklwd m3, m7 ; 75 65 55 45 74 64 54 44
+ movq m2, m4 ; 53 43 52 42 51 41 50 40
+ punpckhwd m4, m6 ; 73 63 53 43 72 62 52 42
+ punpcklwd m2, m6 ; 71 61 51 41 70 60 50 40
+ neg pq
+ movq m6, [ sq + pq * 2] ; 27 26 25 24 23 22 21 20
+ movq m1, m6 ; 27 26 25 24 23 22 21 20
+ punpckhbw m6, [ sq + pq ] ; 37 27 36 36 35 25 34 24
+ punpcklbw m1, [ sq + pq ] ; 33 23 32 22 31 21 30 20
+ movq m7, [ sq + pq * 4]; ; 07 06 05 04 03 02 01 00
+ punpckhbw m7, [s1q + pq * 4] ; 17 07 16 06 15 05 14 04
+ movq m0, m7 ; 17 07 16 06 15 05 14 04
+ punpckhwd m7, m6 ; 37 27 17 07 36 26 16 06
+ punpcklwd m0, m6 ; 35 25 15 05 34 24 14 04
+ movq m6, m7 ; 37 27 17 07 36 26 16 06
+ punpckhdq m7, m5 ; 77 67 57 47 37 27 17 07 = q3
+ punpckldq m6, m5 ; 76 66 56 46 36 26 16 06 = q2
+ movq m5, m6 ; 76 66 56 46 36 26 16 06
+ psubusb m5, m7 ; q2-q3
+ psubusb m7, m6 ; q3-q2
+ por m7, m5; ; m7=abs (q3-q2)
+ movq m5, m0 ; 35 25 15 05 34 24 14 04
+ punpckhdq m5, m3 ; 75 65 55 45 35 25 15 05 = q1
+ punpckldq m0, m3 ; 74 64 54 44 34 24 15 04 = q0
+ movq m3, m5 ; 75 65 55 45 35 25 15 05 = q1
+ psubusb m3, m6 ; q1-q2
+ psubusb m6, m5 ; q2-q1
+ por m6, m3 ; m6=abs(q2-q1)
- punpckldq mm0, mm2 ; 70 60 50 40 30 20 10 00 =p3
- punpckhdq mm1, mm2 ; 71 61 51 41 31 21 11 01 =p2
+ movq [stkreg + q1], m5 ; save q1
+ movq [stkreg + q0], m0 ; save q0
- movq mm2, mm1 ; 71 61 51 41 31 21 11 01 =p2
- psubusb mm2, mm0 ; p2-p3
+ movq m3, [ sq + pq * 4] ; 07 06 05 04 03 02 01 00
+ punpcklbw m3, [s1q + pq * 4] ; 13 03 12 02 11 01 10 00
+ movq m0, m3 ; 13 03 12 02 11 01 10 00
+ punpcklwd m0, m1 ; 31 21 11 01 30 20 10 00
+ punpckhwd m3, m1 ; 33 23 13 03 32 22 12 02
+ movq m1, m0 ; 31 21 11 01 30 20 10 00
+ punpckldq m0, m2 ; 70 60 50 40 30 20 10 00 =p3
+ punpckhdq m1, m2 ; 71 61 51 41 31 21 11 01 =p2
+ movq m2, m1 ; 71 61 51 41 31 21 11 01 =p2
+ psubusb m2, m0 ; p2-p3
+ psubusb m0, m1 ; p3-p2
+ por m0, m2 ; m0=abs(p3-p2)
+ movq m2, m3 ; 33 23 13 03 32 22 12 02
+ punpckldq m2, m4 ; 72 62 52 42 32 22 12 02 = p1
+ punpckhdq m3, m4 ; 73 63 53 43 33 23 13 03 = p0
- psubusb mm0, mm1 ; p3-p2
- por mm0, mm2 ; mm0=abs(p3-p2)
+ movq [stkreg + p0], m3 ; save p0
+ movq [stkreg + p1], m2 ; save p1
+ movq m5, m2 ; m5 = p1
+ psubusb m2, m1 ; p1-p2
+ psubusb m1, m5 ; p2-p1
+ por m1, m2 ; m1=abs(p2-p1)
+ movq m4, [_limitq]
+ GET_GOT goffsetq
+%if GET_GOT_DEFINED=1
+ add rsp, gprsize ; restore stack
+%endif
+ psubusb m7, m4
+ psubusb m0, m4
+ psubusb m1, m4
+ psubusb m6, m4
+ por m7, m6
+ por m0, m1
+ por m0, m7 ; abs(q3-q2) > limit ||
+ ; abs(p3-p2) > limit ||
+ ; abs(p2-p1) > limit ||
+ ; abs(q2-q1) > limit
+ movq m1, m5 ; p1
+ movq m7, m3 ; m3=m7=p0
+ psubusb m7, m5 ; p0 - p1
+ psubusb m5, m3 ; p1 - p0
+ por m5, m7 ; abs(p1-p0)
+ movq [stkreg + t0], m5 ; save abs(p1-p0)
+ psubusb m5, m4
+ por m0, m5 ; m0=mask
+ movq m5, [stkreg + q0] ; m5=q0
+ movq m7, [stkreg + q1] ; m7=q1
+ movq m6, m5 ; m6=q0
+ movq m2, m7 ; q1
+ psubusb m5, m7 ; q0-q1
+ psubusb m7, m6 ; q1-q0
+ por m7, m5 ; abs(q1-q0)
+ movq [stkreg + t1], m7 ; save abs(q1-q0)
+ psubusb m7, m4
+ por m0, m7 ; mask
+ movq m5, m2 ; q1
+ psubusb m5, m1 ; q1-=p1
+ psubusb m1, m2 ; p1-=q1
+ por m5, m1 ; abs(p1-q1)
+ pand m5, [GLOBAL(tfe)] ; set lsb of each byte to zero
+ psrlw m5, 1 ; abs(p1-q1)/2
+ movq m4, [_blimitq]
+ movq m1, m3 ; m1=m3=p0
+ movq m7, m6 ; m7=m6=q0
+ psubusb m1, m7 ; p0-q0
+ psubusb m7, m3 ; q0-p0
+ por m1, m7 ; abs(q0-p0)
+ paddusb m1, m1 ; abs(q0-p0)*2
+ paddusb m1, m5 ; abs(p0 - q0)*2 + abs(p1-q1)/2
+ psubusb m1, m4 ; abs(p0 - q0)*2 + abs(p1-q1)/2
+ ; > blimit
+ por m1, m0; ; mask
+ pxor m0, m0
+ pcmpeqb m1, m0
- movq mm2, mm3 ; 33 23 13 03 32 22 12 02
- punpckldq mm2, mm4 ; 72 62 52 42 32 22 12 02 = p1
+ ; calculate high edge variance
+ movq m7, [_threshq]
+ movq m4, [stkreg + t0] ; get abs (q1 - q0)
+ psubusb m4, m7
+ movq m3, [stkreg + t1] ; get abs (p1 - p0)
+ psubusb m3, m7
+ por m4, m3 ; abs(q1 - q0) > thresh ||
+ ; abs(p1 - p0) > thresh
+ pcmpeqb m4, m0
+ pcmpeqb m0, m0
+ movq m3, [GLOBAL(t80)]
+ pxor m4, m0
- punpckhdq mm3, mm4 ; 73 63 53 43 33 23 13 03 = p0
- movq [rdx+8], mm3 ; save p0
+ ; start work on filters
+ movq m2, [stkreg + p1]
+ movq m7, [stkreg + q1]
+ movq m6, [stkreg + p0]
+ movq m0, [stkreg + q0]
+ pxor m2, m3
+ pxor m7, m3
+ psubsb m2, m7 ; p1 - q1
+ pand m2, m4 ; high var mask (hvm)(p1 - q1)
+ pxor m6, m3
+ pxor m0, m3
+ movq m3, m0 ; q0
+ psubsb m0, m6 ; q0 - p0
+ paddsb m2, m0 ; 1 * (q0 - p0) + hvm(p1 - q1)
+ paddsb m2, m0 ; 2 * (q0 - p0) + hvm(p1 - q1)
+ paddsb m2, m0 ; 3 * (q0 - p0) + hvm(p1 - q1)
+ pand m1, m2 ; mask filter values we don't
+ ; care about
+ movq m2, m1
+ paddsb m1, [GLOBAL(t4)] ; 3*(q0 - p0) + hvm(p1 - q1) + 4
+ paddsb m2, [GLOBAL(t3)] ; 3*(q0 - p0) + hvm(p1 - q1) + 3
+ pxor m0, m0
+ pxor m5, m5
+ punpcklbw m0, m2
+ punpckhbw m5, m2
+ psraw m0, 11
+ psraw m5, 11
+ packsswb m0, m5
+ movq m2, m0 ; (3*(q0 - p0) + hvm(p1 - q1)
+ ; + 3) >> 3;
+ pxor m0, m0
+ movq m5, m1 ; abcdefgh
+ punpcklbw m0, m1 ; e0f0g0h0
+ psraw m0, 11 ; sign extended shift right by 3
+ pxor m1, m1
+ punpckhbw m1, m5 ; a0b0c0d0
+ psraw m1, 11 ; sign extended shift right by 3
+ movq m5, m0 ; save results
+ packsswb m0, m1 ; (3*(q0 - p0) + hvm(p1 - q1)
+ ; + 4) >>3
+ paddsw m5, [GLOBAL(ones)]
+ paddsw m1, [GLOBAL(ones)]
+ psraw m5, 1
+ psraw m1, 1
+ packsswb m5, m1 ; (3* (q0 - p0) + hvm(p1 - q1)
+ ; + 4) >>4
+ pandn m4, m5 ; high edge variance additive
+ movq m5, [GLOBAL(t80)]
+ paddsb m6, m2 ; p0+= p0 add
+ pxor m6, m5 ; unoffset
+ ; m6=p0
+ movq m1, [stkreg + p1]
+ pxor m1, m5 ; reoffset
+ paddsb m1, m4 ; p1+= p1 add
+ pxor m1, m5 ; unoffset
+ ; m6 = p0 m1 = p1
+ psubsb m3, m0 ; q0-= q0 add
+ pxor m3, m5 ; unoffset
+ ; m3 = q0
+ psubsb m7, m4 ; q1-= q1 add
+ pxor m7, m5 ; unoffset
+ ; m7 = q1
+ ; transpose and write back
+ ; m1 = 72 62 52 42 32 22 12 02
+ ; m6 = 73 63 53 43 33 23 13 03
+ ; m3 = 74 64 54 44 34 24 14 04
+ ; m7 = 75 65 55 45 35 25 15 05
+ movq m2, m1 ; 72 62 52 42 32 22 12 02
+ punpcklbw m2, m6 ; 33 32 23 22 13 12 03 02
+ movq m4, m3 ; 74 64 54 44 34 24 14 04
+ punpckhbw m1, m6 ; 73 72 63 62 53 52 43 42
+ punpcklbw m4, m7 ; 35 34 25 24 15 14 05 04
+ punpckhbw m3, m7 ; 75 74 65 64 55 54 45 44
+ movq m6, m2 ; 33 32 23 22 13 12 03 02
+ punpcklwd m2, m4 ; 15 14 13 12 05 04 03 02
+ punpckhwd m6, m4 ; 35 34 33 32 25 24 23 22
+ movq m5, m1 ; 73 72 63 62 53 52 43 42
+ punpcklwd m1, m3 ; 55 54 53 52 45 44 43 42
+ punpckhwd m5, m3 ; 75 74 73 72 65 64 63 62
- movq [rdx], mm2 ; save p1
- movq mm5, mm2 ; mm5 = p1
-
- psubusb mm2, mm1 ; p1-p2
- psubusb mm1, mm5 ; p2-p1
-
- por mm1, mm2 ; mm1=abs(p2-p1)
- mov rdx, arg(3) ;limit
-
- movq mm4, [rdx] ; mm4 = limit
- psubusb mm7, mm4
-
- psubusb mm0, mm4
- psubusb mm1, mm4
-
- psubusb mm6, mm4
- por mm7, mm6
-
- por mm0, mm1
- por mm0, mm7 ; abs(q3-q2) > limit || abs(p3-p2) > limit ||abs(p2-p1) > limit || abs(q2-q1) > limit
-
- movq mm1, mm5 ; p1
-
- movq mm7, mm3 ; mm3=mm7=p0
- psubusb mm7, mm5 ; p0 - p1
-
- psubusb mm5, mm3 ; p1 - p0
- por mm5, mm7 ; abs(p1-p0)
-
- movq t0, mm5 ; save abs(p1-p0)
- lea rdx, srct
-
- psubusb mm5, mm4
- por mm0, mm5 ; mm0=mask
-
- movq mm5, [rdx+16] ; mm5=q0
- movq mm7, [rdx+24] ; mm7=q1
-
- movq mm6, mm5 ; mm6=q0
- movq mm2, mm7 ; q1
- psubusb mm5, mm7 ; q0-q1
-
- psubusb mm7, mm6 ; q1-q0
- por mm7, mm5 ; abs(q1-q0)
-
- movq t1, mm7 ; save abs(q1-q0)
- psubusb mm7, mm4
-
- por mm0, mm7 ; mask
-
- movq mm5, mm2 ; q1
- psubusb mm5, mm1 ; q1-=p1
- psubusb mm1, mm2 ; p1-=q1
- por mm5, mm1 ; abs(p1-q1)
- pand mm5, [GLOBAL(tfe)] ; set lsb of each byte to zero
- psrlw mm5, 1 ; abs(p1-q1)/2
-
- mov rdx, arg(2) ;blimit ;
-
- movq mm4, [rdx] ;blimit
- movq mm1, mm3 ; mm1=mm3=p0
-
- movq mm7, mm6 ; mm7=mm6=q0
- psubusb mm1, mm7 ; p0-q0
-
- psubusb mm7, mm3 ; q0-p0
- por mm1, mm7 ; abs(q0-p0)
- paddusb mm1, mm1 ; abs(q0-p0)*2
- paddusb mm1, mm5 ; abs (p0 - q0) *2 + abs(p1-q1)/2
-
- psubusb mm1, mm4 ; abs (p0 - q0) *2 + abs(p1-q1)/2 > blimit
- por mm1, mm0; ; mask
-
- pxor mm0, mm0
- pcmpeqb mm1, mm0
-
- ; calculate high edge variance
- mov rdx, arg(4) ;thresh ; get thresh
- movq mm7, [rdx]
- ;
- movq mm4, t0 ; get abs (q1 - q0)
- psubusb mm4, mm7
-
- movq mm3, t1 ; get abs (p1 - p0)
- psubusb mm3, mm7
-
- por mm4, mm3 ; abs(q1 - q0) > thresh || abs(p1 - p0) > thresh
- pcmpeqb mm4, mm0
-
- pcmpeqb mm0, mm0
- pxor mm4, mm0
-
-
-
- ; start work on filters
- lea rdx, srct
-
- movq mm2, [rdx] ; p1
- movq mm7, [rdx+24] ; q1
-
- movq mm6, [rdx+8] ; p0
- movq mm0, [rdx+16] ; q0
-
- pxor mm2, [GLOBAL(t80)] ; p1 offset to convert to signed values
- pxor mm7, [GLOBAL(t80)] ; q1 offset to convert to signed values
-
- psubsb mm2, mm7 ; p1 - q1
- pand mm2, mm4 ; high var mask (hvm)(p1 - q1)
-
- pxor mm6, [GLOBAL(t80)] ; offset to convert to signed values
- pxor mm0, [GLOBAL(t80)] ; offset to convert to signed values
-
- movq mm3, mm0 ; q0
- psubsb mm0, mm6 ; q0 - p0
-
- paddsb mm2, mm0 ; 1 * (q0 - p0) + hvm(p1 - q1)
- paddsb mm2, mm0 ; 2 * (q0 - p0) + hvm(p1 - q1)
-
- paddsb mm2, mm0 ; 3 * (q0 - p0) + hvm(p1 - q1)
- pand mm1, mm2 ; mask filter values we don't care about
-
- movq mm2, mm1
- paddsb mm1, [GLOBAL(t4)] ; 3* (q0 - p0) + hvm(p1 - q1) + 4
-
- paddsb mm2, [GLOBAL(t3)] ; 3* (q0 - p0) + hvm(p1 - q1) + 3
- pxor mm0, mm0 ;
-
- pxor mm5, mm5
- punpcklbw mm0, mm2 ;
-
- punpckhbw mm5, mm2 ;
- psraw mm0, 11 ;
-
- psraw mm5, 11
- packsswb mm0, mm5
-
- movq mm2, mm0 ; (3* (q0 - p0) + hvm(p1 - q1) + 3) >> 3;
-
- pxor mm0, mm0 ; 0
- movq mm5, mm1 ; abcdefgh
-
- punpcklbw mm0, mm1 ; e0f0g0h0
- psraw mm0, 11 ; sign extended shift right by 3
-
- pxor mm1, mm1 ; 0
- punpckhbw mm1, mm5 ; a0b0c0d0
-
- psraw mm1, 11 ; sign extended shift right by 3
- movq mm5, mm0 ; save results
-
- packsswb mm0, mm1 ; (3* (q0 - p0) + hvm(p1 - q1) + 4) >>3
- paddsw mm5, [GLOBAL(ones)]
-
- paddsw mm1, [GLOBAL(ones)]
- psraw mm5, 1 ; partial shifted one more time for 2nd tap
-
- psraw mm1, 1 ; partial shifted one more time for 2nd tap
- packsswb mm5, mm1 ; (3* (q0 - p0) + hvm(p1 - q1) + 4) >>4
-
- pandn mm4, mm5 ; high edge variance additive
-
- paddsb mm6, mm2 ; p0+= p0 add
- pxor mm6, [GLOBAL(t80)] ; unoffset
-
- ; mm6=p0 ;
- movq mm1, [rdx] ; p1
- pxor mm1, [GLOBAL(t80)] ; reoffset
-
- paddsb mm1, mm4 ; p1+= p1 add
- pxor mm1, [GLOBAL(t80)] ; unoffset
- ; mm6 = p0 mm1 = p1
-
- psubsb mm3, mm0 ; q0-= q0 add
- pxor mm3, [GLOBAL(t80)] ; unoffset
-
- ; mm3 = q0
- psubsb mm7, mm4 ; q1-= q1 add
- pxor mm7, [GLOBAL(t80)] ; unoffset
- ; mm7 = q1
-
- ; transpose and write back
- ; mm1 = 72 62 52 42 32 22 12 02
- ; mm6 = 73 63 53 43 33 23 13 03
- ; mm3 = 74 64 54 44 34 24 14 04
- ; mm7 = 75 65 55 45 35 25 15 05
-
- movq mm2, mm1 ; 72 62 52 42 32 22 12 02
- punpcklbw mm2, mm6 ; 33 32 23 22 13 12 03 02
-
- movq mm4, mm3 ; 74 64 54 44 34 24 14 04
- punpckhbw mm1, mm6 ; 73 72 63 62 53 52 43 42
-
- punpcklbw mm4, mm7 ; 35 34 25 24 15 14 05 04
- punpckhbw mm3, mm7 ; 75 74 65 64 55 54 45 44
-
- movq mm6, mm2 ; 33 32 23 22 13 12 03 02
- punpcklwd mm2, mm4 ; 15 14 13 12 05 04 03 02
-
- punpckhwd mm6, mm4 ; 35 34 33 32 25 24 23 22
- movq mm5, mm1 ; 73 72 63 62 53 52 43 42
-
- punpcklwd mm1, mm3 ; 55 54 53 52 45 44 43 42
- punpckhwd mm5, mm3 ; 75 74 73 72 65 64 63 62
-
-
- ; mm2 = 15 14 13 12 05 04 03 02
- ; mm6 = 35 34 33 32 25 24 23 22
- ; mm5 = 55 54 53 52 45 44 43 42
- ; mm1 = 75 74 73 72 65 64 63 62
-
-
-
- movd [rsi+rax*4+2], mm2
- psrlq mm2, 32
-
- movd [rdi+rax*4+2], mm2
- movd [rsi+rax*2+2], mm6
-
- psrlq mm6, 32
- movd [rsi+rax+2],mm6
-
- movd [rsi+2], mm1
- psrlq mm1, 32
-
- movd [rdi+2], mm1
- neg rax
-
- movd [rdi+rax+2],mm5
- psrlq mm5, 32
-
- movd [rdi+rax*2+2], mm5
-
- add rsp, 64
- pop rsp
- ; begin epilog
- pop rdi
- pop rsi
- RESTORE_GOT
- UNSHADOW_ARGS
- pop rbp
- ret
-
-SECTION_RODATA
-align 16
-tfe:
- times 8 db 0xfe
-align 16
-t80:
- times 8 db 0x80
-align 16
-t3:
- times 8 db 0x03
-align 16
-t4:
- times 8 db 0x04
-align 16
-ones:
- times 4 dw 0x0001
+ ; m2 = 15 14 13 12 05 04 03 02
+ ; m6 = 35 34 33 32 25 24 23 22
+ ; m5 = 55 54 53 52 45 44 43 42
+ ; m1 = 75 74 73 72 65 64 63 62
+ movd [sq + pq * 4 + 2], m2
+ psrlq m2, 32
+ movd [s1q + pq * 4 + 2], m2
+ movd [sq + pq * 2 + 2], m6
+ psrlq m6, 32
+ movd [sq + pq + 2], m6
+ movd [sq + 2], m1
+ psrlq m1, 32
+ movd [s1q + 2], m1
+ neg pq
+ movd [s1q + pq + 2], m5
+ psrlq m5, 32
+ movd [s1q + pq * 2 + 2], m5
+ RET