nir/copy_prop_vars: prefer using entries from equal derefs

When looking up an entry to use, always prefer an equal match, as it
more likely to contain reusable SSA or derefs to propagate.

This will be necessary when adding entries with array derefs of
vectors, because we don't want the vector if the equal entry (an array
deref of that vector) is present.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2019-01-29 12:39:28 -08:00
parent 61965afd00
commit 6c0de78cc2
1 changed files with 9 additions and 4 deletions

View File

@ -302,12 +302,17 @@ lookup_entry_for_deref(struct util_dynarray *copies,
nir_deref_instr *deref,
nir_deref_compare_result allowed_comparisons)
{
struct copy_entry *entry = NULL;
util_dynarray_foreach(copies, struct copy_entry, iter) {
if (nir_compare_derefs(iter->dst, deref) & allowed_comparisons)
return iter;
nir_deref_compare_result result = nir_compare_derefs(iter->dst, deref);
if (result & allowed_comparisons) {
entry = iter;
if (result & nir_derefs_equal_bit)
break;
/* Keep looking in case we have an equal match later in the array. */
}
}
return NULL;
return entry;
}
static struct copy_entry *