diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index 8d115fad3bbf661ab41cea7f54b83388209e5a1f..cb5562ec19e0c6191224bc120494491adf205f30 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -512,6 +512,14 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fht16x16_c, &vp9_iht16x16_256_add_c, 2), make_tuple(&vp9_fht16x16_c, &vp9_iht16x16_256_add_c, 3))); +#if HAVE_NEON +INSTANTIATE_TEST_CASE_P( + NEON, Trans16x16DCT, + ::testing::Values( + make_tuple(&vp9_fdct16x16_c, + &vp9_idct16x16_256_add_neon, 0))); +#endif + #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, Trans16x16DCT, diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index a2608acb53e250ed50830b349157e8ddf30d855b..013f4513eb691944c004d21bb6ff35c27867b1c5 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -248,6 +248,16 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fdct32x32_c, &vp9_idct32x32_1024_add_c, 0), make_tuple(&vp9_fdct32x32_rd_c, &vp9_idct32x32_1024_add_c, 1))); +#if HAVE_NEON +INSTANTIATE_TEST_CASE_P( + NEON, Trans32x32Test, + ::testing::Values( + make_tuple(&vp9_fdct32x32_c, + &vp9_idct32x32_1024_add_neon, 0), + make_tuple(&vp9_fdct32x32_rd_c, + &vp9_idct32x32_1024_add_neon, 1))); +#endif + #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, Trans32x32Test, diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index dc66687593b442070cc147686efa853ac159a925..127775c9a5219a16efd06bf1d7a5cf3d9eaf25b1 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -286,6 +286,21 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_c, 2), make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_c, 3))); +#if HAVE_NEON +INSTANTIATE_TEST_CASE_P( + NEON, Trans4x4DCT, + ::testing::Values( + make_tuple(&vp9_fdct4x4_c, + &vp9_idct4x4_16_add_neon, 0))); +INSTANTIATE_TEST_CASE_P( + DISABLED_NEON, Trans4x4HT, + ::testing::Values( + make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_neon, 0), + make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_neon, 1), + make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_neon, 2), + make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_neon, 3))); +#endif + #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, Trans4x4DCT, diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index 98aabe6a2931edd062fa92faa781e4cd44a922ce..6f2d7d1c9dbb66ec32db91f9b80aa24dffa76cf9 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc @@ -313,6 +313,20 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_c, 2), make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_c, 3))); +#if HAVE_NEON +INSTANTIATE_TEST_CASE_P( + NEON, FwdTrans8x8DCT, + ::testing::Values( + make_tuple(&vp9_fdct8x8_c, &vp9_idct8x8_64_add_neon, 0))); +INSTANTIATE_TEST_CASE_P( + DISABLED_NEON, FwdTrans8x8HT, + ::testing::Values( + make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_neon, 0), + make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_neon, 1), + make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_neon, 2), + make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_neon, 3))); +#endif + #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, FwdTrans8x8DCT, diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc index 2a32410f3dc79ad29a7518bfa50638eea529ed75..8849ce6260a4f80df0f7c41c33b40cb3b12109f4 100644 --- a/test/partial_idct_test.cc +++ b/test/partial_idct_test.cc @@ -140,6 +140,30 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_idct4x4_16_add_c, &vp9_idct4x4_1_add_c, TX_4X4, 1))); +#if HAVE_NEON +INSTANTIATE_TEST_CASE_P( + NEON, PartialIDctTest, + ::testing::Values( + make_tuple(&vp9_idct32x32_1024_add_c, + &vp9_idct32x32_1_add_neon, + TX_32X32, 1), + make_tuple(&vp9_idct16x16_256_add_c, + &vp9_idct16x16_10_add_neon, + TX_16X16, 10), + make_tuple(&vp9_idct16x16_256_add_c, + &vp9_idct16x16_1_add_neon, + TX_16X16, 1), + make_tuple(&vp9_idct8x8_64_add_c, + &vp9_idct8x8_10_add_neon, + TX_8X8, 10), + make_tuple(&vp9_idct8x8_64_add_c, + &vp9_idct8x8_1_add_neon, + TX_8X8, 1), + make_tuple(&vp9_idct4x4_16_add_c, + &vp9_idct4x4_1_add_neon, + TX_4X4, 1))); +#endif + #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, PartialIDctTest, diff --git a/test/sixtap_predict_test.cc b/test/sixtap_predict_test.cc index 3434662fb84d71f2cbdcc08a315150920b20add8..1b2f03f53414fa92e304703d95d94854bb774558 100644 --- a/test/sixtap_predict_test.cc +++ b/test/sixtap_predict_test.cc @@ -193,6 +193,16 @@ INSTANTIATE_TEST_CASE_P( make_tuple(8, 8, sixtap_8x8_c), make_tuple(8, 4, sixtap_8x4_c), make_tuple(4, 4, sixtap_4x4_c))); +#if HAVE_NEON +const sixtap_predict_fn_t sixtap_16x16_neon = vp8_sixtap_predict16x16_neon; +const sixtap_predict_fn_t sixtap_8x8_neon = vp8_sixtap_predict8x8_neon; +const sixtap_predict_fn_t sixtap_8x4_neon = vp8_sixtap_predict8x4_neon; +INSTANTIATE_TEST_CASE_P( + NEON, SixtapPredictTest, ::testing::Values( + make_tuple(16, 16, sixtap_16x16_neon), + make_tuple(8, 8, sixtap_8x8_neon), + make_tuple(8, 4, sixtap_8x4_neon))); +#endif #if HAVE_MMX const sixtap_predict_fn_t sixtap_16x16_mmx = vp8_sixtap_predict16x16_mmx; const sixtap_predict_fn_t sixtap_8x8_mmx = vp8_sixtap_predict8x8_mmx; diff --git a/test/subtract_test.cc b/test/subtract_test.cc index 9e242a24691b61b3714a02116fd581853619ea92..3efb9553c15e88c9edc5a84460498b2f3ee337a4 100644 --- a/test/subtract_test.cc +++ b/test/subtract_test.cc @@ -105,6 +105,11 @@ TEST_P(SubtractBlockTest, SimpleSubtract) { INSTANTIATE_TEST_CASE_P(C, SubtractBlockTest, ::testing::Values(vp8_subtract_b_c)); +#if HAVE_NEON +INSTANTIATE_TEST_CASE_P(NEON, SubtractBlockTest, + ::testing::Values(vp8_subtract_b_neon)); +#endif + #if HAVE_MMX INSTANTIATE_TEST_CASE_P(MMX, SubtractBlockTest, ::testing::Values(vp8_subtract_b_mmx)); diff --git a/test/variance_test.cc b/test/variance_test.cc index b9144ffabcc54ea60e3af94708e8ee8aa157e54b..c9bf13a6bd4dbf57007b29c292b46a60a9c5286b 100644 --- a/test/variance_test.cc +++ b/test/variance_test.cc @@ -307,6 +307,19 @@ INSTANTIATE_TEST_CASE_P( make_tuple(4, 3, variance16x8_c), make_tuple(4, 4, variance16x16_c))); +#if HAVE_NEON +const vp8_variance_fn_t variance8x8_neon = vp8_variance8x8_neon; +const vp8_variance_fn_t variance8x16_neon = vp8_variance8x16_neon; +const vp8_variance_fn_t variance16x8_neon = vp8_variance16x8_neon; +const vp8_variance_fn_t variance16x16_neon = vp8_variance16x16_neon; +INSTANTIATE_TEST_CASE_P( + NEON, VP8VarianceTest, + ::testing::Values(make_tuple(3, 3, variance8x8_neon), + make_tuple(3, 4, variance8x16_neon), + make_tuple(4, 3, variance16x8_neon), + make_tuple(4, 4, variance16x16_neon))); +#endif + #if HAVE_MMX const vp8_variance_fn_t variance4x4_mmx = vp8_variance4x4_mmx; const vp8_variance_fn_t variance8x8_mmx = vp8_variance8x8_mmx;