diff options
| author | Marco Paniconi <marpan@google.com> | 2017-08-25 16:56:08 +0000 |
|---|---|---|
| committer | Marco Paniconi <marpan@google.com> | 2017-08-25 16:56:08 +0000 |
| commit | 8c42237bb200253931c49e2c530838f3a877dd65 (patch) | |
| tree | 1de7a768b8a0b7f8a6801c567c084df8782f7b99 /test/vp9_quantize_test.cc | |
| parent | f60d1dcd3de46f72bafc5eeef481bd1a4e203301 (diff) | |
| download | libvpx-8c42237bb200253931c49e2c530838f3a877dd65.tar libvpx-8c42237bb200253931c49e2c530838f3a877dd65.tar.gz libvpx-8c42237bb200253931c49e2c530838f3a877dd65.tar.bz2 libvpx-8c42237bb200253931c49e2c530838f3a877dd65.zip | |
Revert "quantize avx: copy 32x32 implementation"
This reverts commit f60d1dcd3de46f72bafc5eeef481bd1a4e203301.
Reason for revert: <INSERT REASONING HERE>
Failures in AVX/VP9QuantizeTest in nightly tests.
Original change's description:
> quantize avx: copy 32x32 implementation
>
> Ensure avx and ssse3 stay in sync by testing them against each other.
>
> Change-Id: I699f3b48785c83260825402d7826231f475f697c
TBR=slavarnway@google.com,johannkoenig@google.com,builds@webmproject.org
Change-Id: Ibd38636212269328317dd0721be9d25452113d1c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Diffstat (limited to 'test/vp9_quantize_test.cc')
| -rw-r--r-- | test/vp9_quantize_test.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc index 7767cd22f..2dca3a55d 100644 --- a/test/vp9_quantize_test.cc +++ b/test/vp9_quantize_test.cc @@ -392,14 +392,16 @@ INSTANTIATE_TEST_CASE_P( // TODO(johannkoenig): AVX optimizations do not yet pass the 32x32 test or // highbitdepth configurations. #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), - // Even though SSSE3 and AVX do not match the reference - // code, we can keep them in sync with each other. - make_tuple(&vpx_quantize_b_32x32_avx, - &vpx_quantize_b_32x32_ssse3, VPX_BITS_8, 32))); +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 // ARCH_X86_64 #endif // HAVE_AVX && !CONFIG_VP9_HIGHBITDEPTH // TODO(webm:1448): dqcoeff is not handled correctly in HBD builds. |