fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 11:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: Remove deref chain support from propagate_invariant

Browse source 
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2018-04-02 16:10:04 -07:00
parent c6a9c2b60b
commit 378d7cf3ba
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,10 +77,7 @@ var_is_invariant(nir_variable *var, struct set * invariants)
static nir_variable *
intrinsic_get_var(nir_intrinsic_instr *intrin, unsigned i)
{
if (nir_intrinsic_infos[intrin->intrinsic].num_variables == 0)
return nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[i]));
else
return intrin->variables[i]->var;
return nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[i]));
}
static void
@ -107,24 +104,17 @@ propagate_invariant_instr(nir_instr *instr, struct set *invariants)
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_copy_var:
case nir_intrinsic_copy_deref:
/* If the destination is invariant then so is the source */
if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants))
add_var(intrinsic_get_var(intrin, 1), invariants);
break;
case nir_intrinsic_load_var:
case nir_intrinsic_load_deref:
if (dest_is_invariant(&intrin->dest, invariants))
add_var(intrinsic_get_var(intrin, 0), invariants);
break;
case nir_intrinsic_store_var:
if (var_is_invariant(intrin->variables[0]->var, invariants))
add_src(&intrin->src[0], invariants);
break;
case nir_intrinsic_store_deref:
if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants))
add_src(&intrin->src[1], invariants);
@ -201,6 +191,8 @@ nir_propagate_invariant(nir_shader *shader)
struct set *invariants = _mesa_set_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal);
nir_assert_unlowered_derefs(shader, nir_lower_load_store_derefs);
bool progress = false;
nir_foreach_function(function, shader) {
if (function->impl && propagate_invariant_impl(function->impl, invariants))