From e23ccb6c46588fd07e2291e7492d4b0c9946de65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 25 Dec 2024 09:15:02 -0500 Subject: [PATCH] radeonsi: call si_nir_late_opts unconditionally We always have progress==true (e.g. due to si_nir_lower_abi), so late_opts is likely to be always true. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index e2243f9d06e..aade60b4edd 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2252,7 +2252,6 @@ static void get_nir_shader(struct si_shader *shader, struct si_nir_shader_ctx *c } bool progress = false; - bool late_opts = false; const char *original_name = NULL; if (unlikely(should_print_nir(nir))) { @@ -2403,7 +2402,6 @@ static void get_nir_shader(struct si_shader *shader, struct si_nir_shader_ctx *c if (progress) { si_nir_opts(sel->screen, nir, true); - late_opts = true; progress = false; } @@ -2553,7 +2551,6 @@ static void get_nir_shader(struct si_shader *shader, struct si_nir_shader_ctx *c if (progress) { si_nir_opts(sel->screen, nir, false); progress = false; - late_opts = true; } NIR_PASS(progress, nir, nir_opt_load_store_vectorize, @@ -2611,7 +2608,6 @@ static void get_nir_shader(struct si_shader *shader, struct si_nir_shader_ctx *c if (progress) { si_nir_opts(sel->screen, nir, false); progress = false; - late_opts = true; } static const nir_opt_offsets_options offset_options = { @@ -2621,8 +2617,7 @@ static void get_nir_shader(struct si_shader *shader, struct si_nir_shader_ctx *c }; NIR_PASS_V(nir, nir_opt_offsets, &offset_options); - if (late_opts) - si_nir_late_opts(nir); + si_nir_late_opts(nir); NIR_PASS(progress, nir, nir_opt_sink, nir_move_const_undef | nir_move_copies | nir_move_alu | nir_move_comparisons |