[x265-commits] [x265] Backed out changeset: 8ba297f59e48
Steve Borho
steve at borho.org
Thu Feb 26 22:26:58 CET 2015
details: http://hg.videolan.org/x265/rev/f10acfd2dae1
branches:
changeset: 9596:f10acfd2dae1
user: Steve Borho <steve at borho.org>
date: Thu Feb 26 15:25:48 2015 -0600
description:
Backed out changeset: 8ba297f59e48
That commit was a spectacularly bad idea
Subject: [x265] asm: use grouping macros to simplify avx2 function sets
details: http://hg.videolan.org/x265/rev/394c2f94a2dc
branches:
changeset: 9597:394c2f94a2dc
user: Steve Borho <steve at borho.org>
date: Thu Feb 26 15:26:39 2015 -0600
description:
asm: use grouping macros to simplify avx2 function sets
diffstat:
source/common/x86/asm-primitives.cpp | 407 +++++++---------------------------
source/encoder/slicetype.cpp | 1 -
2 files changed, 92 insertions(+), 316 deletions(-)
diffs (truncated from 553 to 300 lines):
diff -r 63a912e6dac5 -r 394c2f94a2dc source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp Thu Feb 26 12:22:33 2015 -0600
+++ b/source/common/x86/asm-primitives.cpp Thu Feb 26 15:26:39 2015 -0600
@@ -1069,27 +1069,34 @@ void setupAssemblyPrimitives(EncoderPrim
}
if (cpuMask & X265_CPU_AVX2)
{
+ p.cu[BLOCK_32x32].ssd_s = x265_pixel_ssd_s_32_avx2;
+ p.cu[BLOCK_16x16].sse_ss = x265_pixel_ssd_ss_16x16_avx2;
+
p.quant = x265_quant_avx2;
p.nquant = x265_nquant_avx2;
p.dequant_normal = x265_dequant_normal_avx2;
- p.cu[BLOCK_4x4].count_nonzero = x265_count_nonzero_4x4_avx2;
- p.cu[BLOCK_8x8].count_nonzero = x265_count_nonzero_8x8_avx2;
- p.cu[BLOCK_16x16].count_nonzero = x265_count_nonzero_16x16_avx2;
- p.cu[BLOCK_32x32].count_nonzero = x265_count_nonzero_32x32_avx2;
+
p.scale1D_128to64 = x265_scale1D_128to64_avx2;
// p.weight_pp = x265_weight_pp_avx2; fails tests
+
p.cu[BLOCK_16x16].calcresidual = x265_getResidual16_avx2;
p.cu[BLOCK_32x32].calcresidual = x265_getResidual32_avx2;
+ p.cu[BLOCK_16x16].blockfill_s = x265_blockfill_s_16x16_avx2;
+ p.cu[BLOCK_32x32].blockfill_s = x265_blockfill_s_32x32_avx2;
+
+ ALL_LUMA_TU(count_nonzero, count_nonzero, avx2);
ALL_LUMA_TU_S(cpy1Dto2D_shl, cpy1Dto2D_shl_, avx2);
ALL_LUMA_TU_S(cpy1Dto2D_shr, cpy1Dto2D_shr_, avx2);
p.cu[BLOCK_8x8].copy_cnt = x265_copy_cnt_8_avx2;
p.cu[BLOCK_16x16].copy_cnt = x265_copy_cnt_16_avx2;
p.cu[BLOCK_32x32].copy_cnt = x265_copy_cnt_32_avx2;
+
p.cu[BLOCK_8x8].cpy2Dto1D_shl = x265_cpy2Dto1D_shl_8_avx2;
p.cu[BLOCK_16x16].cpy2Dto1D_shl = x265_cpy2Dto1D_shl_16_avx2;
p.cu[BLOCK_32x32].cpy2Dto1D_shl = x265_cpy2Dto1D_shl_32_avx2;
+
p.cu[BLOCK_8x8].cpy2Dto1D_shr = x265_cpy2Dto1D_shr_8_avx2;
p.cu[BLOCK_16x16].cpy2Dto1D_shr = x265_cpy2Dto1D_shr_16_avx2;
p.cu[BLOCK_32x32].cpy2Dto1D_shr = x265_cpy2Dto1D_shr_32_avx2;
@@ -1097,129 +1104,15 @@ void setupAssemblyPrimitives(EncoderPrim
#if X86_64
ALL_LUMA_TU_S(dct, dct, avx2);
ALL_LUMA_TU_S(idct, idct, avx2);
+ ALL_LUMA_CU_S(transpose, transpose, avx2);
- p.cu[BLOCK_8x8].transpose = x265_transpose8_avx2;
- p.cu[BLOCK_16x16].transpose = x265_transpose16_avx2;
- p.cu[BLOCK_32x32].transpose = x265_transpose32_avx2;
- p.cu[BLOCK_64x64].transpose = x265_transpose64_avx2;
-
- p.pu[LUMA_8x8].luma_vpp = x265_interp_8tap_vert_pp_8x8_avx2;
- p.pu[LUMA_8x16].luma_vpp = x265_interp_8tap_vert_pp_8x16_avx2;
- p.pu[LUMA_8x32].luma_vpp = x265_interp_8tap_vert_pp_8x32_avx2;
-
- p.pu[LUMA_12x16].luma_vpp = x265_interp_8tap_vert_pp_12x16_avx2;
-
- p.pu[LUMA_16x8].luma_vpp = x265_interp_8tap_vert_pp_16x8_avx2;
- p.pu[LUMA_16x12].luma_vpp = x265_interp_8tap_vert_pp_16x12_avx2;
- p.pu[LUMA_16x16].luma_vpp = x265_interp_8tap_vert_pp_16x16_avx2;
- p.pu[LUMA_16x32].luma_vpp = x265_interp_8tap_vert_pp_16x32_avx2;
- p.pu[LUMA_16x64].luma_vpp = x265_interp_8tap_vert_pp_16x64_avx2;
-
- p.pu[LUMA_24x32].luma_vpp = x265_interp_8tap_vert_pp_24x32_avx2;
-
- p.pu[LUMA_32x8].luma_vpp = x265_interp_8tap_vert_pp_32x8_avx2;
- p.pu[LUMA_32x16].luma_vpp = x265_interp_8tap_vert_pp_32x16_avx2;
- p.pu[LUMA_32x24].luma_vpp = x265_interp_8tap_vert_pp_32x24_avx2;
- p.pu[LUMA_32x32].luma_vpp = x265_interp_8tap_vert_pp_32x32_avx2;
- p.pu[LUMA_32x64].luma_vpp = x265_interp_8tap_vert_pp_32x64_avx2;
-
- p.pu[LUMA_48x64].luma_vpp = x265_interp_8tap_vert_pp_48x64_avx2;
-
- p.pu[LUMA_64x16].luma_vpp = x265_interp_8tap_vert_pp_64x16_avx2;
- p.pu[LUMA_64x32].luma_vpp = x265_interp_8tap_vert_pp_64x32_avx2;
- p.pu[LUMA_64x48].luma_vpp = x265_interp_8tap_vert_pp_64x48_avx2;
- p.pu[LUMA_64x64].luma_vpp = x265_interp_8tap_vert_pp_64x64_avx2;
-
- p.pu[LUMA_8x8].luma_vps = x265_interp_8tap_vert_ps_8x8_avx2;
- p.pu[LUMA_8x16].luma_vps = x265_interp_8tap_vert_ps_8x16_avx2;
- p.pu[LUMA_8x32].luma_vps = x265_interp_8tap_vert_ps_8x32_avx2;
-
- p.pu[LUMA_12x16].luma_vps = x265_interp_8tap_vert_ps_12x16_avx2;
-
- p.pu[LUMA_16x8].luma_vps = x265_interp_8tap_vert_ps_16x8_avx2;
- p.pu[LUMA_16x12].luma_vps = x265_interp_8tap_vert_ps_16x12_avx2;
- p.pu[LUMA_16x16].luma_vps = x265_interp_8tap_vert_ps_16x16_avx2;
- p.pu[LUMA_16x32].luma_vps = x265_interp_8tap_vert_ps_16x32_avx2;
- p.pu[LUMA_16x64].luma_vps = x265_interp_8tap_vert_ps_16x64_avx2;
-
- p.pu[LUMA_24x32].luma_vps = x265_interp_8tap_vert_ps_24x32_avx2;
-
- p.pu[LUMA_32x8].luma_vps = x265_interp_8tap_vert_ps_32x8_avx2;
- p.pu[LUMA_32x16].luma_vps = x265_interp_8tap_vert_ps_32x16_avx2;
- p.pu[LUMA_32x24].luma_vps = x265_interp_8tap_vert_ps_32x24_avx2;
- p.pu[LUMA_32x32].luma_vps = x265_interp_8tap_vert_ps_32x32_avx2;
- p.pu[LUMA_32x64].luma_vps = x265_interp_8tap_vert_ps_32x64_avx2;
-
- p.pu[LUMA_48x64].luma_vps = x265_interp_8tap_vert_ps_48x64_avx2;
-
- p.pu[LUMA_64x16].luma_vps = x265_interp_8tap_vert_ps_64x16_avx2;
- p.pu[LUMA_64x32].luma_vps = x265_interp_8tap_vert_ps_64x32_avx2;
- p.pu[LUMA_64x48].luma_vps = x265_interp_8tap_vert_ps_64x48_avx2;
- p.pu[LUMA_64x64].luma_vps = x265_interp_8tap_vert_ps_64x64_avx2;
-
- p.pu[LUMA_8x8].luma_vsp = x265_interp_8tap_vert_sp_8x8_avx2;
- p.pu[LUMA_8x16].luma_vsp = x265_interp_8tap_vert_sp_8x16_avx2;
- p.pu[LUMA_8x32].luma_vsp = x265_interp_8tap_vert_sp_8x32_avx2;
-
- p.pu[LUMA_12x16].luma_vsp = x265_interp_8tap_vert_sp_12x16_avx2;
-
- p.pu[LUMA_16x8].luma_vsp = x265_interp_8tap_vert_sp_16x8_avx2;
- p.pu[LUMA_16x12].luma_vsp = x265_interp_8tap_vert_sp_16x12_avx2;
- p.pu[LUMA_16x16].luma_vsp = x265_interp_8tap_vert_sp_16x16_avx2;
- p.pu[LUMA_16x32].luma_vsp = x265_interp_8tap_vert_sp_16x32_avx2;
- p.pu[LUMA_16x64].luma_vsp = x265_interp_8tap_vert_sp_16x64_avx2;
-
- p.pu[LUMA_24x32].luma_vsp = x265_interp_8tap_vert_sp_24x32_avx2;
-
- p.pu[LUMA_32x8].luma_vsp = x265_interp_8tap_vert_sp_32x8_avx2;
- p.pu[LUMA_32x16].luma_vsp = x265_interp_8tap_vert_sp_32x16_avx2;
- p.pu[LUMA_32x24].luma_vsp = x265_interp_8tap_vert_sp_32x24_avx2;
- p.pu[LUMA_32x32].luma_vsp = x265_interp_8tap_vert_sp_32x32_avx2;
- p.pu[LUMA_32x64].luma_vsp = x265_interp_8tap_vert_sp_32x64_avx2;
-
- p.pu[LUMA_48x64].luma_vsp = x265_interp_8tap_vert_sp_48x64_avx2;
-
- p.pu[LUMA_64x16].luma_vsp = x265_interp_8tap_vert_sp_64x16_avx2;
- p.pu[LUMA_64x32].luma_vsp = x265_interp_8tap_vert_sp_64x32_avx2;
- p.pu[LUMA_64x48].luma_vsp = x265_interp_8tap_vert_sp_64x48_avx2;
- p.pu[LUMA_64x64].luma_vsp = x265_interp_8tap_vert_sp_64x64_avx2;
-
- p.pu[LUMA_8x8].luma_vss = x265_interp_8tap_vert_ss_8x8_avx2;
- p.pu[LUMA_8x16].luma_vss = x265_interp_8tap_vert_ss_8x16_avx2;
- p.pu[LUMA_8x32].luma_vss = x265_interp_8tap_vert_ss_8x32_avx2;
-
- p.pu[LUMA_12x16].luma_vss = x265_interp_8tap_vert_ss_12x16_avx2;
-
- p.pu[LUMA_16x8].luma_vss = x265_interp_8tap_vert_ss_16x8_avx2;
- p.pu[LUMA_16x12].luma_vss = x265_interp_8tap_vert_ss_16x12_avx2;
- p.pu[LUMA_16x16].luma_vss = x265_interp_8tap_vert_ss_16x16_avx2;
- p.pu[LUMA_16x32].luma_vss = x265_interp_8tap_vert_ss_16x32_avx2;
- p.pu[LUMA_16x64].luma_vss = x265_interp_8tap_vert_ss_16x64_avx2;
-
- p.pu[LUMA_24x32].luma_vss = x265_interp_8tap_vert_ss_24x32_avx2;
-
- p.pu[LUMA_32x8].luma_vss = x265_interp_8tap_vert_ss_32x8_avx2;
- p.pu[LUMA_32x16].luma_vss = x265_interp_8tap_vert_ss_32x16_avx2;
- p.pu[LUMA_32x24].luma_vss = x265_interp_8tap_vert_ss_32x24_avx2;
- p.pu[LUMA_32x32].luma_vss = x265_interp_8tap_vert_ss_32x32_avx2;
- p.pu[LUMA_32x64].luma_vss = x265_interp_8tap_vert_ss_32x64_avx2;
-
- p.pu[LUMA_48x64].luma_vss = x265_interp_8tap_vert_ss_48x64_avx2;
-
- p.pu[LUMA_64x16].luma_vss = x265_interp_8tap_vert_ss_64x16_avx2;
- p.pu[LUMA_64x32].luma_vss = x265_interp_8tap_vert_ss_64x32_avx2;
- p.pu[LUMA_64x48].luma_vss = x265_interp_8tap_vert_ss_64x48_avx2;
- p.pu[LUMA_64x64].luma_vss = x265_interp_8tap_vert_ss_64x64_avx2;
+ ALL_LUMA_PU(luma_vpp, interp_8tap_vert_pp, avx2);
+ ALL_LUMA_PU(luma_vps, interp_8tap_vert_ps, avx2);
+ ALL_LUMA_PU(luma_vsp, interp_8tap_vert_sp, avx2);
+ ALL_LUMA_PU(luma_vss, interp_8tap_vert_ss, avx2);
#else
+ /* functions with both 64-bit and 32-bit implementations */
p.cu[BLOCK_4x4].dct = x265_dct4_avx2;
-#endif
- p.cu[BLOCK_32x32].ssd_s = x265_pixel_ssd_s_32_avx2;
- p.cu[BLOCK_16x16].sse_ss = x265_pixel_ssd_ss_16x16_avx2;
-
- // Blockfill_s primitives
- p.cu[BLOCK_16x16].blockfill_s = x265_blockfill_s_16x16_avx2;
- p.cu[BLOCK_32x32].blockfill_s = x265_blockfill_s_32x32_avx2;
-
p.pu[LUMA_4x4].luma_vpp = x265_interp_8tap_vert_pp_4x4_avx2;
p.pu[LUMA_4x8].luma_vpp = x265_interp_8tap_vert_pp_4x8_avx2;
p.pu[LUMA_4x16].luma_vpp = x265_interp_8tap_vert_pp_4x16_avx2;
@@ -1243,6 +1136,7 @@ void setupAssemblyPrimitives(EncoderPrim
p.pu[LUMA_4x16].luma_vss = x265_interp_8tap_vert_ss_4x16_avx2;
p.pu[LUMA_8x4].luma_vss = x265_interp_8tap_vert_ss_8x4_avx2;
p.pu[LUMA_16x4].luma_vss = x265_interp_8tap_vert_ss_16x4_avx2;
+#endif
}
}
#else // if HIGH_BIT_DEPTH
@@ -1381,12 +1275,12 @@ void setupAssemblyPrimitives(EncoderPrim
p.chroma[X265_CSP_I420].p2s = x265_chroma_p2s_ssse3;
p.chroma[X265_CSP_I422].p2s = x265_chroma_p2s_ssse3;
+
p.dst4x4 = x265_dst4_ssse3;
p.cu[BLOCK_8x8].idct = x265_idct8_ssse3;
- p.cu[BLOCK_4x4].count_nonzero = x265_count_nonzero_4x4_ssse3;
- p.cu[BLOCK_8x8].count_nonzero = x265_count_nonzero_8x8_ssse3;
- p.cu[BLOCK_16x16].count_nonzero = x265_count_nonzero_16x16_ssse3;
- p.cu[BLOCK_32x32].count_nonzero = x265_count_nonzero_32x32_ssse3;
+
+ ALL_LUMA_TU(count_nonzero, count_nonzero, ssse3);
+
p.frameInitLowres = x265_frame_init_lowres_core_ssse3;
p.scale1D_128to64 = x265_scale1D_128to64_ssse3;
p.scale2D_64to32 = x265_scale2D_64to32_ssse3;
@@ -1453,14 +1347,12 @@ void setupAssemblyPrimitives(EncoderPrim
INTRA_ANG_SSE4(sse4);
p.cu[BLOCK_4x4].psy_cost_pp = x265_psyCost_pp_4x4_sse4;
+ p.cu[BLOCK_4x4].psy_cost_ss = x265_psyCost_ss_4x4_sse4;
+
#if X86_64
ALL_LUMA_CU(psy_cost_pp, psyCost_pp, sse4);
- p.cu[BLOCK_8x8].psy_cost_ss = x265_psyCost_ss_8x8_sse4;
- p.cu[BLOCK_16x16].psy_cost_ss = x265_psyCost_ss_16x16_sse4;
- p.cu[BLOCK_32x32].psy_cost_ss = x265_psyCost_ss_32x32_sse4;
- p.cu[BLOCK_64x64].psy_cost_ss = x265_psyCost_ss_64x64_sse4;
+ ALL_LUMA_CU(psy_cost_ss, psyCost_ss, sse4);
#endif
- p.cu[BLOCK_4x4].psy_cost_ss = x265_psyCost_ss_4x4_sse4;
}
if (cpuMask & X265_CPU_AVX)
{
@@ -1579,195 +1471,63 @@ void setupAssemblyPrimitives(EncoderPrim
ALL_LUMA_TU_S(cpy1Dto2D_shl, cpy1Dto2D_shl_, avx2);
ALL_LUMA_TU_S(cpy1Dto2D_shr, cpy1Dto2D_shr_, avx2);
+ p.cu[BLOCK_8x8].cpy2Dto1D_shl = x265_cpy2Dto1D_shl_8_avx2;
+ p.cu[BLOCK_16x16].cpy2Dto1D_shl = x265_cpy2Dto1D_shl_16_avx2;
+ p.cu[BLOCK_32x32].cpy2Dto1D_shl = x265_cpy2Dto1D_shl_32_avx2;
+
p.cu[BLOCK_8x8].cpy2Dto1D_shr = x265_cpy2Dto1D_shr_8_avx2;
p.cu[BLOCK_16x16].cpy2Dto1D_shr = x265_cpy2Dto1D_shr_16_avx2;
p.cu[BLOCK_32x32].cpy2Dto1D_shr = x265_cpy2Dto1D_shr_32_avx2;
+ ALL_LUMA_TU(count_nonzero, count_nonzero, avx2);
p.denoiseDct = x265_denoise_dct_avx2;
p.quant = x265_quant_avx2;
p.nquant = x265_nquant_avx2;
p.dequant_normal = x265_dequant_normal_avx2;
- p.cu[BLOCK_4x4].count_nonzero = x265_count_nonzero_4x4_avx2;
- p.cu[BLOCK_8x8].count_nonzero = x265_count_nonzero_8x8_avx2;
- p.cu[BLOCK_16x16].count_nonzero = x265_count_nonzero_16x16_avx2;
- p.cu[BLOCK_32x32].count_nonzero = x265_count_nonzero_32x32_avx2;
+
p.cu[BLOCK_16x16].calcresidual = x265_getResidual16_avx2;
p.cu[BLOCK_32x32].calcresidual = x265_getResidual32_avx2;
p.scale1D_128to64 = x265_scale1D_128to64_avx2;
+ p.weight_pp = x265_weight_pp_avx2;
+
+ // intra_pred functions
+ p.cu[BLOCK_8x8].intra_pred[3] = x265_intra_pred_ang8_3_avx2;
+ p.cu[BLOCK_8x8].intra_pred[33] = x265_intra_pred_ang8_33_avx2;
+ p.cu[BLOCK_8x8].intra_pred[4] = x265_intra_pred_ang8_4_avx2;
+ p.cu[BLOCK_8x8].intra_pred[32] = x265_intra_pred_ang8_32_avx2;
+ p.cu[BLOCK_8x8].intra_pred[5] = x265_intra_pred_ang8_5_avx2;
+ p.cu[BLOCK_8x8].intra_pred[31] = x265_intra_pred_ang8_31_avx2;
+ p.cu[BLOCK_8x8].intra_pred[30] = x265_intra_pred_ang8_30_avx2;
+ p.cu[BLOCK_8x8].intra_pred[6] = x265_intra_pred_ang8_6_avx2;
+ p.cu[BLOCK_8x8].intra_pred[7] = x265_intra_pred_ang8_7_avx2;
+ p.cu[BLOCK_8x8].intra_pred[29] = x265_intra_pred_ang8_29_avx2;
+ p.cu[BLOCK_8x8].intra_pred[8] = x265_intra_pred_ang8_8_avx2;
+ p.cu[BLOCK_8x8].intra_pred[28] = x265_intra_pred_ang8_28_avx2;
+
// copy_sp primitives
p.cu[BLOCK_16x16].copy_sp = x265_blockcopy_sp_16x16_avx2;
p.chroma[X265_CSP_I420].cu[BLOCK_420_16x16].copy_sp = x265_blockcopy_sp_16x16_avx2;
p.chroma[X265_CSP_I422].cu[BLOCK_422_16x32].copy_sp = x265_blockcopy_sp_16x32_avx2;
- // 32 X N
p.cu[BLOCK_32x32].copy_sp = x265_blockcopy_sp_32x32_avx2;
p.chroma[X265_CSP_I420].cu[BLOCK_420_32x32].copy_sp = x265_blockcopy_sp_32x32_avx2;
p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].copy_sp = x265_blockcopy_sp_32x64_avx2;
- // 64 X N
- p.cu[BLOCK_64x64].copy_sp = x265_blockcopy_sp_64x64_avx2;
+ p.cu[BLOCK_64x64].copy_sp = x265_blockcopy_sp_64x64_avx2;
+
// copy_ps primitives
- // 16 X N
p.cu[BLOCK_16x16].copy_ps = x265_blockcopy_ps_16x16_avx2;
p.chroma[X265_CSP_I420].cu[CHROMA_420_16x16].copy_ps = x265_blockcopy_ps_16x16_avx2;
p.chroma[X265_CSP_I422].cu[CHROMA_422_16x32].copy_ps = x265_blockcopy_ps_16x32_avx2;
- // 32 X N
p.cu[BLOCK_32x32].copy_ps = x265_blockcopy_ps_32x32_avx2;
p.chroma[X265_CSP_I420].cu[CHROMA_420_32x32].copy_ps = x265_blockcopy_ps_32x32_avx2;
p.chroma[X265_CSP_I422].cu[CHROMA_422_32x64].copy_ps = x265_blockcopy_ps_32x64_avx2;
- // 64 x N
p.cu[BLOCK_64x64].copy_ps = x265_blockcopy_ps_64x64_avx2;
- p.weight_pp = x265_weight_pp_avx2;
- p.cu[BLOCK_4x4].dct = x265_dct4_avx2;
-#if X86_64
- p.cu[BLOCK_8x8].dct = x265_dct8_avx2;
- p.cu[BLOCK_16x16].dct = x265_dct16_avx2;
- p.cu[BLOCK_32x32].dct = x265_dct32_avx2;
-
- p.cu[BLOCK_4x4].idct = x265_idct4_avx2;
- p.cu[BLOCK_8x8].idct = x265_idct8_avx2;
More information about the x265-commits
mailing list