X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Fx86%2Fpixel.h;h=7f57788962ae044703e5b75d17a794046027535f;hb=d23d18655249944c1ca894b451e2c82c7a584c62;hp=50c9faf1834b96a0fe83d49e69be06d6182deb46;hpb=a36face6a7d9669be6a6e40626d530ef9ff31f30;p=x264 diff --git a/common/x86/pixel.h b/common/x86/pixel.h index 50c9faf1..7f577889 100644 --- a/common/x86/pixel.h +++ b/common/x86/pixel.h @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: x86 pixel metrics ***************************************************************************** - * Copyright (C) 2003-2010 x264 project + * Copyright (C) 2003-2016 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -34,108 +34,185 @@ ret x264_pixel_##name##_8x16_##suffix args;\ ret x264_pixel_##name##_8x8_##suffix args;\ ret x264_pixel_##name##_8x4_##suffix args;\ + ret x264_pixel_##name##_4x16_##suffix args;\ ret x264_pixel_##name##_4x8_##suffix args;\ ret x264_pixel_##name##_4x4_##suffix args;\ #define DECL_X1( name, suffix ) \ - DECL_PIXELS( int, name, suffix, ( pixel *, int, pixel *, int ) ) + DECL_PIXELS( int, name, suffix, ( pixel *, intptr_t, pixel *, intptr_t ) ) #define DECL_X4( name, suffix ) \ - DECL_PIXELS( void, name##_x3, suffix, ( pixel *, pixel *, pixel *, pixel *, int, int * ) )\ - DECL_PIXELS( void, name##_x4, suffix, ( pixel *, pixel *, pixel *, pixel *, pixel *, int, int * ) ) + DECL_PIXELS( void, name##_x3, suffix, ( pixel *, pixel *, pixel *, pixel *, intptr_t, int * ) )\ + DECL_PIXELS( void, name##_x4, suffix, ( pixel *, pixel *, pixel *, pixel *, pixel *, intptr_t, int * ) ) -DECL_X1( sad, mmxext ) +DECL_X1( sad, mmx2 ) DECL_X1( sad, sse2 ) -DECL_X4( sad, sse2_misalign ) DECL_X1( sad, sse3 ) DECL_X1( sad, sse2_aligned ) DECL_X1( sad, ssse3 ) DECL_X1( sad, ssse3_aligned ) -DECL_X4( sad, mmxext ) +DECL_X1( sad, avx2 ) +DECL_X4( sad, mmx2 ) DECL_X4( sad, sse2 ) DECL_X4( sad, sse3 ) DECL_X4( sad, ssse3 ) +DECL_X4( sad, xop ) +DECL_X4( sad, avx ) +DECL_X4( sad, avx2 ) DECL_X1( ssd, mmx ) -DECL_X1( ssd, mmxext ) +DECL_X1( ssd, mmx2 ) DECL_X1( ssd, sse2slow ) DECL_X1( ssd, sse2 ) DECL_X1( ssd, ssse3 ) -DECL_X1( satd, mmxext ) +DECL_X1( ssd, avx ) +DECL_X1( ssd, xop ) +DECL_X1( ssd, avx2 ) +DECL_X1( satd, mmx2 ) DECL_X1( satd, sse2 ) DECL_X1( satd, ssse3 ) +DECL_X1( satd, ssse3_atom ) DECL_X1( satd, sse4 ) -DECL_X1( sa8d, mmxext ) +DECL_X1( satd, avx ) +DECL_X1( satd, xop ) +DECL_X1( satd, avx2 ) +DECL_X1( sa8d, mmx2 ) DECL_X1( sa8d, sse2 ) DECL_X1( sa8d, ssse3 ) -DECL_X1( sa8d, sse4) -DECL_X1( sad, cache32_mmxext ); -DECL_X1( sad, cache64_mmxext ); +DECL_X1( sa8d, ssse3_atom ) +DECL_X1( sa8d, sse4 ) +DECL_X1( sa8d, avx ) +DECL_X1( sa8d, xop ) +DECL_X1( sa8d, avx2 ) +DECL_X1( sad, cache32_mmx2 ); +DECL_X1( sad, cache64_mmx2 ); DECL_X1( sad, cache64_sse2 ); DECL_X1( sad, cache64_ssse3 ); -DECL_X4( sad, cache32_mmxext ); -DECL_X4( sad, cache64_mmxext ); +DECL_X4( sad, cache32_mmx2 ); +DECL_X4( sad, cache64_mmx2 ); DECL_X4( sad, cache64_sse2 ); DECL_X4( sad, cache64_ssse3 ); -DECL_PIXELS( uint64_t, var, mmxext, ( pixel *pix, int i_stride )) -DECL_PIXELS( uint64_t, var, sse2, ( pixel *pix, int i_stride )) -DECL_PIXELS( uint64_t, hadamard_ac, mmxext, ( pixel *pix, int i_stride )) -DECL_PIXELS( uint64_t, hadamard_ac, sse2, ( pixel *pix, int i_stride )) -DECL_PIXELS( uint64_t, hadamard_ac, ssse3, ( pixel *pix, int i_stride )) -DECL_PIXELS( uint64_t, hadamard_ac, sse4, ( pixel *pix, int i_stride )) +DECL_PIXELS( uint64_t, var, mmx2, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, var, sse2, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, var, avx, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, var, xop, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, var, avx2, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, mmx2, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, sse2, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, ssse3, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, ssse3_atom, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, sse4, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, avx, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, xop, ( pixel *pix, intptr_t i_stride )) +DECL_PIXELS( uint64_t, hadamard_ac, avx2, ( pixel *pix, intptr_t i_stride )) -void x264_intra_satd_x3_4x4_mmxext ( pixel *, pixel *, int * ); -void x264_intra_satd_x3_4x4_ssse3 ( uint8_t *, uint8_t *, int * ); -void x264_intra_sad_x3_4x4_mmxext ( pixel *, pixel *, int * ); -void x264_intra_sad_x3_4x4_sse4 ( uint8_t *, uint8_t *, int * ); -void x264_intra_satd_x3_8x8c_mmxext ( pixel *, pixel *, int * ); -void x264_intra_satd_x3_8x8c_ssse3 ( uint8_t *, uint8_t *, int * ); -void x264_intra_sad_x3_8x8c_mmxext ( pixel *, pixel *, int * ); -void x264_intra_sad_x3_8x8c_sse2 ( pixel *, pixel *, int * ); -void x264_intra_sad_x3_8x8c_ssse3 ( pixel *, pixel *, int * ); -void x264_intra_satd_x3_16x16_mmxext( pixel *, pixel *, int * ); -void x264_intra_satd_x3_16x16_ssse3 ( uint8_t *, uint8_t *, int * ); -void x264_intra_sad_x3_16x16_mmxext ( pixel *, pixel *, int * ); -void x264_intra_sad_x3_16x16_sse2 ( pixel *, pixel *, int * ); -void x264_intra_sad_x3_16x16_ssse3 ( pixel *, pixel *, int * ); -void x264_intra_sa8d_x3_8x8_mmxext ( uint8_t *, uint8_t *, int * ); -void x264_intra_sa8d_x3_8x8_sse2 ( pixel *, pixel *, int * ); -void x264_intra_sa8d_x3_8x8_ssse3 ( uint8_t *, uint8_t *, int * ); -void x264_intra_sad_x3_8x8_mmxext ( pixel *, pixel *, int * ); -void x264_intra_sad_x3_8x8_sse2 ( pixel *, pixel *, int * ); -void x264_intra_sad_x3_8x8_ssse3 ( pixel *, pixel *, int * ); -void x264_intra_sa8d_x3_8x8_core_mmxext( uint8_t *, int16_t [2][8], int * ); -void x264_intra_sa8d_x3_8x8_core_sse2 ( uint8_t *, int16_t [2][8], int * ); -void x264_intra_sa8d_x3_8x8_core_ssse3 ( uint8_t *, int16_t [2][8], int * ); +void x264_intra_satd_x3_4x4_mmx2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_4x4_mmx2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_4x4_sse2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_4x4_ssse3 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_4x4_avx ( pixel *, pixel *, int * ); +void x264_intra_satd_x3_8x8c_mmx2 ( pixel *, pixel *, int * ); +void x264_intra_satd_x3_8x8c_ssse3 ( uint8_t *, uint8_t *, int * ); +void x264_intra_sad_x3_8x8c_mmx2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_8x8c_sse2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_8x8c_ssse3 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_8x8c_avx2 ( pixel *, pixel *, int * ); +void x264_intra_satd_x3_16x16_mmx2 ( pixel *, pixel *, int * ); +void x264_intra_satd_x3_16x16_ssse3( uint8_t *, uint8_t *, int * ); +void x264_intra_sad_x3_16x16_mmx2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_16x16_sse2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_16x16_ssse3 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_16x16_avx2 ( pixel *, pixel *, int * ); +void x264_intra_sa8d_x3_8x8_mmx2 ( uint8_t *, uint8_t *, int * ); +void x264_intra_sa8d_x3_8x8_sse2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_8x8_mmx2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_8x8_sse2 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_8x8_ssse3 ( pixel *, pixel *, int * ); +void x264_intra_sad_x3_8x8_avx2 ( uint16_t*, uint16_t*, int * ); +int x264_intra_satd_x9_4x4_ssse3( uint8_t *, uint8_t *, uint16_t * ); +int x264_intra_satd_x9_4x4_sse4 ( uint8_t *, uint8_t *, uint16_t * ); +int x264_intra_satd_x9_4x4_avx ( uint8_t *, uint8_t *, uint16_t * ); +int x264_intra_satd_x9_4x4_xop ( uint8_t *, uint8_t *, uint16_t * ); +int x264_intra_sad_x9_4x4_ssse3 ( uint8_t *, uint8_t *, uint16_t * ); +int x264_intra_sad_x9_4x4_sse4 ( uint8_t *, uint8_t *, uint16_t * ); +int x264_intra_sad_x9_4x4_avx ( uint8_t *, uint8_t *, uint16_t * ); +int x264_intra_sa8d_x9_8x8_ssse3( uint8_t *, uint8_t *, uint8_t *, uint16_t *, uint16_t * ); +int x264_intra_sa8d_x9_8x8_sse4 ( uint8_t *, uint8_t *, uint8_t *, uint16_t *, uint16_t * ); +int x264_intra_sa8d_x9_8x8_avx ( uint8_t *, uint8_t *, uint8_t *, uint16_t *, uint16_t * ); +int x264_intra_sad_x9_8x8_ssse3 ( uint8_t *, uint8_t *, uint8_t *, uint16_t *, uint16_t * ); +int x264_intra_sad_x9_8x8_sse4 ( uint8_t *, uint8_t *, uint8_t *, uint16_t *, uint16_t * ); +int x264_intra_sad_x9_8x8_avx ( uint8_t *, uint8_t *, uint8_t *, uint16_t *, uint16_t * ); +int x264_intra_sad_x9_8x8_avx2 ( uint8_t *, uint8_t *, uint8_t *, uint16_t *, uint16_t * ); -void x264_pixel_ssd_nv12_core_mmxext( pixel *pixuv1, int stride1, - pixel *pixuv2, int stride2, int width, - int height, uint64_t *ssd_u, uint64_t *ssd_v ); -void x264_pixel_ssd_nv12_core_sse2( pixel *pixuv1, int stride1, - pixel *pixuv2, int stride2, int width, +void x264_pixel_ssd_nv12_core_mmx2( pixel *pixuv1, intptr_t stride1, + pixel *pixuv2, intptr_t stride2, int width, int height, uint64_t *ssd_u, uint64_t *ssd_v ); -void x264_pixel_ssim_4x4x2_core_mmxext( const uint8_t *pix1, int stride1, - const uint8_t *pix2, int stride2, int sums[2][4] ); -void x264_pixel_ssim_4x4x2_core_sse2( const uint8_t *pix1, int stride1, - const uint8_t *pix2, int stride2, int sums[2][4] ); +void x264_pixel_ssd_nv12_core_sse2( pixel *pixuv1, intptr_t stride1, + pixel *pixuv2, intptr_t stride2, int width, + int height, uint64_t *ssd_u, uint64_t *ssd_v ); +void x264_pixel_ssd_nv12_core_avx ( pixel *pixuv1, intptr_t stride1, + pixel *pixuv2, intptr_t stride2, int width, + int height, uint64_t *ssd_u, uint64_t *ssd_v ); +void x264_pixel_ssd_nv12_core_xop ( pixel *pixuv1, intptr_t stride1, + pixel *pixuv2, intptr_t stride2, int width, + int height, uint64_t *ssd_u, uint64_t *ssd_v ); +void x264_pixel_ssd_nv12_core_avx2( pixel *pixuv1, intptr_t stride1, + pixel *pixuv2, intptr_t stride2, int width, + int height, uint64_t *ssd_u, uint64_t *ssd_v ); +void x264_pixel_ssim_4x4x2_core_mmx2( const uint8_t *pix1, intptr_t stride1, + const uint8_t *pix2, intptr_t stride2, int sums[2][4] ); +void x264_pixel_ssim_4x4x2_core_sse2( const pixel *pix1, intptr_t stride1, + const pixel *pix2, intptr_t stride2, int sums[2][4] ); +void x264_pixel_ssim_4x4x2_core_avx ( const pixel *pix1, intptr_t stride1, + const pixel *pix2, intptr_t stride2, int sums[2][4] ); float x264_pixel_ssim_end4_sse2( int sum0[5][4], int sum1[5][4], int width ); -int x264_pixel_var2_8x8_mmxext( pixel *, int, pixel *, int, int * ); -int x264_pixel_var2_8x8_sse2( pixel *, int, pixel *, int, int * ); -int x264_pixel_var2_8x8_ssse3( uint8_t *, int, uint8_t *, int, int * ); +float x264_pixel_ssim_end4_avx ( int sum0[5][4], int sum1[5][4], int width ); +int x264_pixel_var2_8x8_mmx2 ( pixel *, intptr_t, pixel *, intptr_t, int * ); +int x264_pixel_var2_8x8_sse2 ( pixel *, intptr_t, pixel *, intptr_t, int * ); +int x264_pixel_var2_8x8_ssse3 ( uint8_t *, intptr_t, uint8_t *, intptr_t, int * ); +int x264_pixel_var2_8x8_xop ( uint8_t *, intptr_t, uint8_t *, intptr_t, int * ); +int x264_pixel_var2_8x8_avx2 ( uint8_t *, intptr_t, uint8_t *, intptr_t, int * ); +int x264_pixel_var2_8x16_mmx2 ( pixel *, intptr_t, pixel *, intptr_t, int * ); +int x264_pixel_var2_8x16_sse2 ( pixel *, intptr_t, pixel *, intptr_t, int * ); +int x264_pixel_var2_8x16_ssse3( uint8_t *, intptr_t, uint8_t *, intptr_t, int * ); +int x264_pixel_var2_8x16_xop ( uint8_t *, intptr_t, uint8_t *, intptr_t, int * ); +int x264_pixel_var2_8x16_avx2 ( uint8_t *, intptr_t, uint8_t *, intptr_t, int * ); +int x264_pixel_vsad_mmx2 ( pixel *src, intptr_t stride, int height ); +int x264_pixel_vsad_sse2 ( pixel *src, intptr_t stride, int height ); +int x264_pixel_vsad_ssse3( pixel *src, intptr_t stride, int height ); +int x264_pixel_vsad_xop ( pixel *src, intptr_t stride, int height ); +int x264_pixel_vsad_avx2 ( uint16_t *src, intptr_t stride, int height ); +int x264_pixel_asd8_sse2 ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2, int height ); +int x264_pixel_asd8_ssse3( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2, int height ); +int x264_pixel_asd8_xop ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2, int height ); +uint64_t x264_pixel_sa8d_satd_16x16_sse2 ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2 ); +uint64_t x264_pixel_sa8d_satd_16x16_ssse3 ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2 ); +uint64_t x264_pixel_sa8d_satd_16x16_ssse3_atom( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2 ); +uint64_t x264_pixel_sa8d_satd_16x16_sse4 ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2 ); +uint64_t x264_pixel_sa8d_satd_16x16_avx ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2 ); +uint64_t x264_pixel_sa8d_satd_16x16_xop ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2 ); +uint64_t x264_pixel_sa8d_satd_16x16_avx2 ( pixel *pix1, intptr_t stride1, pixel *pix2, intptr_t stride2 ); + #define DECL_ADS( size, suffix ) \ int x264_pixel_ads##size##_##suffix( int enc_dc[size], uint16_t *sums, int delta,\ uint16_t *cost_mvx, int16_t *mvs, int width, int thresh ); -DECL_ADS( 4, mmxext ) -DECL_ADS( 2, mmxext ) -DECL_ADS( 1, mmxext ) +DECL_ADS( 4, mmx2 ) +DECL_ADS( 2, mmx2 ) +DECL_ADS( 1, mmx2 ) DECL_ADS( 4, sse2 ) DECL_ADS( 2, sse2 ) DECL_ADS( 1, sse2 ) DECL_ADS( 4, ssse3 ) DECL_ADS( 2, ssse3 ) DECL_ADS( 1, ssse3 ) +DECL_ADS( 4, avx ) +DECL_ADS( 2, avx ) +DECL_ADS( 1, avx ) +DECL_ADS( 4, avx2 ) +DECL_ADS( 2, avx2 ) +DECL_ADS( 1, avx2 ) #undef DECL_PIXELS #undef DECL_X1