From e93dbb6df2f4d899b729eb1143542070db22a348 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Wed, 28 Feb 2024 17:44:39 +0100 Subject: [PATCH] aco/post-ra: track pseudo scratch sgpr/scc clobber MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Foz-DB Navi31: Totals from 1439 (1.84% of 78112) affected shaders: Instrs: 1994854 -> 1996650 (+0.09%) CodeSize: 11376864 -> 11383384 (+0.06%) Latency: 14996299 -> 14999317 (+0.02%); split: -0.00%, +0.02% InvThroughput: 2061294 -> 2061518 (+0.01%); split: -0.00%, +0.01% Cc: mesa-stable Reviewed-by: Timur Kristóf Reviewed-by: Daniel Schürmann Part-of: (cherry picked from commit e7d6cd9216eb83805fa617c0e36257c6834ce080) --- .pick_status.json | 2 +- src/amd/compiler/aco_optimizer_postRA.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1fe7dd70e34..4f846163eed 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -964,7 +964,7 @@ "description": "aco/post-ra: track pseudo scratch sgpr/scc clobber", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/compiler/aco_optimizer_postRA.cpp b/src/amd/compiler/aco_optimizer_postRA.cpp index e56c36e0cce..93fc261a259 100644 --- a/src/amd/compiler/aco_optimizer_postRA.cpp +++ b/src/amd/compiler/aco_optimizer_postRA.cpp @@ -157,6 +157,12 @@ save_reg_writes(pr_opt_ctx& ctx, aco_ptr& instr) std::fill(ctx.instr_idx_by_regs[ctx.current_block->index].begin() + r, ctx.instr_idx_by_regs[ctx.current_block->index].begin() + r + dw_size, idx); } + if (instr->isPseudo() && instr->pseudo().needs_scratch_reg) { + if (!instr->pseudo().tmp_in_scc) + ctx.instr_idx_by_regs[ctx.current_block->index][scc] = overwritten_unknown_instr; + ctx.instr_idx_by_regs[ctx.current_block->index][instr->pseudo().scratch_sgpr] = + overwritten_unknown_instr; + } } Idx