summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2014-11-05 12:56:04 -0800
committerJohann <johannkoenig@google.com>2014-11-05 12:58:08 -0800
commit7d07f512cd87446eef541e9af4af19b1e8c6342a (patch)
treecc3f06b5ce188311cf8dfb1e764f0f66c8e4bee3 /test
parentdf1b0cafd66d9d10873f7dc5e567dececc45a37a (diff)
downloadlibvpx-7d07f512cd87446eef541e9af4af19b1e8c6342a.tar
libvpx-7d07f512cd87446eef541e9af4af19b1e8c6342a.tar.gz
libvpx-7d07f512cd87446eef541e9af4af19b1e8c6342a.tar.bz2
libvpx-7d07f512cd87446eef541e9af4af19b1e8c6342a.zip
Fix SSSE3 partial_idct_test detection
The test filter is not a prefix matcher. It requires test type to contain no more than the optimization type. In this example, SSSE3_64 fails to match and the test is not skipped even when SSSE3 is not available. Change-Id: Ia74229a167c88da4e6da169012a7a77d438c3f75
Diffstat (limited to 'test')
-rw-r--r--test/partial_idct_test.cc23
1 files changed, 10 insertions, 13 deletions
diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc
index 536273e3e..39d585419 100644
--- a/test/partial_idct_test.cc
+++ b/test/partial_idct_test.cc
@@ -294,17 +294,6 @@ INSTANTIATE_TEST_CASE_P(
TX_4X4, 1)));
#endif
-#if HAVE_SSSE3 && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH && \
- !CONFIG_EMULATE_HARDWARE
-INSTANTIATE_TEST_CASE_P(
- SSSE3_64, PartialIDctTest,
- ::testing::Values(
- make_tuple(&vp9_fdct8x8_c,
- &vp9_idct8x8_64_add_c,
- &vp9_idct8x8_12_add_ssse3,
- TX_8X8, 12)));
-#endif
-
#if HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
INSTANTIATE_TEST_CASE_P(
SSSE3, PartialIDctTest,
@@ -312,6 +301,14 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&vp9_fdct16x16_c,
&vp9_idct16x16_256_add_c,
&vp9_idct16x16_10_add_ssse3,
- TX_16X16, 10)));
-#endif
+ TX_16X16, 10)
+#if ARCH_X86_64
+ ,
+ make_tuple(&vp9_fdct8x8_c,
+ &vp9_idct8x8_64_add_c,
+ &vp9_idct8x8_12_add_ssse3,
+ TX_8X8, 12)
+#endif // ARCH_X86_64
+ ));
+#endif // HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
} // namespace