shithub: libvpx

Info  •  Files  •  Log  •  Branches

convolve: disable avx2 variants

tests failing under Win32/Win64

Change-Id: I5d49d11911bcda3a832b14efe5500d22597bedcf

--- a/test/convolve_test.cc

+++ b/test/convolve_test.cc

@@ -645,6 +645,26 @@

 #endif

 #if HAVE_AVX2

+// TODO(jzern): these prototypes can be removed after the avx2 versions are

+// reenabled in vp9_rtcd_defs.pl.

+extern "C" {

+void vp9_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride,

+                             uint8_t *dst, ptrdiff_t dst_stride,

+                             const int16_t *filter_x, int x_step_q4,

+                             const int16_t *filter_y, int y_step_q4,

+                             int w, int h);

+void vp9_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride,

+                              uint8_t *dst, ptrdiff_t dst_stride,

+                              const int16_t *filter_x, int x_step_q4,

+                              const int16_t *filter_y, int y_step_q4,

+                              int w, int h);

+void vp9_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride,

+                        uint8_t *dst, ptrdiff_t dst_stride,

+                        const int16_t *filter_x, int x_step_q4,

+                        const int16_t *filter_y, int y_step_q4,

+                        int w, int h);

+}

+

 const ConvolveFunctions convolve8_avx2(

     vp9_convolve8_horiz_avx2, vp9_convolve8_avg_horiz_ssse3,

     vp9_convolve8_vert_avx2, vp9_convolve8_avg_vert_ssse3,

@@ -655,8 +675,10 @@

     make_tuple(8, 4, &convolve8_avx2),

     make_tuple(4, 8, &convolve8_avx2),

     make_tuple(8, 8, &convolve8_avx2),

+    make_tuple(8, 16, &convolve8_avx2)));

+

+INSTANTIATE_TEST_CASE_P(DISABLED_AVX2, ConvolveTest, ::testing::Values(

     make_tuple(16, 8, &convolve8_avx2),

-    make_tuple(8, 16, &convolve8_avx2),

     make_tuple(16, 16, &convolve8_avx2),

     make_tuple(32, 16, &convolve8_avx2),

     make_tuple(16, 32, &convolve8_avx2),

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -305,15 +305,15 @@

 $vp9_convolve_avg_neon_asm=vp9_convolve_avg_neon;

 add_proto qw/void vp9_convolve8/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h";

-specialize qw/vp9_convolve8 sse2 ssse3 avx2 neon_asm dspr2/;

+specialize qw/vp9_convolve8 sse2 ssse3 neon_asm dspr2/;

 $vp9_convolve8_neon_asm=vp9_convolve8_neon;

 add_proto qw/void vp9_convolve8_horiz/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h";

-specialize qw/vp9_convolve8_horiz sse2 ssse3 avx2 neon_asm dspr2/;

+specialize qw/vp9_convolve8_horiz sse2 ssse3 neon_asm dspr2/;

 $vp9_convolve8_horiz_neon_asm=vp9_convolve8_horiz_neon;

 add_proto qw/void vp9_convolve8_vert/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h";

-specialize qw/vp9_convolve8_vert sse2 ssse3 avx2 neon_asm dspr2/;

+specialize qw/vp9_convolve8_vert sse2 ssse3 neon_asm dspr2/;

 $vp9_convolve8_vert_neon_asm=vp9_convolve8_vert_neon;

 add_proto qw/void vp9_convolve8_avg/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h";