Remove variance sad for 4x rectangular blocks.
330K binary size reduction on linux. Speed 5-9 on realtime mode are
bitexact.
Bug: aomedia:2865
Change-Id: I5452c90982e6fe53ba7942d64cecf91afbe4178c
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index 6f8f19b..844115a 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -47,12 +47,15 @@
push @block_sizes, [$w, $h] if ($w <= 2*$h && $h <= 2*$w) ;
}
}
-push @block_sizes, [4, 16];
-push @block_sizes, [16, 4];
-push @block_sizes, [8, 32];
-push @block_sizes, [32, 8];
-push @block_sizes, [16, 64];
-push @block_sizes, [64, 16];
+
+if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
+ push @block_sizes, [4, 16];
+ push @block_sizes, [16, 4];
+ push @block_sizes, [8, 32];
+ push @block_sizes, [32, 8];
+ push @block_sizes, [16, 64];
+ push @block_sizes, [64, 16];
+}
@tx_dims = (2, 4, 8, 16, 32, 64);
@tx_sizes = ();
@@ -1293,25 +1296,34 @@
specialize qw/aom_sub_pixel_avg_variance4x8 msa sse2 ssse3/;
specialize qw/aom_sub_pixel_avg_variance4x4 msa sse2 ssse3/;
- specialize qw/aom_variance4x16 sse2/;
- specialize qw/aom_variance16x4 sse2 avx2/;
- specialize qw/aom_variance8x32 sse2/;
- specialize qw/aom_variance32x8 sse2 avx2/;
- specialize qw/aom_variance16x64 sse2 avx2/;
- specialize qw/aom_variance64x16 sse2 avx2/;
+ if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
+ specialize qw/aom_variance4x16 sse2/;
+ specialize qw/aom_variance16x4 sse2 avx2/;
+ specialize qw/aom_variance8x32 sse2/;
+ specialize qw/aom_variance32x8 sse2 avx2/;
+ specialize qw/aom_variance16x64 sse2 avx2/;
+ specialize qw/aom_variance64x16 sse2 avx2/;
- specialize qw/aom_sub_pixel_variance4x16 neon sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance16x4 neon avx2 sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance8x32 neon sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance32x8 neon sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance16x64 neon avx2 sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance64x16 neon sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance4x16 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance16x4 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance8x32 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance32x8 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance16x64 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance64x16 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance4x16 neon sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance16x4 neon avx2 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance8x32 neon sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance32x8 neon sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance16x64 neon avx2 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance64x16 neon sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance4x16 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance16x4 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance8x32 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance32x8 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance16x64 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance64x16 sse2 ssse3/;
+
+ specialize qw/aom_dist_wtd_sub_pixel_avg_variance4x16 ssse3/;
+ specialize qw/aom_dist_wtd_sub_pixel_avg_variance16x4 ssse3/;
+ specialize qw/aom_dist_wtd_sub_pixel_avg_variance8x32 ssse3/;
+ specialize qw/aom_dist_wtd_sub_pixel_avg_variance32x8 ssse3/;
+ specialize qw/aom_dist_wtd_sub_pixel_avg_variance16x64 ssse3/;
+ specialize qw/aom_dist_wtd_sub_pixel_avg_variance64x16 ssse3/;
+ }
specialize qw/aom_dist_wtd_sub_pixel_avg_variance64x64 ssse3/;
specialize qw/aom_dist_wtd_sub_pixel_avg_variance64x32 ssse3/;
@@ -1327,13 +1339,6 @@
specialize qw/aom_dist_wtd_sub_pixel_avg_variance4x8 ssse3/;
specialize qw/aom_dist_wtd_sub_pixel_avg_variance4x4 ssse3/;
- specialize qw/aom_dist_wtd_sub_pixel_avg_variance4x16 ssse3/;
- specialize qw/aom_dist_wtd_sub_pixel_avg_variance16x4 ssse3/;
- specialize qw/aom_dist_wtd_sub_pixel_avg_variance8x32 ssse3/;
- specialize qw/aom_dist_wtd_sub_pixel_avg_variance32x8 ssse3/;
- specialize qw/aom_dist_wtd_sub_pixel_avg_variance16x64 ssse3/;
- specialize qw/aom_dist_wtd_sub_pixel_avg_variance64x16 ssse3/;
-
specialize qw/aom_dist_wtd_sub_pixel_avg_variance128x128 ssse3/;
specialize qw/aom_dist_wtd_sub_pixel_avg_variance128x64 ssse3/;
specialize qw/aom_dist_wtd_sub_pixel_avg_variance64x128 ssse3/;
diff --git a/aom_dsp/arm/subpel_variance_neon.c b/aom_dsp/arm/subpel_variance_neon.c
index 7c861d4..4ecf891 100644
--- a/aom_dsp/arm/subpel_variance_neon.c
+++ b/aom_dsp/arm/subpel_variance_neon.c
@@ -196,21 +196,6 @@
return aom_variance4x8(temp1, 4, b, b_stride, sse);
}
-unsigned int aom_sub_pixel_variance4x16_neon(const uint8_t *a, int a_stride,
- int xoffset, int yoffset,
- const uint8_t *b, int b_stride,
- uint32_t *sse) {
- uint8_t temp0[4 * (16 + 2)];
- uint8_t temp1[4 * 16];
-
- var_filter_block2d_bil_w4(a, temp0, a_stride, 1, (16 + 2),
- bilinear_filters_2t[xoffset]);
- var_filter_block2d_bil_w4(temp0, temp1, 4, 4, 16,
- bilinear_filters_2t[yoffset]);
-
- return aom_variance4x16(temp1, 4, b, b_stride, sse);
-}
-
unsigned int aom_sub_pixel_variance8x4_neon(const uint8_t *a, int a_stride,
int xoffset, int yoffset,
const uint8_t *b, int b_stride,
@@ -241,36 +226,6 @@
return aom_variance8x16(temp1, 8, b, b_stride, sse);
}
-unsigned int aom_sub_pixel_variance8x32_neon(const uint8_t *a, int a_stride,
- int xoffset, int yoffset,
- const uint8_t *b, int b_stride,
- uint32_t *sse) {
- uint8_t temp0[8 * (32 + 1)];
- uint8_t temp1[8 * 32];
-
- var_filter_block2d_bil_w8(a, temp0, a_stride, 1, (32 + 1), 8,
- bilinear_filters_2t[xoffset]);
- var_filter_block2d_bil_w8(temp0, temp1, 8, 8, 32, 8,
- bilinear_filters_2t[yoffset]);
-
- return aom_variance8x32(temp1, 8, b, b_stride, sse);
-}
-
-unsigned int aom_sub_pixel_variance16x4_neon(const uint8_t *a, int a_stride,
- int xoffset, int yoffset,
- const uint8_t *b, int b_stride,
- uint32_t *sse) {
- uint8_t temp0[16 * (4 + 1)];
- uint8_t temp1[16 * 4];
-
- var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (4 + 1), 16,
- bilinear_filters_2t[xoffset]);
- var_filter_block2d_bil_w16(temp0, temp1, 16, 16, 4, 16,
- bilinear_filters_2t[yoffset]);
-
- return aom_variance16x4(temp1, 16, b, b_stride, sse);
-}
-
unsigned int aom_sub_pixel_variance16x8_neon(const uint8_t *a, int a_stride,
int xoffset, int yoffset,
const uint8_t *b, int b_stride,
@@ -301,36 +256,6 @@
return aom_variance16x32(temp1, 16, b, b_stride, sse);
}
-unsigned int aom_sub_pixel_variance16x64_neon(const uint8_t *a, int a_stride,
- int xoffset, int yoffset,
- const uint8_t *b, int b_stride,
- uint32_t *sse) {
- uint8_t temp0[16 * (64 + 1)];
- uint8_t temp1[16 * 64];
-
- var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (64 + 1), 16,
- bilinear_filters_2t[xoffset]);
- var_filter_block2d_bil_w16(temp0, temp1, 16, 16, 64, 16,
- bilinear_filters_2t[yoffset]);
-
- return aom_variance16x64(temp1, 16, b, b_stride, sse);
-}
-
-unsigned int aom_sub_pixel_variance32x8_neon(const uint8_t *a, int a_stride,
- int xoffset, int yoffset,
- const uint8_t *b, int b_stride,
- uint32_t *sse) {
- uint8_t temp0[32 * (8 + 1)];
- uint8_t temp1[32 * 8];
-
- var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (8 + 1), 32,
- bilinear_filters_2t[xoffset]);
- var_filter_block2d_bil_w16(temp0, temp1, 32, 32, 8, 32,
- bilinear_filters_2t[yoffset]);
-
- return aom_variance32x8(temp1, 32, b, b_stride, sse);
-}
-
unsigned int aom_sub_pixel_variance32x16_neon(const uint8_t *a, int a_stride,
int xoffset, int yoffset,
const uint8_t *b, int b_stride,
@@ -361,21 +286,6 @@
return aom_variance32x64(temp1, 32, b, b_stride, sse);
}
-unsigned int aom_sub_pixel_variance64x16_neon(const uint8_t *a, int a_stride,
- int xoffset, int yoffset,
- const uint8_t *b, int b_stride,
- uint32_t *sse) {
- uint8_t temp0[64 * (16 + 1)];
- uint8_t temp1[64 * 16];
-
- var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (16 + 1), 64,
- bilinear_filters_2t[xoffset]);
- var_filter_block2d_bil_w16(temp0, temp1, 64, 64, 16, 64,
- bilinear_filters_2t[yoffset]);
-
- return aom_variance64x16(temp1, 64, b, b_stride, sse);
-}
-
unsigned int aom_sub_pixel_variance64x32_neon(const uint8_t *a, int a_stride,
int xoffset, int yoffset,
const uint8_t *b, int b_stride,
@@ -435,3 +345,96 @@
return aom_variance128x128(temp1, 128, b, b_stride, sse);
}
+
+// Realtime mode doesn't use 4x rectangular blocks.
+#if !CONFIG_REALTIME_ONLY
+unsigned int aom_sub_pixel_variance4x16_neon(const uint8_t *a, int a_stride,
+ int xoffset, int yoffset,
+ const uint8_t *b, int b_stride,
+ uint32_t *sse) {
+ uint8_t temp0[4 * (16 + 2)];
+ uint8_t temp1[4 * 16];
+
+ var_filter_block2d_bil_w4(a, temp0, a_stride, 1, (16 + 2),
+ bilinear_filters_2t[xoffset]);
+ var_filter_block2d_bil_w4(temp0, temp1, 4, 4, 16,
+ bilinear_filters_2t[yoffset]);
+
+ return aom_variance4x16(temp1, 4, b, b_stride, sse);
+}
+
+unsigned int aom_sub_pixel_variance8x32_neon(const uint8_t *a, int a_stride,
+ int xoffset, int yoffset,
+ const uint8_t *b, int b_stride,
+ uint32_t *sse) {
+ uint8_t temp0[8 * (32 + 1)];
+ uint8_t temp1[8 * 32];
+
+ var_filter_block2d_bil_w8(a, temp0, a_stride, 1, (32 + 1), 8,
+ bilinear_filters_2t[xoffset]);
+ var_filter_block2d_bil_w8(temp0, temp1, 8, 8, 32, 8,
+ bilinear_filters_2t[yoffset]);
+
+ return aom_variance8x32(temp1, 8, b, b_stride, sse);
+}
+
+unsigned int aom_sub_pixel_variance16x4_neon(const uint8_t *a, int a_stride,
+ int xoffset, int yoffset,
+ const uint8_t *b, int b_stride,
+ uint32_t *sse) {
+ uint8_t temp0[16 * (4 + 1)];
+ uint8_t temp1[16 * 4];
+
+ var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (4 + 1), 16,
+ bilinear_filters_2t[xoffset]);
+ var_filter_block2d_bil_w16(temp0, temp1, 16, 16, 4, 16,
+ bilinear_filters_2t[yoffset]);
+
+ return aom_variance16x4(temp1, 16, b, b_stride, sse);
+}
+
+unsigned int aom_sub_pixel_variance64x16_neon(const uint8_t *a, int a_stride,
+ int xoffset, int yoffset,
+ const uint8_t *b, int b_stride,
+ uint32_t *sse) {
+ uint8_t temp0[64 * (16 + 1)];
+ uint8_t temp1[64 * 16];
+
+ var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (16 + 1), 64,
+ bilinear_filters_2t[xoffset]);
+ var_filter_block2d_bil_w16(temp0, temp1, 64, 64, 16, 64,
+ bilinear_filters_2t[yoffset]);
+
+ return aom_variance64x16(temp1, 64, b, b_stride, sse);
+}
+
+unsigned int aom_sub_pixel_variance16x64_neon(const uint8_t *a, int a_stride,
+ int xoffset, int yoffset,
+ const uint8_t *b, int b_stride,
+ uint32_t *sse) {
+ uint8_t temp0[16 * (64 + 1)];
+ uint8_t temp1[16 * 64];
+
+ var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (64 + 1), 16,
+ bilinear_filters_2t[xoffset]);
+ var_filter_block2d_bil_w16(temp0, temp1, 16, 16, 64, 16,
+ bilinear_filters_2t[yoffset]);
+
+ return aom_variance16x64(temp1, 16, b, b_stride, sse);
+}
+
+unsigned int aom_sub_pixel_variance32x8_neon(const uint8_t *a, int a_stride,
+ int xoffset, int yoffset,
+ const uint8_t *b, int b_stride,
+ uint32_t *sse) {
+ uint8_t temp0[32 * (8 + 1)];
+ uint8_t temp1[32 * 8];
+
+ var_filter_block2d_bil_w16(a, temp0, a_stride, 1, (8 + 1), 32,
+ bilinear_filters_2t[xoffset]);
+ var_filter_block2d_bil_w16(temp0, temp1, 32, 32, 8, 32,
+ bilinear_filters_2t[yoffset]);
+
+ return aom_variance32x8(temp1, 32, b, b_stride, sse);
+}
+#endif // !CONFIG_REALTIME_ONLY
diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index c0b0626..20af52b 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -250,12 +250,16 @@
VARIANCES(4, 2)
VARIANCES(2, 4)
VARIANCES(2, 2)
+
+// Realtime mode doesn't use rectangular blocks.
+#if !CONFIG_REALTIME_ONLY
VARIANCES(4, 16)
VARIANCES(16, 4)
VARIANCES(8, 32)
VARIANCES(32, 8)
VARIANCES(16, 64)
VARIANCES(64, 16)
+#endif
GET_VAR(16, 16)
GET_VAR(8, 8)
@@ -790,12 +794,16 @@
HIGHBD_VARIANCES(4, 2)
HIGHBD_VARIANCES(2, 4)
HIGHBD_VARIANCES(2, 2)
+
+// Realtime mode doesn't use 4x rectangular blocks.
+#if !CONFIG_REALTIME_ONLY
HIGHBD_VARIANCES(4, 16)
HIGHBD_VARIANCES(16, 4)
HIGHBD_VARIANCES(8, 32)
HIGHBD_VARIANCES(32, 8)
HIGHBD_VARIANCES(16, 64)
HIGHBD_VARIANCES(64, 16)
+#endif
HIGHBD_GET_VAR(8)
HIGHBD_GET_VAR(16)
@@ -1049,12 +1057,16 @@
MASK_SUBPIX_VAR(64, 128)
MASK_SUBPIX_VAR(128, 64)
MASK_SUBPIX_VAR(128, 128)
+
+// Realtime mode doesn't use 4x rectangular blocks.
+#if !CONFIG_REALTIME_ONLY
MASK_SUBPIX_VAR(4, 16)
MASK_SUBPIX_VAR(16, 4)
MASK_SUBPIX_VAR(8, 32)
MASK_SUBPIX_VAR(32, 8)
MASK_SUBPIX_VAR(16, 64)
MASK_SUBPIX_VAR(64, 16)
+#endif
#if CONFIG_AV1_HIGHBITDEPTH
void aom_highbd_comp_mask_pred_c(uint8_t *comp_pred8, const uint8_t *pred8,
@@ -1175,12 +1187,14 @@
HIGHBD_MASK_SUBPIX_VAR(64, 128)
HIGHBD_MASK_SUBPIX_VAR(128, 64)
HIGHBD_MASK_SUBPIX_VAR(128, 128)
+#if !CONFIG_REALTIME_ONLY
HIGHBD_MASK_SUBPIX_VAR(4, 16)
HIGHBD_MASK_SUBPIX_VAR(16, 4)
HIGHBD_MASK_SUBPIX_VAR(8, 32)
HIGHBD_MASK_SUBPIX_VAR(32, 8)
HIGHBD_MASK_SUBPIX_VAR(16, 64)
HIGHBD_MASK_SUBPIX_VAR(64, 16)
+#endif
#endif // CONFIG_AV1_HIGHBITDEPTH
#if !CONFIG_REALTIME_ONLY
diff --git a/aom_dsp/x86/jnt_variance_ssse3.c b/aom_dsp/x86/jnt_variance_ssse3.c
index c8b02f5..b74f4bf 100644
--- a/aom_dsp/x86/jnt_variance_ssse3.c
+++ b/aom_dsp/x86/jnt_variance_ssse3.c
@@ -184,9 +184,12 @@
DIST_WTD_SUBPIX_AVG_VAR(8, 4)
DIST_WTD_SUBPIX_AVG_VAR(4, 8)
DIST_WTD_SUBPIX_AVG_VAR(4, 4)
+
+#if !CONFIG_REALTIME_ONLY
DIST_WTD_SUBPIX_AVG_VAR(4, 16)
DIST_WTD_SUBPIX_AVG_VAR(16, 4)
DIST_WTD_SUBPIX_AVG_VAR(8, 32)
DIST_WTD_SUBPIX_AVG_VAR(32, 8)
DIST_WTD_SUBPIX_AVG_VAR(16, 64)
DIST_WTD_SUBPIX_AVG_VAR(64, 16)
+#endif
diff --git a/aom_dsp/x86/variance_avx2.c b/aom_dsp/x86/variance_avx2.c
index 16549ca..f69a1c9 100644
--- a/aom_dsp/x86/variance_avx2.c
+++ b/aom_dsp/x86/variance_avx2.c
@@ -186,20 +186,23 @@
return *sse - (uint32_t)(((int64_t)sum * sum) >> bits); \
}
-AOM_VAR_NO_LOOP_AVX2(16, 4, 6, 512);
AOM_VAR_NO_LOOP_AVX2(16, 8, 7, 512);
AOM_VAR_NO_LOOP_AVX2(16, 16, 8, 512);
AOM_VAR_NO_LOOP_AVX2(16, 32, 9, 512);
-AOM_VAR_NO_LOOP_AVX2(16, 64, 10, 1024);
-AOM_VAR_NO_LOOP_AVX2(32, 8, 8, 512);
AOM_VAR_NO_LOOP_AVX2(32, 16, 9, 512);
AOM_VAR_NO_LOOP_AVX2(32, 32, 10, 1024);
AOM_VAR_NO_LOOP_AVX2(32, 64, 11, 2048);
-AOM_VAR_NO_LOOP_AVX2(64, 16, 10, 1024);
AOM_VAR_NO_LOOP_AVX2(64, 32, 11, 2048);
+#if !CONFIG_REALTIME_ONLY
+AOM_VAR_NO_LOOP_AVX2(64, 16, 10, 1024);
+AOM_VAR_NO_LOOP_AVX2(32, 8, 8, 512);
+AOM_VAR_NO_LOOP_AVX2(16, 64, 10, 1024);
+AOM_VAR_NO_LOOP_AVX2(16, 4, 6, 512);
+#endif
+
#define AOM_VAR_LOOP_AVX2(bw, bh, bits, uh) \
unsigned int aom_variance##bw##x##bh##_avx2( \
const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, \
@@ -281,11 +284,13 @@
AOM_SUB_PIXEL_VAR_AVX2(32, 64, 32, 5, 6);
AOM_SUB_PIXEL_VAR_AVX2(32, 32, 32, 5, 5);
AOM_SUB_PIXEL_VAR_AVX2(32, 16, 32, 5, 4);
-AOM_SUB_PIXEL_VAR_AVX2(16, 64, 16, 4, 6);
AOM_SUB_PIXEL_VAR_AVX2(16, 32, 16, 4, 5);
AOM_SUB_PIXEL_VAR_AVX2(16, 16, 16, 4, 4);
AOM_SUB_PIXEL_VAR_AVX2(16, 8, 16, 4, 3);
+#if !CONFIG_REALTIME_ONLY
+AOM_SUB_PIXEL_VAR_AVX2(16, 64, 16, 4, 6);
AOM_SUB_PIXEL_VAR_AVX2(16, 4, 16, 4, 2);
+#endif
#define AOM_SUB_PIXEL_AVG_VAR_AVX2(w, h, wf, wlog2, hlog2) \
unsigned int aom_sub_pixel_avg_variance##w##x##h##_avx2( \
diff --git a/aom_dsp/x86/variance_sse2.c b/aom_dsp/x86/variance_sse2.c
index 3b87c7f..e372a4b 100644
--- a/aom_dsp/x86/variance_sse2.c
+++ b/aom_dsp/x86/variance_sse2.c
@@ -268,18 +268,21 @@
AOM_VAR_NO_LOOP_SSE2(8, 4, 5, 128);
AOM_VAR_NO_LOOP_SSE2(8, 8, 6, 128);
AOM_VAR_NO_LOOP_SSE2(8, 16, 7, 128);
-AOM_VAR_NO_LOOP_SSE2(8, 32, 8, 256);
-AOM_VAR_NO_LOOP_SSE2(16, 4, 6, 128);
AOM_VAR_NO_LOOP_SSE2(16, 8, 7, 128);
AOM_VAR_NO_LOOP_SSE2(16, 16, 8, 256);
AOM_VAR_NO_LOOP_SSE2(16, 32, 9, 512);
-AOM_VAR_NO_LOOP_SSE2(16, 64, 10, 1024);
AOM_VAR_NO_LOOP_SSE2(32, 8, 8, 256);
AOM_VAR_NO_LOOP_SSE2(32, 16, 9, 512);
AOM_VAR_NO_LOOP_SSE2(32, 32, 10, 1024);
+#if !CONFIG_REALTIME_ONLY
+AOM_VAR_NO_LOOP_SSE2(16, 4, 6, 128);
+AOM_VAR_NO_LOOP_SSE2(8, 32, 8, 256);
+AOM_VAR_NO_LOOP_SSE2(16, 64, 10, 1024);
+#endif
+
#define AOM_VAR_LOOP_SSE2(bw, bh, bits, uh) \
unsigned int aom_variance##bw##x##bh##_sse2( \
const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, \
@@ -303,7 +306,6 @@
AOM_VAR_LOOP_SSE2(32, 64, 11, 32); // 32x32 * ( 64/32 )
-AOM_VAR_NO_LOOP_SSE2(64, 16, 10, 1024);
AOM_VAR_LOOP_SSE2(64, 32, 11, 16); // 64x16 * ( 32/16 )
AOM_VAR_LOOP_SSE2(64, 64, 12, 16); // 64x16 * ( 64/16 )
AOM_VAR_LOOP_SSE2(64, 128, 13, 16); // 64x16 * ( 128/16 )
@@ -311,6 +313,10 @@
AOM_VAR_LOOP_SSE2(128, 64, 13, 8); // 128x8 * ( 64/8 )
AOM_VAR_LOOP_SSE2(128, 128, 14, 8); // 128x8 * ( 128/8 )
+#if !CONFIG_REALTIME_ONLY
+AOM_VAR_NO_LOOP_SSE2(64, 16, 10, 1024);
+#endif
+
unsigned int aom_mse8x8_sse2(const uint8_t *src, int src_stride,
const uint8_t *ref, int ref_stride,
unsigned int *sse) {
@@ -384,6 +390,7 @@
return sse - (unsigned int)(cast_prod(cast se * se) >> (wlog2 + hlog2)); \
}
+#if !CONFIG_REALTIME_ONLY
#define FNS(opt) \
FN(128, 128, 16, 7, 7, opt, (int64_t), (int64_t)); \
FN(128, 64, 16, 7, 6, opt, (int64_t), (int64_t)); \
@@ -407,6 +414,25 @@
FN(32, 8, 16, 5, 3, opt, (uint32_t), (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t), (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t), (int64_t))
+#else
+#define FNS(opt) \
+ FN(128, 128, 16, 7, 7, opt, (int64_t), (int64_t)); \
+ FN(128, 64, 16, 7, 6, opt, (int64_t), (int64_t)); \
+ FN(64, 128, 16, 6, 7, opt, (int64_t), (int64_t)); \
+ FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
+ FN(64, 32, 16, 6, 5, opt, (int64_t), (int64_t)); \
+ FN(32, 64, 16, 5, 6, opt, (int64_t), (int64_t)); \
+ FN(32, 32, 16, 5, 5, opt, (int64_t), (int64_t)); \
+ FN(32, 16, 16, 5, 4, opt, (int64_t), (int64_t)); \
+ FN(16, 32, 16, 4, 5, opt, (int64_t), (int64_t)); \
+ FN(16, 16, 16, 4, 4, opt, (uint32_t), (int64_t)); \
+ FN(16, 8, 16, 4, 3, opt, (int32_t), (int32_t)); \
+ FN(8, 16, 8, 3, 4, opt, (int32_t), (int32_t)); \
+ FN(8, 8, 8, 3, 3, opt, (int32_t), (int32_t)); \
+ FN(8, 4, 8, 3, 2, opt, (int32_t), (int32_t)); \
+ FN(4, 8, 4, 2, 3, opt, (int32_t), (int32_t)); \
+ FN(4, 4, 4, 2, 2, opt, (int32_t), (int32_t));
+#endif
FNS(sse2);
FNS(ssse3);
@@ -463,6 +489,7 @@
return sse - (unsigned int)(cast_prod(cast se * se) >> (wlog2 + hlog2)); \
}
+#if !CONFIG_REALTIME_ONLY
#define FNS(opt) \
FN(128, 128, 16, 7, 7, opt, (int64_t), (int64_t)); \
FN(128, 64, 16, 7, 6, opt, (int64_t), (int64_t)); \
@@ -486,6 +513,25 @@
FN(32, 8, 16, 5, 3, opt, (uint32_t), (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t), (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t), (int64_t))
+#else
+#define FNS(opt) \
+ FN(128, 128, 16, 7, 7, opt, (int64_t), (int64_t)); \
+ FN(128, 64, 16, 7, 6, opt, (int64_t), (int64_t)); \
+ FN(64, 128, 16, 6, 7, opt, (int64_t), (int64_t)); \
+ FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
+ FN(64, 32, 16, 6, 5, opt, (int64_t), (int64_t)); \
+ FN(32, 64, 16, 5, 6, opt, (int64_t), (int64_t)); \
+ FN(32, 32, 16, 5, 5, opt, (int64_t), (int64_t)); \
+ FN(32, 16, 16, 5, 4, opt, (int64_t), (int64_t)); \
+ FN(16, 32, 16, 4, 5, opt, (int64_t), (int64_t)); \
+ FN(16, 16, 16, 4, 4, opt, (uint32_t), (int64_t)); \
+ FN(16, 8, 16, 4, 3, opt, (uint32_t), (int32_t)); \
+ FN(8, 16, 8, 3, 4, opt, (uint32_t), (int32_t)); \
+ FN(8, 8, 8, 3, 3, opt, (uint32_t), (int32_t)); \
+ FN(8, 4, 8, 3, 2, opt, (uint32_t), (int32_t)); \
+ FN(4, 8, 4, 2, 3, opt, (uint32_t), (int32_t)); \
+ FN(4, 4, 4, 2, 2, opt, (uint32_t), (int32_t));
+#endif
FNS(sse2);
FNS(ssse3);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index f7059ad..c45d91e 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1068,6 +1068,8 @@
cpi->fn_ptr[BT].jsdaf = JSDAF; \
cpi->fn_ptr[BT].jsvaf = JSVAF;
+// Realtime mode doesn't use 4x rectangular blocks.
+#if !CONFIG_REALTIME_ONLY
BFP(BLOCK_4X16, aom_sad4x16, aom_sad4x16_avg, aom_variance4x16,
aom_sub_pixel_variance4x16, aom_sub_pixel_avg_variance4x16,
aom_sad4x16x4d, aom_dist_wtd_sad4x16_avg,
@@ -1097,6 +1099,7 @@
aom_sub_pixel_variance64x16, aom_sub_pixel_avg_variance64x16,
aom_sad64x16x4d, aom_dist_wtd_sad64x16_avg,
aom_dist_wtd_sub_pixel_avg_variance64x16)
+#endif // !CONFIG_REALTIME_ONLY
BFP(BLOCK_128X128, aom_sad128x128, aom_sad128x128_avg, aom_variance128x128,
aom_sub_pixel_variance128x128, aom_sub_pixel_avg_variance128x128,
@@ -1248,17 +1251,14 @@
MBFP(BLOCK_8X4, aom_masked_sad8x4, aom_masked_sub_pixel_variance8x4)
MBFP(BLOCK_4X4, aom_masked_sad4x4, aom_masked_sub_pixel_variance4x4)
+#if !CONFIG_REALTIME_ONLY
MBFP(BLOCK_4X16, aom_masked_sad4x16, aom_masked_sub_pixel_variance4x16)
-
MBFP(BLOCK_16X4, aom_masked_sad16x4, aom_masked_sub_pixel_variance16x4)
-
MBFP(BLOCK_8X32, aom_masked_sad8x32, aom_masked_sub_pixel_variance8x32)
-
MBFP(BLOCK_32X8, aom_masked_sad32x8, aom_masked_sub_pixel_variance32x8)
-
MBFP(BLOCK_16X64, aom_masked_sad16x64, aom_masked_sub_pixel_variance16x64)
-
MBFP(BLOCK_64X16, aom_masked_sad64x16, aom_masked_sub_pixel_variance64x16)
+#endif
#define SDSFP(BT, SDSF, SDSX4DF) \
cpi->fn_ptr[BT].sdsf = SDSF; \
@@ -1269,21 +1269,26 @@
SDSFP(BLOCK_64X128, aom_sad_skip_64x128, aom_sad_skip_64x128x4d);
SDSFP(BLOCK_64X64, aom_sad_skip_64x64, aom_sad_skip_64x64x4d);
SDSFP(BLOCK_64X32, aom_sad_skip_64x32, aom_sad_skip_64x32x4d);
- SDSFP(BLOCK_64X16, aom_sad_skip_64x16, aom_sad_skip_64x16x4d);
+
SDSFP(BLOCK_32X64, aom_sad_skip_32x64, aom_sad_skip_32x64x4d);
SDSFP(BLOCK_32X32, aom_sad_skip_32x32, aom_sad_skip_32x32x4d);
SDSFP(BLOCK_32X16, aom_sad_skip_32x16, aom_sad_skip_32x16x4d);
- SDSFP(BLOCK_32X8, aom_sad_skip_32x8, aom_sad_skip_32x8x4d);
- SDSFP(BLOCK_16X64, aom_sad_skip_16x64, aom_sad_skip_16x64x4d);
SDSFP(BLOCK_16X32, aom_sad_skip_16x32, aom_sad_skip_16x32x4d);
SDSFP(BLOCK_16X16, aom_sad_skip_16x16, aom_sad_skip_16x16x4d);
SDSFP(BLOCK_16X8, aom_sad_skip_16x8, aom_sad_skip_16x8x4d);
SDSFP(BLOCK_8X16, aom_sad_skip_8x16, aom_sad_skip_8x16x4d);
SDSFP(BLOCK_8X8, aom_sad_skip_8x8, aom_sad_skip_8x8x4d);
- SDSFP(BLOCK_4X16, aom_sad_skip_4x16, aom_sad_skip_4x16x4d);
+
SDSFP(BLOCK_4X8, aom_sad_skip_4x8, aom_sad_skip_4x8x4d);
+
+#if !CONFIG_REALTIME_ONLY
+ SDSFP(BLOCK_64X16, aom_sad_skip_64x16, aom_sad_skip_64x16x4d);
+ SDSFP(BLOCK_16X64, aom_sad_skip_16x64, aom_sad_skip_16x64x4d);
+ SDSFP(BLOCK_32X8, aom_sad_skip_32x8, aom_sad_skip_32x8x4d);
SDSFP(BLOCK_8X32, aom_sad_skip_8x32, aom_sad_skip_8x32x4d);
+ SDSFP(BLOCK_4X16, aom_sad_skip_4x16, aom_sad_skip_4x16x4d);
+#endif
#undef SDSFP
#if CONFIG_AV1_HIGHBITDEPTH
diff --git a/av1/encoder/encoder_utils.h b/av1/encoder/encoder_utils.h
index e6a32ec..ef7538f 100644
--- a/av1/encoder/encoder_utils.h
+++ b/av1/encoder/encoder_utils.h
@@ -277,6 +277,7 @@
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad4x4_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x4x4d)
+#if !CONFIG_REALTIME_ONLY
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad4x16)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad4x16_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x16x4d)
@@ -295,6 +296,7 @@
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x16)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x16_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x16x4d)
+#endif
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad128x128_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad128x64_avg)
@@ -312,12 +314,14 @@
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad8x4_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad4x8_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad4x4_avg)
+#if !CONFIG_REALTIME_ONLY
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad4x16_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad16x4_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad8x32_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad32x8_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad16x64_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad64x16_avg)
+#endif
#endif // CONFIG_AV1_HIGHBITDEPTH
#define HIGHBD_MBFP(BT, MCSDF, MCSVF) \
@@ -371,6 +375,7 @@
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x4)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x8)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x4)
+#if !CONFIG_REALTIME_ONLY
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x16)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad16x4)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x32)
@@ -378,6 +383,7 @@
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad16x64)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x16)
#endif
+#endif
#define HIGHBD_SDSFP(BT, SDSF, SDSX4DF) \
cpi->fn_ptr[BT].sdsf = SDSF; \
@@ -429,41 +435,47 @@
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x128)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x64)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x32)
-MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x16)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x64)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x32)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x16)
-MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x8)
-MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x64)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x32)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x16)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x8)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x16)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x8)
-MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x16)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x8)
+
+#if !CONFIG_REALTIME_ONLY
+MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x16)
+MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x8)
+MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x64)
+MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x16)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x32)
+#endif
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_128x128x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_128x64x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x128x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x64x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x32x4d)
-MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x16x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x64x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x32x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x16x4d)
-MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x8x4d)
-MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x64x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x32x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x16x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x8x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x16x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x8x4d)
-MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x16x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x8x4d)
+
+#if !CONFIG_REALTIME_ONLY
+MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x16x4d)
+MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x8x4d)
+MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x64x4d)
+MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x16x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x32x4d)
#endif
+#endif
#if !CONFIG_REALTIME_ONLY
@@ -534,12 +546,14 @@
if (cm->seq_params.use_highbitdepth) {
switch (cm->seq_params.bit_depth) {
case AOM_BITS_8:
+#if !CONFIG_REALTIME_ONLY
HIGHBD_BFP_WRAPPER(64, 16, 8)
HIGHBD_BFP_WRAPPER(16, 64, 8)
HIGHBD_BFP_WRAPPER(32, 8, 8)
HIGHBD_BFP_WRAPPER(8, 32, 8)
HIGHBD_BFP_WRAPPER(16, 4, 8)
HIGHBD_BFP_WRAPPER(4, 16, 8)
+#endif
HIGHBD_BFP_WRAPPER(32, 16, 8)
HIGHBD_BFP_WRAPPER(16, 32, 8)
HIGHBD_BFP_WRAPPER(64, 32, 8)
@@ -573,13 +587,16 @@
HIGHBD_MBFP_WRAPPER(4, 8, 8)
HIGHBD_MBFP_WRAPPER(8, 4, 8)
HIGHBD_MBFP_WRAPPER(4, 4, 8)
+#if !CONFIG_REALTIME_ONLY
HIGHBD_MBFP_WRAPPER(64, 16, 8)
HIGHBD_MBFP_WRAPPER(16, 64, 8)
HIGHBD_MBFP_WRAPPER(32, 8, 8)
HIGHBD_MBFP_WRAPPER(8, 32, 8)
HIGHBD_MBFP_WRAPPER(16, 4, 8)
HIGHBD_MBFP_WRAPPER(4, 16, 8)
+#endif
+// OBMC excluded from realtime only build.
#if !CONFIG_REALTIME_ONLY
LOWBD_OBFP_WRAPPER(128, 128)
LOWBD_OBFP_WRAPPER(128, 64)
@@ -610,29 +627,33 @@
HIGHBD_SDSFP_WRAPPER(64, 128, 8);
HIGHBD_SDSFP_WRAPPER(64, 64, 8);
HIGHBD_SDSFP_WRAPPER(64, 32, 8);
- HIGHBD_SDSFP_WRAPPER(64, 16, 8);
HIGHBD_SDSFP_WRAPPER(32, 64, 8);
HIGHBD_SDSFP_WRAPPER(32, 32, 8);
HIGHBD_SDSFP_WRAPPER(32, 16, 8);
- HIGHBD_SDSFP_WRAPPER(32, 8, 8);
- HIGHBD_SDSFP_WRAPPER(16, 64, 8);
HIGHBD_SDSFP_WRAPPER(16, 32, 8);
HIGHBD_SDSFP_WRAPPER(16, 16, 8);
HIGHBD_SDSFP_WRAPPER(16, 8, 8);
HIGHBD_SDSFP_WRAPPER(8, 16, 8);
HIGHBD_SDSFP_WRAPPER(8, 8, 8);
- HIGHBD_SDSFP_WRAPPER(4, 16, 8);
HIGHBD_SDSFP_WRAPPER(4, 8, 8);
+#if !CONFIG_REALTIME_ONLY
+ HIGHBD_SDSFP_WRAPPER(64, 16, 8);
+ HIGHBD_SDSFP_WRAPPER(32, 8, 8);
+ HIGHBD_SDSFP_WRAPPER(16, 64, 8);
HIGHBD_SDSFP_WRAPPER(8, 32, 8);
+ HIGHBD_SDSFP_WRAPPER(4, 16, 8);
+#endif
break;
case AOM_BITS_10:
+#if !CONFIG_REALTIME_ONLY
HIGHBD_BFP_WRAPPER(64, 16, 10)
HIGHBD_BFP_WRAPPER(16, 64, 10)
HIGHBD_BFP_WRAPPER(32, 8, 10)
HIGHBD_BFP_WRAPPER(8, 32, 10)
HIGHBD_BFP_WRAPPER(16, 4, 10)
HIGHBD_BFP_WRAPPER(4, 16, 10)
+#endif
HIGHBD_BFP_WRAPPER(32, 16, 10)
HIGHBD_BFP_WRAPPER(16, 32, 10)
HIGHBD_BFP_WRAPPER(64, 32, 10)
@@ -666,13 +687,16 @@
HIGHBD_MBFP_WRAPPER(4, 8, 10)
HIGHBD_MBFP_WRAPPER(8, 4, 10)
HIGHBD_MBFP_WRAPPER(4, 4, 10)
+#if !CONFIG_REALTIME_ONLY
HIGHBD_MBFP_WRAPPER(64, 16, 10)
HIGHBD_MBFP_WRAPPER(16, 64, 10)
HIGHBD_MBFP_WRAPPER(32, 8, 10)
HIGHBD_MBFP_WRAPPER(8, 32, 10)
HIGHBD_MBFP_WRAPPER(16, 4, 10)
HIGHBD_MBFP_WRAPPER(4, 16, 10)
+#endif
+// OBMC excluded from realtime only build.
#if !CONFIG_REALTIME_ONLY
HIGHBD_OBFP_WRAPPER(128, 128, 10)
HIGHBD_OBFP_WRAPPER(128, 64, 10)
@@ -703,29 +727,34 @@
HIGHBD_SDSFP_WRAPPER(64, 128, 10);
HIGHBD_SDSFP_WRAPPER(64, 64, 10);
HIGHBD_SDSFP_WRAPPER(64, 32, 10);
- HIGHBD_SDSFP_WRAPPER(64, 16, 10);
HIGHBD_SDSFP_WRAPPER(32, 64, 10);
HIGHBD_SDSFP_WRAPPER(32, 32, 10);
HIGHBD_SDSFP_WRAPPER(32, 16, 10);
- HIGHBD_SDSFP_WRAPPER(32, 8, 10);
- HIGHBD_SDSFP_WRAPPER(16, 64, 10);
HIGHBD_SDSFP_WRAPPER(16, 32, 10);
HIGHBD_SDSFP_WRAPPER(16, 16, 10);
HIGHBD_SDSFP_WRAPPER(16, 8, 10);
HIGHBD_SDSFP_WRAPPER(8, 16, 10);
HIGHBD_SDSFP_WRAPPER(8, 8, 10);
- HIGHBD_SDSFP_WRAPPER(4, 16, 10);
HIGHBD_SDSFP_WRAPPER(4, 8, 10);
+
+#if !CONFIG_REALTIME_ONLY
+ HIGHBD_SDSFP_WRAPPER(64, 16, 10);
+ HIGHBD_SDSFP_WRAPPER(32, 8, 10);
+ HIGHBD_SDSFP_WRAPPER(16, 64, 10);
HIGHBD_SDSFP_WRAPPER(8, 32, 10);
+ HIGHBD_SDSFP_WRAPPER(4, 16, 10);
+#endif
break;
case AOM_BITS_12:
+#if !CONFIG_REALTIME_ONLY
HIGHBD_BFP_WRAPPER(64, 16, 12)
HIGHBD_BFP_WRAPPER(16, 64, 12)
HIGHBD_BFP_WRAPPER(32, 8, 12)
HIGHBD_BFP_WRAPPER(8, 32, 12)
HIGHBD_BFP_WRAPPER(16, 4, 12)
HIGHBD_BFP_WRAPPER(4, 16, 12)
+#endif
HIGHBD_BFP_WRAPPER(32, 16, 12)
HIGHBD_BFP_WRAPPER(16, 32, 12)
HIGHBD_BFP_WRAPPER(64, 32, 12)
@@ -759,13 +788,16 @@
HIGHBD_MBFP_WRAPPER(4, 8, 12)
HIGHBD_MBFP_WRAPPER(8, 4, 12)
HIGHBD_MBFP_WRAPPER(4, 4, 12)
+#if !CONFIG_REALTIME_ONLY
HIGHBD_MBFP_WRAPPER(64, 16, 12)
HIGHBD_MBFP_WRAPPER(16, 64, 12)
HIGHBD_MBFP_WRAPPER(32, 8, 12)
HIGHBD_MBFP_WRAPPER(8, 32, 12)
HIGHBD_MBFP_WRAPPER(16, 4, 12)
HIGHBD_MBFP_WRAPPER(4, 16, 12)
+#endif
+// OBMC excluded from realtime only build.
#if !CONFIG_REALTIME_ONLY
HIGHBD_OBFP_WRAPPER(128, 128, 12)
HIGHBD_OBFP_WRAPPER(128, 64, 12)
@@ -796,20 +828,23 @@
HIGHBD_SDSFP_WRAPPER(64, 128, 12);
HIGHBD_SDSFP_WRAPPER(64, 64, 12);
HIGHBD_SDSFP_WRAPPER(64, 32, 12);
- HIGHBD_SDSFP_WRAPPER(64, 16, 12);
HIGHBD_SDSFP_WRAPPER(32, 64, 12);
HIGHBD_SDSFP_WRAPPER(32, 32, 12);
HIGHBD_SDSFP_WRAPPER(32, 16, 12);
- HIGHBD_SDSFP_WRAPPER(32, 8, 12);
- HIGHBD_SDSFP_WRAPPER(16, 64, 12);
HIGHBD_SDSFP_WRAPPER(16, 32, 12);
HIGHBD_SDSFP_WRAPPER(16, 16, 12);
HIGHBD_SDSFP_WRAPPER(16, 8, 12);
HIGHBD_SDSFP_WRAPPER(8, 16, 12);
HIGHBD_SDSFP_WRAPPER(8, 8, 12);
- HIGHBD_SDSFP_WRAPPER(4, 16, 12);
HIGHBD_SDSFP_WRAPPER(4, 8, 12);
+
+#if !CONFIG_REALTIME_ONLY
+ HIGHBD_SDSFP_WRAPPER(64, 16, 12);
+ HIGHBD_SDSFP_WRAPPER(32, 8, 12);
+ HIGHBD_SDSFP_WRAPPER(16, 64, 12);
HIGHBD_SDSFP_WRAPPER(8, 32, 12);
+ HIGHBD_SDSFP_WRAPPER(4, 16, 12);
+#endif
break;
default:
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index 61d8fc2..df7b3f8 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -352,12 +352,14 @@
make_tuple(&aom_masked_sad64x128_ssse3, &aom_masked_sad64x128_c),
make_tuple(&aom_masked_sad128x64_ssse3, &aom_masked_sad128x64_c),
make_tuple(&aom_masked_sad128x128_ssse3, &aom_masked_sad128x128_c),
+#if !CONFIG_REALTIME_ONLY
make_tuple(&aom_masked_sad4x16_ssse3, &aom_masked_sad4x16_c),
make_tuple(&aom_masked_sad16x4_ssse3, &aom_masked_sad16x4_c),
make_tuple(&aom_masked_sad8x32_ssse3, &aom_masked_sad8x32_c),
make_tuple(&aom_masked_sad32x8_ssse3, &aom_masked_sad32x8_c),
make_tuple(&aom_masked_sad16x64_ssse3, &aom_masked_sad16x64_c),
make_tuple(&aom_masked_sad64x16_ssse3, &aom_masked_sad64x16_c),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSSE3, MaskedSADTest, ::testing::ValuesIn(msad_test));
@@ -379,12 +381,14 @@
make_tuple(&aom_masked_sad64x128x4d_ssse3, &aom_masked_sad64x128x4d_c),
make_tuple(&aom_masked_sad128x64x4d_ssse3, &aom_masked_sad128x64x4d_c),
make_tuple(&aom_masked_sad128x128x4d_ssse3, &aom_masked_sad128x128x4d_c),
+#if !CONFIG_REALTIME_ONLY
make_tuple(&aom_masked_sad4x16x4d_ssse3, &aom_masked_sad4x16x4d_c),
make_tuple(&aom_masked_sad16x4x4d_ssse3, &aom_masked_sad16x4x4d_c),
make_tuple(&aom_masked_sad8x32x4d_ssse3, &aom_masked_sad8x32x4d_c),
make_tuple(&aom_masked_sad32x8x4d_ssse3, &aom_masked_sad32x8x4d_c),
make_tuple(&aom_masked_sad16x64x4d_ssse3, &aom_masked_sad16x64x4d_c),
make_tuple(&aom_masked_sad64x16x4d_ssse3, &aom_masked_sad64x16x4d_c),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSSE3, MaskedSADx4Test,
@@ -411,12 +415,14 @@
&aom_highbd_masked_sad128x64_c),
make_tuple(&aom_highbd_masked_sad128x128_ssse3,
&aom_highbd_masked_sad128x128_c),
+#if !CONFIG_REALTIME_ONLY
make_tuple(&aom_highbd_masked_sad4x16_ssse3, &aom_highbd_masked_sad4x16_c),
make_tuple(&aom_highbd_masked_sad16x4_ssse3, &aom_highbd_masked_sad16x4_c),
make_tuple(&aom_highbd_masked_sad8x32_ssse3, &aom_highbd_masked_sad8x32_c),
make_tuple(&aom_highbd_masked_sad32x8_ssse3, &aom_highbd_masked_sad32x8_c),
make_tuple(&aom_highbd_masked_sad16x64_ssse3, &aom_highbd_masked_sad16x64_c),
make_tuple(&aom_highbd_masked_sad64x16_ssse3, &aom_highbd_masked_sad64x16_c),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSSE3, HighbdMaskedSADTest,
@@ -442,12 +448,14 @@
make_tuple(&aom_masked_sad64x128_avx2, &aom_masked_sad64x128_ssse3),
make_tuple(&aom_masked_sad128x64_avx2, &aom_masked_sad128x64_ssse3),
make_tuple(&aom_masked_sad128x128_avx2, &aom_masked_sad128x128_ssse3),
+#if !CONFIG_REALTIME_ONLY
make_tuple(&aom_masked_sad4x16_avx2, &aom_masked_sad4x16_ssse3),
make_tuple(&aom_masked_sad16x4_avx2, &aom_masked_sad16x4_ssse3),
make_tuple(&aom_masked_sad8x32_avx2, &aom_masked_sad8x32_ssse3),
make_tuple(&aom_masked_sad32x8_avx2, &aom_masked_sad32x8_ssse3),
make_tuple(&aom_masked_sad16x64_avx2, &aom_masked_sad16x64_ssse3),
make_tuple(&aom_masked_sad64x16_avx2, &aom_masked_sad64x16_ssse3)
+#endif
};
INSTANTIATE_TEST_SUITE_P(AVX2, MaskedSADTest,
@@ -481,6 +489,7 @@
&aom_highbd_masked_sad128x64_ssse3),
make_tuple(&aom_highbd_masked_sad128x128_avx2,
&aom_highbd_masked_sad128x128_ssse3),
+#if !CONFIG_REALTIME_ONLY
make_tuple(&aom_highbd_masked_sad4x16_avx2, &aom_highbd_masked_sad4x16_ssse3),
make_tuple(&aom_highbd_masked_sad16x4_avx2, &aom_highbd_masked_sad16x4_ssse3),
make_tuple(&aom_highbd_masked_sad8x32_avx2, &aom_highbd_masked_sad8x32_ssse3),
@@ -489,6 +498,7 @@
&aom_highbd_masked_sad16x64_ssse3),
make_tuple(&aom_highbd_masked_sad64x16_avx2,
&aom_highbd_masked_sad64x16_ssse3)
+#endif
};
INSTANTIATE_TEST_SUITE_P(AVX2, HighbdMaskedSADTest,
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index 49ed3b1..afffce9 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -354,7 +354,7 @@
&aom_masked_sub_pixel_variance4x8_c),
make_tuple(&aom_masked_sub_pixel_variance4x4_ssse3,
&aom_masked_sub_pixel_variance4x4_c),
-
+#if !CONFIG_REALTIME_ONLY
make_tuple(&aom_masked_sub_pixel_variance64x16_ssse3,
&aom_masked_sub_pixel_variance64x16_c),
make_tuple(&aom_masked_sub_pixel_variance16x64_ssse3,
@@ -367,6 +367,7 @@
&aom_masked_sub_pixel_variance16x4_c),
make_tuple(&aom_masked_sub_pixel_variance4x16_ssse3,
&aom_masked_sub_pixel_variance4x16_c),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSSE3_C_COMPARE, MaskedSubPixelVarianceTest,
@@ -470,7 +471,7 @@
&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),
-
+#if !CONFIG_REALTIME_ONLY
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,
@@ -507,6 +508,7 @@
&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),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSSE3_C_COMPARE, HighbdMaskedSubPixelVarianceTest,
diff --git a/test/sad_test.cc b/test/sad_test.cc
index e561859..afd84a8 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -1249,6 +1249,7 @@
make_tuple(4, 8, &aom_highbd_sad4x8_c, 12),
make_tuple(4, 4, &aom_highbd_sad4x4_c, 12),
#endif // CONFIG_AV1_HIGHBITDEPTH
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16_c, -1),
make_tuple(16, 64, &aom_sad16x64_c, -1),
#if CONFIG_AV1_HIGHBITDEPTH
@@ -1279,6 +1280,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_c, 12),
make_tuple(4, 16, &aom_highbd_sad4x16_c, 12),
#endif
+#endif // !CONFIG_REALTIME_ONLY
};
INSTANTIATE_TEST_SUITE_P(C, SADTest, ::testing::ValuesIn(c_tests));
@@ -1299,13 +1301,14 @@
make_tuple(8, 4, &aom_sad_skip_8x4_c, -1),
make_tuple(4, 8, &aom_sad_skip_4x8_c, -1),
make_tuple(4, 4, &aom_sad_skip_4x4_c, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad_skip_64x16_c, -1),
make_tuple(16, 64, &aom_sad_skip_16x64_c, -1),
make_tuple(32, 8, &aom_sad_skip_32x8_c, -1),
make_tuple(8, 32, &aom_sad_skip_8x32_c, -1),
make_tuple(16, 4, &aom_sad_skip_16x4_c, -1),
make_tuple(4, 16, &aom_sad_skip_4x16_c, -1),
-
+#endif
#if CONFIG_AV1_HIGHBITDEPTH
make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 8),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64_c, 8),
@@ -1323,13 +1326,14 @@
make_tuple(8, 4, &aom_highbd_sad_skip_8x4_c, 8),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_c, 8),
make_tuple(4, 4, &aom_highbd_sad_skip_4x4_c, 8),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_c, 8),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_c, 8),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_c, 8),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_c, 8),
make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 8),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 8),
-
+#endif
make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 10),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64_c, 10),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128_c, 10),
@@ -1346,13 +1350,14 @@
make_tuple(8, 4, &aom_highbd_sad_skip_8x4_c, 10),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_c, 10),
make_tuple(4, 4, &aom_highbd_sad_skip_4x4_c, 10),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_c, 10),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_c, 10),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_c, 10),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_c, 10),
make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 10),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 10),
-
+#endif
make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 12),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64_c, 12),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128_c, 12),
@@ -1369,13 +1374,15 @@
make_tuple(8, 4, &aom_highbd_sad_skip_8x4_c, 12),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_c, 12),
make_tuple(4, 4, &aom_highbd_sad_skip_4x4_c, 12),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_c, 12),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_c, 12),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_c, 12),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_c, 12),
make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 12),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 12),
-#endif
+#endif // !CONFIG_REALTIME_ONLY
+#endif // CONFIG_AV1_HIGHBITDEPTH
};
INSTANTIATE_TEST_SUITE_P(C, SADSkipTest, ::testing::ValuesIn(skip_c_tests));
@@ -1446,6 +1453,7 @@
make_tuple(4, 8, &aom_highbd_sad4x8_avg_c, 12),
make_tuple(4, 4, &aom_highbd_sad4x4_avg_c, 12),
#endif // CONFIG_AV1_HIGHBITDEPTH
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16_avg_c, -1),
make_tuple(16, 64, &aom_sad16x64_avg_c, -1),
#if CONFIG_AV1_HIGHBITDEPTH
@@ -1476,6 +1484,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_avg_c, 12),
make_tuple(4, 16, &aom_highbd_sad4x16_avg_c, 12),
#endif
+#endif // !CONFIG_REALTIME_ONLY
};
INSTANTIATE_TEST_SUITE_P(C, SADavgTest, ::testing::ValuesIn(avg_c_tests));
@@ -1498,12 +1507,14 @@
make_tuple(4, 8, &aom_dist_wtd_comp_avg_pred_c, -1),
make_tuple(4, 4, &aom_dist_wtd_comp_avg_pred_c, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_dist_wtd_comp_avg_pred_c, -1),
make_tuple(16, 64, &aom_dist_wtd_comp_avg_pred_c, -1),
make_tuple(32, 8, &aom_dist_wtd_comp_avg_pred_c, -1),
make_tuple(8, 32, &aom_dist_wtd_comp_avg_pred_c, -1),
make_tuple(16, 4, &aom_dist_wtd_comp_avg_pred_c, -1),
make_tuple(4, 16, &aom_dist_wtd_comp_avg_pred_c, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(C, DistWtdCompAvgTest,
@@ -1527,12 +1538,14 @@
make_tuple(4, 8, &aom_dist_wtd_sad4x8_avg_c, -1),
make_tuple(4, 4, &aom_dist_wtd_sad4x4_avg_c, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_dist_wtd_sad64x16_avg_c, -1),
make_tuple(16, 64, &aom_dist_wtd_sad16x64_avg_c, -1),
make_tuple(32, 8, &aom_dist_wtd_sad32x8_avg_c, -1),
make_tuple(8, 32, &aom_dist_wtd_sad8x32_avg_c, -1),
make_tuple(16, 4, &aom_dist_wtd_sad16x4_avg_c, -1),
make_tuple(4, 16, &aom_dist_wtd_sad4x16_avg_c, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(C, DistWtdSADavgTest,
@@ -1605,6 +1618,7 @@
make_tuple(4, 8, &aom_highbd_sad4x8x4d_c, 12),
make_tuple(4, 4, &aom_highbd_sad4x4x4d_c, 12),
#endif
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16x4d_c, -1),
make_tuple(16, 64, &aom_sad16x64x4d_c, -1),
#if CONFIG_AV1_HIGHBITDEPTH
@@ -1635,6 +1649,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4x4d_c, 12),
make_tuple(4, 16, &aom_highbd_sad4x16x4d_c, 12),
#endif
+#endif // !CONFIG_REALTIME_ONLY
};
INSTANTIATE_TEST_SUITE_P(C, SADx4Test, ::testing::ValuesIn(x4d_c_tests));
@@ -1653,12 +1668,13 @@
make_tuple(8, 16, &aom_sad_skip_8x16x4d_c, -1),
make_tuple(8, 8, &aom_sad_skip_8x8x4d_c, -1),
make_tuple(4, 8, &aom_sad_skip_4x8x4d_c, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad_skip_64x16x4d_c, -1),
make_tuple(16, 64, &aom_sad_skip_16x64x4d_c, -1),
make_tuple(32, 8, &aom_sad_skip_32x8x4d_c, -1),
make_tuple(8, 32, &aom_sad_skip_8x32x4d_c, -1),
make_tuple(4, 16, &aom_sad_skip_4x16x4d_c, -1),
-
+#endif
#if CONFIG_AV1_HIGHBITDEPTH
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_c, 8),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_c, 8),
@@ -1676,12 +1692,14 @@
make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_c, 8),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_c, 8),
make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_c, 8),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_c, 8),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_c, 8),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_c, 8),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_c, 8),
make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 8),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 8),
+#endif
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_c, 10),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_c, 10),
@@ -1699,12 +1717,14 @@
make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_c, 10),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_c, 10),
make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_c, 10),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_c, 10),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_c, 10),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_c, 10),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_c, 10),
make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 10),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 10),
+#endif
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_c, 12),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_c, 12),
@@ -1722,6 +1742,7 @@
make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_c, 12),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_c, 12),
make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_c, 12),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_c, 12),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_c, 12),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_c, 12),
@@ -1729,6 +1750,7 @@
make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 12),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 12),
#endif
+#endif // CONFIG_AV1_HIGHBITDEPTH
};
INSTANTIATE_TEST_SUITE_P(C, SADSkipx4Test,
::testing::ValuesIn(skip_x4d_c_tests));
@@ -1750,12 +1772,14 @@
make_tuple(8, 4, &aom_sad8x4x4d_avg_c, -1),
make_tuple(4, 8, &aom_sad4x8x4d_avg_c, -1),
make_tuple(4, 4, &aom_sad4x4x4d_avg_c, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16x4d_avg_c, -1),
make_tuple(16, 64, &aom_sad16x64x4d_avg_c, -1),
make_tuple(32, 8, &aom_sad32x8x4d_avg_c, -1),
make_tuple(8, 32, &aom_sad8x32x4d_avg_c, -1),
make_tuple(16, 4, &aom_sad16x4x4d_avg_c, -1),
make_tuple(4, 16, &aom_sad4x16x4d_avg_c, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(C, SADx4AvgTest, ::testing::ValuesIn(x4d_avg_c_tests));
@@ -1786,20 +1810,22 @@
make_tuple(64, 128, &aom_sad_skip_64x128_neon, -1),
make_tuple(64, 64, &aom_sad_skip_64x64_neon, -1),
make_tuple(64, 32, &aom_sad_skip_64x32_neon, -1),
- make_tuple(64, 16, &aom_sad_skip_64x16_neon, -1),
make_tuple(32, 64, &aom_sad_skip_32x64_neon, -1),
make_tuple(32, 32, &aom_sad_skip_32x32_neon, -1),
make_tuple(32, 16, &aom_sad_skip_32x16_neon, -1),
- make_tuple(32, 8, &aom_sad_skip_32x8_neon, -1),
- make_tuple(16, 64, &aom_sad_skip_16x64_neon, -1),
make_tuple(16, 32, &aom_sad_skip_16x32_neon, -1),
make_tuple(16, 16, &aom_sad_skip_16x16_neon, -1),
make_tuple(16, 8, &aom_sad_skip_16x8_neon, -1),
- make_tuple(8, 32, &aom_sad_skip_8x32_neon, -1),
make_tuple(8, 16, &aom_sad_skip_8x16_neon, -1),
make_tuple(8, 8, &aom_sad_skip_8x8_neon, -1),
- make_tuple(4, 16, &aom_sad_skip_4x16_neon, -1),
make_tuple(4, 8, &aom_sad_skip_4x8_neon, -1),
+#if !CONFIG_REALTIME_ONLY
+ make_tuple(64, 16, &aom_sad_skip_64x16_neon, -1),
+ make_tuple(32, 8, &aom_sad_skip_32x8_neon, -1),
+ make_tuple(16, 64, &aom_sad_skip_16x64_neon, -1),
+ make_tuple(8, 32, &aom_sad_skip_8x32_neon, -1),
+ make_tuple(4, 16, &aom_sad_skip_4x16_neon, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(NEON, SADSkipTest,
::testing::ValuesIn(skip_neon_tests));
@@ -1810,20 +1836,22 @@
make_tuple(64, 128, &aom_sad_skip_64x128x4d_neon, -1),
make_tuple(64, 64, &aom_sad_skip_64x64x4d_neon, -1),
make_tuple(64, 32, &aom_sad_skip_64x32x4d_neon, -1),
- make_tuple(64, 16, &aom_sad_skip_64x16x4d_neon, -1),
make_tuple(32, 64, &aom_sad_skip_32x64x4d_neon, -1),
make_tuple(32, 32, &aom_sad_skip_32x32x4d_neon, -1),
make_tuple(32, 16, &aom_sad_skip_32x16x4d_neon, -1),
- make_tuple(32, 8, &aom_sad_skip_32x8x4d_neon, -1),
- make_tuple(16, 64, &aom_sad_skip_16x64x4d_neon, -1),
make_tuple(16, 32, &aom_sad_skip_16x32x4d_neon, -1),
make_tuple(16, 16, &aom_sad_skip_16x16x4d_neon, -1),
make_tuple(16, 8, &aom_sad_skip_16x8x4d_neon, -1),
make_tuple(8, 8, &aom_sad_skip_8x8x4d_neon, -1),
make_tuple(8, 16, &aom_sad_skip_8x16x4d_neon, -1),
- make_tuple(8, 32, &aom_sad_skip_8x32x4d_neon, -1),
make_tuple(4, 8, &aom_sad_skip_4x8x4d_neon, -1),
+#if !CONFIG_REALTIME_ONLY
+ make_tuple(64, 16, &aom_sad_skip_64x16x4d_neon, -1),
+ make_tuple(32, 8, &aom_sad_skip_32x8x4d_neon, -1),
+ make_tuple(16, 64, &aom_sad_skip_16x64x4d_neon, -1),
+ make_tuple(8, 32, &aom_sad_skip_8x32x4d_neon, -1),
make_tuple(4, 16, &aom_sad_skip_4x16x4d_neon, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(NEON, SADSkipx4Test,
::testing::ValuesIn(skip_x4d_neon_tests));
@@ -1890,6 +1918,7 @@
make_tuple(4, 8, &aom_highbd_sad4x8_sse2, 12),
make_tuple(4, 4, &aom_highbd_sad4x4_sse2, 12),
#endif
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16_sse2, -1),
make_tuple(16, 64, &aom_sad16x64_sse2, -1),
#if CONFIG_AV1_HIGHBITDEPTH
@@ -1920,6 +1949,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_sse2, 12),
make_tuple(4, 16, &aom_highbd_sad4x16_sse2, 12),
#endif
+#endif // !CONFIG_REALTIME_ONLY
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADTest, ::testing::ValuesIn(sse2_tests));
@@ -1938,12 +1968,13 @@
make_tuple(8, 16, &aom_sad_skip_8x16_sse2, -1),
make_tuple(8, 8, &aom_sad_skip_8x8_sse2, -1),
make_tuple(4, 8, &aom_sad_skip_4x8_sse2, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad_skip_64x16_sse2, -1),
make_tuple(16, 64, &aom_sad_skip_16x64_sse2, -1),
make_tuple(32, 8, &aom_sad_skip_32x8_sse2, -1),
make_tuple(8, 32, &aom_sad_skip_8x32_sse2, -1),
make_tuple(4, 16, &aom_sad_skip_4x16_sse2, -1),
-
+#endif
#if CONFIG_AV1_HIGHBITDEPTH
make_tuple(64, 64, &aom_highbd_sad_skip_64x64_sse2, 8),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32_sse2, 8),
@@ -1956,11 +1987,13 @@
make_tuple(8, 16, &aom_highbd_sad_skip_8x16_sse2, 8),
make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 8),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 8),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 8),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 8),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_sse2, 8),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_sse2, 8),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_sse2, 8),
+#endif
make_tuple(64, 64, &aom_highbd_sad_skip_64x64_sse2, 10),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32_sse2, 10),
@@ -1973,11 +2006,13 @@
make_tuple(8, 16, &aom_highbd_sad_skip_8x16_sse2, 10),
make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 10),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 10),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 10),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 10),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_sse2, 10),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_sse2, 10),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_sse2, 10),
+#endif
make_tuple(64, 64, &aom_highbd_sad_skip_64x64_sse2, 12),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32_sse2, 12),
@@ -1990,11 +2025,13 @@
make_tuple(8, 16, &aom_highbd_sad_skip_8x16_sse2, 12),
make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 12),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 12),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 12),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 12),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_sse2, 12),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_sse2, 12),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_sse2, 12),
+#endif
#endif // CONFIG_AV1_HIGHBITDEPTH
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADSkipTest,
@@ -2058,6 +2095,7 @@
make_tuple(4, 8, &aom_highbd_sad4x8_avg_sse2, 12),
make_tuple(4, 4, &aom_highbd_sad4x4_avg_sse2, 12),
#endif
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16_avg_sse2, -1),
make_tuple(16, 64, &aom_sad16x64_avg_sse2, -1),
#if CONFIG_AV1_HIGHBITDEPTH
@@ -2088,6 +2126,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_avg_sse2, 12),
make_tuple(4, 16, &aom_highbd_sad4x16_avg_sse2, 12),
#endif
+#endif // !CONFIG_REALTIME_ONLY
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADavgTest, ::testing::ValuesIn(avg_sse2_tests));
@@ -2149,6 +2188,7 @@
make_tuple(4, 8, &aom_highbd_sad4x8x4d_sse2, 12),
make_tuple(4, 4, &aom_highbd_sad4x4x4d_sse2, 12),
#endif
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16x4d_sse2, -1),
make_tuple(16, 64, &aom_sad16x64x4d_sse2, -1),
#if CONFIG_AV1_HIGHBITDEPTH
@@ -2179,6 +2219,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4x4d_sse2, 12),
make_tuple(4, 16, &aom_highbd_sad4x16x4d_sse2, 12),
#endif
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADx4Test, ::testing::ValuesIn(x4d_sse2_tests));
@@ -2197,12 +2238,13 @@
make_tuple(8, 16, &aom_sad_skip_8x16x4d_sse2, -1),
make_tuple(8, 8, &aom_sad_skip_8x8x4d_sse2, -1),
make_tuple(4, 8, &aom_sad_skip_4x8x4d_sse2, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad_skip_64x16x4d_sse2, -1),
make_tuple(16, 64, &aom_sad_skip_16x64x4d_sse2, -1),
make_tuple(32, 8, &aom_sad_skip_32x8x4d_sse2, -1),
make_tuple(8, 32, &aom_sad_skip_8x32x4d_sse2, -1),
make_tuple(4, 16, &aom_sad_skip_4x16x4d_sse2, -1),
-
+#endif
#if CONFIG_AV1_HIGHBITDEPTH
make_tuple(64, 64, &aom_highbd_sad_skip_64x64x4d_sse2, 8),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32x4d_sse2, 8),
@@ -2215,12 +2257,13 @@
make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_sse2, 8),
make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_sse2, 8),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_sse2, 8),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_sse2, 8),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_sse2, 8),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_sse2, 8),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_sse2, 8),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_sse2, 8),
-
+#endif
make_tuple(64, 64, &aom_highbd_sad_skip_64x64x4d_sse2, 10),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32x4d_sse2, 10),
make_tuple(32, 64, &aom_highbd_sad_skip_32x64x4d_sse2, 10),
@@ -2232,12 +2275,13 @@
make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_sse2, 10),
make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_sse2, 10),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_sse2, 10),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_sse2, 10),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_sse2, 10),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_sse2, 10),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_sse2, 10),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_sse2, 10),
-
+#endif
make_tuple(64, 64, &aom_highbd_sad_skip_64x64x4d_sse2, 12),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32x4d_sse2, 12),
make_tuple(32, 64, &aom_highbd_sad_skip_32x64x4d_sse2, 12),
@@ -2249,12 +2293,13 @@
make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_sse2, 12),
make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_sse2, 12),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_sse2, 12),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_sse2, 12),
make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_sse2, 12),
make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_sse2, 12),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_sse2, 12),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_sse2, 12),
-
+#endif
#endif // CONFIG_AV1_HIGHBITDEPTH
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADSkipx4Test,
@@ -2277,12 +2322,14 @@
make_tuple(8, 4, &aom_sad8x4x4d_avg_sse2, -1),
make_tuple(4, 8, &aom_sad4x8x4d_avg_sse2, -1),
make_tuple(4, 4, &aom_sad4x4x4d_avg_sse2, -1),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_sad64x16x4d_avg_sse2, -1),
make_tuple(16, 64, &aom_sad16x64x4d_avg_sse2, -1),
make_tuple(32, 8, &aom_sad32x8x4d_avg_sse2, -1),
make_tuple(8, 32, &aom_sad8x32x4d_avg_sse2, -1),
make_tuple(16, 4, &aom_sad16x4x4d_avg_sse2, -1),
make_tuple(4, 16, &aom_sad4x16x4d_avg_sse2, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADx4AvgTest,
::testing::ValuesIn(x4d_avg_sse2_tests));
@@ -2314,13 +2361,14 @@
make_tuple(32, 8, &aom_sad32xh_sse2, -1),
make_tuple(16, 64, &aom_sad16xh_sse2, -1),
make_tuple(64, 16, &aom_sad64xh_sse2, -1),
-
+#if !CONFIG_REALTIME_ONLY
make_tuple(16, 64, &aom_sad16xh_sse2, -1),
make_tuple(64, 16, &aom_sad64xh_sse2, -1),
make_tuple(8, 32, &aom_sad8xh_sse2, -1),
make_tuple(32, 8, &aom_sad32xh_sse2, -1),
make_tuple(4, 16, &aom_sad4xh_sse2, -1),
make_tuple(16, 4, &aom_sad16xh_sse2, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSE2, DistWtdSADTest,
::testing::ValuesIn(dist_wtd_sad_sse2_tests));
@@ -2350,13 +2398,14 @@
make_tuple(4, 8, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
make_tuple(4, 4, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
make_tuple(16, 16, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
-
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
make_tuple(16, 64, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
make_tuple(32, 8, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
make_tuple(8, 32, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
make_tuple(16, 4, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
make_tuple(4, 16, &aom_dist_wtd_comp_avg_pred_ssse3, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSSE3, DistWtdCompAvgTest,
@@ -2379,13 +2428,14 @@
make_tuple(8, 4, &aom_dist_wtd_sad8x4_avg_ssse3, -1),
make_tuple(4, 8, &aom_dist_wtd_sad4x8_avg_ssse3, -1),
make_tuple(4, 4, &aom_dist_wtd_sad4x4_avg_ssse3, -1),
-
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_dist_wtd_sad64x16_avg_ssse3, -1),
make_tuple(16, 64, &aom_dist_wtd_sad16x64_avg_ssse3, -1),
make_tuple(32, 8, &aom_dist_wtd_sad32x8_avg_ssse3, -1),
make_tuple(8, 32, &aom_dist_wtd_sad8x32_avg_ssse3, -1),
make_tuple(16, 4, &aom_dist_wtd_sad16x4_avg_ssse3, -1),
make_tuple(4, 16, &aom_dist_wtd_sad4x16_avg_ssse3, -1),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSSE3, DistWtdSADavgTest,
::testing::ValuesIn(dist_wtd_avg_ssse3_tests));
@@ -2440,6 +2490,7 @@
make_tuple(16, 8, &aom_highbd_sad16x8_avx2, 10),
make_tuple(16, 8, &aom_highbd_sad16x8_avx2, 12),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad64x16_avx2, 8),
make_tuple(64, 16, &aom_highbd_sad64x16_avx2, 10),
make_tuple(64, 16, &aom_highbd_sad64x16_avx2, 12),
@@ -2453,6 +2504,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_avx2, 10),
make_tuple(16, 4, &aom_highbd_sad16x4_avx2, 12),
#endif
+#endif
};
INSTANTIATE_TEST_SUITE_P(AVX2, SADTest, ::testing::ValuesIn(avx2_tests));
@@ -2474,7 +2526,6 @@
make_tuple(32, 64, &aom_highbd_sad_skip_32x64_avx2, 8),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32_avx2, 8),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16_avx2, 8),
- make_tuple(16, 64, &aom_highbd_sad_skip_16x64_avx2, 8),
make_tuple(16, 32, &aom_highbd_sad_skip_16x32_avx2, 8),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16_avx2, 8),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8_avx2, 8),
@@ -2487,7 +2538,6 @@
make_tuple(32, 64, &aom_highbd_sad_skip_32x64_avx2, 10),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32_avx2, 10),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16_avx2, 10),
- make_tuple(16, 64, &aom_highbd_sad_skip_16x64_avx2, 10),
make_tuple(16, 32, &aom_highbd_sad_skip_16x32_avx2, 10),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16_avx2, 10),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8_avx2, 10),
@@ -2500,10 +2550,15 @@
make_tuple(32, 64, &aom_highbd_sad_skip_32x64_avx2, 12),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32_avx2, 12),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16_avx2, 12),
- make_tuple(16, 64, &aom_highbd_sad_skip_16x64_avx2, 12),
make_tuple(16, 32, &aom_highbd_sad_skip_16x32_avx2, 12),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16_avx2, 12),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8_avx2, 12),
+
+#if !CONFIG_REALTIME_ONLY
+ make_tuple(16, 64, &aom_highbd_sad_skip_16x64_avx2, 8),
+ make_tuple(16, 64, &aom_highbd_sad_skip_16x64_avx2, 10),
+ make_tuple(16, 64, &aom_highbd_sad_skip_16x64_avx2, 12),
+#endif
#endif
};
INSTANTIATE_TEST_SUITE_P(AVX2, SADSkipTest,
@@ -2553,6 +2608,7 @@
make_tuple(16, 8, &aom_highbd_sad16x8_avg_avx2, 10),
make_tuple(16, 8, &aom_highbd_sad16x8_avg_avx2, 12),
+#if !CONFIG_REALTIME_ONLY
make_tuple(64, 16, &aom_highbd_sad64x16_avg_avx2, 8),
make_tuple(64, 16, &aom_highbd_sad64x16_avg_avx2, 10),
make_tuple(64, 16, &aom_highbd_sad64x16_avg_avx2, 12),
@@ -2566,6 +2622,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_avg_avx2, 10),
make_tuple(16, 4, &aom_highbd_sad16x4_avg_avx2, 12),
#endif
+#endif
};
INSTANTIATE_TEST_SUITE_P(AVX2, SADavgTest, ::testing::ValuesIn(avg_avx2_tests));
@@ -2575,23 +2632,19 @@
make_tuple(64, 128, &aom_sad_skip_64x128x4d_avx2, -1),
make_tuple(64, 64, &aom_sad_skip_64x64x4d_avx2, -1),
make_tuple(64, 32, &aom_sad_skip_64x32x4d_avx2, -1),
- make_tuple(64, 16, &aom_sad_skip_64x16x4d_avx2, -1),
make_tuple(32, 64, &aom_sad_skip_32x64x4d_avx2, -1),
make_tuple(32, 32, &aom_sad_skip_32x32x4d_avx2, -1),
make_tuple(32, 16, &aom_sad_skip_32x16x4d_avx2, -1),
- make_tuple(32, 8, &aom_sad_skip_32x8x4d_avx2, -1),
+
#if CONFIG_AV1_HIGHBITDEPTH
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_avx2, 8),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_avx2, 8),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_avx2, 8),
make_tuple(64, 64, &aom_highbd_sad_skip_64x64x4d_avx2, 8),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32x4d_avx2, 8),
- make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 8),
make_tuple(32, 64, &aom_highbd_sad_skip_32x64x4d_avx2, 8),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32x4d_avx2, 8),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_avx2, 8),
- make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 8),
- make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 8),
make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_avx2, 8),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_avx2, 8),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_avx2, 8),
@@ -2601,12 +2654,9 @@
make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_avx2, 10),
make_tuple(64, 64, &aom_highbd_sad_skip_64x64x4d_avx2, 10),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32x4d_avx2, 10),
- make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 10),
make_tuple(32, 64, &aom_highbd_sad_skip_32x64x4d_avx2, 10),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32x4d_avx2, 10),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_avx2, 10),
- make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 10),
- make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 10),
make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_avx2, 10),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_avx2, 10),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_avx2, 10),
@@ -2616,17 +2666,34 @@
make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_avx2, 12),
make_tuple(64, 64, &aom_highbd_sad_skip_64x64x4d_avx2, 12),
make_tuple(64, 32, &aom_highbd_sad_skip_64x32x4d_avx2, 12),
- make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 12),
make_tuple(32, 64, &aom_highbd_sad_skip_32x64x4d_avx2, 12),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32x4d_avx2, 12),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_avx2, 12),
- make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 12),
- make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 12),
make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_avx2, 12),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_avx2, 12),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_avx2, 12),
+
+#if !CONFIG_REALTIME_ONLY
+ make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 8),
+ make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 8),
+ make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 8),
+
+ make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 10),
+ make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 10),
+ make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 10),
+
+ make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 12),
+ make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 12),
+ make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 12),
+#endif
+#endif
+
+#if !CONFIG_REALTIME_ONLY
+ make_tuple(64, 16, &aom_sad_skip_64x16x4d_avx2, -1),
+ make_tuple(32, 8, &aom_sad_skip_32x8x4d_avx2, -1),
#endif
};
+
INSTANTIATE_TEST_SUITE_P(AVX2, SADSkipx4Test,
::testing::ValuesIn(skip_x4d_avx2_tests));
@@ -2634,13 +2701,17 @@
make_tuple(32, 64, &aom_sad32x64x4d_avx2, -1),
make_tuple(32, 32, &aom_sad32x32x4d_avx2, -1),
make_tuple(32, 16, &aom_sad32x16x4d_avx2, -1),
- make_tuple(32, 8, &aom_sad32x8x4d_avx2, -1),
make_tuple(64, 128, &aom_sad64x128x4d_avx2, -1),
make_tuple(64, 64, &aom_sad64x64x4d_avx2, -1),
make_tuple(64, 32, &aom_sad64x32x4d_avx2, -1),
- make_tuple(64, 16, &aom_sad64x16x4d_avx2, -1),
make_tuple(128, 128, &aom_sad128x128x4d_avx2, -1),
make_tuple(128, 64, &aom_sad128x64x4d_avx2, -1),
+
+#if !CONFIG_REALTIME_ONLY
+ make_tuple(32, 8, &aom_sad32x8x4d_avx2, -1),
+ make_tuple(64, 16, &aom_sad64x16x4d_avx2, -1),
+#endif
+
#if CONFIG_AV1_HIGHBITDEPTH
make_tuple(128, 128, &aom_highbd_sad128x128x4d_avx2, 8),
make_tuple(128, 128, &aom_highbd_sad128x128x4d_avx2, 10),
@@ -2676,6 +2747,7 @@
make_tuple(16, 8, &aom_highbd_sad16x8x4d_avx2, 10),
make_tuple(16, 8, &aom_highbd_sad16x8x4d_avx2, 12),
+#if !CONFIG_REALTIME_ONLY
make_tuple(16, 64, &aom_highbd_sad16x64x4d_avx2, 8),
make_tuple(16, 64, &aom_highbd_sad16x64x4d_avx2, 10),
make_tuple(16, 64, &aom_highbd_sad16x64x4d_avx2, 12),
@@ -2689,6 +2761,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4x4d_avx2, 10),
make_tuple(16, 4, &aom_highbd_sad16x4x4d_avx2, 12),
#endif
+#endif
};
INSTANTIATE_TEST_SUITE_P(AVX2, SADx4Test, ::testing::ValuesIn(x4d_avx2_tests));
#endif // HAVE_AVX2
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 8583e47..5bf040c 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -1235,131 +1235,141 @@
MseParams(3, 3, &aom_mse8x8_c)));
typedef TestParams<VarianceMxNFunc> VarianceParams;
-INSTANTIATE_TEST_SUITE_P(
- C, AvxVarianceTest,
- ::testing::Values(VarianceParams(7, 7, &aom_variance128x128_c),
- VarianceParams(7, 6, &aom_variance128x64_c),
- VarianceParams(6, 7, &aom_variance64x128_c),
- VarianceParams(6, 6, &aom_variance64x64_c),
- VarianceParams(6, 5, &aom_variance64x32_c),
- VarianceParams(5, 6, &aom_variance32x64_c),
- VarianceParams(5, 5, &aom_variance32x32_c),
- VarianceParams(5, 4, &aom_variance32x16_c),
- VarianceParams(4, 5, &aom_variance16x32_c),
- VarianceParams(4, 4, &aom_variance16x16_c),
- VarianceParams(4, 3, &aom_variance16x8_c),
- VarianceParams(3, 4, &aom_variance8x16_c),
- VarianceParams(3, 3, &aom_variance8x8_c),
- VarianceParams(3, 2, &aom_variance8x4_c),
- VarianceParams(2, 3, &aom_variance4x8_c),
- VarianceParams(2, 2, &aom_variance4x4_c),
-
- VarianceParams(6, 4, &aom_variance64x16_c),
- VarianceParams(4, 6, &aom_variance16x64_c),
- VarianceParams(5, 3, &aom_variance32x8_c),
- VarianceParams(3, 5, &aom_variance8x32_c),
- VarianceParams(4, 2, &aom_variance16x4_c),
- VarianceParams(2, 4, &aom_variance4x16_c)));
+const VarianceParams kArrayVariance_c[] = {
+ VarianceParams(7, 7, &aom_variance128x128_c),
+ VarianceParams(7, 6, &aom_variance128x64_c),
+ VarianceParams(6, 7, &aom_variance64x128_c),
+ VarianceParams(6, 6, &aom_variance64x64_c),
+ VarianceParams(6, 5, &aom_variance64x32_c),
+ VarianceParams(5, 6, &aom_variance32x64_c),
+ VarianceParams(5, 5, &aom_variance32x32_c),
+ VarianceParams(5, 4, &aom_variance32x16_c),
+ VarianceParams(4, 5, &aom_variance16x32_c),
+ VarianceParams(4, 4, &aom_variance16x16_c),
+ VarianceParams(4, 3, &aom_variance16x8_c),
+ VarianceParams(3, 4, &aom_variance8x16_c),
+ VarianceParams(3, 3, &aom_variance8x8_c),
+ VarianceParams(3, 2, &aom_variance8x4_c),
+ VarianceParams(2, 3, &aom_variance4x8_c),
+ VarianceParams(2, 2, &aom_variance4x4_c),
+#if !CONFIG_REALTIME_ONLY
+ VarianceParams(6, 4, &aom_variance64x16_c),
+ VarianceParams(4, 6, &aom_variance16x64_c),
+ VarianceParams(5, 3, &aom_variance32x8_c),
+ VarianceParams(3, 5, &aom_variance8x32_c),
+ VarianceParams(4, 2, &aom_variance16x4_c),
+ VarianceParams(2, 4, &aom_variance4x16_c),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(C, AvxVarianceTest,
+ ::testing::ValuesIn(kArrayVariance_c));
typedef TestParams<SubpixVarMxNFunc> SubpelVarianceParams;
-INSTANTIATE_TEST_SUITE_P(
- C, AvxSubpelVarianceTest,
- ::testing::Values(
- SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_c, 0),
- SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_c, 0),
- SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_c, 0),
- SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_c, 0),
- SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_c, 0),
- SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_c, 0),
- SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_c, 0),
- SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_c, 0),
- SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_c, 0),
- SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_c, 0),
- SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_c, 0),
- SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_c, 0),
- SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_c, 0),
- SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_c, 0),
- SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_c, 0),
- SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_c, 0),
-
- SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_c, 0),
- SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_c, 0),
- SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_c, 0),
- SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_c, 0),
- SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_c, 0),
- SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_c, 0)));
+const SubpelVarianceParams kArraySubpelVariance_c[] = {
+ SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_c, 0),
+ SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_c, 0),
+ SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_c, 0),
+ SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_c, 0),
+ SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_c, 0),
+ SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_c, 0),
+ SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_c, 0),
+ SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_c, 0),
+ SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_c, 0),
+ SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_c, 0),
+ SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_c, 0),
+ SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_c, 0),
+ SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_c, 0),
+ SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_c, 0),
+ SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_c, 0),
+ SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_c, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_c, 0),
+ SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_c, 0),
+ SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_c, 0),
+ SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_c, 0),
+ SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_c, 0),
+ SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_c, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(C, AvxSubpelVarianceTest,
+ ::testing::ValuesIn(kArraySubpelVariance_c));
typedef TestParams<SubpixAvgVarMxNFunc> SubpelAvgVarianceParams;
-INSTANTIATE_TEST_SUITE_P(
- C, AvxSubpelAvgVarianceTest,
- ::testing::Values(
- SubpelAvgVarianceParams(7, 7, &aom_sub_pixel_avg_variance128x128_c, 0),
- SubpelAvgVarianceParams(7, 6, &aom_sub_pixel_avg_variance128x64_c, 0),
- SubpelAvgVarianceParams(6, 7, &aom_sub_pixel_avg_variance64x128_c, 0),
- SubpelAvgVarianceParams(6, 6, &aom_sub_pixel_avg_variance64x64_c, 0),
- SubpelAvgVarianceParams(6, 5, &aom_sub_pixel_avg_variance64x32_c, 0),
- SubpelAvgVarianceParams(5, 6, &aom_sub_pixel_avg_variance32x64_c, 0),
- SubpelAvgVarianceParams(5, 5, &aom_sub_pixel_avg_variance32x32_c, 0),
- SubpelAvgVarianceParams(5, 4, &aom_sub_pixel_avg_variance32x16_c, 0),
- SubpelAvgVarianceParams(4, 5, &aom_sub_pixel_avg_variance16x32_c, 0),
- SubpelAvgVarianceParams(4, 4, &aom_sub_pixel_avg_variance16x16_c, 0),
- SubpelAvgVarianceParams(4, 3, &aom_sub_pixel_avg_variance16x8_c, 0),
- SubpelAvgVarianceParams(3, 4, &aom_sub_pixel_avg_variance8x16_c, 0),
- SubpelAvgVarianceParams(3, 3, &aom_sub_pixel_avg_variance8x8_c, 0),
- SubpelAvgVarianceParams(3, 2, &aom_sub_pixel_avg_variance8x4_c, 0),
- SubpelAvgVarianceParams(2, 3, &aom_sub_pixel_avg_variance4x8_c, 0),
- SubpelAvgVarianceParams(2, 2, &aom_sub_pixel_avg_variance4x4_c, 0),
-
- SubpelAvgVarianceParams(6, 4, &aom_sub_pixel_avg_variance64x16_c, 0),
- SubpelAvgVarianceParams(4, 6, &aom_sub_pixel_avg_variance16x64_c, 0),
- SubpelAvgVarianceParams(5, 3, &aom_sub_pixel_avg_variance32x8_c, 0),
- SubpelAvgVarianceParams(3, 5, &aom_sub_pixel_avg_variance8x32_c, 0),
- SubpelAvgVarianceParams(4, 2, &aom_sub_pixel_avg_variance16x4_c, 0),
- SubpelAvgVarianceParams(2, 4, &aom_sub_pixel_avg_variance4x16_c, 0)));
+const SubpelAvgVarianceParams kArraySubpelAvgVariance_c[] = {
+ SubpelAvgVarianceParams(7, 7, &aom_sub_pixel_avg_variance128x128_c, 0),
+ SubpelAvgVarianceParams(7, 6, &aom_sub_pixel_avg_variance128x64_c, 0),
+ SubpelAvgVarianceParams(6, 7, &aom_sub_pixel_avg_variance64x128_c, 0),
+ SubpelAvgVarianceParams(6, 6, &aom_sub_pixel_avg_variance64x64_c, 0),
+ SubpelAvgVarianceParams(6, 5, &aom_sub_pixel_avg_variance64x32_c, 0),
+ SubpelAvgVarianceParams(5, 6, &aom_sub_pixel_avg_variance32x64_c, 0),
+ SubpelAvgVarianceParams(5, 5, &aom_sub_pixel_avg_variance32x32_c, 0),
+ SubpelAvgVarianceParams(5, 4, &aom_sub_pixel_avg_variance32x16_c, 0),
+ SubpelAvgVarianceParams(4, 5, &aom_sub_pixel_avg_variance16x32_c, 0),
+ SubpelAvgVarianceParams(4, 4, &aom_sub_pixel_avg_variance16x16_c, 0),
+ SubpelAvgVarianceParams(4, 3, &aom_sub_pixel_avg_variance16x8_c, 0),
+ SubpelAvgVarianceParams(3, 4, &aom_sub_pixel_avg_variance8x16_c, 0),
+ SubpelAvgVarianceParams(3, 3, &aom_sub_pixel_avg_variance8x8_c, 0),
+ SubpelAvgVarianceParams(3, 2, &aom_sub_pixel_avg_variance8x4_c, 0),
+ SubpelAvgVarianceParams(2, 3, &aom_sub_pixel_avg_variance4x8_c, 0),
+ SubpelAvgVarianceParams(2, 2, &aom_sub_pixel_avg_variance4x4_c, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelAvgVarianceParams(6, 4, &aom_sub_pixel_avg_variance64x16_c, 0),
+ SubpelAvgVarianceParams(4, 6, &aom_sub_pixel_avg_variance16x64_c, 0),
+ SubpelAvgVarianceParams(5, 3, &aom_sub_pixel_avg_variance32x8_c, 0),
+ SubpelAvgVarianceParams(3, 5, &aom_sub_pixel_avg_variance8x32_c, 0),
+ SubpelAvgVarianceParams(4, 2, &aom_sub_pixel_avg_variance16x4_c, 0),
+ SubpelAvgVarianceParams(2, 4, &aom_sub_pixel_avg_variance4x16_c, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(C, AvxSubpelAvgVarianceTest,
+ ::testing::ValuesIn(kArraySubpelAvgVariance_c));
typedef TestParams<DistWtdSubpixAvgVarMxNFunc> DistWtdSubpelAvgVarianceParams;
-INSTANTIATE_TEST_SUITE_P(
- C, AvxDistWtdSubpelAvgVarianceTest,
- ::testing::Values(DistWtdSubpelAvgVarianceParams(
- 6, 6, &aom_dist_wtd_sub_pixel_avg_variance64x64_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 6, 5, &aom_dist_wtd_sub_pixel_avg_variance64x32_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 6, &aom_dist_wtd_sub_pixel_avg_variance32x64_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 5, &aom_dist_wtd_sub_pixel_avg_variance32x32_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 4, &aom_dist_wtd_sub_pixel_avg_variance32x16_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 5, &aom_dist_wtd_sub_pixel_avg_variance16x32_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 4, &aom_dist_wtd_sub_pixel_avg_variance16x16_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 3, &aom_dist_wtd_sub_pixel_avg_variance16x8_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 4, &aom_dist_wtd_sub_pixel_avg_variance8x16_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 3, &aom_dist_wtd_sub_pixel_avg_variance8x8_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 2, &aom_dist_wtd_sub_pixel_avg_variance8x4_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 2, 3, &aom_dist_wtd_sub_pixel_avg_variance4x8_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 2, 2, &aom_dist_wtd_sub_pixel_avg_variance4x4_c, 0),
+const DistWtdSubpelAvgVarianceParams kArrayDistWtdSubpelAvgVariance_c[] = {
+ DistWtdSubpelAvgVarianceParams(
+ 6, 6, &aom_dist_wtd_sub_pixel_avg_variance64x64_c, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 6, 5, &aom_dist_wtd_sub_pixel_avg_variance64x32_c, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 5, 6, &aom_dist_wtd_sub_pixel_avg_variance32x64_c, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 5, 5, &aom_dist_wtd_sub_pixel_avg_variance32x32_c, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 5, 4, &aom_dist_wtd_sub_pixel_avg_variance32x16_c, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 5, &aom_dist_wtd_sub_pixel_avg_variance16x32_c, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 4, &aom_dist_wtd_sub_pixel_avg_variance16x16_c, 0),
+ DistWtdSubpelAvgVarianceParams(4, 3,
+ &aom_dist_wtd_sub_pixel_avg_variance16x8_c, 0),
+ DistWtdSubpelAvgVarianceParams(3, 4,
+ &aom_dist_wtd_sub_pixel_avg_variance8x16_c, 0),
+ DistWtdSubpelAvgVarianceParams(3, 3,
+ &aom_dist_wtd_sub_pixel_avg_variance8x8_c, 0),
+ DistWtdSubpelAvgVarianceParams(3, 2,
+ &aom_dist_wtd_sub_pixel_avg_variance8x4_c, 0),
+ DistWtdSubpelAvgVarianceParams(2, 3,
+ &aom_dist_wtd_sub_pixel_avg_variance4x8_c, 0),
+ DistWtdSubpelAvgVarianceParams(2, 2,
+ &aom_dist_wtd_sub_pixel_avg_variance4x4_c, 0),
+#if !CONFIG_REALTIME_ONLY
- DistWtdSubpelAvgVarianceParams(
- 6, 4, &aom_dist_wtd_sub_pixel_avg_variance64x16_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 6, &aom_dist_wtd_sub_pixel_avg_variance16x64_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 3, &aom_dist_wtd_sub_pixel_avg_variance32x8_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 5, &aom_dist_wtd_sub_pixel_avg_variance8x32_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 2, &aom_dist_wtd_sub_pixel_avg_variance16x4_c, 0),
- DistWtdSubpelAvgVarianceParams(
- 2, 4, &aom_dist_wtd_sub_pixel_avg_variance4x16_c,
- 0)));
+ DistWtdSubpelAvgVarianceParams(
+ 6, 4, &aom_dist_wtd_sub_pixel_avg_variance64x16_c, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 6, &aom_dist_wtd_sub_pixel_avg_variance16x64_c, 0),
+ DistWtdSubpelAvgVarianceParams(5, 3,
+ &aom_dist_wtd_sub_pixel_avg_variance32x8_c, 0),
+ DistWtdSubpelAvgVarianceParams(3, 5,
+ &aom_dist_wtd_sub_pixel_avg_variance8x32_c, 0),
+ DistWtdSubpelAvgVarianceParams(4, 2,
+ &aom_dist_wtd_sub_pixel_avg_variance16x4_c, 0),
+ DistWtdSubpelAvgVarianceParams(2, 4,
+ &aom_dist_wtd_sub_pixel_avg_variance4x16_c, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(C, AvxDistWtdSubpelAvgVarianceTest,
+ ::testing::ValuesIn(kArrayDistWtdSubpelAvgVariance_c));
#if !CONFIG_REALTIME_ONLY
INSTANTIATE_TEST_SUITE_P(
@@ -1587,7 +1597,7 @@
VarianceParams(3, 2, &aom_highbd_8_variance8x4_c, 8),
VarianceParams(2, 3, &aom_highbd_8_variance4x8_c, 8),
VarianceParams(2, 2, &aom_highbd_8_variance4x4_c, 8),
-
+#if !CONFIG_REALTIME_ONLY
VarianceParams(6, 4, &aom_highbd_12_variance64x16_c, 12),
VarianceParams(4, 6, &aom_highbd_12_variance16x64_c, 12),
VarianceParams(5, 3, &aom_highbd_12_variance32x8_c, 12),
@@ -1606,6 +1616,7 @@
VarianceParams(3, 5, &aom_highbd_8_variance8x32_c, 8),
VarianceParams(4, 2, &aom_highbd_8_variance16x4_c, 8),
VarianceParams(2, 4, &aom_highbd_8_variance4x16_c, 8),
+#endif
};
INSTANTIATE_TEST_SUITE_P(C, AvxHBDVarianceTest,
::testing::ValuesIn(kArrayHBDVariance_c));
@@ -1668,7 +1679,7 @@
SubpelVarianceParams(3, 2, &aom_highbd_12_sub_pixel_variance8x4_c, 12),
SubpelVarianceParams(2, 3, &aom_highbd_12_sub_pixel_variance4x8_c, 12),
SubpelVarianceParams(2, 2, &aom_highbd_12_sub_pixel_variance4x4_c, 12),
-
+#if !CONFIG_REALTIME_ONLY
SubpelVarianceParams(6, 4, &aom_highbd_8_sub_pixel_variance64x16_c, 8),
SubpelVarianceParams(4, 6, &aom_highbd_8_sub_pixel_variance16x64_c, 8),
SubpelVarianceParams(5, 3, &aom_highbd_8_sub_pixel_variance32x8_c, 8),
@@ -1687,6 +1698,7 @@
SubpelVarianceParams(3, 5, &aom_highbd_12_sub_pixel_variance8x32_c, 12),
SubpelVarianceParams(4, 2, &aom_highbd_12_sub_pixel_variance16x4_c, 12),
SubpelVarianceParams(2, 4, &aom_highbd_12_sub_pixel_variance4x16_c, 12),
+#endif
};
INSTANTIATE_TEST_SUITE_P(C, AvxHBDSubpelVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelVariance_c));
@@ -1768,6 +1780,7 @@
SubpelAvgVarianceParams(2, 3, &aom_highbd_12_sub_pixel_avg_variance4x8_c, 12),
SubpelAvgVarianceParams(2, 2, &aom_highbd_12_sub_pixel_avg_variance4x4_c, 12),
+#if !CONFIG_REALTIME_ONLY
SubpelAvgVarianceParams(6, 4, &aom_highbd_8_sub_pixel_avg_variance64x16_c, 8),
SubpelAvgVarianceParams(4, 6, &aom_highbd_8_sub_pixel_avg_variance16x64_c, 8),
SubpelAvgVarianceParams(5, 3, &aom_highbd_8_sub_pixel_avg_variance32x8_c, 8),
@@ -1798,6 +1811,7 @@
12),
SubpelAvgVarianceParams(2, 4, &aom_highbd_12_sub_pixel_avg_variance4x16_c,
12),
+#endif
};
INSTANTIATE_TEST_SUITE_P(C, AvxHBDSubpelAvgVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelAvgVariance_c));
@@ -1941,88 +1955,92 @@
MseParams(3, 4, &aom_mse8x16_sse2),
MseParams(3, 3, &aom_mse8x8_sse2)));
-INSTANTIATE_TEST_SUITE_P(
- SSE2, AvxVarianceTest,
- ::testing::Values(VarianceParams(7, 7, &aom_variance128x128_sse2),
- VarianceParams(7, 6, &aom_variance128x64_sse2),
- VarianceParams(6, 7, &aom_variance64x128_sse2),
- VarianceParams(6, 6, &aom_variance64x64_sse2),
- VarianceParams(6, 5, &aom_variance64x32_sse2),
- VarianceParams(6, 4, &aom_variance64x16_sse2),
- VarianceParams(5, 6, &aom_variance32x64_sse2),
- VarianceParams(5, 5, &aom_variance32x32_sse2),
- VarianceParams(5, 4, &aom_variance32x16_sse2),
- VarianceParams(5, 3, &aom_variance32x8_sse2),
- VarianceParams(4, 6, &aom_variance16x64_sse2),
- VarianceParams(4, 5, &aom_variance16x32_sse2),
- VarianceParams(4, 4, &aom_variance16x16_sse2),
- VarianceParams(4, 3, &aom_variance16x8_sse2),
- VarianceParams(4, 2, &aom_variance16x4_sse2),
- VarianceParams(3, 5, &aom_variance8x32_sse2),
- VarianceParams(3, 4, &aom_variance8x16_sse2),
- VarianceParams(3, 3, &aom_variance8x8_sse2),
- VarianceParams(3, 2, &aom_variance8x4_sse2),
- VarianceParams(2, 4, &aom_variance4x16_sse2),
- VarianceParams(2, 3, &aom_variance4x8_sse2),
- VarianceParams(2, 2, &aom_variance4x4_sse2)));
+const VarianceParams kArrayVariance_sse2[] = {
+ VarianceParams(7, 7, &aom_variance128x128_sse2),
+ VarianceParams(7, 6, &aom_variance128x64_sse2),
+ VarianceParams(6, 7, &aom_variance64x128_sse2),
+ VarianceParams(6, 6, &aom_variance64x64_sse2),
+ VarianceParams(6, 5, &aom_variance64x32_sse2),
+ VarianceParams(5, 6, &aom_variance32x64_sse2),
+ VarianceParams(5, 5, &aom_variance32x32_sse2),
+ VarianceParams(5, 4, &aom_variance32x16_sse2),
+ VarianceParams(4, 5, &aom_variance16x32_sse2),
+ VarianceParams(4, 4, &aom_variance16x16_sse2),
+ VarianceParams(4, 3, &aom_variance16x8_sse2),
+ VarianceParams(3, 4, &aom_variance8x16_sse2),
+ VarianceParams(3, 3, &aom_variance8x8_sse2),
+ VarianceParams(3, 2, &aom_variance8x4_sse2),
+ VarianceParams(2, 3, &aom_variance4x8_sse2),
+ VarianceParams(2, 2, &aom_variance4x4_sse2),
+#if !CONFIG_REALTIME_ONLY
+ VarianceParams(6, 4, &aom_variance64x16_sse2),
+ VarianceParams(5, 3, &aom_variance32x8_sse2),
+ VarianceParams(4, 6, &aom_variance16x64_sse2),
+ VarianceParams(4, 2, &aom_variance16x4_sse2),
+ VarianceParams(3, 5, &aom_variance8x32_sse2),
+ VarianceParams(2, 4, &aom_variance4x16_sse2),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(SSE2, AvxVarianceTest,
+ ::testing::ValuesIn(kArrayVariance_sse2));
-INSTANTIATE_TEST_SUITE_P(
- SSE2, AvxSubpelVarianceTest,
- ::testing::Values(
- SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_sse2, 0),
- SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_sse2, 0),
- SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_sse2, 0),
- SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_sse2, 0),
- SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_sse2, 0),
- SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_sse2, 0),
- SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_sse2, 0),
- SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_sse2, 0),
- SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_sse2, 0),
- SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_sse2, 0),
- SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_sse2, 0),
- SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_sse2, 0),
- SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_sse2, 0),
- SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_sse2, 0),
- SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_sse2, 0),
- SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_sse2, 0),
+const SubpelVarianceParams kArraySubpelVariance_sse2[] = {
+ SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_sse2, 0),
+ SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_sse2, 0),
+ SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_sse2, 0),
+ SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_sse2, 0),
+ SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_sse2, 0),
+ SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_sse2, 0),
+ SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_sse2, 0),
+ SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_sse2, 0),
+ SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_sse2, 0),
+ SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_sse2, 0),
+ SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_sse2, 0),
+ SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_sse2, 0),
+ SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_sse2, 0),
+ SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_sse2, 0),
+ SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_sse2, 0),
+ SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_sse2, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_sse2, 0),
+ SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_sse2, 0),
+ SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_sse2, 0),
+ SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_sse2, 0),
+ SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_sse2, 0),
+ SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_sse2, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(SSE2, AvxSubpelVarianceTest,
+ ::testing::ValuesIn(kArraySubpelVariance_sse2));
- SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_sse2, 0),
- SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_sse2, 0),
- SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_sse2, 0),
- SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_sse2, 0),
- SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_sse2, 0),
- SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_sse2, 0)));
-
-INSTANTIATE_TEST_SUITE_P(
- SSE2, AvxSubpelAvgVarianceTest,
- ::testing::Values(
- SubpelAvgVarianceParams(7, 7, &aom_sub_pixel_avg_variance128x128_sse2,
- 0),
- SubpelAvgVarianceParams(7, 6, &aom_sub_pixel_avg_variance128x64_sse2,
- 0),
- SubpelAvgVarianceParams(6, 7, &aom_sub_pixel_avg_variance64x128_sse2,
- 0),
- SubpelAvgVarianceParams(6, 6, &aom_sub_pixel_avg_variance64x64_sse2, 0),
- SubpelAvgVarianceParams(6, 5, &aom_sub_pixel_avg_variance64x32_sse2, 0),
- SubpelAvgVarianceParams(5, 6, &aom_sub_pixel_avg_variance32x64_sse2, 0),
- SubpelAvgVarianceParams(5, 5, &aom_sub_pixel_avg_variance32x32_sse2, 0),
- SubpelAvgVarianceParams(5, 4, &aom_sub_pixel_avg_variance32x16_sse2, 0),
- SubpelAvgVarianceParams(4, 5, &aom_sub_pixel_avg_variance16x32_sse2, 0),
- SubpelAvgVarianceParams(4, 4, &aom_sub_pixel_avg_variance16x16_sse2, 0),
- SubpelAvgVarianceParams(4, 3, &aom_sub_pixel_avg_variance16x8_sse2, 0),
- SubpelAvgVarianceParams(3, 4, &aom_sub_pixel_avg_variance8x16_sse2, 0),
- SubpelAvgVarianceParams(3, 3, &aom_sub_pixel_avg_variance8x8_sse2, 0),
- SubpelAvgVarianceParams(3, 2, &aom_sub_pixel_avg_variance8x4_sse2, 0),
- SubpelAvgVarianceParams(2, 3, &aom_sub_pixel_avg_variance4x8_sse2, 0),
- SubpelAvgVarianceParams(2, 2, &aom_sub_pixel_avg_variance4x4_sse2, 0),
-
- SubpelAvgVarianceParams(6, 4, &aom_sub_pixel_avg_variance64x16_sse2, 0),
- SubpelAvgVarianceParams(4, 6, &aom_sub_pixel_avg_variance16x64_sse2, 0),
- SubpelAvgVarianceParams(5, 3, &aom_sub_pixel_avg_variance32x8_sse2, 0),
- SubpelAvgVarianceParams(3, 5, &aom_sub_pixel_avg_variance8x32_sse2, 0),
- SubpelAvgVarianceParams(4, 2, &aom_sub_pixel_avg_variance16x4_sse2, 0),
- SubpelAvgVarianceParams(2, 4, &aom_sub_pixel_avg_variance4x16_sse2,
- 0)));
+const SubpelAvgVarianceParams kArraySubpelAvgVariance_sse2[] = {
+ SubpelAvgVarianceParams(7, 7, &aom_sub_pixel_avg_variance128x128_sse2, 0),
+ SubpelAvgVarianceParams(7, 6, &aom_sub_pixel_avg_variance128x64_sse2, 0),
+ SubpelAvgVarianceParams(6, 7, &aom_sub_pixel_avg_variance64x128_sse2, 0),
+ SubpelAvgVarianceParams(6, 6, &aom_sub_pixel_avg_variance64x64_sse2, 0),
+ SubpelAvgVarianceParams(6, 5, &aom_sub_pixel_avg_variance64x32_sse2, 0),
+ SubpelAvgVarianceParams(5, 6, &aom_sub_pixel_avg_variance32x64_sse2, 0),
+ SubpelAvgVarianceParams(5, 5, &aom_sub_pixel_avg_variance32x32_sse2, 0),
+ SubpelAvgVarianceParams(5, 4, &aom_sub_pixel_avg_variance32x16_sse2, 0),
+ SubpelAvgVarianceParams(4, 5, &aom_sub_pixel_avg_variance16x32_sse2, 0),
+ SubpelAvgVarianceParams(4, 4, &aom_sub_pixel_avg_variance16x16_sse2, 0),
+ SubpelAvgVarianceParams(4, 3, &aom_sub_pixel_avg_variance16x8_sse2, 0),
+ SubpelAvgVarianceParams(3, 4, &aom_sub_pixel_avg_variance8x16_sse2, 0),
+ SubpelAvgVarianceParams(3, 3, &aom_sub_pixel_avg_variance8x8_sse2, 0),
+ SubpelAvgVarianceParams(3, 2, &aom_sub_pixel_avg_variance8x4_sse2, 0),
+ SubpelAvgVarianceParams(2, 3, &aom_sub_pixel_avg_variance4x8_sse2, 0),
+ SubpelAvgVarianceParams(2, 2, &aom_sub_pixel_avg_variance4x4_sse2, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelAvgVarianceParams(6, 4, &aom_sub_pixel_avg_variance64x16_sse2, 0),
+ SubpelAvgVarianceParams(4, 6, &aom_sub_pixel_avg_variance16x64_sse2, 0),
+ SubpelAvgVarianceParams(5, 3, &aom_sub_pixel_avg_variance32x8_sse2, 0),
+ SubpelAvgVarianceParams(3, 5, &aom_sub_pixel_avg_variance8x32_sse2, 0),
+ SubpelAvgVarianceParams(4, 2, &aom_sub_pixel_avg_variance16x4_sse2, 0),
+ SubpelAvgVarianceParams(2, 4, &aom_sub_pixel_avg_variance4x16_sse2, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(SSE2, AvxSubpelAvgVarianceTest,
+ ::testing::ValuesIn(kArraySubpelAvgVariance_sse2));
#if CONFIG_AV1_HIGHBITDEPTH
#if HAVE_SSE2
@@ -2116,7 +2134,7 @@
VarianceParams(4, 3, &aom_highbd_8_variance16x8_sse2, 8),
VarianceParams(3, 4, &aom_highbd_8_variance8x16_sse2, 8),
VarianceParams(3, 3, &aom_highbd_8_variance8x8_sse2, 8),
-
+#if !CONFIG_REALTIME_ONLY
VarianceParams(6, 4, &aom_highbd_12_variance64x16_sse2, 12),
VarianceParams(4, 6, &aom_highbd_12_variance16x64_sse2, 12),
VarianceParams(5, 3, &aom_highbd_12_variance32x8_sse2, 12),
@@ -2133,8 +2151,9 @@
VarianceParams(4, 6, &aom_highbd_8_variance16x64_sse2, 8),
VarianceParams(5, 3, &aom_highbd_8_variance32x8_sse2, 8),
VarianceParams(3, 5, &aom_highbd_8_variance8x32_sse2, 8),
- // VarianceParams(4, 2, &aom_highbd_8_variance16x4_sse2, 8),
- // VarianceParams(2, 4, &aom_highbd_8_variance4x16_sse2, 8),
+// VarianceParams(4, 2, &aom_highbd_8_variance16x4_sse2, 8),
+// VarianceParams(2, 4, &aom_highbd_8_variance4x16_sse2, 8),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSE2, AvxHBDVarianceTest,
::testing::ValuesIn(kArrayHBDVariance_sse2));
@@ -2231,7 +2250,7 @@
SubpelVarianceParams(3, 4, &aom_highbd_8_sub_pixel_variance8x16_sse2, 8),
SubpelVarianceParams(3, 3, &aom_highbd_8_sub_pixel_variance8x8_sse2, 8),
SubpelVarianceParams(3, 2, &aom_highbd_8_sub_pixel_variance8x4_sse2, 8),
-
+#if !CONFIG_REALTIME_ONLY
SubpelVarianceParams(6, 4, &aom_highbd_12_sub_pixel_variance64x16_sse2, 12),
SubpelVarianceParams(4, 6, &aom_highbd_12_sub_pixel_variance16x64_sse2, 12),
SubpelVarianceParams(5, 3, &aom_highbd_12_sub_pixel_variance32x8_sse2, 12),
@@ -2249,7 +2268,8 @@
SubpelVarianceParams(5, 3, &aom_highbd_8_sub_pixel_variance32x8_sse2, 8),
SubpelVarianceParams(3, 5, &aom_highbd_8_sub_pixel_variance8x32_sse2, 8),
SubpelVarianceParams(4, 2, &aom_highbd_8_sub_pixel_variance16x4_sse2, 8),
- // SubpelVarianceParams(2, 4, &aom_highbd_8_sub_pixel_variance4x16_sse2, 8),
+// SubpelVarianceParams(2, 4, &aom_highbd_8_sub_pixel_variance4x16_sse2, 8),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSE2, AvxHBDSubpelVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelVariance_sse2));
@@ -2322,6 +2342,7 @@
SubpelAvgVarianceParams(3, 2, &aom_highbd_8_sub_pixel_avg_variance8x4_sse2,
8),
+#if !CONFIG_REALTIME_ONLY
SubpelAvgVarianceParams(6, 4, &aom_highbd_12_sub_pixel_avg_variance64x16_sse2,
12),
SubpelAvgVarianceParams(4, 6, &aom_highbd_12_sub_pixel_avg_variance16x64_sse2,
@@ -2356,8 +2377,9 @@
8),
SubpelAvgVarianceParams(4, 2, &aom_highbd_8_sub_pixel_avg_variance16x4_sse2,
8),
- // SubpelAvgVarianceParams(2, 4,
- // &aom_highbd_8_sub_pixel_avg_variance4x16_sse2, 8),
+// SubpelAvgVarianceParams(2, 4,
+// &aom_highbd_8_sub_pixel_avg_variance4x16_sse2, 8),
+#endif
};
INSTANTIATE_TEST_SUITE_P(SSE2, AvxHBDSubpelAvgVarianceTest,
@@ -2366,121 +2388,115 @@
#endif // CONFIG_AV1_HIGHBITDEPTH
#if HAVE_SSSE3
-INSTANTIATE_TEST_SUITE_P(
- SSSE3, AvxSubpelVarianceTest,
- ::testing::Values(
- SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_ssse3, 0),
- SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_ssse3, 0),
- SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_ssse3, 0),
- SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_ssse3, 0),
- SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_ssse3, 0),
- SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_ssse3, 0),
- SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_ssse3, 0),
- SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_ssse3, 0),
- SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_ssse3, 0),
- SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_ssse3, 0),
- SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_ssse3, 0),
- SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_ssse3, 0),
- SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_ssse3, 0),
- SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_ssse3, 0),
- SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_ssse3, 0),
- SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_ssse3, 0),
+const SubpelVarianceParams kArraySubpelVariance_ssse3[] = {
+ SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_ssse3, 0),
+ SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_ssse3, 0),
+ SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_ssse3, 0),
+ SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_ssse3, 0),
+ SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_ssse3, 0),
+ SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_ssse3, 0),
+ SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_ssse3, 0),
+ SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_ssse3, 0),
+ SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_ssse3, 0),
+ SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_ssse3, 0),
+ SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_ssse3, 0),
+ SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_ssse3, 0),
+ SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_ssse3, 0),
+ SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_ssse3, 0),
+ SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_ssse3, 0),
+ SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_ssse3, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_ssse3, 0),
+ SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_ssse3, 0),
+ SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_ssse3, 0),
+ SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_ssse3, 0),
+ SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_ssse3, 0),
+ SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_ssse3, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(SSSE3, AvxSubpelVarianceTest,
+ ::testing::ValuesIn(kArraySubpelVariance_ssse3));
- SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_ssse3, 0),
- SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_ssse3, 0),
- SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_ssse3, 0),
- SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_ssse3, 0),
- SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_ssse3, 0),
- SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_ssse3, 0)));
+const SubpelAvgVarianceParams kArraySubpelAvgVariance_ssse3[] = {
+ SubpelAvgVarianceParams(7, 7, &aom_sub_pixel_avg_variance128x128_ssse3, 0),
+ SubpelAvgVarianceParams(7, 6, &aom_sub_pixel_avg_variance128x64_ssse3, 0),
+ SubpelAvgVarianceParams(6, 7, &aom_sub_pixel_avg_variance64x128_ssse3, 0),
+ SubpelAvgVarianceParams(6, 6, &aom_sub_pixel_avg_variance64x64_ssse3, 0),
+ SubpelAvgVarianceParams(6, 5, &aom_sub_pixel_avg_variance64x32_ssse3, 0),
+ SubpelAvgVarianceParams(5, 6, &aom_sub_pixel_avg_variance32x64_ssse3, 0),
+ SubpelAvgVarianceParams(5, 5, &aom_sub_pixel_avg_variance32x32_ssse3, 0),
+ SubpelAvgVarianceParams(5, 4, &aom_sub_pixel_avg_variance32x16_ssse3, 0),
+ SubpelAvgVarianceParams(4, 5, &aom_sub_pixel_avg_variance16x32_ssse3, 0),
+ SubpelAvgVarianceParams(4, 4, &aom_sub_pixel_avg_variance16x16_ssse3, 0),
+ SubpelAvgVarianceParams(4, 3, &aom_sub_pixel_avg_variance16x8_ssse3, 0),
+ SubpelAvgVarianceParams(3, 4, &aom_sub_pixel_avg_variance8x16_ssse3, 0),
+ SubpelAvgVarianceParams(3, 3, &aom_sub_pixel_avg_variance8x8_ssse3, 0),
+ SubpelAvgVarianceParams(3, 2, &aom_sub_pixel_avg_variance8x4_ssse3, 0),
+ SubpelAvgVarianceParams(2, 3, &aom_sub_pixel_avg_variance4x8_ssse3, 0),
+ SubpelAvgVarianceParams(2, 2, &aom_sub_pixel_avg_variance4x4_ssse3, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelAvgVarianceParams(6, 4, &aom_sub_pixel_avg_variance64x16_ssse3, 0),
+ SubpelAvgVarianceParams(4, 6, &aom_sub_pixel_avg_variance16x64_ssse3, 0),
+ SubpelAvgVarianceParams(5, 3, &aom_sub_pixel_avg_variance32x8_ssse3, 0),
+ SubpelAvgVarianceParams(3, 5, &aom_sub_pixel_avg_variance8x32_ssse3, 0),
+ SubpelAvgVarianceParams(4, 2, &aom_sub_pixel_avg_variance16x4_ssse3, 0),
+ SubpelAvgVarianceParams(2, 4, &aom_sub_pixel_avg_variance4x16_ssse3, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(SSSE3, AvxSubpelAvgVarianceTest,
+ ::testing::ValuesIn(kArraySubpelAvgVariance_ssse3));
-INSTANTIATE_TEST_SUITE_P(
- SSSE3, AvxSubpelAvgVarianceTest,
- ::testing::Values(
- SubpelAvgVarianceParams(7, 7, &aom_sub_pixel_avg_variance128x128_ssse3,
- 0),
- SubpelAvgVarianceParams(7, 6, &aom_sub_pixel_avg_variance128x64_ssse3,
- 0),
- SubpelAvgVarianceParams(6, 7, &aom_sub_pixel_avg_variance64x128_ssse3,
- 0),
- SubpelAvgVarianceParams(6, 6, &aom_sub_pixel_avg_variance64x64_ssse3,
- 0),
- SubpelAvgVarianceParams(6, 5, &aom_sub_pixel_avg_variance64x32_ssse3,
- 0),
- SubpelAvgVarianceParams(5, 6, &aom_sub_pixel_avg_variance32x64_ssse3,
- 0),
- SubpelAvgVarianceParams(5, 5, &aom_sub_pixel_avg_variance32x32_ssse3,
- 0),
- SubpelAvgVarianceParams(5, 4, &aom_sub_pixel_avg_variance32x16_ssse3,
- 0),
- SubpelAvgVarianceParams(4, 5, &aom_sub_pixel_avg_variance16x32_ssse3,
- 0),
- SubpelAvgVarianceParams(4, 4, &aom_sub_pixel_avg_variance16x16_ssse3,
- 0),
- SubpelAvgVarianceParams(4, 3, &aom_sub_pixel_avg_variance16x8_ssse3, 0),
- SubpelAvgVarianceParams(3, 4, &aom_sub_pixel_avg_variance8x16_ssse3, 0),
- SubpelAvgVarianceParams(3, 3, &aom_sub_pixel_avg_variance8x8_ssse3, 0),
- SubpelAvgVarianceParams(3, 2, &aom_sub_pixel_avg_variance8x4_ssse3, 0),
- SubpelAvgVarianceParams(2, 3, &aom_sub_pixel_avg_variance4x8_ssse3, 0),
- SubpelAvgVarianceParams(2, 2, &aom_sub_pixel_avg_variance4x4_ssse3, 0),
-
- SubpelAvgVarianceParams(6, 4, &aom_sub_pixel_avg_variance64x16_ssse3,
- 0),
- SubpelAvgVarianceParams(4, 6, &aom_sub_pixel_avg_variance16x64_ssse3,
- 0),
- SubpelAvgVarianceParams(5, 3, &aom_sub_pixel_avg_variance32x8_ssse3, 0),
- SubpelAvgVarianceParams(3, 5, &aom_sub_pixel_avg_variance8x32_ssse3, 0),
- SubpelAvgVarianceParams(4, 2, &aom_sub_pixel_avg_variance16x4_ssse3, 0),
- SubpelAvgVarianceParams(2, 4, &aom_sub_pixel_avg_variance4x16_ssse3,
- 0)));
-
+const DistWtdSubpelAvgVarianceParams kArrayDistWtdSubpelAvgVariance_ssse3[] = {
+ DistWtdSubpelAvgVarianceParams(
+ 7, 7, &aom_dist_wtd_sub_pixel_avg_variance128x128_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 7, 6, &aom_dist_wtd_sub_pixel_avg_variance128x64_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 6, 7, &aom_dist_wtd_sub_pixel_avg_variance64x128_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 6, 6, &aom_dist_wtd_sub_pixel_avg_variance64x64_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 6, 5, &aom_dist_wtd_sub_pixel_avg_variance64x32_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 5, 6, &aom_dist_wtd_sub_pixel_avg_variance32x64_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 5, 5, &aom_dist_wtd_sub_pixel_avg_variance32x32_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 5, 4, &aom_dist_wtd_sub_pixel_avg_variance32x16_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 5, &aom_dist_wtd_sub_pixel_avg_variance16x32_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 4, &aom_dist_wtd_sub_pixel_avg_variance16x16_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 3, &aom_dist_wtd_sub_pixel_avg_variance16x8_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 3, 4, &aom_dist_wtd_sub_pixel_avg_variance8x16_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 3, 3, &aom_dist_wtd_sub_pixel_avg_variance8x8_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 3, 2, &aom_dist_wtd_sub_pixel_avg_variance8x4_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 2, 3, &aom_dist_wtd_sub_pixel_avg_variance4x8_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 2, 2, &aom_dist_wtd_sub_pixel_avg_variance4x4_ssse3, 0),
+#if !CONFIG_REALTIME_ONLY
+ DistWtdSubpelAvgVarianceParams(
+ 6, 4, &aom_dist_wtd_sub_pixel_avg_variance64x16_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 6, &aom_dist_wtd_sub_pixel_avg_variance16x64_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 5, 3, &aom_dist_wtd_sub_pixel_avg_variance32x8_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 3, 5, &aom_dist_wtd_sub_pixel_avg_variance8x32_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 4, 2, &aom_dist_wtd_sub_pixel_avg_variance16x4_ssse3, 0),
+ DistWtdSubpelAvgVarianceParams(
+ 2, 4, &aom_dist_wtd_sub_pixel_avg_variance4x16_ssse3, 0),
+#endif
+};
INSTANTIATE_TEST_SUITE_P(
SSSE3, AvxDistWtdSubpelAvgVarianceTest,
- ::testing::Values(
- DistWtdSubpelAvgVarianceParams(
- 7, 7, &aom_dist_wtd_sub_pixel_avg_variance128x128_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 7, 6, &aom_dist_wtd_sub_pixel_avg_variance128x64_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 6, 7, &aom_dist_wtd_sub_pixel_avg_variance64x128_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 6, 6, &aom_dist_wtd_sub_pixel_avg_variance64x64_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 6, 5, &aom_dist_wtd_sub_pixel_avg_variance64x32_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 6, &aom_dist_wtd_sub_pixel_avg_variance32x64_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 5, &aom_dist_wtd_sub_pixel_avg_variance32x32_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 4, &aom_dist_wtd_sub_pixel_avg_variance32x16_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 5, &aom_dist_wtd_sub_pixel_avg_variance16x32_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 4, &aom_dist_wtd_sub_pixel_avg_variance16x16_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 3, &aom_dist_wtd_sub_pixel_avg_variance16x8_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 4, &aom_dist_wtd_sub_pixel_avg_variance8x16_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 3, &aom_dist_wtd_sub_pixel_avg_variance8x8_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 2, &aom_dist_wtd_sub_pixel_avg_variance8x4_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 2, 3, &aom_dist_wtd_sub_pixel_avg_variance4x8_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 2, 2, &aom_dist_wtd_sub_pixel_avg_variance4x4_ssse3, 0),
-
- DistWtdSubpelAvgVarianceParams(
- 6, 4, &aom_dist_wtd_sub_pixel_avg_variance64x16_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 6, &aom_dist_wtd_sub_pixel_avg_variance16x64_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 5, 3, &aom_dist_wtd_sub_pixel_avg_variance32x8_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 3, 5, &aom_dist_wtd_sub_pixel_avg_variance8x32_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 4, 2, &aom_dist_wtd_sub_pixel_avg_variance16x4_ssse3, 0),
- DistWtdSubpelAvgVarianceParams(
- 2, 4, &aom_dist_wtd_sub_pixel_avg_variance4x16_ssse3, 0)));
+ ::testing::ValuesIn(kArrayDistWtdSubpelAvgVariance_ssse3));
#endif // HAVE_SSSE3
#if HAVE_SSE4_1
@@ -2520,7 +2536,6 @@
0),
ObmcSubpelVarianceParams(2, 2, &aom_obmc_sub_pixel_variance4x4_sse4_1,
0),
-
ObmcSubpelVarianceParams(6, 4, &aom_obmc_sub_pixel_variance64x16_sse4_1,
0),
ObmcSubpelVarianceParams(4, 6, &aom_obmc_sub_pixel_variance16x64_sse4_1,
@@ -2549,40 +2564,48 @@
::testing::Values(MseParams(4, 4,
&aom_mse16x16_avx2)));
-INSTANTIATE_TEST_SUITE_P(
- AVX2, AvxVarianceTest,
- ::testing::Values(VarianceParams(7, 7, &aom_variance128x128_avx2),
- VarianceParams(7, 6, &aom_variance128x64_avx2),
- VarianceParams(6, 7, &aom_variance64x128_avx2),
- VarianceParams(6, 6, &aom_variance64x64_avx2),
- VarianceParams(6, 5, &aom_variance64x32_avx2),
- VarianceParams(6, 4, &aom_variance64x16_avx2),
- VarianceParams(5, 6, &aom_variance32x64_avx2),
- VarianceParams(5, 5, &aom_variance32x32_avx2),
- VarianceParams(5, 4, &aom_variance32x16_avx2),
- VarianceParams(5, 3, &aom_variance32x8_avx2),
- VarianceParams(4, 6, &aom_variance16x64_avx2),
- VarianceParams(4, 5, &aom_variance16x32_avx2),
- VarianceParams(4, 4, &aom_variance16x16_avx2),
- VarianceParams(4, 3, &aom_variance16x8_avx2),
- VarianceParams(4, 2, &aom_variance16x4_avx2)));
+const VarianceParams kArrayVariance_avx2[] = {
+ VarianceParams(7, 7, &aom_variance128x128_avx2),
+ VarianceParams(7, 6, &aom_variance128x64_avx2),
+ VarianceParams(6, 7, &aom_variance64x128_avx2),
+ VarianceParams(6, 6, &aom_variance64x64_avx2),
+ VarianceParams(6, 5, &aom_variance64x32_avx2),
+ VarianceParams(5, 6, &aom_variance32x64_avx2),
+ VarianceParams(5, 5, &aom_variance32x32_avx2),
+ VarianceParams(5, 4, &aom_variance32x16_avx2),
+ VarianceParams(4, 5, &aom_variance16x32_avx2),
+ VarianceParams(4, 4, &aom_variance16x16_avx2),
+ VarianceParams(4, 3, &aom_variance16x8_avx2),
+#if !CONFIG_REALTIME_ONLY
+ VarianceParams(6, 4, &aom_variance64x16_avx2),
+ VarianceParams(4, 6, &aom_variance16x64_avx2),
+ VarianceParams(5, 3, &aom_variance32x8_avx2),
+ VarianceParams(4, 2, &aom_variance16x4_avx2),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(AVX2, AvxVarianceTest,
+ ::testing::ValuesIn(kArrayVariance_avx2));
-INSTANTIATE_TEST_SUITE_P(
- AVX2, AvxSubpelVarianceTest,
- ::testing::Values(
- SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_avx2, 0),
- SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_avx2, 0),
- SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_avx2, 0),
- SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_avx2, 0),
- SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_avx2, 0),
- SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_avx2, 0),
- SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_avx2, 0),
- SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_avx2, 0),
- SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_avx2, 0),
- SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_avx2, 0),
- SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_avx2, 0),
- SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_avx2, 0),
- SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_avx2, 0)));
+const SubpelVarianceParams kArraySubpelVariance_avx2[] = {
+ SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_avx2, 0),
+ SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_avx2, 0),
+ SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_avx2, 0),
+ SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_avx2, 0),
+ SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_avx2, 0),
+ SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_avx2, 0),
+ SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_avx2, 0),
+ SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_avx2, 0),
+
+ SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_avx2, 0),
+ SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_avx2, 0),
+ SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_avx2, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_avx2, 0),
+ SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_avx2, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(AVX2, AvxSubpelVarianceTest,
+ ::testing::ValuesIn(kArraySubpelVariance_avx2));
INSTANTIATE_TEST_SUITE_P(
AVX2, AvxSubpelAvgVarianceTest,
@@ -2630,32 +2653,34 @@
VarianceParams(2, 3, &aom_variance4x8_neon),
VarianceParams(2, 2, &aom_variance4x4_neon)));
-INSTANTIATE_TEST_SUITE_P(
- NEON, AvxSubpelVarianceTest,
- ::testing::Values(
- SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_neon, 0),
- SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_neon, 0),
- SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_neon, 0),
- SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_neon, 0),
- SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_neon, 0),
- SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_neon, 0),
- SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_neon, 0),
- SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_neon, 0),
- SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_neon, 0),
- SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_neon, 0),
- SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_neon, 0),
- SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_neon, 0),
- SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_neon, 0),
- SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_neon, 0),
- SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_neon, 0),
- SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_neon, 0),
-
- SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_neon, 0),
- SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_neon, 0),
- SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_neon, 0),
- SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_neon, 0),
- SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_neon, 0),
- SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_neon, 0)));
+const SubpelVarianceParams kArraySubpelVariance_neon[] = {
+ SubpelVarianceParams(7, 7, &aom_sub_pixel_variance128x128_neon, 0),
+ SubpelVarianceParams(7, 6, &aom_sub_pixel_variance128x64_neon, 0),
+ SubpelVarianceParams(6, 7, &aom_sub_pixel_variance64x128_neon, 0),
+ SubpelVarianceParams(6, 6, &aom_sub_pixel_variance64x64_neon, 0),
+ SubpelVarianceParams(6, 5, &aom_sub_pixel_variance64x32_neon, 0),
+ SubpelVarianceParams(5, 6, &aom_sub_pixel_variance32x64_neon, 0),
+ SubpelVarianceParams(5, 5, &aom_sub_pixel_variance32x32_neon, 0),
+ SubpelVarianceParams(5, 4, &aom_sub_pixel_variance32x16_neon, 0),
+ SubpelVarianceParams(4, 5, &aom_sub_pixel_variance16x32_neon, 0),
+ SubpelVarianceParams(4, 4, &aom_sub_pixel_variance16x16_neon, 0),
+ SubpelVarianceParams(4, 3, &aom_sub_pixel_variance16x8_neon, 0),
+ SubpelVarianceParams(3, 4, &aom_sub_pixel_variance8x16_neon, 0),
+ SubpelVarianceParams(3, 3, &aom_sub_pixel_variance8x8_neon, 0),
+ SubpelVarianceParams(3, 2, &aom_sub_pixel_variance8x4_neon, 0),
+ SubpelVarianceParams(2, 3, &aom_sub_pixel_variance4x8_neon, 0),
+ SubpelVarianceParams(2, 2, &aom_sub_pixel_variance4x4_neon, 0),
+#if !CONFIG_REALTIME_ONLY
+ SubpelVarianceParams(6, 4, &aom_sub_pixel_variance64x16_neon, 0),
+ SubpelVarianceParams(4, 6, &aom_sub_pixel_variance16x64_neon, 0),
+ SubpelVarianceParams(5, 3, &aom_sub_pixel_variance32x8_neon, 0),
+ SubpelVarianceParams(3, 5, &aom_sub_pixel_variance8x32_neon, 0),
+ SubpelVarianceParams(4, 2, &aom_sub_pixel_variance16x4_neon, 0),
+ SubpelVarianceParams(2, 4, &aom_sub_pixel_variance4x16_neon, 0),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(NEON, AvxSubpelVarianceTest,
+ ::testing::ValuesIn(kArraySubpelVariance_neon));
#endif // HAVE_NEON
#if HAVE_MSA
