intel,ir3: Disable nir_opt_copy_prop_vars

This pass doesn't handle deref instructions yet.  Making it handle both
legacy derefs and deref instructions would be painful.  Since it's not
important for correctness, just disable it for now.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
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 990be925833c88a6b6052d4622d14ee47942e96a..52b6168f3a39675f3f4518d61f24cd178c797d51 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
@@ -94,7 +94,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 dfeea73b06ac3a0d33343aff6bafaa20a30d25a8..227c94d83b9b88f7f58cb3ff0cbb361de42a8543 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);