From 1b3e103d0bf1c506f9ec413be11af8bd207ad674 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Wed, 15 Apr 2020 16:53:09 +0200 Subject: [PATCH] r600/sfn: Move removing of unused variables It doesn't make sense to do this in the optimization loop Signed-off-by: Gert Wollny Part-of: --- src/gallium/drivers/r600/sfn/sfn_nir.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index e9a598703f3..ce416d92e17 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -529,9 +529,6 @@ optimize_once(nir_shader *shader) NIR_PASS(progress, shader, nir_opt_conditional_discard); NIR_PASS(progress, shader, nir_opt_dce); NIR_PASS(progress, shader, nir_opt_undef); - - NIR_PASS(progress, shader, nir_remove_dead_variables, nir_var_shader_in); - NIR_PASS(progress, shader, nir_remove_dead_variables, nir_var_shader_out); return progress; } @@ -610,6 +607,10 @@ int r600_shader_from_nir(struct r600_context *rctx, if (optimize) while(optimize_once(sel->nir)); + NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_in); + NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_out); + + NIR_PASS_V(sel->nir, nir_lower_vars_to_scratch, nir_var_function_temp, 40, -- 2.30.2