summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2024-07-19 19:44:44 +0300
committerEric Engestrom <eric@engestrom.ch>2024-08-27 09:25:15 +0200
commit7d7a9cce4181e2447e06a6a9e5f956e63f698d1e (patch)
treec8c78e7cf328a9b937146dc844d6d8e44c024587
parent56a5cf145efda8e2b7b3c0a924fd973835443a15 (diff)
nir/divergence: add missing load_constant_base_ptr
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Cc: mesa-stable Reviewed-by: Daniel Schürmann <daniel@schuermann.dev> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30712> (cherry picked from commit 2158fe2ae29d20b397b5c10bdd36a9279fc86c0b)
-rw-r--r--.pick_status.json2
-rw-r--r--src/compiler/nir/nir_divergence_analysis.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index dd6389a3e24..6eea08062a9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -54,7 +54,7 @@
"description": "nir/divergence: add missing load_constant_base_ptr",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null
diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 7d248188c3a..bf2e146ac95 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -267,6 +267,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state)
case nir_intrinsic_optimization_barrier_sgpr_amd:
case nir_intrinsic_load_printf_buffer_address:
case nir_intrinsic_load_printf_base_identifier:
+ case nir_intrinsic_load_constant_base_ptr:
is_divergent = false;
break;