From 54e440945ed67a8850f4e0d6133cfb3bb7a64e68 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 15 Mar 2018 15:37:50 -0700 Subject: [PATCH] nir: Add a pass for fixing deref modes This will be needed by anything which changes variable modes without rewriting derefs. Reviewed-by: Caio Marcelo de Oliveira Filho Acked-by: Rob Clark Acked-by: Bas Nieuwenhuizen Acked-by: Dave Airlie Reviewed-by: Kenneth Graunke --- src/compiler/nir/nir.h | 2 ++ src/compiler/nir/nir_deref.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 0b950862334..3ba2ddfeb02 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2701,6 +2701,8 @@ bool nir_lower_deref_instrs(nir_shader *shader, void nir_lower_var_copy_instr(nir_intrinsic_instr *copy, nir_shader *shader); bool nir_lower_var_copies(nir_shader *shader); +void nir_fixup_deref_modes(nir_shader *shader); + bool nir_lower_global_vars_to_local(nir_shader *shader); bool nir_lower_indirect_derefs(nir_shader *shader, nir_variable_mode modes); diff --git a/src/compiler/nir/nir_deref.c b/src/compiler/nir/nir_deref.c index d7b4bbcdcd6..762b21833cf 100644 --- a/src/compiler/nir/nir_deref.c +++ b/src/compiler/nir/nir_deref.c @@ -354,3 +354,33 @@ nir_lower_deref_instrs(nir_shader *shader, return progress; } + +void +nir_fixup_deref_modes(nir_shader *shader) +{ + nir_foreach_function(function, shader) { + if (!function->impl) + continue; + + nir_foreach_block(block, function->impl) { + nir_foreach_instr(instr, block) { + if (instr->type != nir_instr_type_deref) + continue; + + nir_deref_instr *deref = nir_instr_as_deref(instr); + + nir_variable_mode parent_mode; + if (deref->deref_type == nir_deref_type_var) { + parent_mode = deref->var->data.mode; + } else { + assert(deref->parent.is_ssa); + nir_deref_instr *parent = + nir_instr_as_deref(deref->parent.ssa->parent_instr); + parent_mode = parent->mode; + } + + deref->mode = parent_mode; + } + } + } +} -- 2.30.2