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

aco: Add support for multiple ops fixed to defs

Browse Source 
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34273>
This commit is contained in:
Natalie Vock
2025-03-27 18:37:52 +01:00
committed by Marge Bot
parent fe739a2da2
commit f309d76aab
5 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_register_allocation.cpp
+12 -10
View File
@@ -2104,9 +2104,12 @@ operand_can_use_reg(amd_gfx_level gfx_level, aco_ptr<Instruction>& instr, unsign
return false;
FALLTHROUGH;
case Format::SOP2:
case Format::SOP1:
return get_op_fixed_to_def(instr.get()) != (int)idx ||
case Format::SOP1: {
auto fixed_ops = get_ops_fixed_to_def(instr.get());
return std::all_of(fixed_ops.begin(), fixed_ops.end(),
[idx](auto op_idx) { return op_idx != idx; }) ||
is_sgpr_writable_without_side_effects(gfx_level, reg);
}
default:
// TODO: there are more instructions with restrictions on registers
return true;
@@ -2813,7 +2816,7 @@ get_affinities(ra_ctx& ctx)
ctx.assignments[instr->operands[0].tempId()].m0 = true;
}
int op_fixed_to_def0 = get_op_fixed_to_def(instr.get());
auto ops_fixed_to_defs = get_ops_fixed_to_def(instr.get());
for (unsigned i = 0; i < instr->definitions.size(); i++) {
const Definition& def = instr->definitions[i];
if (!def.isTemp())
@@ -2827,8 +2830,8 @@ get_affinities(ra_ctx& ctx)
Operand op;
if (instr->opcode == aco_opcode::p_parallelcopy) {
op = instr->operands[i];
} else if (i == 0 && op_fixed_to_def0 != -1) {
op = instr->operands[op_fixed_to_def0];
} else if (i < ops_fixed_to_defs.size()) {
op = instr->operands[ops_fixed_to_defs[i]];
} else if (vop3_can_use_vop2acc(ctx, instr.get())) {
op = instr->operands[2];
} else if (i == 0 && sop2_can_use_sopk(ctx, instr.get())) {
@@ -3253,11 +3256,10 @@ register_allocation(Program* program, ra_test_policy policy)
* We can't read from the old location because it's corrupted, and we can't write the new
* location because that's used by a live-through operand.
*/
int op_fixed_to_def = get_op_fixed_to_def(instr.get());
if (op_fixed_to_def != -1) {
instr->definitions[0].setPrecolored(instr->operands[op_fixed_to_def].physReg());
instr->operands[op_fixed_to_def].setPrecolored(
instr->operands[op_fixed_to_def].physReg());
unsigned fixed_def_idx = 0;
for (auto op_idx : get_ops_fixed_to_def(instr.get())) {
instr->definitions[fixed_def_idx++].setPrecolored(instr->operands[op_idx].physReg());
instr->operands[op_idx].setPrecolored(instr->operands[op_idx].physReg());
}
/* handle fixed definitions first */