summaryrefslogtreecommitdiff
path: root/test/fdct4x4_test.cc
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2014-10-02 15:43:27 -0700
committerDeb Mukherjee <debargha@google.com>2014-10-03 11:38:05 -0700
commitd50716face72ce03d074722fc3219b5b519e780b (patch)
tree799311027fd2fcd1ffae72c8884698bfecaf39a0 /test/fdct4x4_test.cc
parenta0befb93e7150f72afe57aa5b7f7df3308690cef (diff)
downloadlibvpx-d50716face72ce03d074722fc3219b5b519e780b.tar
libvpx-d50716face72ce03d074722fc3219b5b519e780b.tar.gz
libvpx-d50716face72ce03d074722fc3219b5b519e780b.tar.bz2
libvpx-d50716face72ce03d074722fc3219b5b519e780b.zip
Incorporate WRAPLOW macro into non-highbitdepth tx
Incorporates the WRAPLOW macro into the non-highbitdepth transforms to aid hardware verification between a software C model and an intended hardware implementation though the use of the configure options: --enable-experimental --enable-emulate-hardware. Note that to avoid further discrepancies between the sse/sse2 implementations of the transforms and the C implementation, when the emulate hardware option is invoked, we also disable sse/sse2/etc. Also incudes some minor cleanups/renaming etc. Change-Id: Ib864d8493313927d429cce402982f1c8e45b3287
Diffstat (limited to 'test/fdct4x4_test.cc')
-rw-r--r--test/fdct4x4_test.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index f803c8e25..d75bd69f3 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -458,7 +458,7 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&vp9_fwht4x4_c, &vp9_iwht4x4_16_add_c, 0, VPX_BITS_8)));
#endif
-#if HAVE_NEON_ASM && !CONFIG_VP9_HIGHBITDEPTH
+#if HAVE_NEON_ASM && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
INSTANTIATE_TEST_CASE_P(
NEON, Trans4x4DCT,
::testing::Values(
@@ -473,14 +473,15 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_neon, 3, VPX_BITS_8)));
#endif
-#if CONFIG_USE_X86INC && HAVE_MMX && !CONFIG_VP9_HIGHBITDEPTH
+#if CONFIG_USE_X86INC && HAVE_MMX && !CONFIG_VP9_HIGHBITDEPTH && \
+ !CONFIG_EMULATE_HARDWARE
INSTANTIATE_TEST_CASE_P(
MMX, Trans4x4WHT,
::testing::Values(
make_tuple(&vp9_fwht4x4_mmx, &vp9_iwht4x4_16_add_c, 0, VPX_BITS_8)));
#endif
-#if HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH
+#if HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
INSTANTIATE_TEST_CASE_P(
SSE2, Trans4x4DCT,
::testing::Values(