fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-19 08:28:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir/divergence_analysis: handle derefs of system values

Browse source 
needed by GLSL compiler optimizations that have unlowered sysvals

Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28049>
This commit is contained in:
Marek Olšák 2024-03-07 09:51:46 -05:00 • committed by Marge Bot
parent eb670d6eaf
commit 867a0a7db9
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/compiler/nir/nir_divergence_analysis.c
View file

@ -736,11 +736,25 @@ nir_variable_mode_is_uniform(nir_variable_mode mode)
}
static bool
nir_variable_is_uniform(nir_shader *shader, nir_variable *var)
nir_variable_is_uniform(nir_shader *shader, nir_variable *var,
struct divergence_state *state)
{
if (nir_variable_mode_is_uniform(var->data.mode))
return true;
/* Handle system value variables. */
if (var->data.mode == nir_var_system_value) {
/* Fake the instruction to reuse visit_intrinsic for all sysvals. */
nir_intrinsic_instr fake_instr;
memset(&fake_instr, 0, sizeof(fake_instr));
fake_instr.intrinsic =
nir_intrinsic_from_system_value(var->data.location);
visit_intrinsic(&fake_instr, state);
return !fake_instr.def.divergent;
}
nir_divergence_options options = shader->options->divergence_analysis_options;
gl_shader_stage stage = shader->info.stage;
@ -764,7 +778,8 @@ nir_variable_is_uniform(nir_shader *shader, nir_variable *var)
}
static bool
visit_deref(nir_shader *shader, nir_deref_instr *deref)
visit_deref(nir_shader *shader, nir_deref_instr *deref,
struct divergence_state *state)
{
if (deref->def.divergent)
return false;
@ -772,7 +787,7 @@ visit_deref(nir_shader *shader, nir_deref_instr *deref)
bool is_divergent = false;
switch (deref->deref_type) {
case nir_deref_type_var:
is_divergent = !nir_variable_is_uniform(shader, deref->var);
is_divergent = !nir_variable_is_uniform(shader, deref->var, state);
break;
case nir_deref_type_array:
case nir_deref_type_ptr_as_array:
@ -844,7 +859,7 @@ update_instr_divergence(nir_instr *instr, struct divergence_state *state)
case nir_instr_type_undef:
return visit_def(&nir_instr_as_undef(instr)->def, state);
case nir_instr_type_deref:
return visit_deref(state->shader, nir_instr_as_deref(instr));
return visit_deref(state->shader, nir_instr_as_deref(instr), state);
case nir_instr_type_jump:
case nir_instr_type_phi:
case nir_instr_type_call: