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 <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
index 6dc8213e5a930ed2f5f8f7cb1e8c5ff7749d021d..9ada3889eb94e03cc56d5648971b0f8bb613efa6 100644 (file)
--- 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 d9642c7d4904f2b6947478cfe5dbaa18de1bd741..9472585fe4bccd1d106605aedef4b29f11930021 100644 (file)
--- 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);