diff options
| author | Marcin Ślusarz <marcin.slusarz@intel.com> | 2022-04-13 14:37:15 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-04-20 21:44:50 -0700 |
| commit | 9a28aea2a22f2cd534fd202d90bbafdf6941fa1d (patch) | |
| tree | 48dd8960284e9312e7d458ed8b8bbf94c5b606fc | |
| parent | 30a980fb9477294c557f050feea4c39f374580b3 (diff) | |
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)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_mesh.cpp | 7 |
2 files changed, 8 insertions, 1 deletions
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 |