fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/copy_prop_vars: Handle volatile better

Browse source 
For deref_store, we can still delete invalid stores that write to
statically OOB data.  For everything, we need to make sure that we kill
aliases of destinations even if it's volatile.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4767>
This commit is contained in:
Jason Ekstrand 2020-04-14 11:01:15 -05:00 • committed by Marge Bot
parent 118f045fb7
commit d9af5277b3
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/compiler/nir/nir_opt_copy_prop_vars.c
View file

@ -930,9 +930,6 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
case nir_intrinsic_store_deref: {
if (debug) dump_instr(instr);
if (nir_intrinsic_access(intrin) & ACCESS_VOLATILE)
break;
nir_deref_instr *dst = nir_src_as_deref(intrin->src[0]);
assert(glsl_type_is_vector_or_scalar(dst->type));
@ -954,6 +951,12 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
}
}
if (nir_intrinsic_access(intrin) & ACCESS_VOLATILE) {
unsigned wrmask = nir_intrinsic_write_mask(intrin);
kill_aliases(copies, dst, wrmask);
break;
}
struct copy_entry *entry =
lookup_entry_for_deref(copies, dst, nir_derefs_equal_bit);
if (entry && value_equals_store_src(&entry->src, intrin)) {
@ -977,25 +980,27 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
case nir_intrinsic_copy_deref: {
if (debug) dump_instr(instr);
if ((nir_intrinsic_src_access(intrin) & ACCESS_VOLATILE) ||
(nir_intrinsic_dst_access(intrin) & ACCESS_VOLATILE))
break;
nir_deref_instr *dst = nir_src_as_deref(intrin->src[0]);
nir_deref_instr *src = nir_src_as_deref(intrin->src[1]);
if (nir_compare_derefs(src, dst) & nir_derefs_equal_bit) {
/* This is a no-op self-copy. Get rid of it */
nir_instr_remove(instr);
continue;
}
/* The copy_deref intrinsic doesn't keep track of num_components, so
* get it ourselves.
*/
unsigned num_components = glsl_get_vector_elements(dst->type);
unsigned full_mask = (1 << num_components) - 1;
if ((nir_intrinsic_src_access(intrin) & ACCESS_VOLATILE) ||
(nir_intrinsic_dst_access(intrin) & ACCESS_VOLATILE)) {
kill_aliases(copies, dst, full_mask);
break;
}
if (nir_compare_derefs(src, dst) & nir_derefs_equal_bit) {
/* This is a no-op self-copy. Get rid of it */
nir_instr_remove(instr);
continue;
}
/* Copy of direct array derefs of vectors are not handled. Just
* invalidate what's written and bail.
*/
@ -1058,9 +1063,6 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
case nir_intrinsic_deref_atomic_comp_swap:
if (debug) dump_instr(instr);
if (nir_intrinsic_access(intrin) & ACCESS_VOLATILE)
break;
nir_deref_instr *dst = nir_src_as_deref(intrin->src[0]);
unsigned num_components = glsl_get_vector_elements(dst->type);
unsigned full_mask = (1 << num_components) - 1;