Temporarily disable highbd_dr_prediction_z2_avx2 This to avoid the valgrind issue reported in the bug. BUG=aomedia:2316 Change-Id: Ie68a06f19ac3dcd0ea3fd875cf216b522fa84daa
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl index e37f4d6..cf6534f 100644 --- a/av1/common/av1_rtcd_defs.pl +++ b/av1/common/av1_rtcd_defs.pl
@@ -160,8 +160,9 @@ add_proto qw/void av1_highbd_dr_prediction_z1/, "uint16_t *dst, ptrdiff_t stride, int bw, int bh, const uint16_t *above, const uint16_t *left, int upsample_above, int dx, int dy, int bd"; specialize qw/av1_highbd_dr_prediction_z1 avx2/; add_proto qw/void av1_highbd_dr_prediction_z2/, "uint16_t *dst, ptrdiff_t stride, int bw, int bh, const uint16_t *above, const uint16_t *left, int upsample_above, int upsample_left, int dx, int dy, int bd"; - -specialize qw/av1_highbd_dr_prediction_z2 avx2/; +# TODO(niva213@gmail.com): Re-enable avx2 after fixing valgrind issue +# https://crbug.com/aomedia/2316 +# specialize qw/av1_highbd_dr_prediction_z2 avx2/; add_proto qw/void av1_highbd_dr_prediction_z3/, "uint16_t *dst, ptrdiff_t stride, int bw, int bh, const uint16_t *above, const uint16_t *left, int upsample_left, int dx, int dy, int bd"; specialize qw/av1_highbd_dr_prediction_z3 avx2/;
diff --git a/test/dr_prediction_test.cc b/test/dr_prediction_test.cc index bacc366..4be8489 100644 --- a/test/dr_prediction_test.cc +++ b/test/dr_prediction_test.cc
@@ -365,9 +365,11 @@ ::testing::Values(DrPredFunc<DrPred>(&z1_wrapper<av1_dr_prediction_z1_c>, &z1_wrapper<av1_dr_prediction_z1_avx2>, AOM_BITS_8, kZ1Start), + /* TODO(niva213@gmail.com): Re-enable this test after + fixing valgrind issue: https://crbug.com/aomedia/2316 DrPredFunc<DrPred>(&z2_wrapper<av1_dr_prediction_z2_c>, &z2_wrapper<av1_dr_prediction_z2_avx2>, - AOM_BITS_8, kZ2Start), + AOM_BITS_8, kZ2Start), */ DrPredFunc<DrPred>(&z3_wrapper<av1_dr_prediction_z3_c>, &z3_wrapper<av1_dr_prediction_z3_avx2>, AOM_BITS_8, kZ3Start))); @@ -412,6 +414,8 @@ &z1_wrapper_hbd<av1_highbd_dr_prediction_z1_c>, &z1_wrapper_hbd<av1_highbd_dr_prediction_z1_avx2>, AOM_BITS_12, kZ1Start), + /* TODO(niva213@gmail.com): Re-enable these tests after + fixing valgrind issue: https://crbug.com/aomedia/2316 DrPredFunc<DrPred_Hbd>( &z2_wrapper_hbd<av1_highbd_dr_prediction_z2_c>, &z2_wrapper_hbd<av1_highbd_dr_prediction_z2_avx2>, @@ -423,7 +427,7 @@ DrPredFunc<DrPred_Hbd>( &z2_wrapper_hbd<av1_highbd_dr_prediction_z2_c>, &z2_wrapper_hbd<av1_highbd_dr_prediction_z2_avx2>, - AOM_BITS_12, kZ2Start), + AOM_BITS_12, kZ2Start),*/ DrPredFunc<DrPred_Hbd>( &z3_wrapper_hbd<av1_highbd_dr_prediction_z3_c>, &z3_wrapper_hbd<av1_highbd_dr_prediction_z3_avx2>,