X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Fx86%2Fpredict-c.c;h=329f6696e351e8598c50a773ec460aa308ab8f90;hb=6e5033417a53fa66d002665618a1350d7417725e;hp=36e8e95090cf99b5461d172ef733d4f47cef5c2a;hpb=189c30d390d08b2b3d3007acd0a106a4e0cd17b2;p=x264 diff --git a/common/x86/predict-c.c b/common/x86/predict-c.c index 36e8e950..329f6696 100644 --- a/common/x86/predict-c.c +++ b/common/x86/predict-c.c @@ -1,7 +1,7 @@ /***************************************************************************** * predict-c.c: intra prediction ***************************************************************************** - * Copyright (C) 2003-2011 x264 project + * Copyright (C) 2003-2015 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -29,89 +29,8 @@ #include "predict.h" #include "pixel.h" - void x264_predict_16x16_v_mmx( pixel *src ); - void x264_predict_16x16_v_sse2( pixel *src ); - void x264_predict_16x16_h_mmx2( pixel *src ); - void x264_predict_16x16_h_sse2( uint16_t *src ); - void x264_predict_16x16_h_ssse3( uint8_t *src ); - void x264_predict_16x16_dc_core_mmx2( pixel *src, int i_dc_left ); - void x264_predict_16x16_dc_core_sse2( pixel *src, int i_dc_left ); - void x264_predict_16x16_dc_left_core_mmx2( pixel *src, int i_dc_left ); - void x264_predict_16x16_dc_left_core_sse2( pixel *src, int i_dc_left ); - void x264_predict_16x16_dc_top_mmx2( pixel *src ); - void x264_predict_16x16_dc_top_sse2( pixel *src ); - void x264_predict_16x16_dc_top_ssse3( uint16_t *src ); - void x264_predict_16x16_p_core_mmx2( uint8_t *src, int i00, int b, int c ); - void x264_predict_16x16_p_core_sse2( pixel *src, int i00, int b, int c ); - void x264_predict_16x16_p_core_avx( pixel *src, int i00, int b, int c ); - void x264_predict_8x8c_p_core_mmx2( uint8_t *src, int i00, int b, int c ); - void x264_predict_8x8c_p_core_sse2( pixel *src, int i00, int b, int c ); - void x264_predict_8x8c_dc_mmx2( pixel *src ); - void x264_predict_8x8c_dc_sse2( uint16_t *src ); - void x264_predict_8x8c_dc_top_mmx2( uint8_t *src ); - void x264_predict_8x8c_dc_top_sse2( uint16_t *src ); - void x264_predict_8x8c_v_mmx( pixel *src ); - void x264_predict_8x8c_v_sse2( uint16_t *src ); - void x264_predict_8x8c_h_mmx2( uint8_t *src ); - void x264_predict_8x8c_h_sse2( pixel *src ); - void x264_predict_8x8c_h_ssse3( uint8_t *src ); - void x264_predict_8x8_v_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_v_sse2( uint16_t *src, uint16_t edge[33] ); - void x264_predict_8x8_h_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_h_sse2( uint16_t *src, uint16_t edge[33] ); - void x264_predict_8x8_hd_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_hu_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_dc_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_dc_sse2( uint16_t *src, uint16_t edge[33] ); - void x264_predict_8x8_dc_top_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_dc_top_sse2( uint16_t *src, uint16_t edge[33] ); - void x264_predict_8x8_dc_left_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_dc_left_sse2( uint16_t *src, uint16_t edge[33] ); - void x264_predict_8x8_ddl_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_ddl_sse2( pixel *src, pixel edge[33] ); - void x264_predict_8x8_ddl_avx( pixel *src, pixel edge[33] ); - void x264_predict_8x8_ddr_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_ddr_sse2( pixel *src, pixel edge[33] ); - void x264_predict_8x8_ddr_avx( pixel *src, pixel edge[33] ); - void x264_predict_8x8_vl_sse2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_vl_avx( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_vr_mmx2( uint8_t *src, uint8_t edge[33] ); - void x264_predict_8x8_vr_sse2( pixel *src, pixel edge[33] ); - void x264_predict_8x8_vr_ssse3( uint16_t *src, uint16_t edge[33] ); - void x264_predict_8x8_vr_avx( pixel *src, pixel edge[33] ); - void x264_predict_8x8_hu_sse2( pixel *src, pixel edge[33] ); - void x264_predict_8x8_hu_ssse3( pixel *src, pixel edge[33] ); - void x264_predict_8x8_hu_avx( pixel *src, pixel edge[33] ); - void x264_predict_8x8_hd_sse2( pixel *src, pixel edge[33] ); - void x264_predict_8x8_hd_ssse3( pixel *src, pixel edge[33] ); - void x264_predict_8x8_hd_avx( pixel *src, pixel edge[33] ); - void x264_predict_8x8_filter_mmx2( uint8_t *src, uint8_t edge[33], int i_neighbor, int i_filters ); - void x264_predict_8x8_filter_sse2( uint16_t *src, uint16_t edge[33], int i_neighbor, int i_filters ); - void x264_predict_8x8_filter_ssse3( pixel *src, pixel edge[33], int i_neighbor, int i_filters ); - void x264_predict_8x8_filter_avx( uint16_t *src, uint16_t edge[33], int i_neighbor, int i_filters ); - void x264_predict_4x4_ddl_mmx2( pixel *src ); - void x264_predict_4x4_ddl_sse2( uint16_t *src ); - void x264_predict_4x4_ddl_avx( uint16_t *src ); - void x264_predict_4x4_ddr_mmx2( pixel *src ); - void x264_predict_4x4_vl_mmx2( pixel *src ); - void x264_predict_4x4_vl_sse2( uint16_t *src ); - void x264_predict_4x4_vl_avx( uint16_t *src ); - void x264_predict_4x4_vr_mmx2( uint8_t *src ); - void x264_predict_4x4_vr_sse2( uint16_t *src ); - void x264_predict_4x4_vr_ssse3( pixel *src ); - void x264_predict_4x4_vr_avx( uint16_t *src ); - void x264_predict_4x4_hd_mmx2( pixel *src ); - void x264_predict_4x4_hd_sse2( uint16_t *src ); - void x264_predict_4x4_hd_ssse3( pixel *src ); - void x264_predict_4x4_hd_avx( uint16_t *src ); - void x264_predict_4x4_dc_mmx2( pixel *src ); - void x264_predict_4x4_ddr_sse2( uint16_t *src ); - void x264_predict_4x4_ddr_ssse3( pixel *src ); - void x264_predict_4x4_ddr_avx( uint16_t *src ); - void x264_predict_4x4_hu_mmx2( pixel *src ); - #define PREDICT_16x16_DC(name)\ -static void x264_predict_16x16_dc_##name( pixel *src )\ +void x264_predict_16x16_dc_##name( pixel *src )\ {\ uint32_t dc = 16;\ for( int i = 0; i < 16; i += 2 )\ @@ -124,6 +43,7 @@ static void x264_predict_16x16_dc_##name( pixel *src )\ PREDICT_16x16_DC( mmx2 ) PREDICT_16x16_DC( sse2 ) +PREDICT_16x16_DC( avx2 ) #define PREDICT_16x16_DC_LEFT(name)\ static void x264_predict_16x16_dc_left_##name( pixel *src )\ @@ -139,191 +59,260 @@ static void x264_predict_16x16_dc_left_##name( pixel *src )\ PREDICT_16x16_DC_LEFT( mmx2 ) PREDICT_16x16_DC_LEFT( sse2 ) +PREDICT_16x16_DC_LEFT( avx2 ) #define PREDICT_P_SUM(j,i)\ H += i * ( src[j+i - FDEC_STRIDE ] - src[j-i - FDEC_STRIDE ] );\ - V += i * ( src[(j+i)*FDEC_STRIDE -1] - src[(j-i)*FDEC_STRIDE -1] );\ + V += i * ( src[(j+i)*FDEC_STRIDE -1] - src[(j-i)*FDEC_STRIDE -1] ); +#if HAVE_X86_INLINE_ASM +#if HIGH_BIT_DEPTH ALIGNED_16( static const int16_t pw_12345678[8] ) = {1,2,3,4,5,6,7,8}; ALIGNED_16( static const int16_t pw_m87654321[8] ) = {-8,-7,-6,-5,-4,-3,-2,-1}; ALIGNED_16( static const int16_t pw_m32101234[8] ) = {-3,-2,-1,0,1,2,3,4}; +#else // !HIGH_BIT_DEPTH ALIGNED_8( static const int8_t pb_12345678[8] ) = {1,2,3,4,5,6,7,8}; ALIGNED_8( static const int8_t pb_m87654321[8] ) = {-8,-7,-6,-5,-4,-3,-2,-1}; ALIGNED_8( static const int8_t pb_m32101234[8] ) = {-3,-2,-1,0,1,2,3,4}; +#endif // HIGH_BIT_DEPTH +#endif // HAVE_X86_INLINE_ASM -#if !HIGH_BIT_DEPTH -#define PREDICT_16x16_P(name)\ -static void x264_predict_16x16_p_##name( pixel *src )\ -{\ - int a, b, c;\ +#define PREDICT_16x16_P_CORE\ int H = 0;\ int V = 0;\ - int i00;\ - PREDICT_P_SUM(7,1) \ - PREDICT_P_SUM(7,2) \ - PREDICT_P_SUM(7,3) \ - PREDICT_P_SUM(7,4) \ - PREDICT_P_SUM(7,5) \ - PREDICT_P_SUM(7,6) \ - PREDICT_P_SUM(7,7) \ - PREDICT_P_SUM(7,8) \ - a = 16 * ( src[15*FDEC_STRIDE -1] + src[15 - FDEC_STRIDE] );\ - b = ( 5 * H + 32 ) >> 6;\ - c = ( 5 * V + 32 ) >> 6;\ - i00 = a - b * 7 - c * 7 + 16;\ - x264_predict_16x16_p_core_##name( src, i00, b, c );\ + PREDICT_P_SUM(7,1)\ + PREDICT_P_SUM(7,2)\ + PREDICT_P_SUM(7,3)\ + PREDICT_P_SUM(7,4)\ + PREDICT_P_SUM(7,5)\ + PREDICT_P_SUM(7,6)\ + PREDICT_P_SUM(7,7)\ + PREDICT_P_SUM(7,8) + +#define PREDICT_16x16_P_END(name)\ + int a = 16 * ( src[15*FDEC_STRIDE -1] + src[15 - FDEC_STRIDE] );\ + int b = ( 5 * H + 32 ) >> 6;\ + int c = ( 5 * V + 32 ) >> 6;\ + int i00 = a - b * 7 - c * 7 + 16;\ + /* b*15 + c*15 can overflow: it's easier to just branch away in this rare case + * than to try to consider it in the asm. */\ + if( BIT_DEPTH > 8 && (i00 > 0x7fff || abs(b) > 1092 || abs(c) > 1092) )\ + x264_predict_16x16_p_c( src );\ + else\ + x264_predict_16x16_p_core_##name( src, i00, b, c ); + +#define PREDICT_16x16_P(name, name2)\ +static void x264_predict_16x16_p_##name( pixel *src )\ +{\ + PREDICT_16x16_P_CORE\ + PREDICT_16x16_P_END(name2)\ } -#ifndef ARCH_X86_64 -PREDICT_16x16_P( mmx2 ) -#endif -PREDICT_16x16_P( sse2 ) -PREDICT_16x16_P( avx ) -#endif //!HIGH_BIT_DEPTH #if HAVE_X86_INLINE_ASM #if HIGH_BIT_DEPTH -static void x264_predict_16x16_p_sse2( uint16_t *src ) -#else -static void x264_predict_16x16_p_ssse3( uint8_t *src ) -#endif -{ - int a, b, c, i00; - int H, V; -#if HIGH_BIT_DEPTH - asm ( - "movdqu %1, %%xmm1 \n" - "movdqa %2, %%xmm0 \n" - "pmaddwd %3, %%xmm0 \n" - "pmaddwd %4, %%xmm1 \n" - "paddd %%xmm1, %%xmm0 \n" - "movhlps %%xmm0, %%xmm1 \n" - "paddd %%xmm1, %%xmm0 \n" - "pshuflw $14, %%xmm0, %%xmm1 \n" - "paddd %%xmm1, %%xmm0 \n" - "movd %%xmm0, %0 \n" - :"=r"(H) - :"m"(src[-FDEC_STRIDE-1]), "m"(src[-FDEC_STRIDE+8]), - "m"(*pw_12345678), "m"(*pw_m87654321) +#define PREDICT_16x16_P_ASM\ + asm (\ + "movdqu %1, %%xmm1 \n"\ + "movdqa %2, %%xmm0 \n"\ + "pmaddwd %3, %%xmm0 \n"\ + "pmaddwd %4, %%xmm1 \n"\ + "paddd %%xmm1, %%xmm0 \n"\ + "movhlps %%xmm0, %%xmm1 \n"\ + "paddd %%xmm1, %%xmm0 \n"\ + "pshuflw $14, %%xmm0, %%xmm1 \n"\ + "paddd %%xmm1, %%xmm0 \n"\ + "movd %%xmm0, %0 \n"\ + :"=r"(H)\ + :"m"(src[-FDEC_STRIDE-1]), "m"(src[-FDEC_STRIDE+8]),\ + "m"(*pw_12345678), "m"(*pw_m87654321)\ ); -#else - asm ( - "movq %1, %%mm1 \n" - "movq %2, %%mm0 \n" - "palignr $7, %3, %%mm1 \n" - "pmaddubsw %4, %%mm0 \n" - "pmaddubsw %5, %%mm1 \n" - "paddw %%mm1, %%mm0 \n" - "pshufw $14, %%mm0, %%mm1 \n" - "paddw %%mm1, %%mm0 \n" - "pshufw $1, %%mm0, %%mm1 \n" - "paddw %%mm1, %%mm0 \n" - "movd %%mm0, %0 \n" - "movswl %w0, %0 \n" - :"=r"(H) - :"m"(src[-FDEC_STRIDE]), "m"(src[-FDEC_STRIDE+8]), - "m"(src[-FDEC_STRIDE-8]), "m"(*pb_12345678), "m"(*pb_m87654321) +#else // !HIGH_BIT_DEPTH +#define PREDICT_16x16_P_ASM\ + asm (\ + "movq %1, %%mm1 \n"\ + "movq %2, %%mm0 \n"\ + "palignr $7, %3, %%mm1 \n"\ + "pmaddubsw %4, %%mm0 \n"\ + "pmaddubsw %5, %%mm1 \n"\ + "paddw %%mm1, %%mm0 \n"\ + "pshufw $14, %%mm0, %%mm1 \n"\ + "paddw %%mm1, %%mm0 \n"\ + "pshufw $1, %%mm0, %%mm1 \n"\ + "paddw %%mm1, %%mm0 \n"\ + "movd %%mm0, %0 \n"\ + "movswl %w0, %0 \n"\ + :"=r"(H)\ + :"m"(src[-FDEC_STRIDE]), "m"(src[-FDEC_STRIDE+8]),\ + "m"(src[-FDEC_STRIDE-8]), "m"(*pb_12345678), "m"(*pb_m87654321)\ ); -#endif - V = 8 * ( src[15*FDEC_STRIDE-1] - src[-1*FDEC_STRIDE-1] ) - + 7 * ( src[14*FDEC_STRIDE-1] - src[ 0*FDEC_STRIDE-1] ) - + 6 * ( src[13*FDEC_STRIDE-1] - src[ 1*FDEC_STRIDE-1] ) - + 5 * ( src[12*FDEC_STRIDE-1] - src[ 2*FDEC_STRIDE-1] ) - + 4 * ( src[11*FDEC_STRIDE-1] - src[ 3*FDEC_STRIDE-1] ) - + 3 * ( src[10*FDEC_STRIDE-1] - src[ 4*FDEC_STRIDE-1] ) - + 2 * ( src[ 9*FDEC_STRIDE-1] - src[ 5*FDEC_STRIDE-1] ) +#endif // HIGH_BIT_DEPTH + +#define PREDICT_16x16_P_CORE_INLINE\ + int H, V;\ + PREDICT_16x16_P_ASM\ + V = 8 * ( src[15*FDEC_STRIDE-1] - src[-1*FDEC_STRIDE-1] )\ + + 7 * ( src[14*FDEC_STRIDE-1] - src[ 0*FDEC_STRIDE-1] )\ + + 6 * ( src[13*FDEC_STRIDE-1] - src[ 1*FDEC_STRIDE-1] )\ + + 5 * ( src[12*FDEC_STRIDE-1] - src[ 2*FDEC_STRIDE-1] )\ + + 4 * ( src[11*FDEC_STRIDE-1] - src[ 3*FDEC_STRIDE-1] )\ + + 3 * ( src[10*FDEC_STRIDE-1] - src[ 4*FDEC_STRIDE-1] )\ + + 2 * ( src[ 9*FDEC_STRIDE-1] - src[ 5*FDEC_STRIDE-1] )\ + 1 * ( src[ 8*FDEC_STRIDE-1] - src[ 6*FDEC_STRIDE-1] ); - a = 16 * ( src[15*FDEC_STRIDE -1] + src[15 - FDEC_STRIDE] ); - b = ( 5 * H + 32 ) >> 6; - c = ( 5 * V + 32 ) >> 6; - i00 = a - b * 7 - c * 7 + 16; - /* b*15 + c*15 can overflow: it's easier to just branch away in this rare case - * than to try to consider it in the asm. */ - if( BIT_DEPTH > 8 && (i00 > 0x7fff || abs(b) > 1092 || abs(c) > 1092) ) - x264_predict_16x16_p_c( src ); - else - x264_predict_16x16_p_core_sse2( src, i00, b, c ); + +#define PREDICT_16x16_P_INLINE(name, name2)\ +static void x264_predict_16x16_p_##name( pixel *src )\ +{\ + PREDICT_16x16_P_CORE_INLINE\ + PREDICT_16x16_P_END(name2)\ } -#endif +#else // !HAVE_X86_INLINE_ASM +#define PREDICT_16x16_P_INLINE(name, name2) PREDICT_16x16_P(name, name2) +#endif // HAVE_X86_INLINE_ASM + +#if HIGH_BIT_DEPTH +PREDICT_16x16_P_INLINE( sse2, sse2 ) +#else // !HIGH_BIT_DEPTH +#if !ARCH_X86_64 +PREDICT_16x16_P( mmx2, mmx2 ) +#endif // !ARCH_X86_64 +PREDICT_16x16_P( sse2, sse2 ) +#if HAVE_X86_INLINE_ASM +PREDICT_16x16_P_INLINE( ssse3, sse2 ) +#endif // HAVE_X86_INLINE_ASM +PREDICT_16x16_P_INLINE( avx, avx ) +#endif // HIGH_BIT_DEPTH +PREDICT_16x16_P_INLINE( avx2, avx2 ) -#if !HIGH_BIT_DEPTH +#define PREDICT_8x16C_P_CORE\ + int H = 0, V = 0;\ + for( int i = 0; i < 4; i++ )\ + H += ( i + 1 ) * ( src[4 + i - FDEC_STRIDE] - src[2 - i - FDEC_STRIDE] );\ + for( int i = 0; i < 8; i++ )\ + V += ( i + 1 ) * ( src[-1 + (i+8)*FDEC_STRIDE] - src[-1 + (6-i)*FDEC_STRIDE] ); -#define PREDICT_8x8_P(name)\ -static void x264_predict_8x8c_p_##name( uint8_t *src )\ +#if HIGH_BIT_DEPTH +#define PREDICT_8x16C_P_END(name)\ + int a = 16 * ( src[-1 + 15*FDEC_STRIDE] + src[7 - FDEC_STRIDE] );\ + int b = ( 17 * H + 16 ) >> 5;\ + int c = ( 5 * V + 32 ) >> 6;\ + x264_predict_8x16c_p_core_##name( src, a, b, c ); +#else // !HIGH_BIT_DEPTH +#define PREDICT_8x16C_P_END(name)\ + int a = 16 * ( src[-1 + 15*FDEC_STRIDE] + src[7 - FDEC_STRIDE] );\ + int b = ( 17 * H + 16 ) >> 5;\ + int c = ( 5 * V + 32 ) >> 6;\ + int i00 = a -3*b -7*c + 16;\ + x264_predict_8x16c_p_core_##name( src, i00, b, c ); +#endif // HIGH_BIT_DEPTH + +#define PREDICT_8x16C_P(name)\ +static void x264_predict_8x16c_p_##name( pixel *src )\ {\ - int a, b, c;\ + PREDICT_8x16C_P_CORE\ + PREDICT_8x16C_P_END(name)\ +} + +#if !ARCH_X86_64 && !HIGH_BIT_DEPTH +PREDICT_8x16C_P( mmx2 ) +#endif // !ARCH_X86_64 && !HIGH_BIT_DEPTH +PREDICT_8x16C_P( sse2 ) +PREDICT_8x16C_P( avx ) +PREDICT_8x16C_P( avx2 ) + +#define PREDICT_8x8C_P_CORE\ int H = 0;\ int V = 0;\ - int i00;\ PREDICT_P_SUM(3,1)\ PREDICT_P_SUM(3,2)\ PREDICT_P_SUM(3,3)\ - PREDICT_P_SUM(3,4)\ - a = 16 * ( src[7*FDEC_STRIDE -1] + src[7 - FDEC_STRIDE] );\ - b = ( 17 * H + 16 ) >> 5;\ - c = ( 17 * V + 16 ) >> 5;\ - i00 = a -3*b -3*c + 16;\ - x264_predict_8x8c_p_core_##name( src, i00, b, c );\ -} -#ifndef ARCH_X86_64 -PREDICT_8x8_P( mmx2 ) -#endif -PREDICT_8x8_P( sse2 ) + PREDICT_P_SUM(3,4) -#endif //!HIGH_BIT_DEPTH +#if HIGH_BIT_DEPTH +#define PREDICT_8x8C_P_END(name)\ + int a = 16 * ( src[7*FDEC_STRIDE -1] + src[7 - FDEC_STRIDE] );\ + int b = ( 17 * H + 16 ) >> 5;\ + int c = ( 17 * V + 16 ) >> 5;\ + x264_predict_8x8c_p_core_##name( src, a, b, c ); +#else // !HIGH_BIT_DEPTH +#define PREDICT_8x8C_P_END(name)\ + int a = 16 * ( src[7*FDEC_STRIDE -1] + src[7 - FDEC_STRIDE] );\ + int b = ( 17 * H + 16 ) >> 5;\ + int c = ( 17 * V + 16 ) >> 5;\ + int i00 = a -3*b -3*c + 16;\ + x264_predict_8x8c_p_core_##name( src, i00, b, c ); +#endif // HIGH_BIT_DEPTH + +#define PREDICT_8x8C_P(name, name2)\ +static void x264_predict_8x8c_p_##name( pixel *src )\ +{\ + PREDICT_8x8C_P_CORE\ + PREDICT_8x8C_P_END(name2)\ +} #if HAVE_X86_INLINE_ASM #if HIGH_BIT_DEPTH -static void x264_predict_8x8c_p_sse2( uint16_t *src ) -#else -static void x264_predict_8x8c_p_ssse3( uint8_t *src ) -#endif -{ - int a, b, c, i00; - int H, V; -#if HIGH_BIT_DEPTH - asm ( - "movdqa %1, %%xmm0 \n" - "pmaddwd %2, %%xmm0 \n" - "movhlps %%xmm0, %%xmm1 \n" - "paddd %%xmm1, %%xmm0 \n" - "pshuflw $14, %%xmm0, %%xmm1 \n" - "paddd %%xmm1, %%xmm0 \n" - "movd %%xmm0, %0 \n" - :"=r"(H) - :"m"(src[-FDEC_STRIDE]), "m"(*pw_m32101234) +#define PREDICT_8x8C_P_ASM\ + asm (\ + "movdqa %1, %%xmm0 \n"\ + "pmaddwd %2, %%xmm0 \n"\ + "movhlps %%xmm0, %%xmm1 \n"\ + "paddd %%xmm1, %%xmm0 \n"\ + "pshuflw $14, %%xmm0, %%xmm1 \n"\ + "paddd %%xmm1, %%xmm0 \n"\ + "movd %%xmm0, %0 \n"\ + :"=r"(H)\ + :"m"(src[-FDEC_STRIDE]), "m"(*pw_m32101234)\ ); -#else - asm ( - "movq %1, %%mm0 \n" - "pmaddubsw %2, %%mm0 \n" - "pshufw $14, %%mm0, %%mm1 \n" - "paddw %%mm1, %%mm0 \n" - "pshufw $1, %%mm0, %%mm1 \n" - "paddw %%mm1, %%mm0 \n" - "movd %%mm0, %0 \n" - "movswl %w0, %0 \n" - :"=r"(H) - :"m"(src[-FDEC_STRIDE]), "m"(*pb_m32101234) +#else // !HIGH_BIT_DEPTH +#define PREDICT_8x8C_P_ASM\ + asm (\ + "movq %1, %%mm0 \n"\ + "pmaddubsw %2, %%mm0 \n"\ + "pshufw $14, %%mm0, %%mm1 \n"\ + "paddw %%mm1, %%mm0 \n"\ + "pshufw $1, %%mm0, %%mm1 \n"\ + "paddw %%mm1, %%mm0 \n"\ + "movd %%mm0, %0 \n"\ + "movswl %w0, %0 \n"\ + :"=r"(H)\ + :"m"(src[-FDEC_STRIDE]), "m"(*pb_m32101234)\ ); -#endif - V = 1 * ( src[4*FDEC_STRIDE -1] - src[ 2*FDEC_STRIDE -1] ) - + 2 * ( src[5*FDEC_STRIDE -1] - src[ 1*FDEC_STRIDE -1] ) - + 3 * ( src[6*FDEC_STRIDE -1] - src[ 0*FDEC_STRIDE -1] ) - + 4 * ( src[7*FDEC_STRIDE -1] - src[-1*FDEC_STRIDE -1] ); +#endif // HIGH_BIT_DEPTH + +#define PREDICT_8x8C_P_CORE_INLINE\ + int H, V;\ + PREDICT_8x8C_P_ASM\ + V = 1 * ( src[4*FDEC_STRIDE -1] - src[ 2*FDEC_STRIDE -1] )\ + + 2 * ( src[5*FDEC_STRIDE -1] - src[ 1*FDEC_STRIDE -1] )\ + + 3 * ( src[6*FDEC_STRIDE -1] - src[ 0*FDEC_STRIDE -1] )\ + + 4 * ( src[7*FDEC_STRIDE -1] - src[-1*FDEC_STRIDE -1] );\ H += -4 * src[-1*FDEC_STRIDE -1]; - a = 16 * ( src[7*FDEC_STRIDE -1] + src[7 - FDEC_STRIDE] ); - b = ( 17 * H + 16 ) >> 5; - c = ( 17 * V + 16 ) >> 5; - i00 = a -3*b -3*c + 16; -#if HIGH_BIT_DEPTH - x264_predict_8x8c_p_core_sse2( src, a, b, c ); -#else - x264_predict_8x8c_p_core_sse2( src, i00, b, c ); -#endif + +#define PREDICT_8x8C_P_INLINE(name, name2)\ +static void x264_predict_8x8c_p_##name( pixel *src )\ +{\ + PREDICT_8x8C_P_CORE_INLINE\ + PREDICT_8x8C_P_END(name2)\ } -#endif -#if !HIGH_BIT_DEPTH -#if ARCH_X86_64 +#else // !HAVE_X86_INLINE_ASM +#define PREDICT_8x8C_P_INLINE(name, name2) PREDICT_8x8C_P(name, name2) +#endif // HAVE_X86_INLINE_ASM + +#if HIGH_BIT_DEPTH +PREDICT_8x8C_P_INLINE( sse2, sse2 ) +#else //!HIGH_BIT_DEPTH +#if !ARCH_X86_64 +PREDICT_8x8C_P( mmx2, mmx2 ) +#endif // !ARCH_X86_64 +PREDICT_8x8C_P( sse2, sse2 ) +#if HAVE_X86_INLINE_ASM +PREDICT_8x8C_P_INLINE( ssse3, sse2 ) +#endif // HAVE_X86_INLINE_ASM +#endif // HIGH_BIT_DEPTH +PREDICT_8x8C_P_INLINE( avx, avx ) +PREDICT_8x8C_P_INLINE( avx2, avx2 ) + +#if ARCH_X86_64 && !HIGH_BIT_DEPTH static void x264_predict_8x8c_dc_left( uint8_t *src ) { int y; @@ -348,100 +337,48 @@ static void x264_predict_8x8c_dc_left( uint8_t *src ) M64( src ) = dc1; src += FDEC_STRIDE; } - } -#endif - -#define PL(y) \ - UNUSED int l##y = edge[14-y]; -#define PT(x) \ - UNUSED int t##x = edge[16+x]; -#define PREDICT_8x8_LOAD_LEFT \ - PL(0) PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) PL(7) -#define PREDICT_8x8_LOAD_TOP \ - PT(0) PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) PT(7) - -#define SUMSUB(a,b,c,d,e,f,g,h)\ - t=a; a+=b; b-=t;\ - t=c; c+=d; d-=t;\ - t=e; e+=f; f-=t;\ - t=g; g+=h; h-=t; - -#define INTRA_SA8D_X3(cpu)\ -void x264_intra_sa8d_x3_8x8_##cpu( uint8_t *fenc, uint8_t edge[33], int res[3] )\ -{\ - PREDICT_8x8_LOAD_TOP\ - PREDICT_8x8_LOAD_LEFT\ - int t;\ - ALIGNED_16( int16_t sa8d_1d[2][8] );\ - SUMSUB(l0,l4,l1,l5,l2,l6,l3,l7);\ - SUMSUB(l0,l2,l1,l3,l4,l6,l5,l7);\ - SUMSUB(l0,l1,l2,l3,l4,l5,l6,l7);\ - sa8d_1d[0][0] = l0;\ - sa8d_1d[0][1] = l1;\ - sa8d_1d[0][2] = l2;\ - sa8d_1d[0][3] = l3;\ - sa8d_1d[0][4] = l4;\ - sa8d_1d[0][5] = l5;\ - sa8d_1d[0][6] = l6;\ - sa8d_1d[0][7] = l7;\ - SUMSUB(t0,t4,t1,t5,t2,t6,t3,t7);\ - SUMSUB(t0,t2,t1,t3,t4,t6,t5,t7);\ - SUMSUB(t0,t1,t2,t3,t4,t5,t6,t7);\ - sa8d_1d[1][0] = t0;\ - sa8d_1d[1][1] = t1;\ - sa8d_1d[1][2] = t2;\ - sa8d_1d[1][3] = t3;\ - sa8d_1d[1][4] = t4;\ - sa8d_1d[1][5] = t5;\ - sa8d_1d[1][6] = t6;\ - sa8d_1d[1][7] = t7;\ - x264_intra_sa8d_x3_8x8_core_##cpu( fenc, sa8d_1d, res );\ -} - -#if ARCH_X86_64 -INTRA_SA8D_X3(sse2) -INTRA_SA8D_X3(ssse3) -INTRA_SA8D_X3(avx) -#else -INTRA_SA8D_X3(mmx2) -#endif -#endif // !HIGH_BIT_DEPTH +#endif // ARCH_X86_64 && !HIGH_BIT_DEPTH /**************************************************************************** * Exported functions: ****************************************************************************/ void x264_predict_16x16_init_mmx( int cpu, x264_predict_t pf[7] ) { - if( !(cpu&X264_CPU_MMX) ) + if( !(cpu&X264_CPU_MMX2) ) return; - pf[I_PRED_16x16_V] = x264_predict_16x16_v_mmx; - if( cpu&X264_CPU_MMX2 ) - { - pf[I_PRED_16x16_DC] = x264_predict_16x16_dc_mmx2; - pf[I_PRED_16x16_DC_TOP] = x264_predict_16x16_dc_top_mmx2; - pf[I_PRED_16x16_DC_LEFT] = x264_predict_16x16_dc_left_mmx2; - pf[I_PRED_16x16_H] = x264_predict_16x16_h_mmx2; - } + pf[I_PRED_16x16_DC] = x264_predict_16x16_dc_mmx2; + pf[I_PRED_16x16_DC_TOP] = x264_predict_16x16_dc_top_mmx2; + pf[I_PRED_16x16_DC_LEFT] = x264_predict_16x16_dc_left_mmx2; + pf[I_PRED_16x16_V] = x264_predict_16x16_v_mmx2; + pf[I_PRED_16x16_H] = x264_predict_16x16_h_mmx2; #if HIGH_BIT_DEPTH + if( !(cpu&X264_CPU_SSE) ) + return; + pf[I_PRED_16x16_V] = x264_predict_16x16_v_sse; if( !(cpu&X264_CPU_SSE2) ) return; pf[I_PRED_16x16_DC] = x264_predict_16x16_dc_sse2; pf[I_PRED_16x16_DC_TOP] = x264_predict_16x16_dc_top_sse2; pf[I_PRED_16x16_DC_LEFT] = x264_predict_16x16_dc_left_sse2; - pf[I_PRED_16x16_V] = x264_predict_16x16_v_sse2; pf[I_PRED_16x16_H] = x264_predict_16x16_h_sse2; -#if HAVE_X86_INLINE_ASM pf[I_PRED_16x16_P] = x264_predict_16x16_p_sse2; -#endif + if( !(cpu&X264_CPU_AVX) ) + return; + pf[I_PRED_16x16_V] = x264_predict_16x16_v_avx; + if( !(cpu&X264_CPU_AVX2) ) + return; + pf[I_PRED_16x16_H] = x264_predict_16x16_h_avx2; #else #if !ARCH_X86_64 pf[I_PRED_16x16_P] = x264_predict_16x16_p_mmx2; #endif + if( !(cpu&X264_CPU_SSE) ) + return; + pf[I_PRED_16x16_V] = x264_predict_16x16_v_sse; if( !(cpu&X264_CPU_SSE2) ) return; pf[I_PRED_16x16_DC] = x264_predict_16x16_dc_sse2; - pf[I_PRED_16x16_V] = x264_predict_16x16_v_sse2; if( cpu&X264_CPU_SSE2_IS_SLOW ) return; pf[I_PRED_16x16_DC_TOP] = x264_predict_16x16_dc_top_sse2; @@ -449,7 +386,8 @@ void x264_predict_16x16_init_mmx( int cpu, x264_predict_t pf[7] ) pf[I_PRED_16x16_P] = x264_predict_16x16_p_sse2; if( !(cpu&X264_CPU_SSSE3) ) return; - pf[I_PRED_16x16_H] = x264_predict_16x16_h_ssse3; + if( !(cpu&X264_CPU_SLOW_PSHUFB) ) + pf[I_PRED_16x16_H] = x264_predict_16x16_h_ssse3; #if HAVE_X86_INLINE_ASM pf[I_PRED_16x16_P] = x264_predict_16x16_p_ssse3; #endif @@ -457,6 +395,14 @@ void x264_predict_16x16_init_mmx( int cpu, x264_predict_t pf[7] ) return; pf[I_PRED_16x16_P] = x264_predict_16x16_p_avx; #endif // HIGH_BIT_DEPTH + + if( cpu&X264_CPU_AVX2 ) + { + pf[I_PRED_16x16_P] = x264_predict_16x16_p_avx2; + pf[I_PRED_16x16_DC] = x264_predict_16x16_dc_avx2; + pf[I_PRED_16x16_DC_TOP] = x264_predict_16x16_dc_top_avx2; + pf[I_PRED_16x16_DC_LEFT] = x264_predict_16x16_dc_left_avx2; + } } void x264_predict_8x8c_init_mmx( int cpu, x264_predict_t pf[7] ) @@ -468,15 +414,22 @@ void x264_predict_8x8c_init_mmx( int cpu, x264_predict_t pf[7] ) if( !(cpu&X264_CPU_MMX2) ) return; pf[I_PRED_CHROMA_DC] = x264_predict_8x8c_dc_mmx2; + pf[I_PRED_CHROMA_H] = x264_predict_8x8c_h_mmx2; + if( !(cpu&X264_CPU_SSE) ) + return; + pf[I_PRED_CHROMA_V] = x264_predict_8x8c_v_sse; if( !(cpu&X264_CPU_SSE2) ) return; - pf[I_PRED_CHROMA_V] = x264_predict_8x8c_v_sse2; pf[I_PRED_CHROMA_DC] = x264_predict_8x8c_dc_sse2; pf[I_PRED_CHROMA_DC_TOP] = x264_predict_8x8c_dc_top_sse2; pf[I_PRED_CHROMA_H] = x264_predict_8x8c_h_sse2; -#if HAVE_X86_INLINE_ASM pf[I_PRED_CHROMA_P] = x264_predict_8x8c_p_sse2; -#endif + if( !(cpu&X264_CPU_AVX) ) + return; + pf[I_PRED_CHROMA_P] = x264_predict_8x8c_p_avx; + if( !(cpu&X264_CPU_AVX2) ) + return; + pf[I_PRED_CHROMA_H] = x264_predict_8x8c_h_avx2; #else #if ARCH_X86_64 pf[I_PRED_CHROMA_DC_LEFT] = x264_predict_8x8c_dc_left; @@ -499,7 +452,66 @@ void x264_predict_8x8c_init_mmx( int cpu, x264_predict_t pf[7] ) #if HAVE_X86_INLINE_ASM pf[I_PRED_CHROMA_P] = x264_predict_8x8c_p_ssse3; #endif + if( !(cpu&X264_CPU_AVX) ) + return; + pf[I_PRED_CHROMA_P] = x264_predict_8x8c_p_avx; #endif // HIGH_BIT_DEPTH + + if( cpu&X264_CPU_AVX2 ) + { + pf[I_PRED_CHROMA_P] = x264_predict_8x8c_p_avx2; + } +} + +void x264_predict_8x16c_init_mmx( int cpu, x264_predict_t pf[7] ) +{ + if( !(cpu&X264_CPU_MMX) ) + return; +#if HIGH_BIT_DEPTH + if( !(cpu&X264_CPU_MMX2) ) + return; + pf[I_PRED_CHROMA_DC] = x264_predict_8x16c_dc_mmx2; + pf[I_PRED_CHROMA_H] = x264_predict_8x16c_h_mmx2; + if( !(cpu&X264_CPU_SSE) ) + return; + pf[I_PRED_CHROMA_V] = x264_predict_8x16c_v_sse; + if( !(cpu&X264_CPU_SSE2) ) + return; + pf[I_PRED_CHROMA_DC_TOP] = x264_predict_8x16c_dc_top_sse2; + pf[I_PRED_CHROMA_DC] = x264_predict_8x16c_dc_sse2; + pf[I_PRED_CHROMA_H] = x264_predict_8x16c_h_sse2; + pf[I_PRED_CHROMA_P] = x264_predict_8x16c_p_sse2; + if( !(cpu&X264_CPU_AVX) ) + return; + pf[I_PRED_CHROMA_P] = x264_predict_8x16c_p_avx; + if( !(cpu&X264_CPU_AVX2) ) + return; + pf[I_PRED_CHROMA_H] = x264_predict_8x16c_h_avx2; +#else + pf[I_PRED_CHROMA_V] = x264_predict_8x16c_v_mmx; + if( !(cpu&X264_CPU_MMX2) ) + return; + pf[I_PRED_CHROMA_DC_TOP] = x264_predict_8x16c_dc_top_mmx2; + pf[I_PRED_CHROMA_DC] = x264_predict_8x16c_dc_mmx2; + pf[I_PRED_CHROMA_H] = x264_predict_8x16c_h_mmx2; +#if !ARCH_X86_64 + pf[I_PRED_CHROMA_P] = x264_predict_8x16c_p_mmx2; +#endif + if( !(cpu&X264_CPU_SSE2) ) + return; + pf[I_PRED_CHROMA_P] = x264_predict_8x16c_p_sse2; + if( !(cpu&X264_CPU_SSSE3) ) + return; + pf[I_PRED_CHROMA_H] = x264_predict_8x16c_h_ssse3; + if( !(cpu&X264_CPU_AVX) ) + return; + pf[I_PRED_CHROMA_P] = x264_predict_8x16c_p_avx; +#endif // HIGH_BIT_DEPTH + + if( cpu&X264_CPU_AVX2 ) + { + pf[I_PRED_CHROMA_P] = x264_predict_8x16c_p_avx2; + } } void x264_predict_8x8_init_mmx( int cpu, x264_predict8x8_t pf[12], x264_predict_8x8_filter_t *predict_8x8_filter ) @@ -507,30 +519,41 @@ void x264_predict_8x8_init_mmx( int cpu, x264_predict8x8_t pf[12], x264_predict_ if( !(cpu&X264_CPU_MMX2) ) return; #if HIGH_BIT_DEPTH + if( !(cpu&X264_CPU_SSE) ) + return; + pf[I_PRED_8x8_V] = x264_predict_8x8_v_sse; if( !(cpu&X264_CPU_SSE2) ) return; - pf[I_PRED_8x8_V] = x264_predict_8x8_v_sse2; pf[I_PRED_8x8_H] = x264_predict_8x8_h_sse2; pf[I_PRED_8x8_DC] = x264_predict_8x8_dc_sse2; pf[I_PRED_8x8_DC_TOP] = x264_predict_8x8_dc_top_sse2; pf[I_PRED_8x8_DC_LEFT]= x264_predict_8x8_dc_left_sse2; pf[I_PRED_8x8_DDL] = x264_predict_8x8_ddl_sse2; pf[I_PRED_8x8_DDR] = x264_predict_8x8_ddr_sse2; + pf[I_PRED_8x8_VL] = x264_predict_8x8_vl_sse2; pf[I_PRED_8x8_VR] = x264_predict_8x8_vr_sse2; pf[I_PRED_8x8_HD] = x264_predict_8x8_hd_sse2; pf[I_PRED_8x8_HU] = x264_predict_8x8_hu_sse2; *predict_8x8_filter = x264_predict_8x8_filter_sse2; if( !(cpu&X264_CPU_SSSE3) ) return; + pf[I_PRED_8x8_DDL] = x264_predict_8x8_ddl_ssse3; + pf[I_PRED_8x8_DDR] = x264_predict_8x8_ddr_ssse3; pf[I_PRED_8x8_HD] = x264_predict_8x8_hd_ssse3; pf[I_PRED_8x8_HU] = x264_predict_8x8_hu_ssse3; + pf[I_PRED_8x8_VL] = x264_predict_8x8_vl_ssse3; pf[I_PRED_8x8_VR] = x264_predict_8x8_vr_ssse3; *predict_8x8_filter = x264_predict_8x8_filter_ssse3; + if( cpu&X264_CPU_CACHELINE_64 ) + { + pf[I_PRED_8x8_DDL]= x264_predict_8x8_ddl_ssse3_cache64; + pf[I_PRED_8x8_DDR]= x264_predict_8x8_ddr_ssse3_cache64; + } if( !(cpu&X264_CPU_AVX) ) return; - pf[I_PRED_8x8_DDL] = x264_predict_8x8_ddl_avx; pf[I_PRED_8x8_HD] = x264_predict_8x8_hd_avx; pf[I_PRED_8x8_HU] = x264_predict_8x8_hu_avx; + pf[I_PRED_8x8_VL] = x264_predict_8x8_vl_avx; pf[I_PRED_8x8_VR] = x264_predict_8x8_vr_avx; *predict_8x8_filter = x264_predict_8x8_filter_avx; #else @@ -540,6 +563,7 @@ void x264_predict_8x8_init_mmx( int cpu, x264_predict8x8_t pf[12], x264_predict_ pf[I_PRED_8x8_DC_TOP] = x264_predict_8x8_dc_top_mmx2; pf[I_PRED_8x8_DC_LEFT]= x264_predict_8x8_dc_left_mmx2; pf[I_PRED_8x8_HD] = x264_predict_8x8_hd_mmx2; + pf[I_PRED_8x8_VL] = x264_predict_8x8_vl_mmx2; *predict_8x8_filter = x264_predict_8x8_filter_mmx2; #if ARCH_X86 pf[I_PRED_8x8_DDL] = x264_predict_8x8_ddl_mmx2; @@ -557,7 +581,11 @@ void x264_predict_8x8_init_mmx( int cpu, x264_predict8x8_t pf[12], x264_predict_ pf[I_PRED_8x8_HU] = x264_predict_8x8_hu_sse2; if( !(cpu&X264_CPU_SSSE3) ) return; - pf[I_PRED_8x8_HD] = x264_predict_8x8_hd_ssse3; + if( !(cpu&X264_CPU_SLOW_PALIGNR) ) + { + pf[I_PRED_8x8_DDL] = x264_predict_8x8_ddl_ssse3; + pf[I_PRED_8x8_VR] = x264_predict_8x8_vr_ssse3; + } pf[I_PRED_8x8_HU] = x264_predict_8x8_hu_ssse3; *predict_8x8_filter = x264_predict_8x8_filter_ssse3; if( !(cpu&X264_CPU_AVX) ) @@ -566,6 +594,7 @@ void x264_predict_8x8_init_mmx( int cpu, x264_predict8x8_t pf[12], x264_predict_ pf[I_PRED_8x8_DDR] = x264_predict_8x8_ddr_avx; pf[I_PRED_8x8_VL] = x264_predict_8x8_vl_avx; pf[I_PRED_8x8_VR] = x264_predict_8x8_vr_avx; + pf[I_PRED_8x8_HD] = x264_predict_8x8_hd_avx; #endif // HIGH_BIT_DEPTH } @@ -587,21 +616,29 @@ void x264_predict_4x4_init_mmx( int cpu, x264_predict_t pf[12] ) pf[I_PRED_4x4_HD] = x264_predict_4x4_hd_sse2; pf[I_PRED_4x4_VL] = x264_predict_4x4_vl_sse2; pf[I_PRED_4x4_VR] = x264_predict_4x4_vr_sse2; + if( !(cpu&X264_CPU_SSSE3) ) + return; + pf[I_PRED_4x4_DDR] = x264_predict_4x4_ddr_ssse3; + pf[I_PRED_4x4_VR] = x264_predict_4x4_vr_ssse3; + pf[I_PRED_4x4_HD] = x264_predict_4x4_hd_ssse3; if( !(cpu&X264_CPU_AVX) ) return; pf[I_PRED_4x4_DDL] = x264_predict_4x4_ddl_avx; pf[I_PRED_4x4_DDR] = x264_predict_4x4_ddr_avx; pf[I_PRED_4x4_HD] = x264_predict_4x4_hd_avx; -#if ARCH_X86_64 pf[I_PRED_4x4_VL] = x264_predict_4x4_vl_avx; -#endif pf[I_PRED_4x4_VR] = x264_predict_4x4_vr_avx; + if( !(cpu&X264_CPU_AVX2) ) + return; + pf[I_PRED_4x4_H] = x264_predict_4x4_h_avx2; #else pf[I_PRED_4x4_VR] = x264_predict_4x4_vr_mmx2; -#endif // HIGH_BIT_DEPTH if( !(cpu&X264_CPU_SSSE3) ) return; pf[I_PRED_4x4_DDR] = x264_predict_4x4_ddr_ssse3; pf[I_PRED_4x4_VR] = x264_predict_4x4_vr_ssse3; pf[I_PRED_4x4_HD] = x264_predict_4x4_hd_ssse3; + if( cpu&X264_CPU_CACHELINE_64 ) + pf[I_PRED_4x4_VR] = x264_predict_4x4_vr_ssse3_cache64; +#endif // HIGH_BIT_DEPTH }