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 <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32910>
This commit is contained in:
Marek Olšák 2024-12-25 09:15:02 -05:00 committed by Marge Bot
parent 58c91fb8cf
commit e23ccb6c46

View file

@ -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 |