From 87aa5bdf9b904ae0d65a90035a5af010650d54f6 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 17 Aug 2023 17:51:15 -0500
Subject: [PATCH] nir: Fix metadata in nir_lower_is_helper_invocation

It does not preserve everything.  It adds and removes instructions and
even adds a variable.

Fixes: f17b41ab4f01 ("nir: add lowering pass for helperInvocationEXT()")
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24760>
(cherry picked from commit 831085afa3f68cef851dca7e50f979a375dab548)
---
 .pick_status.json                                 | 2 +-
 src/compiler/nir/nir_lower_is_helper_invocation.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index b831f1f9b37..c200ed2ae4c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5824,7 +5824,7 @@
         "description": "nir: Fix metadata in nir_lower_is_helper_invocation",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f17b41ab4f017b562fdf7c388200e68c22105331",
         "notes": null
diff --git a/src/compiler/nir/nir_lower_is_helper_invocation.c b/src/compiler/nir/nir_lower_is_helper_invocation.c
index bce5999a139..dfcb34ec35a 100644
--- a/src/compiler/nir/nir_lower_is_helper_invocation.c
+++ b/src/compiler/nir/nir_lower_is_helper_invocation.c
@@ -118,6 +118,7 @@ nir_lower_is_helper_invocation(nir_shader *shader)
 
    return nir_shader_instructions_pass(shader,
                                        nir_lower_load_and_store_is_helper,
-                                       nir_metadata_all,
+                                       nir_metadata_block_index |
+                                          nir_metadata_dominance,
                                        is_helper_deref);
 }