nir/copy_prop_vars: Record progress in more places

Fixes: 96c32d7776 "nir/copy_prop_vars: handle load/store of vector..."
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5170>
(cherry picked from commit f0e075ce6e)
This commit is contained in:
Jason Ekstrand 2019-05-28 14:40:35 -05:00 committed by Eric Engestrom
parent cebdf2700f
commit 8cb8c7f0f1
2 changed files with 4 additions and 1 deletions

View file

@ -1201,7 +1201,7 @@
"description": "nir/copy_prop_vars: Record progress in more places",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "96c32d77763c4b561f751ca360e6539a3c5e7f4d"
},

View file

@ -868,6 +868,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
b->cursor = nir_instr_remove(instr);
nir_ssa_def *u = nir_ssa_undef(b, 1, intrin->dest.ssa.bit_size);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(u));
state->progress = true;
break;
}
}
@ -948,6 +949,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
/* Storing to an invalid index is a no-op. */
if (vec_index >= vec_comps) {
nir_instr_remove(instr);
state->progress = true;
break;
}
}
@ -965,6 +967,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
* store is redundant so remove it.
*/
nir_instr_remove(instr);
state->progress = true;
} else {
struct value value = {0};
value_set_ssa_components(&value, intrin->src[1].ssa,