Mesa (staging/22.1): nir/divergence: handle load_global_block_intel

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 2324083fe9de798ec85aff7d97e5baf3e8ac8678
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2324083fe9de798ec85aff7d97e5baf3e8ac8678

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Apr 21 11:00:23 2022 +0300

nir/divergence: handle load_global_block_intel

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: dd39e311b336 ("nir: Add nir_intrinsic_{load,store}_deref_block_intel")
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16075>
(cherry picked from commit 9f44a264623461c98368185b023d99446676e039)

---

 .pick_status.json                          | 2 +-
 src/compiler/nir/nir_divergence_analysis.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index bce07273571..70d8ef31157 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "nir/divergence: handle load_global_block_intel",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "dd39e311b336dddcc7343c5119ce05af410d8dc5"
     },
diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 72852f4e076..37683da969d 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -163,6 +163,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr)
    case nir_intrinsic_load_smem_amd:
    case nir_intrinsic_load_global_const_block_intel:
    case nir_intrinsic_load_reloc_const_intel:
+   case nir_intrinsic_load_global_block_intel:
       is_divergent = false;
       break;