Commit 46f0f299 authored by Yaowu Xu's avatar Yaowu Xu

Fix compiling of tests with emulate-hardware

CONFIG_EMULATE_HARDWARE disable SIMD versions of transform functions.
This commits added !CONFIG_EMULATE_HARDWARE to get tests that use
SIMD versions of transforms to compile.

Change-Id: I4b9ef5a46ae8f12c439f4fe18766b95f8a520d34
parent 8da6d9d7
......@@ -162,7 +162,7 @@ TEST_P(AV1HighbdTrans16x16HT, HighbdCoeffCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE2
#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
const Ht16x16Param kArrayHt16x16Param_sse2[] = {
make_tuple(&av1_fht16x16_sse2, &av1_iht16x16_256_add_sse2, 0, AOM_BITS_8,
256),
......@@ -199,9 +199,9 @@ const Ht16x16Param kArrayHt16x16Param_sse2[] = {
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans16x16HT,
::testing::ValuesIn(kArrayHt16x16Param_sse2));
#endif // HAVE_SSE2
#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
#if HAVE_AVX2
#if HAVE_AVX2 && !CONFIG_EMULATE_HARDWARE
const Ht16x16Param kArrayHt16x16Param_avx2[] = {
make_tuple(&av1_fht16x16_avx2, av1_iht16x16_256_add_avx2, 0, AOM_BITS_8, 256),
make_tuple(&av1_fht16x16_avx2, av1_iht16x16_256_add_avx2, 1, AOM_BITS_8, 256),
......@@ -228,9 +228,9 @@ const Ht16x16Param kArrayHt16x16Param_avx2[] = {
};
INSTANTIATE_TEST_CASE_P(AVX2, AV1Trans16x16HT,
::testing::ValuesIn(kArrayHt16x16Param_avx2));
#endif // HAVE_AVX2
#endif // HAVE_AVX2 && !CONFIG_EMULATE_HARDWARE
#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH
#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
const HighbdHt16x16Param kArrayHBDHt16x16Param_sse4_1[] = {
make_tuple(&av1_fwd_txfm2d_16x16_sse4_1, 0, 10),
make_tuple(&av1_fwd_txfm2d_16x16_sse4_1, 0, 12),
......@@ -255,6 +255,6 @@ const HighbdHt16x16Param kArrayHBDHt16x16Param_sse4_1[] = {
};
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans16x16HT,
::testing::ValuesIn(kArrayHBDHt16x16Param_sse4_1));
#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH
#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
} // namespace
......@@ -164,7 +164,7 @@ TEST_P(AV1HighbdTrans4x4HT, HighbdCoeffCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE2
#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
const Ht4x4Param kArrayHt4x4Param_sse2[] = {
make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_sse2, 0, AOM_BITS_8, 16),
make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_sse2, 1, AOM_BITS_8, 16),
......@@ -186,9 +186,9 @@ const Ht4x4Param kArrayHt4x4Param_sse2[] = {
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans4x4HT,
::testing::ValuesIn(kArrayHt4x4Param_sse2));
#endif // HAVE_SSE2
#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH
#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
const HighbdHt4x4Param kArrayHighbdHt4x4Param[] = {
make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, 0, 10),
make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, 0, 12),
......@@ -215,6 +215,6 @@ const HighbdHt4x4Param kArrayHighbdHt4x4Param[] = {
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans4x4HT,
::testing::ValuesIn(kArrayHighbdHt4x4Param));
#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH
#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
} // namespace
......@@ -77,7 +77,7 @@ TEST_P(AV1Trans8x16HT, InvAccuracyCheck) { RunInvAccuracyCheck(0); }
using std::tr1::make_tuple;
#if HAVE_SSE2
#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
const Ht8x16Param kArrayHt8x16Param_sse2[] = {
make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 0, AOM_BITS_8, 128),
make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 1, AOM_BITS_8, 128),
......@@ -100,6 +100,6 @@ const Ht8x16Param kArrayHt8x16Param_sse2[] = {
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans8x16HT,
::testing::ValuesIn(kArrayHt8x16Param_sse2));
#endif // HAVE_SSE2
#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
} // namespace
......@@ -164,7 +164,7 @@ TEST_P(AV1HighbdTrans8x8HT, HighbdCoeffCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE2
#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
const Ht8x8Param kArrayHt8x8Param_sse2[] = {
make_tuple(&av1_fht8x8_sse2, &av1_iht8x8_64_add_sse2, 0, AOM_BITS_8, 64),
make_tuple(&av1_fht8x8_sse2, &av1_iht8x8_64_add_sse2, 1, AOM_BITS_8, 64),
......@@ -186,9 +186,9 @@ const Ht8x8Param kArrayHt8x8Param_sse2[] = {
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans8x8HT,
::testing::ValuesIn(kArrayHt8x8Param_sse2));
#endif // HAVE_SSE2
#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE
#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH
#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
const HighbdHt8x8Param kArrayHBDHt8x8Param_sse4_1[] = {
make_tuple(&av1_fwd_txfm2d_8x8_sse4_1, 0, 10),
make_tuple(&av1_fwd_txfm2d_8x8_sse4_1, 0, 12),
......@@ -213,6 +213,6 @@ const HighbdHt8x8Param kArrayHBDHt8x8Param_sse4_1[] = {
};
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans8x8HT,
::testing::ValuesIn(kArrayHBDHt8x8Param_sse4_1));
#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH
#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
} // namespace
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment