Corrections in convolve unit test

Macros are corrected in convolve unit test.
Cosmetic changes in build files.

Change-Id: Ie5247419733e20140ab4d62eb2ac8419acdb1a05

aom_dsp/aom_dsp_rtcd_defs.pl

@@ -456,9 +456,9 @@ if (aom_config("CONFIG_AV1") eq "yes") {
   #
   if (aom_config("CONFIG_LOWPRECISION_BLEND") eq "yes") {
     add_proto qw/void aom_lowbd_blend_a64_d16_mask/, "uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx, ConvolveParams *conv_params";
-	  add_proto qw/void aom_highbd_blend_a64_d16_mask/, "uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx, ConvolveParams *conv_params, const int bd";
+    add_proto qw/void aom_highbd_blend_a64_d16_mask/, "uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx, ConvolveParams *conv_params, const int bd";
   } else {
-	  add_proto qw/void aom_blend_a64_d32_mask/, "int32_t *dst, uint32_t dst_stride, const int32_t *src0, uint32_t src0_stride, const int32_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx";
+    add_proto qw/void aom_blend_a64_d32_mask/, "int32_t *dst, uint32_t dst_stride, const int32_t *src0, uint32_t src0_stride, const int32_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx";
   }
   add_proto qw/void aom_blend_a64_mask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx";
   add_proto qw/void aom_blend_a64_hmask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int h, int w";
@@ -467,12 +467,12 @@ if (aom_config("CONFIG_AV1") eq "yes") {
   specialize "aom_blend_a64_hmask", qw/sse4_1/;
   specialize "aom_blend_a64_vmask", qw/sse4_1/;
 
-    add_proto qw/void aom_highbd_blend_a64_mask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx, int bd";
-    add_proto qw/void aom_highbd_blend_a64_hmask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int h, int w, int bd";
-    add_proto qw/void aom_highbd_blend_a64_vmask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int h, int w, int bd";
-    specialize "aom_highbd_blend_a64_mask", qw/sse4_1/;
-    specialize "aom_highbd_blend_a64_hmask", qw/sse4_1/;
-    specialize "aom_highbd_blend_a64_vmask", qw/sse4_1/;
+  add_proto qw/void aom_highbd_blend_a64_mask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx, int bd";
+  add_proto qw/void aom_highbd_blend_a64_hmask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int h, int w, int bd";
+  add_proto qw/void aom_highbd_blend_a64_vmask/, "uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int h, int w, int bd";
+  specialize "aom_highbd_blend_a64_mask", qw/sse4_1/;
+  specialize "aom_highbd_blend_a64_hmask", qw/sse4_1/;
+  specialize "aom_highbd_blend_a64_vmask", qw/sse4_1/;
 
 }  # CONFIG_AV1
 

av1/av1.cmake

@@ -276,11 +276,11 @@ set(AOM_AV1_COMMON_INTRIN_SSE2
     "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_sse2.c")
 
 
-  set(AOM_AV1_COMMON_INTRIN_AVX2
-      ${AOM_AV1_COMMON_INTRIN_AVX2}
-      "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_avx2.c")
+set(AOM_AV1_COMMON_INTRIN_AVX2
+    ${AOM_AV1_COMMON_INTRIN_AVX2}
+    "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_avx2.c")
 
-  if (CONFIG_LOWPRECISION_BLEND)
+if (CONFIG_LOWPRECISION_BLEND)
   set(AOM_AV1_COMMON_INTRIN_SSE2
       ${AOM_AV1_COMMON_INTRIN_SSE2}
       "${AOM_ROOT}/av1/common/x86/jnt_convolve_sse2.c")
@@ -288,12 +288,12 @@ set(AOM_AV1_COMMON_INTRIN_SSE2
   set(AOM_AV1_COMMON_INTRIN_SSSE3
       ${AOM_AV1_COMMON_INTRIN_SSSE3}
       "${AOM_ROOT}/av1/common/x86/jnt_convolve_ssse3.c")
-  else()    
+else()
 
   set(AOM_AV1_COMMON_INTRIN_SSE4_1
       ${AOM_AV1_COMMON_INTRIN_SSE4_1}
       "${AOM_ROOT}/av1/common/x86/jnt_convolve_sse4.c")
-  endif()
+endif()
 set(AOM_AV1_COMMON_INTRIN_AVX2
     ${AOM_AV1_COMMON_INTRIN_AVX2}
     "${AOM_ROOT}/av1/common/x86/jnt_convolve_avx2.c")

av1/common/x86/jnt_convolve_sse2.c

 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2018, Alliance for Open Media. All rights reserved
  *
  * This source code is subject to the terms of the BSD 2 Clause License and
  * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License

av1/common/x86/jnt_convolve_ssse3.c

 /*
- * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ * Copyright (c) 2018, Alliance for Open Media. All rights reserved
  *
  * This source code is subject to the terms of the BSD 2 Clause License and
  * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License

test/av1_convolve_2d_test.cc

@@ -14,16 +14,15 @@
 
 using libaom_test::ACMRandom;
 using libaom_test::AV1Convolve2D::AV1Convolve2DSrTest;
+using libaom_test::AV1Convolve2D::AV1JntConvolve2DTest;
 using libaom_test::AV1HighbdConvolve2D::AV1HighbdConvolve2DSrTest;
+using libaom_test::AV1HighbdConvolve2D::AV1HighbdJntConvolve2DTest;
 using std::tr1::make_tuple;
 using std::tr1::tuple;
-#if CONFIG_LOWPRECISION_BLEND
-using libaom_test::AV1Convolve2D::AV1JntConvolve2DTest;
-using libaom_test::AV1HighbdConvolve2D::AV1HighbdJntConvolve2DTest;
-#else
+#if !CONFIG_LOWPRECISION_BLEND
 using libaom_test::AV1Convolve2D::AV1Convolve2DTest;
 using libaom_test::AV1HighbdConvolve2D::AV1HighbdConvolve2DTest;
-#endif
+#endif  // CONFIG_LOWPRECISION_BLEND
 namespace {
 #if !CONFIG_LOWPRECISION_BLEND
 TEST_P(AV1Convolve2DTest, DISABLED_Speed) { RunSpeedTest(GET_PARAM(0)); }
@@ -39,35 +38,7 @@ INSTANTIATE_TEST_CASE_P(
 INSTANTIATE_TEST_CASE_P(
     C_Y, AV1Convolve2DTest,
     libaom_test::AV1Convolve2D::BuildParams(av1_convolve_y_c, 0, 1));
-
-#if CONFIG_LOWPRECISION_BLEND
-INSTANTIATE_TEST_CASE_P(
-    SSE2_COPY, AV1Convolve2DTest,
-    libaom_test::AV1Convolve2D::BuildParams(av1_convolve_2d_copy_sse2, 0, 0));
-INSTANTIATE_TEST_CASE_P(
-    SSE2_X, AV1Convolve2DTest,
-    libaom_test::AV1Convolve2D::BuildParams(av1_convolve_x_sse2, 1, 0));
-INSTANTIATE_TEST_CASE_P(
-    SSE2_Y, AV1Convolve2DTest,
-    libaom_test::AV1Convolve2D::BuildParams(av1_convolve_y_sse2, 0, 1));
-INSTANTIATE_TEST_CASE_P(
-    SSE2, AV1Convolve2DTest,
-    libaom_test::AV1Convolve2D::BuildParams(av1_convolve_2d_sse2, 1, 1));
-#if HAVE_AVX2
-INSTANTIATE_TEST_CASE_P(
-    AVX2_X, AV1Convolve2DTest,
-    libaom_test::AV1Convolve2D::BuildParams(av1_convolve_x_avx2, 1, 0));
-
-INSTANTIATE_TEST_CASE_P(
-    AVX2_Y, AV1Convolve2DTest,
-    libaom_test::AV1Convolve2D::BuildParams(av1_convolve_y_avx2, 0, 1));
-
-INSTANTIATE_TEST_CASE_P(
-    AVX2, AV1Convolve2DTest,
-    libaom_test::AV1Convolve2D::BuildParams(av1_convolve_2d_avx2, 1, 1));
-#endif
-#endif  // CONFIG_LOWPRECISION_BLEND
-#endif  // CONFIG_LOWPRECISION_BLEND
+#endif  // !CONFIG_LOWPRECISION_BLEND
 
 TEST_P(AV1Convolve2DSrTest, DISABLED_Speed) { RunSpeedTest(GET_PARAM(0)); }
 
@@ -83,6 +54,7 @@ INSTANTIATE_TEST_CASE_P(
     C_Y, AV1Convolve2DSrTest,
     libaom_test::AV1Convolve2D::BuildParams(av1_convolve_y_sr_c, 0, 1));
 #if CONFIG_LOWPRECISION_BLEND
+#if HAVE_SSE2
 INSTANTIATE_TEST_CASE_P(SSE2_COPY, AV1Convolve2DSrTest,
                         libaom_test::AV1Convolve2D::BuildParams(
                             av1_convolve_2d_copy_sr_sse2, 0, 0));
@@ -110,7 +82,9 @@ INSTANTIATE_TEST_CASE_P(
 INSTANTIATE_TEST_CASE_P(
     AVX2, AV1Convolve2DSrTest,
     libaom_test::AV1Convolve2D::BuildParams(av1_convolve_2d_sr_avx2, 1, 1));
-#endif
+#endif  // HAVE_AVX2
+#endif  // HAVE_SSE2
+#endif  // CONFIG_LOWPRECISION_BLEND
 
 TEST_P(AV1JntConvolve2DTest, CheckOutput) { RunCheckOutput(GET_PARAM(0)); }
 
@@ -126,6 +100,8 @@ INSTANTIATE_TEST_CASE_P(
     C_Y, AV1JntConvolve2DTest,
     libaom_test::AV1Convolve2D::BuildParams(av1_jnt_convolve_y_c, 0, 1));
 
+#if CONFIG_LOWPRECISION_BLEND
+#if HAVE_SSE2
 INSTANTIATE_TEST_CASE_P(SSE2_COPY, AV1JntConvolve2DTest,
                         libaom_test::AV1Convolve2D::BuildParams(
                             av1_jnt_convolve_2d_copy_sse2, 0, 0));
@@ -157,9 +133,10 @@ INSTANTIATE_TEST_CASE_P(
 INSTANTIATE_TEST_CASE_P(
     AVX2, AV1JntConvolve2DTest,
     libaom_test::AV1Convolve2D::BuildParams(av1_jnt_convolve_2d_avx2, 1, 1));
-#endif
-#endif
-#endif
+#endif  // HAVE_AVX2
+#endif  // HAVE_SSE4_1
+#endif  // HAVE_SSE2
+#endif  // CONFIG_LOWPRECISION_BLEND
 
 #if !CONFIG_LOWPRECISION_BLEND
 #if HAVE_SSSE3
@@ -177,17 +154,8 @@ INSTANTIATE_TEST_CASE_P(C_COPY, AV1HighbdConvolve2DTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
                             av1_highbd_convolve_2d_copy_c, 0, 0));
 
-#if CONFIG_LOWPRECISION_BLEND
-INSTANTIATE_TEST_CASE_P(SSSE3, AV1HighbdConvolve2DTest,
-                        libaom_test::AV1HighbdConvolve2D::BuildParams(
-                            av1_highbd_convolve_2d_ssse3, 1, 1));
-#if HAVE_AVX2
-INSTANTIATE_TEST_CASE_P(AVX2, AV1HighbdConvolve2DTest,
-                        libaom_test::AV1HighbdConvolve2D::BuildParams(
-                            av1_highbd_convolve_2d_avx2, 1, 1));
-#endif
-#endif  // CONFIG_LOWPRECISION_BLEND
-#endif  // CONFIG_LOWPRECISION_BLEND
+#endif  // HAVE_SSSE3
+#endif  // !CONFIG_LOWPRECISION_BLEND
 
 TEST_P(AV1HighbdConvolve2DSrTest, CheckOutput) { RunCheckOutput(GET_PARAM(1)); }
 TEST_P(AV1HighbdConvolve2DSrTest, DISABLED_Speed) {
@@ -210,7 +178,6 @@ INSTANTIATE_TEST_CASE_P(C_COPY, AV1HighbdConvolve2DSrTest,
 INSTANTIATE_TEST_CASE_P(SSE2_COPY, AV1HighbdConvolve2DSrTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
                             av1_highbd_convolve_2d_copy_sr_sse2, 0, 0));
-#endif
 #if HAVE_SSSE3
 INSTANTIATE_TEST_CASE_P(SSSE3, AV1HighbdConvolve2DSrTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
@@ -221,7 +188,6 @@ INSTANTIATE_TEST_CASE_P(SSSE3_X, AV1HighbdConvolve2DSrTest,
 INSTANTIATE_TEST_CASE_P(SSSE3_Y, AV1HighbdConvolve2DSrTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
                             av1_highbd_convolve_y_sr_ssse3, 0, 1));
-#endif
 #if HAVE_AVX2
 INSTANTIATE_TEST_CASE_P(AVX2, AV1HighbdConvolve2DSrTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
@@ -235,8 +201,10 @@ INSTANTIATE_TEST_CASE_P(AVX2_Y, AV1HighbdConvolve2DSrTest,
 INSTANTIATE_TEST_CASE_P(AVX2_COPY, AV1HighbdConvolve2DSrTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
                             av1_highbd_convolve_2d_copy_sr_avx2, 0, 0));
-#endif
-
+#endif  // HAVE_AVX2
+#endif  // HAVE_SSSE3
+#endif  // HAVE_SSE2
+#endif  // CONFIG_LOWPRECISION_BLEND
 TEST_P(AV1HighbdJntConvolve2DTest, CheckOutput) {
   RunCheckOutput(GET_PARAM(1));
 }
@@ -256,6 +224,7 @@ INSTANTIATE_TEST_CASE_P(C_Y, AV1HighbdJntConvolve2DTest,
 INSTANTIATE_TEST_CASE_P(C_COPY, AV1HighbdJntConvolve2DTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
                             av1_highbd_jnt_convolve_2d_copy_c, 0, 0));
+#if CONFIG_LOWPRECISION_BLEND
 #if HAVE_SSE4_1
 INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdJntConvolve2DTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
@@ -273,8 +242,7 @@ INSTANTIATE_TEST_CASE_P(AVX2_X, AV1HighbdJntConvolve2DTest,
 INSTANTIATE_TEST_CASE_P(AVX2_Y, AV1HighbdJntConvolve2DTest,
                         libaom_test::AV1HighbdConvolve2D::BuildParams(
                             av1_highbd_jnt_convolve_y_avx2, 0, 1));
-#endif
-#endif
-#endif
-#endif
+#endif  // HAVE_AVX2
+#endif  // HAVE_SSE4_1
+#endif  // CONFIG_LOWPRECISION_BLEND
 }  // namespace

test/av1_convolve_2d_test_util.cc

@@ -31,11 +31,11 @@ namespace AV1Convolve2D {
                             ::testing::Range(BLOCK_4X4, BLOCK_SIZES_ALL));
 }
 
+#if !CONFIG_LOWPRECISION_BLEND
 AV1Convolve2DTest::~AV1Convolve2DTest() {}
 void AV1Convolve2DTest::SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
 
 void AV1Convolve2DTest::TearDown() { libaom_test::ClearSystemState(); }
-#if !CONFIG_LOWPRECISION_BLEND
 void AV1Convolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
   const int w = kMaxSize, h = kMaxSize;
   const int has_subx = GET_PARAM(1);
@@ -94,7 +94,6 @@ void AV1Convolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
     }
   }
 }
-#endif  // CONFIG_LOWPRECISION_BLEND
 
 void AV1Convolve2DTest::RunSpeedTest(convolve_2d_func test_impl) {
   const int w = kMaxSize, h = kMaxSize;
@@ -134,6 +133,7 @@ void AV1Convolve2DTest::RunSpeedTest(convolve_2d_func test_impl) {
   printf("%d,%d convolve %3dx%-3d: %7.2f us\n", has_subx, has_suby, out_w,
          out_h, 1000.0 * elapsed_time / num_loops);
 }
+#endif  // CONFIG_LOWPRECISION_BLEND
 
 AV1Convolve2DSrTest::~AV1Convolve2DSrTest() {}
 void AV1Convolve2DSrTest::SetUp() {
@@ -256,7 +256,6 @@ void AV1Convolve2DSrTest::RunSpeedTest(convolve_2d_func test_impl) {
   }
 }
 
-#if CONFIG_LOWPRECISION_BLEND
 AV1JntConvolve2DTest::~AV1JntConvolve2DTest() {}
 void AV1JntConvolve2DTest::SetUp() {
   rnd_.Reset(ACMRandom::DeterministicSeed());
@@ -396,11 +395,9 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
     }
   }
 }
-#endif  // CONFIG_LOWPRECISION_BLEND
 }  // namespace AV1Convolve2D
 
 namespace AV1HighbdConvolve2D {
-
 ::testing::internal::ParamGenerator<HighbdConvolve2DParam> BuildParams(
     highbd_convolve_2d_func filter, int has_subx, int has_suby) {
   return ::testing::Combine(
@@ -409,6 +406,7 @@ namespace AV1HighbdConvolve2D {
       ::testing::Range(BLOCK_4X4, BLOCK_SIZES_ALL));
 }
 
+#if !CONFIG_LOWPRECISION_BLEND
 AV1HighbdConvolve2DTest::~AV1HighbdConvolve2DTest() {}
 void AV1HighbdConvolve2DTest::SetUp() {
   rnd_.Reset(ACMRandom::DeterministicSeed());
@@ -416,7 +414,6 @@ void AV1HighbdConvolve2DTest::SetUp() {
 
 void AV1HighbdConvolve2DTest::TearDown() { libaom_test::ClearSystemState(); }
 
-#if !CONFIG_LOWPRECISION_BLEND
 void AV1HighbdConvolve2DTest::RunCheckOutput(
     highbd_convolve_2d_func test_impl) {
   const int w = kMaxSize, h = kMaxSize;
@@ -479,7 +476,7 @@ void AV1HighbdConvolve2DTest::RunCheckOutput(
     }
   }
 }
-#endif  // CONFIG_LOWPRECISION_BLEND
+#endif  // !CONFIG_LOWPRECISION_BLEND
 
 AV1HighbdConvolve2DSrTest::~AV1HighbdConvolve2DSrTest() {}
 void AV1HighbdConvolve2DSrTest::SetUp() {
@@ -617,7 +614,6 @@ void AV1HighbdConvolve2DSrTest::RunCheckOutput(
   }
 }
 
-#if CONFIG_LOWPRECISION_BLEND
 AV1HighbdJntConvolve2DTest::~AV1HighbdJntConvolve2DTest() {}
 void AV1HighbdJntConvolve2DTest::SetUp() {
   rnd_.Reset(ACMRandom::DeterministicSeed());
@@ -812,6 +808,5 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
     }
   }
 }
-#endif  // CONFIG_LOWPRECISION_BLEND
 }  // namespace AV1HighbdConvolve2D
 }  // namespace libaom_test

test/av1_convolve_2d_test_util.h

@@ -36,6 +36,7 @@ typedef std::tr1::tuple<convolve_2d_func, int, int, BLOCK_SIZE> Convolve2DParam;
 ::testing::internal::ParamGenerator<Convolve2DParam> BuildParams(
     convolve_2d_func filter, int subx_exist, int suby_exist);
 
+#if !CONFIG_LOWPRECISION_BLEND
 class AV1Convolve2DTest : public ::testing::TestWithParam<Convolve2DParam> {
  public:
   virtual ~AV1Convolve2DTest();
@@ -49,6 +50,7 @@ class AV1Convolve2DTest : public ::testing::TestWithParam<Convolve2DParam> {
 
   libaom_test::ACMRandom rnd_;
 };
+#endif  // !CONFIG_LOWPRECISION_BLEND
 
 class AV1Convolve2DSrTest : public ::testing::TestWithParam<Convolve2DParam> {
  public:
@@ -64,7 +66,6 @@ class AV1Convolve2DSrTest : public ::testing::TestWithParam<Convolve2DParam> {
   libaom_test::ACMRandom rnd_;
 };
 
-#if CONFIG_LOWPRECISION_BLEND
 class AV1JntConvolve2DTest : public ::testing::TestWithParam<Convolve2DParam> {
  public:
   virtual ~AV1JntConvolve2DTest();
@@ -77,7 +78,6 @@ class AV1JntConvolve2DTest : public ::testing::TestWithParam<Convolve2DParam> {
 
   libaom_test::ACMRandom rnd_;
 };
-#endif
 }  // namespace AV1Convolve2D
 
 namespace AV1HighbdConvolve2D {
@@ -93,6 +93,7 @@ typedef std::tr1::tuple<int, highbd_convolve_2d_func, int, int, BLOCK_SIZE>
 ::testing::internal::ParamGenerator<HighbdConvolve2DParam> BuildParams(
     highbd_convolve_2d_func filter, int subx_exist, int suby_exist);
 
+#if !CONFIG_LOWPRECISION_BLEND
 class AV1HighbdConvolve2DTest
     : public ::testing::TestWithParam<HighbdConvolve2DParam> {
  public:
@@ -106,6 +107,7 @@ class AV1HighbdConvolve2DTest
 
   libaom_test::ACMRandom rnd_;
 };
+#endif  // !CONFIG_LOWPRECISION_BLEND
 
 class AV1HighbdConvolve2DSrTest
     : public ::testing::TestWithParam<HighbdConvolve2DParam> {
@@ -122,7 +124,6 @@ class AV1HighbdConvolve2DSrTest
   libaom_test::ACMRandom rnd_;
 };
 
-#if CONFIG_LOWPRECISION_BLEND
 class AV1HighbdJntConvolve2DTest
     : public ::testing::TestWithParam<HighbdConvolve2DParam> {
  public:
@@ -137,7 +138,6 @@ class AV1HighbdJntConvolve2DTest
 
   libaom_test::ACMRandom rnd_;
 };
-#endif
 }  // namespace AV1HighbdConvolve2D
 
 }  // namespace libaom_test

test/test.cmake

@@ -228,9 +228,9 @@ if (CONFIG_AV1_ENCODER)
         set(AOM_UNIT_TEST_ENCODER_SOURCES
             ${AOM_UNIT_TEST_ENCODER_SOURCES}
             "${AOM_ROOT}/test/av1_convolve_scale_test.cc"
-			"${AOM_ROOT}/test/warp_filter_test_util.cc"
-			"${AOM_ROOT}/test/warp_filter_test_util.h"
-			"${AOM_ROOT}/test/warp_filter_test.cc")
+            "${AOM_ROOT}/test/warp_filter_test_util.cc"
+            "${AOM_ROOT}/test/warp_filter_test_util.h"
+            "${AOM_ROOT}/test/warp_filter_test.cc")
       endif ()
     endif ()