Add missing obmc/masked var tests for 4:1 blocks
Change-Id: Icc41f57d3a1e1c444366f0de9d62dd35cf01d133
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index 275b9fe..d156ec9 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -348,7 +348,20 @@
make_tuple(&aom_masked_sub_pixel_variance4x8_ssse3,
&aom_masked_sub_pixel_variance4x8_c),
make_tuple(&aom_masked_sub_pixel_variance4x4_ssse3,
- &aom_masked_sub_pixel_variance4x4_c)
+ &aom_masked_sub_pixel_variance4x4_c),
+
+ make_tuple(&aom_masked_sub_pixel_variance64x16_ssse3,
+ &aom_masked_sub_pixel_variance64x16_c),
+ make_tuple(&aom_masked_sub_pixel_variance16x64_ssse3,
+ &aom_masked_sub_pixel_variance16x64_c),
+ make_tuple(&aom_masked_sub_pixel_variance32x8_ssse3,
+ &aom_masked_sub_pixel_variance32x8_c),
+ make_tuple(&aom_masked_sub_pixel_variance8x32_ssse3,
+ &aom_masked_sub_pixel_variance8x32_c),
+ make_tuple(&aom_masked_sub_pixel_variance16x4_ssse3,
+ &aom_masked_sub_pixel_variance16x4_c),
+ make_tuple(&aom_masked_sub_pixel_variance4x16_ssse3,
+ &aom_masked_sub_pixel_variance4x16_c),
};
INSTANTIATE_TEST_CASE_P(SSSE3_C_COMPARE, MaskedSubPixelVarianceTest,
@@ -450,7 +463,44 @@
make_tuple(&aom_highbd_12_masked_sub_pixel_variance4x8_ssse3,
&aom_highbd_12_masked_sub_pixel_variance4x8_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance4x4_ssse3,
- &aom_highbd_12_masked_sub_pixel_variance4x4_c, AOM_BITS_12)
+ &aom_highbd_12_masked_sub_pixel_variance4x4_c, AOM_BITS_12),
+
+ make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x16_ssse3,
+ &aom_highbd_8_masked_sub_pixel_variance64x16_c, AOM_BITS_8),
+ make_tuple(&aom_highbd_8_masked_sub_pixel_variance16x64_ssse3,
+ &aom_highbd_8_masked_sub_pixel_variance16x64_c, AOM_BITS_8),
+ make_tuple(&aom_highbd_8_masked_sub_pixel_variance32x8_ssse3,
+ &aom_highbd_8_masked_sub_pixel_variance32x8_c, AOM_BITS_8),
+ make_tuple(&aom_highbd_8_masked_sub_pixel_variance8x32_ssse3,
+ &aom_highbd_8_masked_sub_pixel_variance8x32_c, AOM_BITS_8),
+ make_tuple(&aom_highbd_8_masked_sub_pixel_variance16x4_ssse3,
+ &aom_highbd_8_masked_sub_pixel_variance16x4_c, AOM_BITS_8),
+ make_tuple(&aom_highbd_8_masked_sub_pixel_variance4x16_ssse3,
+ &aom_highbd_8_masked_sub_pixel_variance4x16_c, AOM_BITS_8),
+ make_tuple(&aom_highbd_10_masked_sub_pixel_variance64x16_ssse3,
+ &aom_highbd_10_masked_sub_pixel_variance64x16_c, AOM_BITS_10),
+ make_tuple(&aom_highbd_10_masked_sub_pixel_variance16x64_ssse3,
+ &aom_highbd_10_masked_sub_pixel_variance16x64_c, AOM_BITS_10),
+ make_tuple(&aom_highbd_10_masked_sub_pixel_variance32x8_ssse3,
+ &aom_highbd_10_masked_sub_pixel_variance32x8_c, AOM_BITS_10),
+ make_tuple(&aom_highbd_10_masked_sub_pixel_variance8x32_ssse3,
+ &aom_highbd_10_masked_sub_pixel_variance8x32_c, AOM_BITS_10),
+ make_tuple(&aom_highbd_10_masked_sub_pixel_variance16x4_ssse3,
+ &aom_highbd_10_masked_sub_pixel_variance16x4_c, AOM_BITS_10),
+ make_tuple(&aom_highbd_10_masked_sub_pixel_variance4x16_ssse3,
+ &aom_highbd_10_masked_sub_pixel_variance4x16_c, AOM_BITS_10),
+ make_tuple(&aom_highbd_12_masked_sub_pixel_variance64x16_ssse3,
+ &aom_highbd_12_masked_sub_pixel_variance64x16_c, AOM_BITS_12),
+ make_tuple(&aom_highbd_12_masked_sub_pixel_variance16x64_ssse3,
+ &aom_highbd_12_masked_sub_pixel_variance16x64_c, AOM_BITS_12),
+ make_tuple(&aom_highbd_12_masked_sub_pixel_variance32x8_ssse3,
+ &aom_highbd_12_masked_sub_pixel_variance32x8_c, AOM_BITS_12),
+ make_tuple(&aom_highbd_12_masked_sub_pixel_variance8x32_ssse3,
+ &aom_highbd_12_masked_sub_pixel_variance8x32_c, AOM_BITS_12),
+ make_tuple(&aom_highbd_12_masked_sub_pixel_variance16x4_ssse3,
+ &aom_highbd_12_masked_sub_pixel_variance16x4_c, AOM_BITS_12),
+ make_tuple(&aom_highbd_12_masked_sub_pixel_variance4x16_ssse3,
+ &aom_highbd_12_masked_sub_pixel_variance4x16_c, AOM_BITS_12),
};
INSTANTIATE_TEST_CASE_P(SSSE3_C_COMPARE, HighbdMaskedSubPixelVarianceTest,
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index 4563b96..c015202 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -147,7 +147,14 @@
TestFuncs(aom_obmc_variance8x8_c, aom_obmc_variance8x8_sse4_1),
TestFuncs(aom_obmc_variance8x4_c, aom_obmc_variance8x4_sse4_1),
TestFuncs(aom_obmc_variance4x8_c, aom_obmc_variance4x8_sse4_1),
- TestFuncs(aom_obmc_variance4x4_c, aom_obmc_variance4x4_sse4_1)
+ TestFuncs(aom_obmc_variance4x4_c, aom_obmc_variance4x4_sse4_1),
+
+ TestFuncs(aom_obmc_variance64x16_c, aom_obmc_variance64x16_sse4_1),
+ TestFuncs(aom_obmc_variance16x64_c, aom_obmc_variance16x64_sse4_1),
+ TestFuncs(aom_obmc_variance32x8_c, aom_obmc_variance32x8_sse4_1),
+ TestFuncs(aom_obmc_variance8x32_c, aom_obmc_variance8x32_sse4_1),
+ TestFuncs(aom_obmc_variance16x4_c, aom_obmc_variance16x4_sse4_1),
+ TestFuncs(aom_obmc_variance4x16_c, aom_obmc_variance4x16_sse4_1),
};
INSTANTIATE_TEST_CASE_P(SSE4_1, ObmcVarianceTest,
@@ -170,8 +177,15 @@
TestFuncs(aom_obmc_variance8x16_c, aom_obmc_variance8x16_avx2),
TestFuncs(aom_obmc_variance8x8_c, aom_obmc_variance8x8_avx2),
TestFuncs(aom_obmc_variance8x4_c, aom_obmc_variance8x4_avx2),
- TestFuncs(aom_obmc_variance4x8_c, aom_obmc_variance4x8_sse4_1),
- TestFuncs(aom_obmc_variance4x4_c, aom_obmc_variance4x4_sse4_1)
+ TestFuncs(aom_obmc_variance4x8_c, aom_obmc_variance4x8_avx2),
+ TestFuncs(aom_obmc_variance4x4_c, aom_obmc_variance4x4_avx2),
+
+ TestFuncs(aom_obmc_variance64x16_c, aom_obmc_variance64x16_avx2),
+ TestFuncs(aom_obmc_variance16x64_c, aom_obmc_variance16x64_avx2),
+ TestFuncs(aom_obmc_variance32x8_c, aom_obmc_variance32x8_avx2),
+ TestFuncs(aom_obmc_variance8x32_c, aom_obmc_variance8x32_avx2),
+ TestFuncs(aom_obmc_variance16x4_c, aom_obmc_variance16x4_avx2),
+ TestFuncs(aom_obmc_variance4x16_c, aom_obmc_variance4x16_avx2),
};
INSTANTIATE_TEST_CASE_P(AVX2, ObmcVarianceTest,
@@ -336,7 +350,44 @@
TestFuncs(aom_highbd_12_obmc_variance4x8_c,
aom_highbd_12_obmc_variance4x8_sse4_1, 12),
TestFuncs(aom_highbd_12_obmc_variance4x4_c,
- aom_highbd_12_obmc_variance4x4_sse4_1, 12)
+ aom_highbd_12_obmc_variance4x4_sse4_1, 12),
+
+ TestFuncs(aom_highbd_obmc_variance64x16_c,
+ aom_highbd_obmc_variance64x16_sse4_1, 8),
+ TestFuncs(aom_highbd_obmc_variance16x64_c,
+ aom_highbd_obmc_variance16x64_sse4_1, 8),
+ TestFuncs(aom_highbd_obmc_variance32x8_c, aom_highbd_obmc_variance32x8_sse4_1,
+ 8),
+ TestFuncs(aom_highbd_obmc_variance8x32_c, aom_highbd_obmc_variance8x32_sse4_1,
+ 8),
+ TestFuncs(aom_highbd_obmc_variance16x4_c, aom_highbd_obmc_variance16x4_sse4_1,
+ 8),
+ TestFuncs(aom_highbd_obmc_variance4x16_c, aom_highbd_obmc_variance4x16_sse4_1,
+ 8),
+ TestFuncs(aom_highbd_10_obmc_variance64x16_c,
+ aom_highbd_10_obmc_variance64x16_sse4_1, 10),
+ TestFuncs(aom_highbd_10_obmc_variance16x64_c,
+ aom_highbd_10_obmc_variance16x64_sse4_1, 10),
+ TestFuncs(aom_highbd_10_obmc_variance32x8_c,
+ aom_highbd_10_obmc_variance32x8_sse4_1, 10),
+ TestFuncs(aom_highbd_10_obmc_variance8x32_c,
+ aom_highbd_10_obmc_variance8x32_sse4_1, 10),
+ TestFuncs(aom_highbd_10_obmc_variance16x4_c,
+ aom_highbd_10_obmc_variance16x4_sse4_1, 10),
+ TestFuncs(aom_highbd_10_obmc_variance4x16_c,
+ aom_highbd_10_obmc_variance4x16_sse4_1, 10),
+ TestFuncs(aom_highbd_12_obmc_variance64x16_c,
+ aom_highbd_12_obmc_variance64x16_sse4_1, 12),
+ TestFuncs(aom_highbd_12_obmc_variance16x64_c,
+ aom_highbd_12_obmc_variance16x64_sse4_1, 12),
+ TestFuncs(aom_highbd_12_obmc_variance32x8_c,
+ aom_highbd_12_obmc_variance32x8_sse4_1, 12),
+ TestFuncs(aom_highbd_12_obmc_variance8x32_c,
+ aom_highbd_12_obmc_variance8x32_sse4_1, 12),
+ TestFuncs(aom_highbd_12_obmc_variance16x4_c,
+ aom_highbd_12_obmc_variance16x4_sse4_1, 12),
+ TestFuncs(aom_highbd_12_obmc_variance4x16_c,
+ aom_highbd_12_obmc_variance4x16_sse4_1, 12),
};
INSTANTIATE_TEST_CASE_P(SSE4_1, ObmcVarianceHBDTest,
