From 70705f9bfec47fc88c47226e5622bfa33586d8a5 Mon Sep 17 00:00:00 2001 From: dzaima Date: Thu, 24 Apr 2025 18:36:10 +0300 Subject: [PATCH] move bmi.singeli into base x86 include --- src/singeli/src/base.singeli | 2 +- src/singeli/src/fold.singeli | 1 - src/singeli/src/slash.singeli | 5 +---- src/singeli/src/x86.singeli | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/singeli/src/base.singeli b/src/singeli/src/base.singeli index a0d68e31..9433503d 100644 --- a/src/singeli/src/base.singeli +++ b/src/singeli/src/base.singeli @@ -179,7 +179,7 @@ def { all_hom,any_hom,blend_hom,hom_to_int,store_masked_hom,store_blended_hom, all_top,any_top,blend_top,top_to_int,store_masked_top,store_blended_top, load_expand_bits,make,mask_to_hom,mulw_split,mulh,narrow,narrow_trunc,narrow_pair, - pair,pdep,pext,rbit,sel,shuf_ind,reverse_units,broadcast_sel,absdiff_sum,mul_sum,mul_sum_sat, + pair,pdep,pext,bzhi,rbit,sel,shuf_ind,reverse_units,broadcast_sel,absdiff_sum,mul_sum,mul_sum_sat, unord,unzip,vfold,vec_select,vec_shuffle,widen,widen_upper,multishift, addp,addpw,addpwa, } diff --git a/src/singeli/src/fold.singeli b/src/singeli/src/fold.singeli index e0cda6f7..0966f776 100644 --- a/src/singeli/src/fold.singeli +++ b/src/singeli/src/fold.singeli @@ -1,6 +1,5 @@ include './base' include './mask' -if_inline (hasarch{'BMI2'}) include './bmi' include './spaced' include './scan_common' include './vecfold' diff --git a/src/singeli/src/slash.singeli b/src/singeli/src/slash.singeli index 04d3b71d..56322727 100644 --- a/src/singeli/src/slash.singeli +++ b/src/singeli/src/slash.singeli @@ -1,8 +1,5 @@ include './base' -if_inline (hasarch{'X86_64'}) { - if_inline (hasarch{'PCLMUL'}) include './clmul' - if_inline (hasarch{'BMI2'}) include './bmi' -} +if_inline (hasarch{'PCLMUL'}) include './clmul' include './mask' def popc_rand{x:T if isint{T} and width{T}==64} = emit{u8, 'rand_popc64', x} # under valgrind, return a random result in the range of possible ones diff --git a/src/singeli/src/x86.singeli b/src/singeli/src/x86.singeli index ca6dd262..547ff8fa 100644 --- a/src/singeli/src/x86.singeli +++ b/src/singeli/src/x86.singeli @@ -58,6 +58,7 @@ include './sse' include './avx' include './avx2' include './avx512' +include './bmi'