OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: clear moved operands in get_reg_create_vector()

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4507>
This commit is contained in:
Rhys Perry
2020-04-10 12:24:28 +01:00
committed by Marge Bot
parent 52cc1f8237
commit fbd2be3f5d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/amd/compiler/aco_register_allocation.cpp
View File

@@ -992,12 +992,15 @@ PhysReg get_reg_create_vector(ra_ctx& ctx,
std::set<std::pair<unsigned, unsigned>> vars = collect_vars(ctx, reg_file, PhysReg{best_pos}, size);
/* move killed operands which aren't yet at the correct position */
uint64_t moved_operand_mask = 0;
for (unsigned i = 0, offset = 0; i < instr->operands.size(); offset += instr->operands[i].bytes(), i++) {
if (instr->operands[i].isTemp() &&
instr->operands[i].isFirstKillBeforeDef() &&
instr->operands[i].getTemp().type() == rc.type() &&
instr->operands[i].physReg().reg_b != best_pos * 4 + offset)
instr->operands[i].physReg().reg_b != best_pos * 4 + offset) {
vars.emplace(instr->operands[i].bytes(), instr->operands[i].tempId());
moved_operand_mask |= (uint64_t)1 << i;
}
}
ASSERTED bool success = false;
@@ -1006,6 +1009,13 @@ PhysReg get_reg_create_vector(ra_ctx& ctx,
update_renames(ctx, reg_file, parallelcopies, instr);
adjust_max_used_regs(ctx, rc, best_pos);
while (moved_operand_mask) {
unsigned i = u_bit_scan64(&moved_operand_mask);
assert(instr->operands[i].isFirstKillBeforeDef());
reg_file.clear(instr->operands[i]);
}
return PhysReg{best_pos};
}