From f138d13672b01c633a170276255ba9218472b54f Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 2 Apr 2026 10:25:10 -0400
Subject: [PATCH] pan/nir: Stop being so conservative about phi scalarizing

Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40769>
---
 src/panfrost/compiler/bifrost/bifrost_nir.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/panfrost/compiler/bifrost/bifrost_nir.c b/src/panfrost/compiler/bifrost/bifrost_nir.c
index b75b8219db9..5a02d1c0272 100644
--- a/src/panfrost/compiler/bifrost/bifrost_nir.c
+++ b/src/panfrost/compiler/bifrost/bifrost_nir.c
@@ -1124,16 +1124,10 @@ bifrost_compile_shader_nir(nir_shader *nir,
 
    bi_optimize_nir(nir, inputs->gpu_id, inputs->robust_modes);
 
-   {
-      bool scalar_phis_pass = false;
-      uint64_t gpu_id = inputs->gpu_id;
-      NIR_PASS(scalar_phis_pass, nir, nir_lower_phis_to_scalar,
-               bi_vectorize_filter, &gpu_id);
-      if (scalar_phis_pass) {
-         NIR_PASS(_, nir, nir_opt_copy_prop);
-         NIR_PASS(_, nir, nir_opt_dce);
-      }
-   }
+   uint64_t gpu_id = inputs->gpu_id;
+   NIR_PASS(_, nir, nir_lower_phis_to_scalar, bi_vectorize_filter, &gpu_id);
+   NIR_PASS(_, nir, nir_opt_copy_prop);
+   NIR_PASS(_, nir, nir_opt_dce);
 
    info->tls_size = nir->scratch_size;
    info->stage = nir->info.stage;