diff options
author | Sergii Romantsov <sergii.romantsov@globallogic.com> | 2019-08-29 10:58:38 +0300 |
---|---|---|
committer | Danylo Piliaiev <danylo.piliaiev@gmail.com> | 2019-09-16 11:23:48 +0000 |
commit | 2bfcf043456411a6037404d9afae9760964c9b48 (patch) | |
tree | 8c95176e9fa91265bc3b4b29218c7dc2b077b6f2 /src/compiler/nir/nir_opt_large_constants.c | |
parent | e536446b609b07b655d35fba6957c5c4eb16065a (diff) |
nir/large_constants: pass after lowering copy_deref
v2: by J.Ekstrand suggestion moved lowering of large
constants after lowering of copy_deref is done.
CC: Jason Ekstrand <jason@jlekstrand.net>
CC: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111450
Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
Diffstat (limited to 'src/compiler/nir/nir_opt_large_constants.c')
-rw-r--r-- | src/compiler/nir/nir_opt_large_constants.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/compiler/nir/nir_opt_large_constants.c b/src/compiler/nir/nir_opt_large_constants.c index 8fd1f0d2e99..bc67496836e 100644 --- a/src/compiler/nir/nir_opt_large_constants.c +++ b/src/compiler/nir/nir_opt_large_constants.c @@ -222,13 +222,7 @@ nir_opt_large_constants(nir_shader *shader, break; case nir_intrinsic_copy_deref: - /* We always assume the src and therefore the dst are not - * constants here. Copy and constant propagation passes should - * have taken care of this in most cases anyway. - */ - dst_deref = nir_src_as_deref(intrin->src[0]); - src_deref = nir_src_as_deref(intrin->src[1]); - src_is_const = false; + assert(!"Lowering of copy_deref with large constants is prohibited"); break; default: @@ -366,24 +360,7 @@ nir_opt_large_constants(nir_shader *shader, } break; } - - case nir_intrinsic_copy_deref: { - nir_deref_instr *deref = nir_src_as_deref(intrin->src[1]); - if (deref->mode != nir_var_function_temp) - continue; - - nir_variable *var = nir_deref_instr_get_variable(deref); - struct var_info *info = &var_infos[var->data.index]; - if (info->is_constant) { - b.cursor = nir_after_instr(&intrin->instr); - nir_ssa_def *val = build_constant_load(&b, deref, size_align); - nir_store_deref(&b, nir_src_as_deref(intrin->src[0]), val, ~0); - nir_instr_remove(&intrin->instr); - nir_deref_instr_remove_if_unused(deref); - } - break; - } - + case nir_intrinsic_copy_deref: default: continue; } |