fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-21 22:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

nir,aco: add INCLUDE_HELPERS index to reduce intrinsic

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23621>
This commit is contained in:
Rhys Perry 2023-06-13 15:27:26 +01:00 • committed by Marge Bot
parent c5fc89019b
commit 58f8e0e2a0
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -7892,7 +7892,7 @@ emit_uniform_reduce(isel_context* ctx, nir_intrinsic_instr* instr)
Temp thread_count =
bld.sop1(Builder::s_bcnt1_i32, bld.def(s1), bld.def(s1, scc), Operand(exec, bld.lm));
thread_count = emit_wqm(bld, thread_count);
thread_count = emit_wqm(bld, thread_count, Temp(0, s1), nir_intrinsic_include_helpers(instr));
emit_addition_uniform_reduce(ctx, op, dst, instr->src[0], thread_count);
} else {
@ -8523,6 +8523,8 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
instr->intrinsic == nir_intrinsic_reduce ? nir_intrinsic_cluster_size(instr) : 0;
cluster_size = util_next_power_of_two(
MIN2(cluster_size ? cluster_size : ctx->program->wave_size, ctx->program->wave_size));
bool create_helpers =
instr->intrinsic == nir_intrinsic_reduce && nir_intrinsic_include_helpers(instr);
if (!nir_src_is_divergent(instr->src[0]) && cluster_size == ctx->program->wave_size &&
instr->dest.ssa.bit_size != 1) {
@ -8552,7 +8554,7 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
switch (instr->intrinsic) {
case nir_intrinsic_reduce:
emit_wqm(bld, emit_boolean_reduce(ctx, op, cluster_size, src), dst);
emit_wqm(bld, emit_boolean_reduce(ctx, op, cluster_size, src), dst, create_helpers);
break;
case nir_intrinsic_exclusive_scan:
emit_wqm(bld, emit_boolean_exclusive_scan(ctx, op, src), dst);
@ -8581,7 +8583,7 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
Temp tmp_dst = emit_reduction_instr(ctx, aco_op, reduce_op, cluster_size,
bld.def(dst.regClass()), src);
emit_wqm(bld, tmp_dst, dst);
emit_wqm(bld, tmp_dst, dst, create_helpers);
}
break;
}

5
src/compiler/nir/nir_intrinsics.py
View file

@ -172,6 +172,9 @@ index("unsigned", "reduction_op")
# Cluster size for reduction operations
index("unsigned", "cluster_size")
# Requires that the operation creates and includes helper invocations
index("bool", "include_helpers")
# Parameter index for a load_param intrinsic
index("unsigned", "param_idx")
@ -445,7 +448,7 @@ intrinsic("rotate", src_comp=[0, 1], dest_comp=0, bit_sizes=src0,
indices=[EXECUTION_SCOPE, CLUSTER_SIZE], flags=[CAN_ELIMINATE]);
intrinsic("reduce", src_comp=[0], dest_comp=0, bit_sizes=src0,
indices=[REDUCTION_OP, CLUSTER_SIZE], flags=[CAN_ELIMINATE])
indices=[REDUCTION_OP, CLUSTER_SIZE, INCLUDE_HELPERS], flags=[CAN_ELIMINATE])
intrinsic("inclusive_scan", src_comp=[0], dest_comp=0, bit_sizes=src0,
indices=[REDUCTION_OP], flags=[CAN_ELIMINATE])
intrinsic("exclusive_scan", src_comp=[0], dest_comp=0, bit_sizes=src0,