From 32e278d0afd192188aab1767a8a3ce9bb442aac6 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Fri, 1 Mar 2024 15:52:35 +0100 Subject: [PATCH] aco/post-ra: rename overwritten_subdword to allow additional uses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Reviewed-by: Timur Kristóf Reviewed-by: Daniel Schürmann Part-of: (cherry picked from commit a5056b2f93e261bc50cc3d5ab237da77f636023e) --- .pick_status.json | 2 +- src/amd/compiler/aco_optimizer_postRA.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c701edcafa7..874a33c09c1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -994,7 +994,7 @@ "description": "aco/post-ra: rename overwritten_subdword to allow additional uses", "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 5978e7c4b46..5ae59dad2ce 100644 --- a/src/amd/compiler/aco_optimizer_postRA.cpp +++ b/src/amd/compiler/aco_optimizer_postRA.cpp @@ -57,8 +57,8 @@ Idx const_or_undef{UINT32_MAX, 2}; /** Indicates that a register was overwritten by different instructions in previous blocks. */ Idx overwritten_untrackable{UINT32_MAX, 3}; -/** Indicates that a register was written by subdword operations. */ -Idx overwritten_subdword{UINT32_MAX, 4}; +/** Indicates that there isn't a clear single writer, for example due to subdword operations. */ +Idx overwritten_unknown_instr{UINT32_MAX, 4}; struct pr_opt_ctx { using Idx_array = std::array; @@ -150,7 +150,7 @@ save_reg_writes(pr_opt_ctx& ctx, aco_ptr& instr) Idx idx{ctx.current_block->index, ctx.current_instr_idx}; if (def.regClass().is_subdword()) - idx = overwritten_subdword; + idx = overwritten_unknown_instr; assert((r + dw_size) <= max_reg_cnt); assert(def.size() == dw_size || def.regClass().is_subdword()); @@ -211,7 +211,7 @@ is_overwritten_since(pr_opt_ctx& ctx, PhysReg reg, RegClass rc, const Idx& since return true; else if (i == overwritten_untrackable || i == not_written_yet) continue; - else if (i == overwritten_subdword) + else if (i == overwritten_unknown_instr) return true; assert(i.found());