diff options
| author | Johann Koenig <johannkoenig@google.com> | 2017-08-23 21:14:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-23 21:14:13 +0000 |
| commit | f53b656207daebaee57d2162e8534e34c0b3f6a5 (patch) | |
| tree | d6156be46a52f2ce48c891bf09ac53e5551df102 /test/vp9_quantize_test.cc | |
| parent | 1aad50c092f9877ea1632ca4c12ee016100df05c (diff) | |
| parent | 7c27872164941cecd17e685a0a2c537b996509ec (diff) | |
| download | libvpx-f53b656207daebaee57d2162e8534e34c0b3f6a5.tar libvpx-f53b656207daebaee57d2162e8534e34c0b3f6a5.tar.gz libvpx-f53b656207daebaee57d2162e8534e34c0b3f6a5.tar.bz2 libvpx-f53b656207daebaee57d2162e8534e34c0b3f6a5.zip | |
Merge "quantize avx: copy implementation to intrinsics"
Diffstat (limited to 'test/vp9_quantize_test.cc')
| -rw-r--r-- | test/vp9_quantize_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc index a0a791a99..fcf86e9c6 100644 --- a/test/vp9_quantize_test.cc +++ b/test/vp9_quantize_test.cc @@ -388,17 +388,18 @@ INSTANTIATE_TEST_CASE_P( // TODO(johannkoenig): AVX optimizations do not yet pass the 32x32 test or // highbitdepth configurations. -#if HAVE_AVX && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH +#if HAVE_AVX && !CONFIG_VP9_HIGHBITDEPTH INSTANTIATE_TEST_CASE_P(AVX, VP9QuantizeTest, ::testing::Values(make_tuple(&vpx_quantize_b_avx, &vpx_quantize_b_c, VPX_BITS_8, 16))); - +#if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(DISABLED_AVX, VP9QuantizeTest, ::testing::Values(make_tuple(&vpx_quantize_b_32x32_avx, &vpx_quantize_b_32x32_c, VPX_BITS_8, 32))); -#endif // HAVE_AVX && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH +#endif // ARCH_X86_64 +#endif // HAVE_AVX && !CONFIG_VP9_HIGHBITDEPTH // TODO(webm:1448): dqcoeff is not handled correctly in HBD builds. #if HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH |