From 231012fdab530a1fea51dbeeeadf2eaf97c76dc9 Mon Sep 17 00:00:00 2001
From: Linfeng Zhang <linfengz@google.com>
Date: Tue, 23 Jan 2018 09:47:34 -0800
Subject: Add vp9_highbd_iht16x16_256_add_sse4_1()

BUG=webm:1413

Change-Id: I8d7eeae1bd219eb848c1a86071046a477f7a91af
---
 test/dct_test.cc | 65 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/dct_test.cc b/test/dct_test.cc
index f7e0e371b..379fbecc0 100644
--- a/test/dct_test.cc
+++ b/test/dct_test.cc
@@ -597,7 +597,9 @@ class TransHT : public TransTestBase {
   TransHT() { fwd_txfm_ref = fht_ref; }
 };
 
-TEST_P(TransHT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(TransHT, AccuracyCheck) {
+  RunAccuracyCheck(size_ == 16 && bit_depth_ > 10 ? 2 : 1);
+}
 
 TEST_P(TransHT, CoeffCheck) { RunCoeffCheck(); }
 
@@ -605,17 +607,6 @@ TEST_P(TransHT, MemCheck) { RunMemCheck(); }
 
 TEST_P(TransHT, InvAccuracyCheck) { RunInvAccuracyCheck(1); }
 
-/* TODO:(johannkoenig) Determine why these fail AccuracyCheck
-   make_tuple(&vp9_highbd_fht16x16_c,
-   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 0, VPX_BITS_12, 2),
-   make_tuple(&vp9_highbd_fht16x16_c,
-   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 1, VPX_BITS_12, 2),
-   make_tuple(&vp9_highbd_fht16x16_c,
-   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 2, VPX_BITS_12, 2),
-   make_tuple(&vp9_highbd_fht16x16_c,
-   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 3, VPX_BITS_12, 2),
-  */
-
 const DctParam c_ht_tests[] = {
 #if CONFIG_VP9_HIGHBITDEPTH
   make_tuple(&vp9_highbd_fht16x16_c,
@@ -642,6 +633,19 @@ const DctParam c_ht_tests[] = {
   make_tuple(&vp9_highbd_fht16x16_c,
              &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 3,
              VPX_BITS_10, 2),
+  make_tuple(&vp9_highbd_fht16x16_c,
+             &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 0,
+             VPX_BITS_12, 2),
+  make_tuple(&vp9_highbd_fht16x16_c,
+             &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 1,
+             VPX_BITS_12, 2),
+  make_tuple(&vp9_highbd_fht16x16_c,
+             &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 2,
+             VPX_BITS_12, 2),
+  make_tuple(&vp9_highbd_fht16x16_c,
+             &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_c>, 16, 3,
+             VPX_BITS_12, 2),
+
   make_tuple(&vp9_highbd_fht8x8_c,
              &highbd_iht_wrapper<vp9_highbd_iht8x8_64_add_c>, 8, 0, VPX_BITS_8,
              2),
@@ -784,6 +788,43 @@ INSTANTIATE_TEST_CASE_P(
 INSTANTIATE_TEST_CASE_P(
     SSE4_1, TransHT,
     ::testing::Values(
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   0, VPX_BITS_8, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   1, VPX_BITS_8, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   2, VPX_BITS_8, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   3, VPX_BITS_8, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   0, VPX_BITS_10, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   1, VPX_BITS_10, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   2, VPX_BITS_10, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   3, VPX_BITS_10, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   0, VPX_BITS_12, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   1, VPX_BITS_12, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   2, VPX_BITS_12, 2),
+        make_tuple(&vp9_highbd_fht16x16_c,
+                   &highbd_iht_wrapper<vp9_highbd_iht16x16_256_add_sse4_1>, 16,
+                   3, VPX_BITS_12, 2),
+
         make_tuple(&vp9_highbd_fht8x8_c,
                    &highbd_iht_wrapper<vp9_highbd_iht8x8_64_add_sse4_1>, 8, 0,
                    VPX_BITS_8, 2),
-- 
cgit v1.2.3