r600/sfn: Move removing of unused variables

It doesn't make sense to do this in the optimization loop

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4714>

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index e9a598703f374c394617de20abe0ed22491e6315..ce416d92e17dc4f7e637372de6a749b959c769d6 100644 (file)
--- 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,