AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco/ra: Add option to skip renaming for parallelcopies

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29576>
This commit is contained in:
Natalie Vock
2024-10-29 19:23:07 +01:00
committed by Marge Bot
parent b339bcfa38
commit 7a4775b396
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_register_allocation.cpp
+17 -9
View File
@@ -30,11 +30,15 @@ void add_subdword_definition(Program* program, aco_ptr<Instruction>& instr, Phys
bool allow_16bit_write);
struct parallelcopy {
constexpr parallelcopy(Operand op_, Definition def_) : op(op_), def(def_)
constexpr parallelcopy(Operand op_, Definition def_) : op(op_), def(def_), skip_renaming(false)
{}
constexpr parallelcopy(Operand op_, Definition def_, bool skip_renaming_)
: op(op_), def(def_), skip_renaming(skip_renaming_)
{}
Operand op;
Definition def;
bool skip_renaming;
};
struct assignment {
@@ -823,7 +827,7 @@ update_renames(ra_ctx& ctx, RegisterFile& reg_file, std::vector<parallelcopy>& p
/* clear operands */
for (parallelcopy& copy : parallelcopies) {
/* the definitions with id are not from this function and already handled */
if (copy.def.isTemp())
if (copy.def.isTemp() || copy.skip_renaming)
continue;
reg_file.clear(copy.op);
}
@@ -896,9 +900,9 @@ update_renames(ra_ctx& ctx, RegisterFile& reg_file, std::vector<parallelcopy>& p
/* Fix the kill flags */
if (first[omit_renaming])
op.setFirstKill(omit_renaming || op.isKill());
op.setFirstKill((omit_renaming && !copy.skip_renaming) || op.isKill());
else
op.setKill(omit_renaming || op.isKill());
op.setKill((omit_renaming && !copy.skip_renaming) || op.isKill());
first[omit_renaming] = false;
if (omit_renaming)
@@ -3026,11 +3030,15 @@ emit_parallel_copy_internal(ra_ctx& ctx, std::vector<parallelcopy>& parallelcopy
pc->definitions[i] = parallelcopy[i].def;
assert(pc->operands[i].size() == pc->definitions[i].size());
/* it might happen that the operand is already renamed. we have to restore the
* original name. */
auto it = ctx.orig_names.find(pc->operands[i].tempId());
Temp orig = it != ctx.orig_names.end() ? it->second : pc->operands[i].getTemp();
add_rename(ctx, orig, pc->definitions[i].getTemp());
if (!parallelcopy[i].skip_renaming) {
/* it might happen that the operand is already renamed. we have to restore the
* original name. */
auto it =
ctx.orig_names.find(pc->operands[i].tempId());
Temp orig = it != ctx.orig_names.end() ? it->second : pc->operands[i].getTemp();
add_rename(
ctx, orig, pc->definitions[i].getTemp());
}
}
if (temp_in_scc && (may_swap_sgprs || linear_vgpr)) {