ref: 655fa807df97c0e027d60a40742c8cdbf22045f0
parent: 104d8ec034729183f9c1bb80aea6ae546276e152
parent: d5e07a8451891b1a978dc54fcfcb86d3e57197ec
author: James Zern <jzern@google.com>
date: Wed Feb 26 18:34:40 EST 2014
Merge changes I03c1ba21,I6d8ac50c,Id0a2d9ef,I3db3acbd,I028bdec9,I26f8724b,I3795d78b,I6bb7ffe8 * changes: variance_test: add NEON functions subtract_test: add NEON functions sixtap_predict_test: add NEON functions partial_idct_test: add NEON functions fdct8x8_test: add NEON functions fdct4x4_test: add NEON functions dct32x32_test: add NEON functions dct16x16_test: add NEON functions
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -512,6 +512,14 @@
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,
--- a/test/dct32x32_test.cc
+++ b/test/dct32x32_test.cc
@@ -248,6 +248,16 @@
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,
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -286,6 +286,21 @@
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,
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -313,6 +313,20 @@
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,
--- a/test/partial_idct_test.cc
+++ b/test/partial_idct_test.cc
@@ -140,6 +140,30 @@
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,
--- a/test/sixtap_predict_test.cc
+++ b/test/sixtap_predict_test.cc
@@ -193,6 +193,16 @@
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;
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -105,6 +105,11 @@
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));
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -307,6 +307,19 @@
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;