libvpx: Pull from upstream

source/libvpx/test/lpf_8_test.cc

 /*
  *  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 456 matching lines @@
       << "Error: Loop8Test9Param, C output doesn't match SSE2"
          "loopfilter output. "
       << "First failed at test case " << first_failure;
 }
 
 using std::tr1::make_tuple;
 
 #if HAVE_SSE2
 #if CONFIG_VP9_HIGHBITDEPTH
 INSTANTIATE_TEST_CASE_P(
-    SSE2_C_COMPARE_SINGLE, Loop8Test6Param,
+    SSE2, Loop8Test6Param,
     ::testing::Values(
         make_tuple(&vp9_highbd_lpf_horizontal_4_sse2,
                    &vp9_highbd_lpf_horizontal_4_c, 8),
         make_tuple(&vp9_highbd_lpf_vertical_4_sse2,
                    &vp9_highbd_lpf_vertical_4_c, 8),
         make_tuple(&vp9_highbd_lpf_horizontal_8_sse2,
                    &vp9_highbd_lpf_horizontal_8_c, 8),
         make_tuple(&vp9_highbd_lpf_horizontal_16_sse2,
                    &vp9_highbd_lpf_horizontal_16_c, 8),
         make_tuple(&vp9_highbd_lpf_vertical_8_sse2,
@@ skipping 16 matching lines @@
                    &vp9_highbd_lpf_horizontal_4_c, 12),
         make_tuple(&vp9_highbd_lpf_vertical_4_sse2,
                    &vp9_highbd_lpf_vertical_4_c, 12),
         make_tuple(&vp9_highbd_lpf_horizontal_8_sse2,
                    &vp9_highbd_lpf_horizontal_8_c, 12),
         make_tuple(&vp9_highbd_lpf_horizontal_16_sse2,
                    &vp9_highbd_lpf_horizontal_16_c, 12),
         make_tuple(&vp9_highbd_lpf_vertical_8_sse2,
                    &vp9_highbd_lpf_vertical_8_c, 12),
         make_tuple(&wrapper_vertical_16_sse2,
-                   &wrapper_vertical_16_c, 12)));
-#else
-INSTANTIATE_TEST_CASE_P(
-    SSE2_C_COMPARE_SINGLE, Loop8Test6Param,
-    ::testing::Values(
-        make_tuple(&vp9_lpf_horizontal_8_sse2, &vp9_lpf_horizontal_8_c, 8),
-        make_tuple(&vp9_lpf_horizontal_16_sse2, &vp9_lpf_horizontal_16_c, 8),
-        make_tuple(&vp9_lpf_vertical_8_sse2, &vp9_lpf_vertical_8_c, 8)));
-#endif  // CONFIG_VP9_HIGHBITDEPTH
-#endif
-
-#if HAVE_SSE2
-#if CONFIG_VP9_HIGHBITDEPTH
-INSTANTIATE_TEST_CASE_P(
-    SSE2_C_COMPARE_DUAL, Loop8Test6Param,
-    ::testing::Values(
+                   &wrapper_vertical_16_c, 12),
         make_tuple(&wrapper_vertical_16_dual_sse2,
                    &wrapper_vertical_16_dual_c, 8),
         make_tuple(&wrapper_vertical_16_dual_sse2,
                    &wrapper_vertical_16_dual_c, 10),
         make_tuple(&wrapper_vertical_16_dual_sse2,
                    &wrapper_vertical_16_dual_c, 12)));
 #else
 INSTANTIATE_TEST_CASE_P(
-    SSE2_C_COMPARE_DUAL, Loop8Test6Param,
+    SSE2, Loop8Test6Param,
     ::testing::Values(
+        make_tuple(&vp9_lpf_horizontal_8_sse2, &vp9_lpf_horizontal_8_c, 8),
+        make_tuple(&vp9_lpf_horizontal_16_sse2, &vp9_lpf_horizontal_16_c, 8),
+        make_tuple(&vp9_lpf_vertical_8_sse2, &vp9_lpf_vertical_8_c, 8),
         make_tuple(&wrapper_vertical_16_sse2, &wrapper_vertical_16_c, 8)));
 #endif  // CONFIG_VP9_HIGHBITDEPTH
-#endif  // HAVE_SSE2
+#endif
+
+#if HAVE_AVX2 && (!CONFIG_VP9_HIGHBITDEPTH)
+INSTANTIATE_TEST_CASE_P(
+    AVX2, Loop8Test6Param,
+    ::testing::Values(
+        make_tuple(&vp9_lpf_horizontal_16_avx2, &vp9_lpf_horizontal_16_c, 8)));
+#endif
 
 #if HAVE_SSE2
 #if CONFIG_VP9_HIGHBITDEPTH
 INSTANTIATE_TEST_CASE_P(
-    SSE_C_COMPARE_DUAL, Loop8Test9Param,
+    SSE2, Loop8Test9Param,
     ::testing::Values(
         make_tuple(&vp9_highbd_lpf_horizontal_4_dual_sse2,
                    &vp9_highbd_lpf_horizontal_4_dual_c, 8),
         make_tuple(&vp9_highbd_lpf_horizontal_8_dual_sse2,
                    &vp9_highbd_lpf_horizontal_8_dual_c, 8),
         make_tuple(&vp9_highbd_lpf_vertical_4_dual_sse2,
                    &vp9_highbd_lpf_vertical_4_dual_c, 8),
         make_tuple(&vp9_highbd_lpf_vertical_8_dual_sse2,
                    &vp9_highbd_lpf_vertical_8_dual_c, 8),
         make_tuple(&vp9_highbd_lpf_horizontal_4_dual_sse2,
                    &vp9_highbd_lpf_horizontal_4_dual_c, 10),
         make_tuple(&vp9_highbd_lpf_horizontal_8_dual_sse2,
                    &vp9_highbd_lpf_horizontal_8_dual_c, 10),
         make_tuple(&vp9_highbd_lpf_vertical_4_dual_sse2,
                    &vp9_highbd_lpf_vertical_4_dual_c, 10),
         make_tuple(&vp9_highbd_lpf_vertical_8_dual_sse2,
                    &vp9_highbd_lpf_vertical_8_dual_c, 10),
         make_tuple(&vp9_highbd_lpf_horizontal_4_dual_sse2,
                    &vp9_highbd_lpf_horizontal_4_dual_c, 12),
         make_tuple(&vp9_highbd_lpf_horizontal_8_dual_sse2,
                    &vp9_highbd_lpf_horizontal_8_dual_c, 12),
         make_tuple(&vp9_highbd_lpf_vertical_4_dual_sse2,
                    &vp9_highbd_lpf_vertical_4_dual_c, 12),
         make_tuple(&vp9_highbd_lpf_vertical_8_dual_sse2,
                    &vp9_highbd_lpf_vertical_8_dual_c, 12)));
 #else
 INSTANTIATE_TEST_CASE_P(
-    SSE_C_COMPARE_DUAL, Loop8Test9Param,
+    SSE2, Loop8Test9Param,
     ::testing::Values(
         make_tuple(&vp9_lpf_horizontal_4_dual_sse2,
                    &vp9_lpf_horizontal_4_dual_c, 8),
         make_tuple(&vp9_lpf_horizontal_8_dual_sse2,
                    &vp9_lpf_horizontal_8_dual_c, 8),
         make_tuple(&vp9_lpf_vertical_4_dual_sse2,
                    &vp9_lpf_vertical_4_dual_c, 8),
         make_tuple(&vp9_lpf_vertical_8_dual_sse2,
                    &vp9_lpf_vertical_8_dual_c, 8)));
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 #endif
+
 }  // namespace