From 4fb33124c32a9445a8013f61dccb0360c956efa5 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 29 Nov 2022 13:52:43 -0600 Subject: [PATCH] nir/divergence: Handle base_workgroup_id and workgrpu_id_zero_base Reviewed-by: Lionel Landwerlin Part-of: --- src/compiler/nir/nir_divergence_analysis.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 7d888f7e11d..20d361c4ba4 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -203,6 +203,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_load_lds_ngg_scratch_base_amd: case nir_intrinsic_load_lds_ngg_gs_out_vertex_base_amd: case nir_intrinsic_load_btd_shader_type_intel: + case nir_intrinsic_load_base_workgroup_id: is_divergent = false; break; @@ -314,6 +315,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_load_workgroup_index: case nir_intrinsic_load_workgroup_id: + case nir_intrinsic_load_workgroup_id_zero_base: assert(gl_shader_stage_uses_workgroup(stage)); if (stage == MESA_SHADER_COMPUTE) is_divergent |= (options & nir_divergence_multiple_workgroup_per_compute_subgroup);