[Mesa-dev] [PATCH v4 123/129] intel, ir3: Re-enable nir_opt_copy_prop_vars

[Jason Ekstrand]

Now that it's rewritten for deref instructions, we can turn it back on.
---
 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 da434bf..cd1f9c5 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
@@ -91,7 +91,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 d9642c7..9472585 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.5.0.400.gff86faf