Commit 59b633c2 authored by Hui Su's avatar Hui Su Committed by Urvang Joshi

Remove deprecated intra predictor functions

Change-Id: Iff336228d90bf71ed821735401643001b36393c2
parent 0eb93e95
......@@ -54,8 +54,7 @@ set(AOM_DSP_COMMON_INTRIN_SSE2
set(AOM_DSP_COMMON_ASM_SSSE3
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_ssse3.asm"
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm"
"${AOM_ROOT}/aom_dsp/x86/intrapred_ssse3.asm")
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm")
set(AOM_DSP_COMMON_INTRIN_SSSE3
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c"
......@@ -203,14 +202,9 @@ set(AOM_DSP_COMMON_INTRIN_MSA
"${AOM_ROOT}/aom_dsp/x86/highbd_intrapred_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_sse2.c")
set(AOM_DSP_COMMON_INTRIN_SSSE3
${AOM_DSP_COMMON_INTRIN_SSSE3}
"${AOM_ROOT}/aom_dsp/x86/highbd_intrapred_ssse3.c")
set(AOM_DSP_COMMON_INTRIN_AVX2
${AOM_DSP_COMMON_INTRIN_AVX2}
"${AOM_ROOT}/aom_dsp/x86/highbd_convolve_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/highbd_intrapred_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_avx2.c")
set(AOM_DSP_COMMON_SOURCES
......
......@@ -166,12 +166,6 @@ specialize qw/aom_smooth_predictor_16x32 ssse3/;
specialize qw/aom_smooth_predictor_32x16 ssse3/;
specialize qw/aom_smooth_predictor_32x32 ssse3/;
specialize qw/aom_d135_predictor_4x4 neon/;
specialize qw/aom_d153_predictor_4x4 ssse3/;
specialize qw/aom_d153_predictor_8x8 ssse3/;
specialize qw/aom_d153_predictor_16x16 ssse3/;
specialize qw/aom_d153_predictor_32x32 ssse3/;
# TODO(yungingwang): optimize rectangular DC_PRED to replace division
# by multiply and shift.
specialize qw/aom_dc_predictor_4x4 dspr2 msa neon sse2/;
......@@ -185,39 +179,6 @@ specialize qw/aom_dc_predictor_16x32 sse2/;
specialize qw/aom_dc_predictor_32x16 sse2 avx2/;
specialize qw/aom_dc_predictor_32x32 msa neon sse2 avx2/;
specialize qw/aom_d207e_predictor_4x4 sse2/;
specialize qw/aom_d207e_predictor_4x8 sse2/;
specialize qw/aom_d207e_predictor_8x4 sse2/;
specialize qw/aom_d207e_predictor_8x8 sse2/;
specialize qw/aom_d207e_predictor_8x16 sse2/;
specialize qw/aom_d207e_predictor_16x8 sse2/;
specialize qw/aom_d207e_predictor_16x16 sse2/;
specialize qw/aom_d207e_predictor_16x32 sse2/;
specialize qw/aom_d207e_predictor_32x16 sse2/;
specialize qw/aom_d207e_predictor_32x32 sse2/;
specialize qw/aom_d63e_predictor_4x4 sse2 ssse3/;
specialize qw/aom_d63e_predictor_4x8 sse2/;
specialize qw/aom_d63e_predictor_8x4 sse2/;
specialize qw/aom_d63e_predictor_8x8 sse2/;
specialize qw/aom_d63e_predictor_8x16 sse2/;
specialize qw/aom_d63e_predictor_16x8 sse2/;
specialize qw/aom_d63e_predictor_16x16 sse2/;
specialize qw/aom_d63e_predictor_16x32 sse2/;
specialize qw/aom_d63e_predictor_32x16 sse2/;
specialize qw/aom_d63e_predictor_32x32 sse2/;
specialize qw/aom_d45e_predictor_4x4 ssse3/;
specialize qw/aom_d45e_predictor_4x8 ssse3/;
specialize qw/aom_d45e_predictor_8x4 ssse3/;
specialize qw/aom_d45e_predictor_8x8 ssse3/;
specialize qw/aom_d45e_predictor_8x16 ssse3/;
specialize qw/aom_d45e_predictor_16x8 ssse3/;
specialize qw/aom_d45e_predictor_16x16 ssse3/;
specialize qw/aom_d45e_predictor_16x32 ssse3/;
specialize qw/aom_d45e_predictor_32x16 ssse3/;
specialize qw/aom_d45e_predictor_32x32 ssse3/;
specialize qw/aom_highbd_v_predictor_4x4 sse2/;
specialize qw/aom_highbd_v_predictor_4x8 sse2/;
specialize qw/aom_highbd_v_predictor_8x4 sse2/;
......@@ -283,52 +244,6 @@ specialize qw/aom_d45e_predictor_32x32 ssse3/;
specialize qw/aom_highbd_dc_top_predictor_32x32 sse2/;
specialize qw/aom_highbd_dc_128_predictor_32x32 sse2/;
specialize qw/aom_highbd_d117_predictor_4x4 sse2/;
specialize qw/aom_highbd_d117_predictor_8x8 ssse3/;
specialize qw/aom_highbd_d117_predictor_16x16 ssse3/;
specialize qw/aom_highbd_d117_predictor_32x32 ssse3/;
specialize qw/aom_highbd_d135_predictor_4x4 sse2/;
specialize qw/aom_highbd_d135_predictor_8x8 ssse3/;
specialize qw/aom_highbd_d135_predictor_16x16 ssse3/;
specialize qw/aom_highbd_d135_predictor_32x32 ssse3/;
specialize qw/aom_highbd_d153_predictor_4x4 sse2/;
specialize qw/aom_highbd_d153_predictor_8x8 ssse3/;
specialize qw/aom_highbd_d153_predictor_16x16 ssse3/;
specialize qw/aom_highbd_d153_predictor_32x32 ssse3/;
specialize qw/aom_highbd_d45e_predictor_4x4 sse2/;
specialize qw/aom_highbd_d45e_predictor_4x8 sse2/;
specialize qw/aom_highbd_d45e_predictor_8x4 sse2/;
specialize qw/aom_highbd_d45e_predictor_8x8 sse2/;
specialize qw/aom_highbd_d45e_predictor_8x16 sse2/;
specialize qw/aom_highbd_d45e_predictor_16x8 avx2/;
specialize qw/aom_highbd_d45e_predictor_16x16 avx2/;
specialize qw/aom_highbd_d45e_predictor_16x32 avx2/;
specialize qw/aom_highbd_d45e_predictor_32x16 avx2/;
specialize qw/aom_highbd_d45e_predictor_32x32 avx2/;
specialize qw/aom_highbd_d207e_predictor_4x4 sse2/;
specialize qw/aom_highbd_d207e_predictor_4x8 sse2/;
specialize qw/aom_highbd_d207e_predictor_8x4 sse2/;
specialize qw/aom_highbd_d207e_predictor_8x8 sse2/;
specialize qw/aom_highbd_d207e_predictor_8x16 sse2/;
specialize qw/aom_highbd_d207e_predictor_16x8 sse2/;
specialize qw/aom_highbd_d207e_predictor_16x16 sse2/;
specialize qw/aom_highbd_d207e_predictor_16x32 sse2/;
specialize qw/aom_highbd_d207e_predictor_32x16 avx2/;
specialize qw/aom_highbd_d207e_predictor_32x32 avx2/;
specialize qw/aom_highbd_d63e_predictor_4x4 sse2/;
specialize qw/aom_highbd_d63e_predictor_4x8 sse2/;
specialize qw/aom_highbd_d63e_predictor_8x4 sse2/;
specialize qw/aom_highbd_d63e_predictor_8x8 sse2/;
specialize qw/aom_highbd_d63e_predictor_8x16 sse2/;
specialize qw/aom_highbd_d63e_predictor_16x8 avx2/;
specialize qw/aom_highbd_d63e_predictor_16x16 avx2/;
specialize qw/aom_highbd_d63e_predictor_16x32 avx2/;
specialize qw/aom_highbd_d63e_predictor_32x16 avx2/;
specialize qw/aom_highbd_d63e_predictor_32x32 avx2/;
#
# Sub Pixel Filters
#
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -611,18 +611,10 @@ static void av1_init_intra_predictors_internal(void) {
INIT_ALL_SIZES(pred[V_PRED], v);
INIT_ALL_SIZES(pred[H_PRED], h);
INIT_ALL_SIZES(pred[D203_PRED], d207e);
INIT_ALL_SIZES(pred[D45_PRED], d45e);
INIT_ALL_SIZES(pred[D67_PRED], d63e);
INIT_ALL_SIZES(pred[D113_PRED], d117);
INIT_ALL_SIZES(pred[D135_PRED], d135);
INIT_ALL_SIZES(pred[D157_PRED], d153);
INIT_ALL_SIZES(pred[PAETH_PRED], paeth);
INIT_ALL_SIZES(pred[SMOOTH_PRED], smooth);
INIT_ALL_SIZES(pred[SMOOTH_V_PRED], smooth_v);
INIT_ALL_SIZES(pred[SMOOTH_H_PRED], smooth_h);
INIT_ALL_SIZES(dc_pred[0][0], dc_128);
INIT_ALL_SIZES(dc_pred[0][1], dc_top);
INIT_ALL_SIZES(dc_pred[1][0], dc_left);
......@@ -630,18 +622,10 @@ static void av1_init_intra_predictors_internal(void) {
INIT_ALL_SIZES(pred_high[V_PRED], highbd_v);
INIT_ALL_SIZES(pred_high[H_PRED], highbd_h);
INIT_ALL_SIZES(pred_high[D203_PRED], highbd_d207e);
INIT_ALL_SIZES(pred_high[D45_PRED], highbd_d45e);
INIT_ALL_SIZES(pred_high[D67_PRED], highbd_d63e);
INIT_ALL_SIZES(pred_high[D113_PRED], highbd_d117);
INIT_ALL_SIZES(pred_high[D135_PRED], highbd_d135);
INIT_ALL_SIZES(pred_high[D157_PRED], highbd_d153);
INIT_ALL_SIZES(pred_high[PAETH_PRED], highbd_paeth);
INIT_ALL_SIZES(pred_high[SMOOTH_PRED], highbd_smooth);
INIT_ALL_SIZES(pred_high[SMOOTH_V_PRED], highbd_smooth_v);
INIT_ALL_SIZES(pred_high[SMOOTH_H_PRED], highbd_smooth_h);
INIT_ALL_SIZES(dc_pred_high[0][0], highbd_dc_128);
INIT_ALL_SIZES(dc_pred_high[0][1], highbd_dc_top);
INIT_ALL_SIZES(dc_pred_high[1][0], highbd_dc_left);
......
......@@ -179,146 +179,8 @@ TEST_P(LowbdIntraPredTest, Bitexact) {
highbd_entry(type, 32, 16, opt, bd), highbd_entry(type, 32, 32, opt, bd)
#endif
#if HAVE_SSE2
const IntraPredFunc<HighbdIntraPred> IntraPredTestVector8[] = {
// highbd_intrapred(dc, sse2, 8), highbd_intrapred(dc_left, sse2, 8),
// highbd_intrapred(dc_top, sse2, 8), highbd_intrapred(dc_128, sse2, 8),
// highbd_intrapred(h, sse2, 8), highbd_intrapred(v, sse2, 8),
// highbd_entry(d117, 4, 4, sse2, 8), highbd_entry(d135, 4, 4, sse2, 8),
// highbd_entry(d153, 4, 4, sse2, 8), highbd_entry(d45e, 4, 4, sse2, 8),
// highbd_entry(d45e, 4, 8, sse2, 8), highbd_entry(d45e, 8, 4, sse2, 8),
// highbd_entry(d45e, 8, 8, sse2, 8), highbd_entry(d45e, 8, 16, sse2, 8),
// highbd_entry(d207e, 4, 4, sse2, 8), highbd_entry(d207e, 4, 8, sse2, 8),
// highbd_entry(d207e, 8, 4, sse2, 8), highbd_entry(d207e, 8, 8, sse2, 8),
// highbd_entry(d207e, 8, 16, sse2, 8), highbd_entry(d207e, 16, 8, sse2, 8),
// highbd_entry(d207e, 16, 16, sse2, 8), highbd_entry(d207e, 16, 32, sse2, 8),
highbd_entry(d63e, 4, 4, sse2, 8), highbd_entry(d63e, 4, 8, sse2, 8),
highbd_entry(d63e, 8, 4, sse2, 8), highbd_entry(d63e, 8, 8, sse2, 8),
highbd_entry(d63e, 8, 16, sse2, 8),
};
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVector8));
const IntraPredFunc<HighbdIntraPred> IntraPredTestVector10[] = {
// highbd_intrapred(dc, sse2, 10), highbd_intrapred(dc_left, sse2, 10),
// highbd_intrapred(dc_top, sse2, 10), highbd_intrapred(dc_128, sse2, 10),
// highbd_intrapred(h, sse2, 10), highbd_intrapred(v, sse2, 10),
// highbd_entry(d117, 4, 4, sse2, 10), highbd_entry(d135, 4, 4, sse2, 10),
// highbd_entry(d153, 4, 4, sse2, 10),
// highbd_entry(d45e, 4, 4, sse2, 10),
// highbd_entry(d45e, 4, 8, sse2, 10),
// highbd_entry(d45e, 8, 4, sse2, 10),
// highbd_entry(d45e, 8, 8, sse2, 10),
// highbd_entry(d45e, 8, 16, sse2, 10),
// highbd_entry(d207e, 4, 4, sse2, 10), highbd_entry(d207e, 4, 8, sse2, 10),
// highbd_entry(d207e, 8, 4, sse2, 10), highbd_entry(d207e, 8, 8, sse2, 10),
// highbd_entry(d207e, 8, 16, sse2, 10), highbd_entry(d207e, 16, 8, sse2,
// 10),
// highbd_entry(d207e, 16, 16, sse2, 10), highbd_entry(d207e, 16, 32, sse2,
// 10),
highbd_entry(d63e, 4, 4, sse2, 10), highbd_entry(d63e, 4, 8, sse2, 10),
highbd_entry(d63e, 8, 4, sse2, 10), highbd_entry(d63e, 8, 8, sse2, 10),
highbd_entry(d63e, 8, 16, sse2, 10),
};
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVector10));
const IntraPredFunc<HighbdIntraPred> IntraPredTestVector12[] = {
// highbd_intrapred(dc, sse2, 12), highbd_intrapred(dc_left, sse2, 12),
// highbd_intrapred(dc_top, sse2, 12), highbd_intrapred(dc_128, sse2, 12),
// highbd_intrapred(h, sse2, 12), highbd_intrapred(v, sse2, 12),
// highbd_entry(d117, 4, 4, sse2, 12), highbd_entry(d135, 4, 4, sse2, 12),
// highbd_entry(d153, 4, 4, sse2, 12),
// highbd_entry(d45e, 4, 4, sse2, 12),
// highbd_entry(d45e, 4, 8, sse2, 12), highbd_entry(d45e, 8, 4, sse2, 12),
// highbd_entry(d45e, 8, 8, sse2, 12), highbd_entry(d45e, 8, 16, sse2, 12),
// highbd_entry(d207e, 4, 4, sse2, 12), highbd_entry(d207e, 4, 8, sse2, 12),
// highbd_entry(d207e, 8, 4, sse2, 12), highbd_entry(d207e, 8, 8, sse2, 12),
// highbd_entry(d207e, 8, 16, sse2, 12), highbd_entry(d207e, 16, 8, sse2,
// 12),
// highbd_entry(d207e, 16, 16, sse2, 12), highbd_entry(d207e, 16, 32, sse2,
// 12),
highbd_entry(d63e, 4, 4, sse2, 12), highbd_entry(d63e, 4, 8, sse2, 12),
highbd_entry(d63e, 8, 4, sse2, 12), highbd_entry(d63e, 8, 8, sse2, 12),
highbd_entry(d63e, 8, 16, sse2, 12),
};
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVector12));
#endif // HAVE_SSE2
#if HAVE_SSSE3
const IntraPredFunc<HighbdIntraPred> IntraPredTestVectorSsse3_8[] = {
highbd_entry(d117, 8, 8, ssse3, 8), highbd_entry(d117, 16, 16, ssse3, 8),
highbd_entry(d117, 32, 32, ssse3, 8), highbd_entry(d135, 8, 8, ssse3, 8),
highbd_entry(d135, 16, 16, ssse3, 8), highbd_entry(d135, 32, 32, ssse3, 8),
highbd_entry(d153, 8, 8, ssse3, 8), highbd_entry(d153, 16, 16, ssse3, 8),
highbd_entry(d153, 32, 32, ssse3, 8),
};
INSTANTIATE_TEST_CASE_P(SSSE3_TO_C_8, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVectorSsse3_8));
const IntraPredFunc<HighbdIntraPred> IntraPredTestVectorSsse3_10[] = {
highbd_entry(d117, 8, 8, ssse3, 10), highbd_entry(d117, 16, 16, ssse3, 10),
highbd_entry(d117, 32, 32, ssse3, 10), highbd_entry(d135, 8, 8, ssse3, 10),
highbd_entry(d135, 16, 16, ssse3, 10), highbd_entry(d135, 32, 32, ssse3, 10),
highbd_entry(d153, 8, 8, ssse3, 10), highbd_entry(d153, 16, 16, ssse3, 10),
highbd_entry(d153, 32, 32, ssse3, 10),
};
INSTANTIATE_TEST_CASE_P(SSSE3_TO_C_10, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVectorSsse3_10));
const IntraPredFunc<HighbdIntraPred> IntraPredTestVectorSsse3_12[] = {
highbd_entry(d117, 8, 8, ssse3, 12), highbd_entry(d117, 16, 16, ssse3, 12),
highbd_entry(d117, 32, 32, ssse3, 12), highbd_entry(d135, 8, 8, ssse3, 12),
highbd_entry(d135, 16, 16, ssse3, 12), highbd_entry(d135, 32, 32, ssse3, 12),
highbd_entry(d153, 8, 8, ssse3, 12), highbd_entry(d153, 16, 16, ssse3, 12),
highbd_entry(d153, 32, 32, ssse3, 12),
};
INSTANTIATE_TEST_CASE_P(SSSE3_TO_C_12, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVectorSsse3_12));
#endif // HAVE_SSSE3
#if HAVE_AVX2
const IntraPredFunc<HighbdIntraPred> IntraPredTestVectorAvx2_8[] = {
highbd_entry(d45e, 16, 8, avx2, 8), highbd_entry(d45e, 16, 16, avx2, 8),
highbd_entry(d45e, 16, 32, avx2, 8), highbd_entry(d45e, 32, 16, avx2, 8),
highbd_entry(d45e, 32, 32, avx2, 8), highbd_entry(d207e, 32, 16, avx2, 8),
highbd_entry(d207e, 32, 32, avx2, 8), highbd_entry(d63e, 16, 8, avx2, 8),
highbd_entry(d63e, 16, 16, avx2, 8), highbd_entry(d63e, 16, 32, avx2, 8),
highbd_entry(d63e, 32, 16, avx2, 8), highbd_entry(d63e, 32, 32, avx2, 8),
};
INSTANTIATE_TEST_CASE_P(AVX2_TO_C_8, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVectorAvx2_8));
const IntraPredFunc<HighbdIntraPred> IntraPredTestVectorAvx2_10[] = {
highbd_entry(d45e, 16, 8, avx2, 10), highbd_entry(d45e, 16, 16, avx2, 10),
highbd_entry(d45e, 16, 32, avx2, 10), highbd_entry(d45e, 32, 16, avx2, 10),
highbd_entry(d45e, 32, 32, avx2, 10), highbd_entry(d207e, 32, 16, avx2, 10),
highbd_entry(d207e, 32, 32, avx2, 10), highbd_entry(d63e, 16, 8, avx2, 10),
highbd_entry(d63e, 16, 16, avx2, 10), highbd_entry(d63e, 16, 32, avx2, 10),
highbd_entry(d63e, 32, 16, avx2, 10), highbd_entry(d63e, 32, 32, avx2, 10),
};
INSTANTIATE_TEST_CASE_P(AVX2_TO_C_10, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVectorAvx2_10));
const IntraPredFunc<HighbdIntraPred> IntraPredTestVectorAvx2_12[] = {
highbd_entry(d45e, 16, 8, avx2, 12), highbd_entry(d45e, 16, 16, avx2, 12),
highbd_entry(d45e, 16, 32, avx2, 12), highbd_entry(d45e, 32, 16, avx2, 12),
highbd_entry(d45e, 32, 32, avx2, 12), highbd_entry(d207e, 32, 16, avx2, 12),
highbd_entry(d207e, 32, 32, avx2, 12), highbd_entry(d63e, 16, 8, avx2, 12),
highbd_entry(d63e, 16, 16, avx2, 12), highbd_entry(d63e, 16, 32, avx2, 12),
highbd_entry(d63e, 32, 16, avx2, 12), highbd_entry(d63e, 32, 32, avx2, 12),
};
INSTANTIATE_TEST_CASE_P(AVX2_TO_C_12, HighbdIntraPredTest,
::testing::ValuesIn(IntraPredTestVectorAvx2_12));
#endif // HAVE_AVX2
// -----------------------------------------------------------------------------
// Low Bit Depth Tests
// ---------------------------------------------------------------------------
// Low Bit Depth Tests
#define lowbd_entry(type, width, height, opt) \
IntraPredFunc<IntraPred>(&aom_##type##_predictor_##width##x##height##_##opt, \
......@@ -334,7 +196,6 @@ INSTANTIATE_TEST_CASE_P(AVX2_TO_C_12, HighbdIntraPredTest,
#if HAVE_SSE2
const IntraPredFunc<IntraPred> LowbdIntraPredTestVector[] = {
lowbd_intrapred(d63e, sse2), lowbd_intrapred(d207e, sse2),
lowbd_intrapred(dc, sse2), lowbd_intrapred(dc_top, sse2),
lowbd_intrapred(dc_left, sse2), lowbd_intrapred(dc_128, sse2),
lowbd_intrapred(v, sse2), lowbd_intrapred(h, sse2),
......@@ -347,8 +208,6 @@ INSTANTIATE_TEST_CASE_P(SSE2, LowbdIntraPredTest,
#if HAVE_SSSE3
const IntraPredFunc<IntraPred> LowbdIntraPredTestVectorSsse3[] = {
lowbd_entry(d63e, 4, 4, ssse3),
lowbd_intrapred(d45e, ssse3),
lowbd_intrapred(paeth, ssse3),
lowbd_intrapred(smooth, ssse3),
};
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment