From a3839dbb903b6915c0c28b54f9a9259b3efe647c Mon Sep 17 00:00:00 2001
From: Mel Henning <mhenning@darkrefraction.com>
Date: Fri, 9 May 2025 20:47:49 -0400
Subject: [PATCH] nak: Change divergence analysis pass order

Always convert to lcssa before divergence analysis

Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34912>
---
 src/nouveau/compiler/nak_nir.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c
index 684bcf980d9..6d2648433df 100644
--- a/src/nouveau/compiler/nak_nir.c
+++ b/src/nouveau/compiler/nak_nir.c
@@ -995,12 +995,13 @@ nak_postprocess_nir(nir_shader *nir,
 
    OPT(nir, nir_opt_combine_barriers, NULL, NULL);
 
+   OPT(nir, nir_convert_to_lcssa, true, true);
+   nir_divergence_analysis(nir);
+   if (nir->info.stage == MESA_SHADER_FRAGMENT)
+      OPT(nir, nir_opt_tex_skip_helpers, true);
+
    nak_optimize_nir(nir, nak);
 
-   if (nir->info.stage == MESA_SHADER_FRAGMENT) {
-      nir_divergence_analysis(nir);
-      OPT(nir, nir_opt_tex_skip_helpers, true);
-   }
    OPT(nir, nak_nir_lower_tex, nak);
    OPT(nir, nir_lower_idiv, NULL);