diff options
| -rw-r--r-- | src/compiler/nir/nir_deref.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/compiler/nir/nir_deref.c b/src/compiler/nir/nir_deref.c index 02f77d622bd..aa841223a3b 100644 --- a/src/compiler/nir/nir_deref.c +++ b/src/compiler/nir/nir_deref.c @@ -26,6 +26,19 @@ #include "nir_deref.h" #include "util/hash_table.h" +static bool +is_trivial_deref_cast(nir_deref_instr *cast) +{ + nir_deref_instr *parent = nir_src_as_deref(cast->parent); + if (!parent) + return false; + + return cast->mode == parent->mode && + cast->type == parent->type && + cast->dest.ssa.num_components == parent->dest.ssa.num_components && + cast->dest.ssa.bit_size == parent->dest.ssa.bit_size; +} + void nir_deref_path_init(nir_deref_path *path, nir_deref_instr *deref, void *mem_ctx) @@ -44,6 +57,8 @@ nir_deref_path_init(nir_deref_path *path, *tail = NULL; for (nir_deref_instr *d = deref; d; d = nir_deref_instr_parent(d)) { + if (d->deref_type == nir_deref_type_cast && is_trivial_deref_cast(d)) + continue; count++; if (count <= max_short_path_len) *(--head) = d; @@ -64,8 +79,11 @@ nir_deref_path_init(nir_deref_path *path, path->path = ralloc_array(mem_ctx, nir_deref_instr *, count + 1); head = tail = path->path + count; *tail = NULL; - for (nir_deref_instr *d = deref; d; d = nir_deref_instr_parent(d)) + for (nir_deref_instr *d = deref; d; d = nir_deref_instr_parent(d)) { + if (d->deref_type == nir_deref_type_cast && is_trivial_deref_cast(d)) + continue; *(--head) = d; + } done: assert(head == path->path); @@ -736,19 +754,6 @@ nir_rematerialize_derefs_in_use_blocks_impl(nir_function_impl *impl) } static bool -is_trivial_deref_cast(nir_deref_instr *cast) -{ - nir_deref_instr *parent = nir_src_as_deref(cast->parent); - if (!parent) - return false; - - return cast->mode == parent->mode && - cast->type == parent->type && - cast->dest.ssa.num_components == parent->dest.ssa.num_components && - cast->dest.ssa.bit_size == parent->dest.ssa.bit_size; -} - -static bool is_trivial_array_deref_cast(nir_deref_instr *cast) { assert(is_trivial_deref_cast(cast)); |