fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 12:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallivm: add subgroup vote 64-bit and feq support.

Browse source 
These are both required for vulkan subgroup support.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9645>
This commit is contained in:
Dave Airlie 2021-03-19 11:56:35 +10:00 • committed by Marge Bot
parent 8a18ed018b
commit 2e23108274
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/auxiliary/gallivm/lp_bld_nir.c
View file

@ -1789,7 +1789,8 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base,
case nir_intrinsic_vote_all:
case nir_intrinsic_vote_any:
case nir_intrinsic_vote_ieq:
bld_base->vote(bld_base, cast_type(bld_base, get_src(bld_base, instr->src[0]), nir_type_int, 32), instr, result);
case nir_intrinsic_vote_feq:
bld_base->vote(bld_base, cast_type(bld_base, get_src(bld_base, instr->src[0]), nir_type_int, nir_src_bit_size(instr->src[0])), instr, result);
break;
case nir_intrinsic_interp_deref_at_offset:
case nir_intrinsic_interp_deref_at_centroid:

30
src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c
View file

@ -1805,19 +1805,21 @@ emit_prologue(struct lp_build_nir_soa_context *bld)
}
}
static void emit_vote(struct lp_build_nir_context *bld_base, LLVMValueRef src, nir_intrinsic_instr *instr, LLVMValueRef result[4])
static void emit_vote(struct lp_build_nir_context *bld_base, LLVMValueRef src,
nir_intrinsic_instr *instr, LLVMValueRef result[4])
{
struct gallivm_state * gallivm = bld_base->base.gallivm;
LLVMBuilderRef builder = gallivm->builder;
uint32_t bit_size = nir_src_bit_size(instr->src[0]);
LLVMValueRef exec_mask = mask_vec(bld_base);
struct lp_build_loop_state loop_state;
LLVMValueRef outer_cond = LLVMBuildICmp(builder, LLVMIntNE, exec_mask, bld_base->uint_bld.zero, "");
LLVMValueRef res_store = lp_build_alloca(gallivm, bld_base->int_bld.elem_type, "");
LLVMValueRef res_store = lp_build_alloca(gallivm, bld_base->uint_bld.elem_type, "");
LLVMValueRef eq_store = lp_build_alloca(gallivm, get_int_bld(bld_base, true, bit_size)->elem_type, "");
LLVMValueRef init_val = NULL;
if (instr->intrinsic == nir_intrinsic_vote_ieq) {
if (instr->intrinsic == nir_intrinsic_vote_ieq ||
instr->intrinsic == nir_intrinsic_vote_feq) {
/* for equal we unfortunately have to loop and find the first valid one. */
lp_build_loop_begin(&loop_state, gallivm, lp_build_const_int32(gallivm, 0));
LLVMValueRef if_cond = LLVMBuildExtractElement(gallivm->builder, outer_cond, loop_state.counter, "");
@ -1826,11 +1828,12 @@ static void emit_vote(struct lp_build_nir_context *bld_base, LLVMValueRef src, n
lp_build_if(&ifthen, gallivm, if_cond);
LLVMValueRef value_ptr = LLVMBuildExtractElement(gallivm->builder, src,
loop_state.counter, "");
LLVMBuildStore(builder, value_ptr, res_store);
LLVMBuildStore(builder, value_ptr, eq_store);
LLVMBuildStore(builder, lp_build_const_int32(gallivm, -1), res_store);
lp_build_endif(&ifthen);
lp_build_loop_end_cond(&loop_state, lp_build_const_int32(gallivm, bld_base->uint_bld.type.length),
NULL, LLVMIntUGE);
init_val = LLVMBuildLoad(builder, res_store, "");
NULL, LLVMIntUGE);
init_val = LLVMBuildLoad(builder, eq_store, "");
} else {
LLVMBuildStore(builder, lp_build_const_int32(gallivm, instr->intrinsic == nir_intrinsic_vote_any ? 0 : -1), res_store);
}
@ -1846,10 +1849,17 @@ static void emit_vote(struct lp_build_nir_context *bld_base, LLVMValueRef src, n
lp_build_if(&ifthen, gallivm, if_cond);
res = LLVMBuildLoad(builder, res_store, "");
if (instr->intrinsic == nir_intrinsic_vote_ieq) {
if (instr->intrinsic == nir_intrinsic_vote_feq) {
struct lp_build_context *flt_bld = get_flt_bld(bld_base, bit_size);
LLVMValueRef tmp = LLVMBuildFCmp(builder, LLVMRealUEQ,
LLVMBuildBitCast(builder, init_val, flt_bld->elem_type, ""),
LLVMBuildBitCast(builder, value_ptr, flt_bld->elem_type, ""), "");
tmp = LLVMBuildSExt(builder, tmp, bld_base->uint_bld.elem_type, "");
res = LLVMBuildAnd(builder, res, tmp, "");
} else if (instr->intrinsic == nir_intrinsic_vote_ieq) {
LLVMValueRef tmp = LLVMBuildICmp(builder, LLVMIntEQ, init_val, value_ptr, "");
tmp = LLVMBuildSExt(builder, tmp, bld_base->uint_bld.elem_type, "");
res = LLVMBuildOr(builder, res, tmp, "");
res = LLVMBuildAnd(builder, res, tmp, "");
} else if (instr->intrinsic == nir_intrinsic_vote_any)
res = LLVMBuildOr(builder, res, value_ptr, "");
else