rename jnt_sad_ssse3.c -> jnt_sad_sse2.c
There's no ssse3 in this file.
Change-Id: I73a7262ecd1ee62bf8d30064080bbe4588f79765
diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index c4dd8ae..92c79bf 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -210,7 +210,8 @@
"${AOM_ROOT}/aom_dsp/x86/quantize_x86.h"
"${AOM_ROOT}/aom_dsp/x86/blk_sse_sum_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/sum_squares_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/variance_sse2.c")
+ "${AOM_ROOT}/aom_dsp/x86/variance_sse2.c"
+ "${AOM_ROOT}/aom_dsp/x86/jnt_sad_sse2.c")
list(APPEND AOM_DSP_ENCODER_ASM_SSSE3_X86_64
"${AOM_ROOT}/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm"
@@ -247,8 +248,7 @@
"${AOM_ROOT}/aom_dsp/x86/masked_variance_intrin_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/quantize_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/variance_impl_ssse3.c"
- "${AOM_ROOT}/aom_dsp/x86/jnt_variance_ssse3.c"
- "${AOM_ROOT}/aom_dsp/x86/jnt_sad_ssse3.c")
+ "${AOM_ROOT}/aom_dsp/x86/jnt_variance_ssse3.c")
list(APPEND AOM_DSP_ENCODER_INTRIN_SSE4_1
"${AOM_ROOT}/aom_dsp/x86/avg_intrin_sse4.c"
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index 16f32f8..cab94ab 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -838,29 +838,29 @@
specialize qw/aom_sad16x64_avg sse2 neon/;
specialize qw/aom_sad64x16_avg sse2 neon/;
- specialize qw/aom_dist_wtd_sad128x128_avg ssse3/;
- specialize qw/aom_dist_wtd_sad128x64_avg ssse3/;
- specialize qw/aom_dist_wtd_sad64x128_avg ssse3/;
- specialize qw/aom_dist_wtd_sad64x64_avg ssse3/;
- specialize qw/aom_dist_wtd_sad64x32_avg ssse3/;
- specialize qw/aom_dist_wtd_sad32x64_avg ssse3/;
- specialize qw/aom_dist_wtd_sad32x32_avg ssse3/;
- specialize qw/aom_dist_wtd_sad32x16_avg ssse3/;
- specialize qw/aom_dist_wtd_sad16x32_avg ssse3/;
- specialize qw/aom_dist_wtd_sad16x16_avg ssse3/;
- specialize qw/aom_dist_wtd_sad16x8_avg ssse3/;
- specialize qw/aom_dist_wtd_sad8x16_avg ssse3/;
- specialize qw/aom_dist_wtd_sad8x8_avg ssse3/;
- specialize qw/aom_dist_wtd_sad8x4_avg ssse3/;
- specialize qw/aom_dist_wtd_sad4x8_avg ssse3/;
- specialize qw/aom_dist_wtd_sad4x4_avg ssse3/;
+ specialize qw/aom_dist_wtd_sad128x128_avg sse2/;
+ specialize qw/aom_dist_wtd_sad128x64_avg sse2/;
+ specialize qw/aom_dist_wtd_sad64x128_avg sse2/;
+ specialize qw/aom_dist_wtd_sad64x64_avg sse2/;
+ specialize qw/aom_dist_wtd_sad64x32_avg sse2/;
+ specialize qw/aom_dist_wtd_sad32x64_avg sse2/;
+ specialize qw/aom_dist_wtd_sad32x32_avg sse2/;
+ specialize qw/aom_dist_wtd_sad32x16_avg sse2/;
+ specialize qw/aom_dist_wtd_sad16x32_avg sse2/;
+ specialize qw/aom_dist_wtd_sad16x16_avg sse2/;
+ specialize qw/aom_dist_wtd_sad16x8_avg sse2/;
+ specialize qw/aom_dist_wtd_sad8x16_avg sse2/;
+ specialize qw/aom_dist_wtd_sad8x8_avg sse2/;
+ specialize qw/aom_dist_wtd_sad8x4_avg sse2/;
+ specialize qw/aom_dist_wtd_sad4x8_avg sse2/;
+ specialize qw/aom_dist_wtd_sad4x4_avg sse2/;
- specialize qw/aom_dist_wtd_sad4x16_avg ssse3/;
- specialize qw/aom_dist_wtd_sad16x4_avg ssse3/;
- specialize qw/aom_dist_wtd_sad8x32_avg ssse3/;
- specialize qw/aom_dist_wtd_sad32x8_avg ssse3/;
- specialize qw/aom_dist_wtd_sad16x64_avg ssse3/;
- specialize qw/aom_dist_wtd_sad64x16_avg ssse3/;
+ specialize qw/aom_dist_wtd_sad4x16_avg sse2/;
+ specialize qw/aom_dist_wtd_sad16x4_avg sse2/;
+ specialize qw/aom_dist_wtd_sad8x32_avg sse2/;
+ specialize qw/aom_dist_wtd_sad32x8_avg sse2/;
+ specialize qw/aom_dist_wtd_sad16x64_avg sse2/;
+ specialize qw/aom_dist_wtd_sad64x16_avg sse2/;
if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
foreach (@encoder_block_sizes) {
diff --git a/aom_dsp/x86/jnt_sad_ssse3.c b/aom_dsp/x86/jnt_sad_sse2.c
similarity index 97%
rename from aom_dsp/x86/jnt_sad_ssse3.c
rename to aom_dsp/x86/jnt_sad_sse2.c
index ad80411..62818f6 100644
--- a/aom_dsp/x86/jnt_sad_ssse3.c
+++ b/aom_dsp/x86/jnt_sad_sse2.c
@@ -10,8 +10,7 @@
*/
#include <assert.h>
-#include <emmintrin.h> // SSE2
-#include <tmmintrin.h>
+#include <emmintrin.h>
#include "config/aom_config.h"
#include "config/aom_dsp_rtcd.h"
@@ -204,7 +203,7 @@
}
#define DIST_WTD_SADMXN_SSE2(m, n) \
- unsigned int aom_dist_wtd_sad##m##x##n##_avg_ssse3( \
+ unsigned int aom_dist_wtd_sad##m##x##n##_avg_sse2( \
const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, \
const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param) { \
uint8_t comp_pred[m * n]; \
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 6f08f59..ca3e34b 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -2557,6 +2557,35 @@
INSTANTIATE_TEST_SUITE_P(SSE2, SADx4AvgTest,
::testing::ValuesIn(x4d_avg_sse2_tests));
#endif // !CONFIG_REALTIME_ONLY
+
+const DistWtdSadMxNAvgParam dist_wtd_avg_sse2_tests[] = {
+ make_tuple(128, 128, &aom_dist_wtd_sad128x128_avg_sse2, -1),
+ make_tuple(128, 64, &aom_dist_wtd_sad128x64_avg_sse2, -1),
+ make_tuple(64, 128, &aom_dist_wtd_sad64x128_avg_sse2, -1),
+ make_tuple(64, 64, &aom_dist_wtd_sad64x64_avg_sse2, -1),
+ make_tuple(64, 32, &aom_dist_wtd_sad64x32_avg_sse2, -1),
+ make_tuple(32, 64, &aom_dist_wtd_sad32x64_avg_sse2, -1),
+ make_tuple(32, 32, &aom_dist_wtd_sad32x32_avg_sse2, -1),
+ make_tuple(32, 16, &aom_dist_wtd_sad32x16_avg_sse2, -1),
+ make_tuple(16, 32, &aom_dist_wtd_sad16x32_avg_sse2, -1),
+ make_tuple(16, 16, &aom_dist_wtd_sad16x16_avg_sse2, -1),
+ make_tuple(16, 8, &aom_dist_wtd_sad16x8_avg_sse2, -1),
+ make_tuple(8, 16, &aom_dist_wtd_sad8x16_avg_sse2, -1),
+ make_tuple(8, 8, &aom_dist_wtd_sad8x8_avg_sse2, -1),
+ make_tuple(8, 4, &aom_dist_wtd_sad8x4_avg_sse2, -1),
+ make_tuple(4, 8, &aom_dist_wtd_sad4x8_avg_sse2, -1),
+ make_tuple(4, 4, &aom_dist_wtd_sad4x4_avg_sse2, -1),
+#if !CONFIG_REALTIME_ONLY
+ make_tuple(64, 16, &aom_dist_wtd_sad64x16_avg_sse2, -1),
+ make_tuple(16, 64, &aom_dist_wtd_sad16x64_avg_sse2, -1),
+ make_tuple(32, 8, &aom_dist_wtd_sad32x8_avg_sse2, -1),
+ make_tuple(8, 32, &aom_dist_wtd_sad8x32_avg_sse2, -1),
+ make_tuple(16, 4, &aom_dist_wtd_sad16x4_avg_sse2, -1),
+ make_tuple(4, 16, &aom_dist_wtd_sad4x16_avg_sse2, -1),
+#endif
+};
+INSTANTIATE_TEST_SUITE_P(sse2, DistWtdSADavgTest,
+ ::testing::ValuesIn(dist_wtd_avg_sse2_tests));
#endif // HAVE_SSE2
#if HAVE_SSE3
@@ -2594,35 +2623,6 @@
INSTANTIATE_TEST_SUITE_P(SSSE3, DistWtdCompAvgTest,
::testing::ValuesIn(dist_wtd_comp_avg_ssse3_tests));
-
-const DistWtdSadMxNAvgParam dist_wtd_avg_ssse3_tests[] = {
- make_tuple(128, 128, &aom_dist_wtd_sad128x128_avg_ssse3, -1),
- make_tuple(128, 64, &aom_dist_wtd_sad128x64_avg_ssse3, -1),
- make_tuple(64, 128, &aom_dist_wtd_sad64x128_avg_ssse3, -1),
- make_tuple(64, 64, &aom_dist_wtd_sad64x64_avg_ssse3, -1),
- make_tuple(64, 32, &aom_dist_wtd_sad64x32_avg_ssse3, -1),
- make_tuple(32, 64, &aom_dist_wtd_sad32x64_avg_ssse3, -1),
- make_tuple(32, 32, &aom_dist_wtd_sad32x32_avg_ssse3, -1),
- make_tuple(32, 16, &aom_dist_wtd_sad32x16_avg_ssse3, -1),
- make_tuple(16, 32, &aom_dist_wtd_sad16x32_avg_ssse3, -1),
- make_tuple(16, 16, &aom_dist_wtd_sad16x16_avg_ssse3, -1),
- make_tuple(16, 8, &aom_dist_wtd_sad16x8_avg_ssse3, -1),
- make_tuple(8, 16, &aom_dist_wtd_sad8x16_avg_ssse3, -1),
- make_tuple(8, 8, &aom_dist_wtd_sad8x8_avg_ssse3, -1),
- 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));
#endif // HAVE_SSSE3
#if HAVE_SSE4_1
