From 697fbaddb5d0ccb9cc71a8f4fcd6f0f8cce30e24 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Wed, 11 Feb 2026 11:52:11 +0000 Subject: [PATCH] aco: reset all vgpr_used_by_vmem_ in resolve_all_gfx11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rhys Perry Backport-to: 26.0 Reviewed-by: Daniel Schürmann (cherry picked from commit dfda890ae839d8f2dc2b48ab7ca7a0aeaa763f7d) Part-of: --- .pick_status.json | 2 +- src/amd/compiler/aco_insert_NOPs.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index e9148d2c08c..7bbcaad2aa3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -654,7 +654,7 @@ "description": "aco: reset all vgpr_used_by_vmem_ in resolve_all_gfx11", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/compiler/aco_insert_NOPs.cpp b/src/amd/compiler/aco_insert_NOPs.cpp index 1f7459bb441..2066314ae35 100644 --- a/src/amd/compiler/aco_insert_NOPs.cpp +++ b/src/amd/compiler/aco_insert_NOPs.cpp @@ -1867,6 +1867,8 @@ resolve_all_gfx11(State& state, NOP_ctx_gfx11& ctx, ctx.vgpr_used_by_vmem_bvh.any()) { waitcnt_depctr &= 0xffe3; ctx.vgpr_used_by_vmem_load.reset(); + ctx.vgpr_used_by_vmem_sample.reset(); + ctx.vgpr_used_by_vmem_bvh.reset(); ctx.vgpr_used_by_vmem_store.reset(); ctx.vgpr_used_by_ds.reset(); }