AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Fix divergence of reductions.

Browse Source 
By accident, the function would return without setting
the divergence information.

Cc: mesa-stable
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27680>
This commit is contained in:
Timur Kristóf
2024-02-08 11:14:21 +01:00
committed by Marge Bot
parent 9548cba8ab
commit 537c0029dd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_divergence_analysis.c
+10 -5
View File
@@ -371,14 +371,19 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr,
* the source is uniform and the operation is invariant
*/
case nir_intrinsic_reduce:
if (vertex_divergence)
return true;
if (nir_intrinsic_cluster_size(instr) == 0)
return false;
if (nir_intrinsic_cluster_size(instr) == 0) {
/* Cluster size of 0 means the subgroup size.
* This is uniform within a subgroup, but divergent between
* vertices of the same primitive because they may be in
* different subgroups.
*/
is_divergent = vertex_divergence;
break;
}
FALLTHROUGH;
case nir_intrinsic_inclusive_scan: {
nir_op op = nir_intrinsic_reduction_op(instr);
is_divergent = instr->src[0].ssa->divergent;
is_divergent = instr->src[0].ssa->divergent || vertex_divergence;
if (op != nir_op_umin && op != nir_op_imin && op != nir_op_fmin &&
op != nir_op_umax && op != nir_op_imax && op != nir_op_fmax &&
op != nir_op_iand && op != nir_op_ior)