From 2fa7a4a54185cd64cb26c2d14339b95890b69da0 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 27 Mar 2018 21:00:01 -0700 Subject: [PATCH] intel,ir3: Re-enable nir_opt_copy_prop_vars Now that it's rewritten for deref instructions, we can turn it back on. Acked-by: Rob Clark Acked-by: Bas Nieuwenhuizen Acked-by: Dave Airlie Reviewed-by: Kenneth Graunke --- src/gallium/drivers/freedreno/ir3/ir3_nir.c | 2 +- src/intel/compiler/brw_nir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_nir.c index 6dc8213e5a9..9ada3889eb9 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_nir.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.c @@ -92,7 +92,7 @@ ir3_optimize_loop(nir_shader *s) progress = false; OPT_V(s, nir_lower_vars_to_ssa); - /* progress |= OPT(s, nir_opt_copy_prop_vars); */ + progress |= OPT(s, nir_opt_copy_prop_vars); progress |= OPT(s, nir_lower_alu_to_scalar); progress |= OPT(s, nir_lower_phis_to_scalar); diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index d9642c7d490..9472585fe4b 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -543,7 +543,7 @@ brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, do { progress = false; OPT(nir_lower_vars_to_ssa); - /* OPT(nir_opt_copy_prop_vars); */ + OPT(nir_opt_copy_prop_vars); if (is_scalar) { OPT(nir_lower_alu_to_scalar); -- 2.30.2