shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "disable vp8_sub_pixel_variance8x8_neon"

--- a/test/variance_test.cc

+++ b/test/variance_test.cc

@@ -1976,12 +1976,9 @@

 #if HAVE_NEON_ASM

 const SubpixVarMxNFunc vp8_subpel_variance16x16_neon =

     vp8_sub_pixel_variance16x16_neon;

-const SubpixVarMxNFunc vp8_subpel_variance8x8_neon =

-    vp8_sub_pixel_variance8x8_neon;

 INSTANTIATE_TEST_CASE_P(

     NEON, VP8SubpelVarianceTest,

-    ::testing::Values(make_tuple(3, 3, vp8_subpel_variance8x8_neon, 0),

-                      make_tuple(4, 4, vp8_subpel_variance16x16_neon, 0)));

+    ::testing::Values(make_tuple(4, 4, vp8_subpel_variance16x16_neon, 0)));

 #endif  // HAVE_NEON_ASM

 #endif  // CONFIG_VP8

--- a/vp8/common/rtcd_defs.pl

+++ b/vp8/common/rtcd_defs.pl

@@ -245,10 +245,9 @@

 $vp8_sub_pixel_variance4x4_sse2=vp8_sub_pixel_variance4x4_wmt;

 add_proto qw/unsigned int vp8_sub_pixel_variance8x8/, "const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse";

-specialize qw/vp8_sub_pixel_variance8x8 mmx sse2 media neon_asm/;

+specialize qw/vp8_sub_pixel_variance8x8 mmx sse2 media/;

 $vp8_sub_pixel_variance8x8_sse2=vp8_sub_pixel_variance8x8_wmt;

 $vp8_sub_pixel_variance8x8_media=vp8_sub_pixel_variance8x8_armv6;

-$vp8_sub_pixel_variance8x8_neon_asm=vp8_sub_pixel_variance8x8_neon;

 add_proto qw/unsigned int vp8_sub_pixel_variance8x16/, "const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse";

 specialize qw/vp8_sub_pixel_variance8x16 mmx sse2/;