From 7908d4e89fb386a647a7e0cceab8b3008010fc3e Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Fri, 20 Mar 2026 18:37:57 +0100 Subject: [PATCH] nir/dead_cf: Add missing load_ssbo_ir3 handling Signed-off-by: Mary Guillemard Fixes: 0092edfec08 ("nir/dead_cf: Do not remove loops with loads that can't be reordered") Reviewed-by: Faith Ekstrand Reviewed-by: Mel Henning (cherry picked from commit 6013667d61c7c552c19903a9dcea421c2d037faf) Part-of: --- .pick_status.json | 2 +- src/compiler/nir/nir_opt_dead_cf.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index b0426fda3c7..a35dbdc747a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4874,7 +4874,7 @@ "description": "nir/dead_cf: Add missing load_ssbo_ir3 handling", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0092edfec0895533260a52c84cb4ce098f6b6bea", "notes": null diff --git a/src/compiler/nir/nir_opt_dead_cf.c b/src/compiler/nir/nir_opt_dead_cf.c index 2212acdfac7..f9cbf5c79f4 100644 --- a/src/compiler/nir/nir_opt_dead_cf.c +++ b/src/compiler/nir/nir_opt_dead_cf.c @@ -218,6 +218,7 @@ node_is_dead(nir_cf_node *node) case nir_intrinsic_load_ssbo: case nir_intrinsic_load_global: case nir_intrinsic_load_ssbo_intel: + case nir_intrinsic_load_ssbo_ir3: /* If there's a memory barrier after the loop, a load might be * required to happen before some other instruction after the * barrier, so it is not valid to eliminate it -- unless we