Skip to content

GitLab

Commit a9b275fd authored by James Zern's avatar James Zern
Browse files
Options

variance_test: Use static arrays for test params 

fixes compiler warnings in MSVC related to decorated name truncation

Change-Id: I614e2466651d2f90983ba34ba560d093754c1028
parent 7184065f
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 72 deletions
test/variance_test.cc
View file @ a9b275fd
......@@ -1142,79 +1142,82 @@ INSTANTIATE_TEST_CASE_P(
VarianceParams(3, 4, &aom_highbd_8_variance8x16_sse2, 8),
VarianceParams(3, 3, &aom_highbd_8_variance8x8_sse2, 8)));
INSTANTIATE_TEST_CASE_P(
SSE2, AvxHBDSubpelVarianceTest,
::testing::Values(
make_tuple(6, 6, &aom_highbd_12_sub_pixel_variance64x64_sse2, 12),
make_tuple(6, 5, &aom_highbd_12_sub_pixel_variance64x32_sse2, 12),
make_tuple(5, 6, &aom_highbd_12_sub_pixel_variance32x64_sse2, 12),
make_tuple(5, 5, &aom_highbd_12_sub_pixel_variance32x32_sse2, 12),
make_tuple(5, 4, &aom_highbd_12_sub_pixel_variance32x16_sse2, 12),
make_tuple(4, 5, &aom_highbd_12_sub_pixel_variance16x32_sse2, 12),
make_tuple(4, 4, &aom_highbd_12_sub_pixel_variance16x16_sse2, 12),
make_tuple(4, 3, &aom_highbd_12_sub_pixel_variance16x8_sse2, 12),
make_tuple(3, 4, &aom_highbd_12_sub_pixel_variance8x16_sse2, 12),
make_tuple(3, 3, &aom_highbd_12_sub_pixel_variance8x8_sse2, 12),
make_tuple(3, 2, &aom_highbd_12_sub_pixel_variance8x4_sse2, 12),
make_tuple(6, 6, &aom_highbd_10_sub_pixel_variance64x64_sse2, 10),
make_tuple(6, 5, &aom_highbd_10_sub_pixel_variance64x32_sse2, 10),
make_tuple(5, 6, &aom_highbd_10_sub_pixel_variance32x64_sse2, 10),
make_tuple(5, 5, &aom_highbd_10_sub_pixel_variance32x32_sse2, 10),
make_tuple(5, 4, &aom_highbd_10_sub_pixel_variance32x16_sse2, 10),
make_tuple(4, 5, &aom_highbd_10_sub_pixel_variance16x32_sse2, 10),
make_tuple(4, 4, &aom_highbd_10_sub_pixel_variance16x16_sse2, 10),
make_tuple(4, 3, &aom_highbd_10_sub_pixel_variance16x8_sse2, 10),
make_tuple(3, 4, &aom_highbd_10_sub_pixel_variance8x16_sse2, 10),
make_tuple(3, 3, &aom_highbd_10_sub_pixel_variance8x8_sse2, 10),
make_tuple(3, 2, &aom_highbd_10_sub_pixel_variance8x4_sse2, 10),
make_tuple(6, 6, &aom_highbd_8_sub_pixel_variance64x64_sse2, 8),
make_tuple(6, 5, &aom_highbd_8_sub_pixel_variance64x32_sse2, 8),
make_tuple(5, 6, &aom_highbd_8_sub_pixel_variance32x64_sse2, 8),
make_tuple(5, 5, &aom_highbd_8_sub_pixel_variance32x32_sse2, 8),
make_tuple(5, 4, &aom_highbd_8_sub_pixel_variance32x16_sse2, 8),
make_tuple(4, 5, &aom_highbd_8_sub_pixel_variance16x32_sse2, 8),
make_tuple(4, 4, &aom_highbd_8_sub_pixel_variance16x16_sse2, 8),
make_tuple(4, 3, &aom_highbd_8_sub_pixel_variance16x8_sse2, 8),
make_tuple(3, 4, &aom_highbd_8_sub_pixel_variance8x16_sse2, 8),
make_tuple(3, 3, &aom_highbd_8_sub_pixel_variance8x8_sse2, 8),
make_tuple(3, 2, &aom_highbd_8_sub_pixel_variance8x4_sse2, 8)));
const AvxHBDSubpelVarianceTest::ParamType kArrayHBDSubpelVariance_sse2[] = {
make_tuple(6, 6, &aom_highbd_12_sub_pixel_variance64x64_sse2, 12),
make_tuple(6, 5, &aom_highbd_12_sub_pixel_variance64x32_sse2, 12),
make_tuple(5, 6, &aom_highbd_12_sub_pixel_variance32x64_sse2, 12),
make_tuple(5, 5, &aom_highbd_12_sub_pixel_variance32x32_sse2, 12),
make_tuple(5, 4, &aom_highbd_12_sub_pixel_variance32x16_sse2, 12),
make_tuple(4, 5, &aom_highbd_12_sub_pixel_variance16x32_sse2, 12),
make_tuple(4, 4, &aom_highbd_12_sub_pixel_variance16x16_sse2, 12),
make_tuple(4, 3, &aom_highbd_12_sub_pixel_variance16x8_sse2, 12),
make_tuple(3, 4, &aom_highbd_12_sub_pixel_variance8x16_sse2, 12),
make_tuple(3, 3, &aom_highbd_12_sub_pixel_variance8x8_sse2, 12),
make_tuple(3, 2, &aom_highbd_12_sub_pixel_variance8x4_sse2, 12),
make_tuple(6, 6, &aom_highbd_10_sub_pixel_variance64x64_sse2, 10),
make_tuple(6, 5, &aom_highbd_10_sub_pixel_variance64x32_sse2, 10),
make_tuple(5, 6, &aom_highbd_10_sub_pixel_variance32x64_sse2, 10),
make_tuple(5, 5, &aom_highbd_10_sub_pixel_variance32x32_sse2, 10),
make_tuple(5, 4, &aom_highbd_10_sub_pixel_variance32x16_sse2, 10),
make_tuple(4, 5, &aom_highbd_10_sub_pixel_variance16x32_sse2, 10),
make_tuple(4, 4, &aom_highbd_10_sub_pixel_variance16x16_sse2, 10),
make_tuple(4, 3, &aom_highbd_10_sub_pixel_variance16x8_sse2, 10),
make_tuple(3, 4, &aom_highbd_10_sub_pixel_variance8x16_sse2, 10),
make_tuple(3, 3, &aom_highbd_10_sub_pixel_variance8x8_sse2, 10),
make_tuple(3, 2, &aom_highbd_10_sub_pixel_variance8x4_sse2, 10),
make_tuple(6, 6, &aom_highbd_8_sub_pixel_variance64x64_sse2, 8),
make_tuple(6, 5, &aom_highbd_8_sub_pixel_variance64x32_sse2, 8),
make_tuple(5, 6, &aom_highbd_8_sub_pixel_variance32x64_sse2, 8),
make_tuple(5, 5, &aom_highbd_8_sub_pixel_variance32x32_sse2, 8),
make_tuple(5, 4, &aom_highbd_8_sub_pixel_variance32x16_sse2, 8),
make_tuple(4, 5, &aom_highbd_8_sub_pixel_variance16x32_sse2, 8),
make_tuple(4, 4, &aom_highbd_8_sub_pixel_variance16x16_sse2, 8),
make_tuple(4, 3, &aom_highbd_8_sub_pixel_variance16x8_sse2, 8),
make_tuple(3, 4, &aom_highbd_8_sub_pixel_variance8x16_sse2, 8),
make_tuple(3, 3, &aom_highbd_8_sub_pixel_variance8x8_sse2, 8),
make_tuple(3, 2, &aom_highbd_8_sub_pixel_variance8x4_sse2, 8)
};
INSTANTIATE_TEST_CASE_P(
SSE2, AvxHBDSubpelAvgVarianceTest,
::testing::Values(
make_tuple(6, 6, &aom_highbd_12_sub_pixel_avg_variance64x64_sse2, 12),
make_tuple(6, 5, &aom_highbd_12_sub_pixel_avg_variance64x32_sse2, 12),
make_tuple(5, 6, &aom_highbd_12_sub_pixel_avg_variance32x64_sse2, 12),
make_tuple(5, 5, &aom_highbd_12_sub_pixel_avg_variance32x32_sse2, 12),
make_tuple(5, 4, &aom_highbd_12_sub_pixel_avg_variance32x16_sse2, 12),
make_tuple(4, 5, &aom_highbd_12_sub_pixel_avg_variance16x32_sse2, 12),
make_tuple(4, 4, &aom_highbd_12_sub_pixel_avg_variance16x16_sse2, 12),
make_tuple(4, 3, &aom_highbd_12_sub_pixel_avg_variance16x8_sse2, 12),
make_tuple(3, 4, &aom_highbd_12_sub_pixel_avg_variance8x16_sse2, 12),
make_tuple(3, 3, &aom_highbd_12_sub_pixel_avg_variance8x8_sse2, 12),
make_tuple(3, 2, &aom_highbd_12_sub_pixel_avg_variance8x4_sse2, 12),
make_tuple(6, 6, &aom_highbd_10_sub_pixel_avg_variance64x64_sse2, 10),
make_tuple(6, 5, &aom_highbd_10_sub_pixel_avg_variance64x32_sse2, 10),
make_tuple(5, 6, &aom_highbd_10_sub_pixel_avg_variance32x64_sse2, 10),
make_tuple(5, 5, &aom_highbd_10_sub_pixel_avg_variance32x32_sse2, 10),
make_tuple(5, 4, &aom_highbd_10_sub_pixel_avg_variance32x16_sse2, 10),
make_tuple(4, 5, &aom_highbd_10_sub_pixel_avg_variance16x32_sse2, 10),
make_tuple(4, 4, &aom_highbd_10_sub_pixel_avg_variance16x16_sse2, 10),
make_tuple(4, 3, &aom_highbd_10_sub_pixel_avg_variance16x8_sse2, 10),
make_tuple(3, 4, &aom_highbd_10_sub_pixel_avg_variance8x16_sse2, 10),
make_tuple(3, 3, &aom_highbd_10_sub_pixel_avg_variance8x8_sse2, 10),
make_tuple(3, 2, &aom_highbd_10_sub_pixel_avg_variance8x4_sse2, 10),
make_tuple(6, 6, &aom_highbd_8_sub_pixel_avg_variance64x64_sse2, 8),
make_tuple(6, 5, &aom_highbd_8_sub_pixel_avg_variance64x32_sse2, 8),
make_tuple(5, 6, &aom_highbd_8_sub_pixel_avg_variance32x64_sse2, 8),
make_tuple(5, 5, &aom_highbd_8_sub_pixel_avg_variance32x32_sse2, 8),
make_tuple(5, 4, &aom_highbd_8_sub_pixel_avg_variance32x16_sse2, 8),
make_tuple(4, 5, &aom_highbd_8_sub_pixel_avg_variance16x32_sse2, 8),
make_tuple(4, 4, &aom_highbd_8_sub_pixel_avg_variance16x16_sse2, 8),
make_tuple(4, 3, &aom_highbd_8_sub_pixel_avg_variance16x8_sse2, 8),
make_tuple(3, 4, &aom_highbd_8_sub_pixel_avg_variance8x16_sse2, 8),
make_tuple(3, 3, &aom_highbd_8_sub_pixel_avg_variance8x8_sse2, 8),
make_tuple(3, 2, &aom_highbd_8_sub_pixel_avg_variance8x4_sse2, 8)));
INSTANTIATE_TEST_CASE_P(SSE2, AvxHBDSubpelVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelVariance_sse2));
const AvxHBDSubpelAvgVarianceTest::ParamType kArrayHBDSubpelAvgVariance_sse2[] =
{ make_tuple(6, 6, &aom_highbd_12_sub_pixel_avg_variance64x64_sse2, 12),
make_tuple(6, 5, &aom_highbd_12_sub_pixel_avg_variance64x32_sse2, 12),
make_tuple(5, 6, &aom_highbd_12_sub_pixel_avg_variance32x64_sse2, 12),
make_tuple(5, 5, &aom_highbd_12_sub_pixel_avg_variance32x32_sse2, 12),
make_tuple(5, 4, &aom_highbd_12_sub_pixel_avg_variance32x16_sse2, 12),
make_tuple(4, 5, &aom_highbd_12_sub_pixel_avg_variance16x32_sse2, 12),
make_tuple(4, 4, &aom_highbd_12_sub_pixel_avg_variance16x16_sse2, 12),
make_tuple(4, 3, &aom_highbd_12_sub_pixel_avg_variance16x8_sse2, 12),
make_tuple(3, 4, &aom_highbd_12_sub_pixel_avg_variance8x16_sse2, 12),
make_tuple(3, 3, &aom_highbd_12_sub_pixel_avg_variance8x8_sse2, 12),
make_tuple(3, 2, &aom_highbd_12_sub_pixel_avg_variance8x4_sse2, 12),
make_tuple(6, 6, &aom_highbd_10_sub_pixel_avg_variance64x64_sse2, 10),
make_tuple(6, 5, &aom_highbd_10_sub_pixel_avg_variance64x32_sse2, 10),
make_tuple(5, 6, &aom_highbd_10_sub_pixel_avg_variance32x64_sse2, 10),
make_tuple(5, 5, &aom_highbd_10_sub_pixel_avg_variance32x32_sse2, 10),
make_tuple(5, 4, &aom_highbd_10_sub_pixel_avg_variance32x16_sse2, 10),
make_tuple(4, 5, &aom_highbd_10_sub_pixel_avg_variance16x32_sse2, 10),
make_tuple(4, 4, &aom_highbd_10_sub_pixel_avg_variance16x16_sse2, 10),
make_tuple(4, 3, &aom_highbd_10_sub_pixel_avg_variance16x8_sse2, 10),
make_tuple(3, 4, &aom_highbd_10_sub_pixel_avg_variance8x16_sse2, 10),
make_tuple(3, 3, &aom_highbd_10_sub_pixel_avg_variance8x8_sse2, 10),
make_tuple(3, 2, &aom_highbd_10_sub_pixel_avg_variance8x4_sse2, 10),
make_tuple(6, 6, &aom_highbd_8_sub_pixel_avg_variance64x64_sse2, 8),
make_tuple(6, 5, &aom_highbd_8_sub_pixel_avg_variance64x32_sse2, 8),
make_tuple(5, 6, &aom_highbd_8_sub_pixel_avg_variance32x64_sse2, 8),
make_tuple(5, 5, &aom_highbd_8_sub_pixel_avg_variance32x32_sse2, 8),
make_tuple(5, 4, &aom_highbd_8_sub_pixel_avg_variance32x16_sse2, 8),
make_tuple(4, 5, &aom_highbd_8_sub_pixel_avg_variance16x32_sse2, 8),
make_tuple(4, 4, &aom_highbd_8_sub_pixel_avg_variance16x16_sse2, 8),
make_tuple(4, 3, &aom_highbd_8_sub_pixel_avg_variance16x8_sse2, 8),
make_tuple(3, 4, &aom_highbd_8_sub_pixel_avg_variance8x16_sse2, 8),
make_tuple(3, 3, &aom_highbd_8_sub_pixel_avg_variance8x8_sse2, 8),
make_tuple(3, 2, &aom_highbd_8_sub_pixel_avg_variance8x4_sse2, 8) };
INSTANTIATE_TEST_CASE_P(SSE2, AvxHBDSubpelAvgVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelAvgVariance_sse2));
#endif // CONFIG_HIGHBITDEPTH
#endif // HAVE_SSE2
......
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