From d7d5aab45b4b24a89970df17c82c4e00393400d2 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 20 Mar 2018 14:19:32 -0700 Subject: [PATCH] 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 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 990be925833..52b6168f3a3 100644 --- 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 dfeea73b06a..227c94d83b9 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