From 79c1ff9077c1381f2c2c956dc0f33f5a956c7bc3 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Fri, 20 Mar 2026 17:45:57 +0100 Subject: [PATCH] nak: Do not allow load_helper_invocation reordering load_helper_invocation can not be reordered past a demote. Signed-off-by: Mary Guillemard Fixes: 7ece220f968 ("nak/nir: Lower systm values before lowering I/O") Reviewed-by: Faith Ekstrand (cherry picked from commit cba5841d61a5f8439f0a00531cb8f42e4817611b) Part-of: --- .pick_status.json | 2 +- src/nouveau/compiler/nak_nir.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 76c73580d52..3f9a57393c9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4844,7 +4844,7 @@ "description": "nak: Do not allow load_helper_invocation reordering", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7ece220f968e1c8f9a7e09da1c0640dd8ff9f170", "notes": null diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c index e9fa411afa0..bddca6055b8 100644 --- a/src/nouveau/compiler/nak_nir.c +++ b/src/nouveau/compiler/nak_nir.c @@ -531,7 +531,6 @@ nak_nir_lower_system_value_intrin(nir_builder *b, nir_intrinsic_instr *intrin, } case nir_intrinsic_load_subgroup_invocation: - case nir_intrinsic_load_helper_invocation: case nir_intrinsic_load_invocation_id: case nir_intrinsic_load_workgroup_id: { const gl_system_value sysval = @@ -602,8 +601,8 @@ nak_nir_lower_system_value_intrin(nir_builder *b, nir_intrinsic_instr *intrin, } break; - case nir_intrinsic_is_helper_invocation: { - /* Unlike load_helper_invocation, this one isn't re-orderable */ + case nir_intrinsic_is_helper_invocation: + case nir_intrinsic_load_helper_invocation: { val = nak_nir_load_sysval(b, NAK_SV_THREAD_KILL, 0); break; }