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

nir/propagate_invariant: be more conservative with aliasing variables

Browse source 
No fossil-db changes.

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/40740>
This commit is contained in:
Rhys Perry 2026-04-02 10:54:46 +01:00 • committed by Marge Bot
parent 310c8a0a17
commit 4d65a7d16e
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compiler/nir/nir_propagate_invariant.c
View file

@ -26,6 +26,7 @@
enum var_flags {
var_all_invariant = 1 << 0,
var_all_alias_invariant = 1 << 1,
var_any_invariant = 1 << 2,
};
@ -60,6 +61,16 @@ add_cf_node(nir_cf_node *cf, struct set *invariants)
add_cf_node(cf->parent, invariants);
}
static bool
var_may_alias(nir_variable *var)
{
if (var->data.mode == nir_var_mem_ssbo)
return !(var->data.access & ACCESS_RESTRICT);
else if (var->data.mode == nir_var_mem_shared)
return var->data.aliased_shared_memory;
return false;
}
static void
add_var(const nir_deref_instr *deref, struct set *invariants, uint8_t *var_invariant)
{
@ -74,8 +85,10 @@ add_var(const nir_deref_instr *deref, struct set *invariants, uint8_t *var_invar
_mesa_set_add(invariants, var);
flags = var_any_invariant;
if (var_may_alias(var))
flags |= var_all_alias_invariant;
} else if (!var) {
flags = var_any_invariant | var_all_invariant;
flags = var_any_invariant | var_all_invariant | var_all_alias_invariant;
}
u_foreach_bit(i, modes)
var_invariant[i] |= flags;
@ -102,6 +115,8 @@ var_is_invariant(const nir_deref_instr *deref, struct set *invariants, uint8_t *
return true;
if (var) {
if (var_may_alias(var) && (flags & var_all_alias_invariant))
return true;
return var->data.invariant || _mesa_set_search(invariants, var);
} else {
return flags & var_any_invariant;