Skip to content

V
vlc-2-2
Commit 4f2c5774 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

yadif: update asm code from ffmpeg.git 

Clang doesn't like that %%rip macro for some reason, so I disabled
it for apple. That MANGLE macro is done based on ffmpeg one and
I added MANGEVARIABLE to work around osx/32-bit compile issues (and
my lack of asm-fu).
parent 62d68cd9
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 25 deletions
modules/video_filter/deinterlace/yadif_template.h
View file @ 4f2c5774
...@@ -18,6 +18,18 @@ ...@@ -18,6 +18,18 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
/* For some reason clang doens't like that %%rip macro */
#if defined(__x86_64__) && !defined(__APPLE__)
#define MANGLE(a) "" #a "(%%rip)"
#define MANGLEVARIABLES [mode] "g"(mode),
#else
#define MANGLE(a) "" "%["#a"]"
#define MANGLEVARIABLES [pw_1] "m"(pw_1),\
[pb_1] "m"(pb_1),\
[mode] "g"(mode),
#endif
#ifdef COMPILE_TEMPLATE_SSE #ifdef COMPILE_TEMPLATE_SSE
#define REGMM "xmm" #define REGMM "xmm"
#define MM "%%"REGMM #define MM "%%"REGMM
...@@ -65,7 +77,7 @@ ...@@ -65,7 +77,7 @@
MOVQ" "MM"2, "MM"5 \n\t"\ MOVQ" "MM"2, "MM"5 \n\t"\
"pxor "MM"3, "MM"4 \n\t"\ "pxor "MM"3, "MM"4 \n\t"\
"pavgb "MM"3, "MM"5 \n\t"\ "pavgb "MM"3, "MM"5 \n\t"\
"pand %[pb_1], "MM"4 \n\t"\ "pand "MANGLE(pb_1)", "MM"4 \n\t"\
"psubusb "MM"4, "MM"5 \n\t"\ "psubusb "MM"4, "MM"5 \n\t"\
PSRL1(MM"5") \ PSRL1(MM"5") \
"punpcklbw "MM"7, "MM"5 \n\t" /* (cur[x-refs+j] + cur[x+refs-j])>>1 */\ "punpcklbw "MM"7, "MM"5 \n\t" /* (cur[x-refs+j] + cur[x+refs-j])>>1 */\
...@@ -95,7 +107,7 @@ ...@@ -95,7 +107,7 @@
#define CHECK2 /* pretend not to have checked dir=2 if dir=1 was bad.\ #define CHECK2 /* pretend not to have checked dir=2 if dir=1 was bad.\
hurts both quality and speed, but matches the C version. */\ hurts both quality and speed, but matches the C version. */\
"paddw %[pw_1], "MM"6 \n\t"\ "paddw "MANGLE(pw_1)", "MM"6 \n\t"\
"psllw $14, "MM"6 \n\t"\ "psllw $14, "MM"6 \n\t"\
"paddsw "MM"6, "MM"2 \n\t"\ "paddsw "MM"6, "MM"2 \n\t"\
MOVQ" "MM"0, "MM"3 \n\t"\ MOVQ" "MM"0, "MM"3 \n\t"\
...@@ -113,10 +125,8 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -113,10 +125,8 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, uint8_t *prev, uint8_t *cur, uint8_t *next,
int w, int prefs, int mrefs, int parity, int mode) int w, int prefs, int mrefs, int parity, int mode)
{ {
DECLARE_ALIGNED(16, uint8_t, tmp0[16]); uint8_t tmpU[5*16];
DECLARE_ALIGNED(16, uint8_t, tmp1[16]); uint8_t *tmp= (uint8_t*)(((uint64_t)(tmpU+15)) & ~15);
DECLARE_ALIGNED(16, uint8_t, tmp2[16]);
DECLARE_ALIGNED(16, uint8_t, tmp3[16]);
int x; int x;
#define FILTER\ #define FILTER\
...@@ -130,9 +140,9 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -130,9 +140,9 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
MOVQ" "MM"3, "MM"4 \n\t"\ MOVQ" "MM"3, "MM"4 \n\t"\
"paddw "MM"2, "MM"3 \n\t"\ "paddw "MM"2, "MM"3 \n\t"\
"psraw $1, "MM"3 \n\t" /* d = (prev2[x] + next2[x])>>1 */\ "psraw $1, "MM"3 \n\t" /* d = (prev2[x] + next2[x])>>1 */\
MOVQ" "MM"0, %[tmp0] \n\t" /* c */\ MOVQ" "MM"0, (%[tmp]) \n\t" /* c */\
MOVQ" "MM"3, %[tmp1] \n\t" /* d */\ MOVQ" "MM"3, 16(%[tmp]) \n\t" /* d */\
MOVQ" "MM"1, %[tmp2] \n\t" /* e */\ MOVQ" "MM"1, 32(%[tmp]) \n\t" /* e */\
"psubw "MM"4, "MM"2 \n\t"\ "psubw "MM"4, "MM"2 \n\t"\
PABS( MM"4", MM"2") /* temporal_diff0 */\ PABS( MM"4", MM"2") /* temporal_diff0 */\
LOAD("(%[prev],%[mrefs])", MM"3") /* prev[x-refs] */\ LOAD("(%[prev],%[mrefs])", MM"3") /* prev[x-refs] */\
...@@ -154,7 +164,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -154,7 +164,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
"paddw "MM"4, "MM"3 \n\t" /* temporal_diff2 */\ "paddw "MM"4, "MM"3 \n\t" /* temporal_diff2 */\
"psrlw $1, "MM"3 \n\t"\ "psrlw $1, "MM"3 \n\t"\
"pmaxsw "MM"3, "MM"2 \n\t"\ "pmaxsw "MM"3, "MM"2 \n\t"\
MOVQ" "MM"2, %[tmp3] \n\t" /* diff */\ MOVQ" "MM"2, 48(%[tmp]) \n\t" /* diff */\
\ \
"paddw "MM"0, "MM"1 \n\t"\ "paddw "MM"0, "MM"1 \n\t"\
"paddw "MM"0, "MM"0 \n\t"\ "paddw "MM"0, "MM"0 \n\t"\
...@@ -173,7 +183,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -173,7 +183,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
"punpcklbw "MM"7, "MM"3 \n\t" /* ABS(cur[x-refs+1] - cur[x+refs+1]) */\ "punpcklbw "MM"7, "MM"3 \n\t" /* ABS(cur[x-refs+1] - cur[x+refs+1]) */\
"paddw "MM"2, "MM"0 \n\t"\ "paddw "MM"2, "MM"0 \n\t"\
"paddw "MM"3, "MM"0 \n\t"\ "paddw "MM"3, "MM"0 \n\t"\
"psubw %[pw_1], "MM"0 \n\t" /* spatial_score */\ "psubw "MANGLE(pw_1)", "MM"0 \n\t" /* spatial_score */\
\ \
CHECK(-2,0)\ CHECK(-2,0)\
CHECK1\ CHECK1\
...@@ -185,7 +195,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -185,7 +195,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
CHECK2\ CHECK2\
\ \
/* if(p->mode<2) ... */\ /* if(p->mode<2) ... */\
MOVQ" %[tmp3], "MM"6 \n\t" /* diff */\ MOVQ" 48(%[tmp]), "MM"6 \n\t" /* diff */\
"cmpl $2, %[mode] \n\t"\ "cmpl $2, %[mode] \n\t"\
"jge 1f \n\t"\ "jge 1f \n\t"\
LOAD("(%["prev2"],%[mrefs],2)", MM"2") /* prev2[x-2*refs] */\ LOAD("(%["prev2"],%[mrefs],2)", MM"2") /* prev2[x-2*refs] */\
...@@ -196,9 +206,9 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -196,9 +206,9 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
"paddw "MM"5, "MM"3 \n\t"\ "paddw "MM"5, "MM"3 \n\t"\
"psrlw $1, "MM"2 \n\t" /* b */\ "psrlw $1, "MM"2 \n\t" /* b */\
"psrlw $1, "MM"3 \n\t" /* f */\ "psrlw $1, "MM"3 \n\t" /* f */\
MOVQ" %[tmp0], "MM"4 \n\t" /* c */\ MOVQ" (%[tmp]), "MM"4 \n\t" /* c */\
MOVQ" %[tmp1], "MM"5 \n\t" /* d */\ MOVQ" 16(%[tmp]), "MM"5 \n\t" /* d */\
MOVQ" %[tmp2], "MM"7 \n\t" /* e */\ MOVQ" 32(%[tmp]), "MM"7 \n\t" /* e */\
"psubw "MM"4, "MM"2 \n\t" /* b-c */\ "psubw "MM"4, "MM"2 \n\t" /* b-c */\
"psubw "MM"7, "MM"3 \n\t" /* f-e */\ "psubw "MM"7, "MM"3 \n\t" /* f-e */\
MOVQ" "MM"5, "MM"0 \n\t"\ MOVQ" "MM"5, "MM"0 \n\t"\
...@@ -217,7 +227,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -217,7 +227,7 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
"pmaxsw "MM"4, "MM"6 \n\t" /* diff= MAX3(diff, min, -max); */\ "pmaxsw "MM"4, "MM"6 \n\t" /* diff= MAX3(diff, min, -max); */\
"1: \n\t"\ "1: \n\t"\
\ \
MOVQ" %[tmp1], "MM"2 \n\t" /* d */\ MOVQ" 16(%[tmp]), "MM"2 \n\t" /* d */\
MOVQ" "MM"2, "MM"3 \n\t"\ MOVQ" "MM"2, "MM"3 \n\t"\
"psubw "MM"6, "MM"2 \n\t" /* d-diff */\ "psubw "MM"6, "MM"2 \n\t" /* d-diff */\
"paddw "MM"6, "MM"3 \n\t" /* d+diff */\ "paddw "MM"6, "MM"3 \n\t" /* d+diff */\
...@@ -225,19 +235,13 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst, ...@@ -225,19 +235,13 @@ VLC_TARGET static void RENAME(yadif_filter_line)(uint8_t *dst,
"pminsw "MM"3, "MM"1 \n\t" /* d = clip(spatial_pred, d-diff, d+diff); */\ "pminsw "MM"3, "MM"1 \n\t" /* d = clip(spatial_pred, d-diff, d+diff); */\
"packuswb "MM"1, "MM"1 \n\t"\ "packuswb "MM"1, "MM"1 \n\t"\
\ \
:[tmp0]"=m"(tmp0),\ ::[prev] "r"(prev),\
[tmp1]"=m"(tmp1),\
[tmp2]"=m"(tmp2),\
[tmp3]"=m"(tmp3)\
:[prev] "r"(prev),\
[cur] "r"(cur),\ [cur] "r"(cur),\
[next] "r"(next),\ [next] "r"(next),\
[prefs]"r"((x86_reg)prefs),\ [prefs]"r"((x86_reg)prefs),\
[mrefs]"r"((x86_reg)mrefs),\ [mrefs]"r"((x86_reg)mrefs),\
[pw_1] "m"(pw_1),\ MANGLEVARIABLES\
[pb_1] "m"(pb_1),\ [tmp] "r"(tmp)\
[mode] "g"(mode)\
:REGMM"0",REGMM"1",REGMM"2",REGMM"3",REGMM"4",REGMM"5",REGMM"6",REGMM"7"\
);\ );\
__asm__ volatile(MOV" "MM"1, %0" :"=m"(*dst));\ __asm__ volatile(MOV" "MM"1, %0" :"=m"(*dst));\
dst += STEP;\ dst += STEP;\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment