From 9a28aea2a22f2cd534fd202d90bbafdf6941fa1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Wed, 13 Apr 2022 14:37:15 +0200
Subject: [PATCH] intel/compiler: invalidate metadata in brw_nir_initialize_mue

New "if" blocks may have been inserted.

Fixes: bc4f8c073a2 ("intel/compiler: inject MUE initialization")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15924>
(cherry picked from commit 5dace41c108f84e9e0ba4de42da2261ae834fd3b)
---
 .pick_status.json               | 2 +-
 src/intel/compiler/brw_mesh.cpp | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 1cbccf24097..94f67377b06 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -742,7 +742,7 @@
         "description": "intel/compiler: invalidate metadata in brw_nir_initialize_mue",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "bc4f8c073a2cf35227df85a1edfce9848b9cdfae"
     },
diff --git a/src/intel/compiler/brw_mesh.cpp b/src/intel/compiler/brw_mesh.cpp
index 3a971152f99..0f177f55a3c 100644
--- a/src/intel/compiler/brw_mesh.cpp
+++ b/src/intel/compiler/brw_mesh.cpp
@@ -584,6 +584,13 @@ brw_nir_initialize_mue(nir_shader *nir,
       nir_scoped_barrier(&b, NIR_SCOPE_WORKGROUP, NIR_SCOPE_WORKGROUP,
                          NIR_MEMORY_ACQ_REL, nir_var_shader_out);
    }
+
+   if (remaining) {
+      nir_metadata_preserve(entrypoint, nir_metadata_none);
+   } else {
+      nir_metadata_preserve(entrypoint, nir_metadata_block_index |
+                                        nir_metadata_dominance);
+   }
 }
 
 static bool