Merge "Connect partial IDCT tests"
This commit is contained in:
commit
3db06394e7
@ -177,79 +177,133 @@ using std::tr1::make_tuple;
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
C, PartialIDctTest,
|
||||
::testing::Values(make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_c, TX_32X32, 1024),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_135_add_c, TX_32X32, 135),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_34_add_c, TX_32X32, 34),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1_add_c, TX_32X32, 1),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_256_add_c, TX_16X16, 256),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_10_add_c, TX_16X16, 10),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_1_add_c, TX_16X16, 1),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_64_add_c, TX_8X8, 64),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_12_add_c, TX_8X8, 12),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_1_add_c, TX_8X8, 1),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_16_add_c, TX_4X4, 16),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_1_add_c, TX_4X4, 1)));
|
||||
|
||||
#if HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
||||
// 32x32_34_ 32x32_135_ are implemented using the 1024 version.
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
NEON, PartialIDctTest,
|
||||
::testing::Values(make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_neon, TX_32X32, 1024),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_neon, TX_32X32, 135),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_neon, TX_32X32, 34),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1_add_neon, TX_32X32, 1),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_256_add_neon, TX_16X16, 256),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_10_add_neon, TX_16X16, 10),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_1_add_neon, TX_16X16, 1),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_64_add_neon, TX_8X8, 64),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_12_add_neon, TX_8X8, 12),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_1_add_neon, TX_8X8, 1),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_16_add_neon, TX_4X4, 16),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_1_add_neon, TX_4X4, 1)));
|
||||
#endif // HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
||||
|
||||
#if HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
||||
// 32x32_135_ is implemented using the 1024 version.
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
SSE2, PartialIDctTest,
|
||||
::testing::Values(make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_sse2, TX_32X32, 1024),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_sse2, TX_32X32, 135),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_34_add_sse2, TX_32X32, 34),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1_add_sse2, TX_32X32, 1),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_256_add_sse2, TX_16X16, 256),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_10_add_sse2, TX_16X16, 10),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_1_add_sse2, TX_16X16, 1),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_64_add_sse2, TX_8X8, 64),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_12_add_sse2, TX_8X8, 12),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_1_add_sse2, TX_8X8, 1),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_16_add_sse2, TX_4X4, 16),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_1_add_sse2, TX_4X4, 1)));
|
||||
#endif
|
||||
#endif // HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
||||
|
||||
#if HAVE_SSSE3 && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH && \
|
||||
!CONFIG_EMULATE_HARDWARE
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
SSSE3_64, PartialIDctTest,
|
||||
::testing::Values(make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
::testing::Values(make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_ssse3, TX_32X32, 1024),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_135_add_ssse3, TX_32X32, 135),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_34_add_ssse3, TX_32X32, 34),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_64_add_ssse3, TX_8X8, 64),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_12_add_ssse3, TX_8X8, 12)));
|
||||
#endif
|
||||
#endif // HAVE_SSSE3 && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH &&
|
||||
// !CONFIG_EMULATE_HARDWARE
|
||||
|
||||
#if HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
||||
// 32x32_135_ is implemented using the 1024 version.
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
MSA, PartialIDctTest,
|
||||
::testing::Values(make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_msa, TX_32X32, 1024),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1024_add_msa, TX_32X32, 135),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_34_add_msa, TX_32X32, 34),
|
||||
make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c,
|
||||
&vpx_idct32x32_1_add_msa, TX_32X32, 1),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_256_add_msa, TX_16X16, 256),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_10_add_msa, TX_16X16, 10),
|
||||
make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c,
|
||||
&vpx_idct16x16_1_add_msa, TX_16X16, 1),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_64_add_msa, TX_8X8, 64),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_12_add_msa, TX_8X8, 10),
|
||||
make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c,
|
||||
&vpx_idct8x8_1_add_msa, TX_8X8, 1),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_16_add_msa, TX_4X4, 16),
|
||||
make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c,
|
||||
&vpx_idct4x4_1_add_msa, TX_4X4, 1)));
|
||||
#endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
||||
|
Loading…
x
Reference in New Issue
Block a user