From 666bad5d227dd8a3f3ccb40f8c4b30f91b60df2d Mon Sep 17 00:00:00 2001 From: Mel Henning Date: Fri, 30 May 2025 14:48:55 -0400 Subject: [PATCH] nak: Always run nak_nir_mark_lcssa_invariants We're about to change the way that lcssa is constructed, and we won't be able to conclude that there are no lcssa phis based on this pass' progress. Reviewed-by: Faith Ekstrand Part-of: --- src/nouveau/compiler/nak_nir.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c index 79b4d6485b7..684bcf980d9 100644 --- a/src/nouveau/compiler/nak_nir.c +++ b/src/nouveau/compiler/nak_nir.c @@ -1101,12 +1101,10 @@ nak_postprocess_nir(nir_shader *nir, if (OPT(nir, nak_nir_rematerialize_load_const)) OPT(nir, nir_opt_dce); - bool lcssa_progress = nir_convert_to_lcssa(nir, false, false); + OPT(nir, nir_convert_to_lcssa, false, false); if (nak->sm >= 73) { - if (lcssa_progress) { - OPT(nir, nak_nir_mark_lcssa_invariants); - } + OPT(nir, nak_nir_mark_lcssa_invariants); if (OPT(nir, nak_nir_lower_non_uniform_ldcx)) { OPT(nir, nir_copy_prop); OPT(nir, nir_opt_dce);