| Index: source/libvpx/test/partial_idct_test.cc
|
| diff --git a/source/libvpx/test/partial_idct_test.cc b/source/libvpx/test/partial_idct_test.cc
|
| index ba73f8612d5491efa1a6f10181d09b882fe38175..3237f37dae580deb12003bc305b46043af5f6900 100644
|
| --- a/source/libvpx/test/partial_idct_test.cc
|
| +++ b/source/libvpx/test/partial_idct_test.cc
|
| @@ -74,16 +74,16 @@ TEST_P(PartialIDctTest, RunQuantCheck) {
|
| FAIL() << "Wrong Size!";
|
| break;
|
| }
|
| - DECLARE_ALIGNED_ARRAY(16, tran_low_t, test_coef_block1, kMaxNumCoeffs);
|
| - DECLARE_ALIGNED_ARRAY(16, tran_low_t, test_coef_block2, kMaxNumCoeffs);
|
| - DECLARE_ALIGNED_ARRAY(16, uint8_t, dst1, kMaxNumCoeffs);
|
| - DECLARE_ALIGNED_ARRAY(16, uint8_t, dst2, kMaxNumCoeffs);
|
| + DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]);
|
| + DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]);
|
| + DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]);
|
| + DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]);
|
|
|
| const int count_test_block = 1000;
|
| const int block_size = size * size;
|
|
|
| - DECLARE_ALIGNED_ARRAY(16, int16_t, input_extreme_block, kMaxNumCoeffs);
|
| - DECLARE_ALIGNED_ARRAY(16, tran_low_t, output_ref_block, kMaxNumCoeffs);
|
| + DECLARE_ALIGNED(16, int16_t, input_extreme_block[kMaxNumCoeffs]);
|
| + DECLARE_ALIGNED(16, tran_low_t, output_ref_block[kMaxNumCoeffs]);
|
|
|
| int max_error = 0;
|
| for (int i = 0; i < count_test_block; ++i) {
|
| @@ -153,10 +153,10 @@ TEST_P(PartialIDctTest, ResultsMatch) {
|
| FAIL() << "Wrong Size!";
|
| break;
|
| }
|
| - DECLARE_ALIGNED_ARRAY(16, tran_low_t, test_coef_block1, kMaxNumCoeffs);
|
| - DECLARE_ALIGNED_ARRAY(16, tran_low_t, test_coef_block2, kMaxNumCoeffs);
|
| - DECLARE_ALIGNED_ARRAY(16, uint8_t, dst1, kMaxNumCoeffs);
|
| - DECLARE_ALIGNED_ARRAY(16, uint8_t, dst2, kMaxNumCoeffs);
|
| + DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]);
|
| + DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]);
|
| + DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]);
|
| + DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]);
|
| const int count_test_block = 1000;
|
| const int max_coeff = 32766 / 4;
|
| const int block_size = size * size;
|
| @@ -305,13 +305,26 @@ INSTANTIATE_TEST_CASE_P(
|
| TX_8X8, 12)));
|
| #endif
|
|
|
| -#if HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
| +#if HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
| INSTANTIATE_TEST_CASE_P(
|
| - SSSE3, PartialIDctTest,
|
| + MSA, PartialIDctTest,
|
| ::testing::Values(
|
| + make_tuple(&vp9_fdct32x32_c,
|
| + &vp9_idct32x32_1024_add_c,
|
| + &vp9_idct32x32_34_add_msa,
|
| + TX_32X32, 34),
|
| + make_tuple(&vp9_fdct32x32_c,
|
| + &vp9_idct32x32_1024_add_c,
|
| + &vp9_idct32x32_1_add_msa,
|
| + TX_32X32, 1),
|
| make_tuple(&vp9_fdct16x16_c,
|
| &vp9_idct16x16_256_add_c,
|
| - &vp9_idct16x16_10_add_ssse3,
|
| - TX_16X16, 10)));
|
| -#endif
|
| + &vp9_idct16x16_10_add_msa,
|
| + TX_16X16, 10),
|
| + make_tuple(&vp9_fdct16x16_c,
|
| + &vp9_idct16x16_256_add_c,
|
| + &vp9_idct16x16_1_add_msa,
|
| + TX_16X16, 1)));
|
| +#endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
| +
|
| } // namespace
|
|
|