From b6b93ceec5669310ffbcfa4cbd88c0c2f9c68ca2 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 16 Apr 2024 10:36:13 +0200 Subject: x86inc.asm: update to current master 04f14f43 Requires changing residual calc functions to AVX2. Also, supply the private prefix via nasm -D option rather than modifying x86inc.asm. --- residual_calc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'residual_calc.c') diff --git a/residual_calc.c b/residual_calc.c index 948655e..6d43e4d 100644 --- a/residual_calc.c +++ b/residual_calc.c @@ -75,10 +75,10 @@ struct ResidualCalcInternal { }; #if HAVE_NASM -ResidualLineCalc mg2di_residual_line_calc_s1_fma3; -ResidualLineCalc mg2di_residual_line_calc_s2_fma3; -ResidualLineAdd mg2di_residual_line_add_s1_fma3; -ResidualLineAdd mg2di_residual_line_add_s2_fma3; +ResidualLineCalc mg2di_residual_line_calc_s1_avx2; +ResidualLineCalc mg2di_residual_line_calc_s2_avx2; +ResidualLineAdd mg2di_residual_line_add_s1_avx2; +ResidualLineAdd mg2di_residual_line_add_s2_avx2; #endif static void @@ -331,9 +331,9 @@ int mg2di_residual_calc_init(ResidualCalcContext *ctx) priv->residual_line_calc = residual_calc_line_s1_c; priv->residual_line_add = residual_add_line_s1_c; #if HAVE_NASM - if (ctx->cpuflags & MG2DI_CPU_FLAG_FMA3) { - priv->residual_line_calc = mg2di_residual_line_calc_s1_fma3; - priv->residual_line_add = mg2di_residual_line_add_s1_fma3; + if (ctx->cpuflags & MG2DI_CPU_FLAG_AVX2) { + priv->residual_line_calc = mg2di_residual_line_calc_s1_avx2; + priv->residual_line_add = mg2di_residual_line_add_s1_avx2; priv->calc_blocksize = 4; } #endif @@ -342,9 +342,9 @@ int mg2di_residual_calc_init(ResidualCalcContext *ctx) priv->residual_line_calc = residual_calc_line_s2_c; priv->residual_line_add = residual_add_line_s2_c; #if HAVE_NASM - if (ctx->cpuflags & MG2DI_CPU_FLAG_FMA3) { - priv->residual_line_calc = mg2di_residual_line_calc_s2_fma3; - priv->residual_line_add = mg2di_residual_line_add_s2_fma3; + if (ctx->cpuflags & MG2DI_CPU_FLAG_AVX2) { + priv->residual_line_calc = mg2di_residual_line_calc_s2_avx2; + priv->residual_line_add = mg2di_residual_line_add_s2_avx2; priv->calc_blocksize = 4; } #endif -- cgit v1.2.3