fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-05 04:00:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

aco/ra: fix live-range splits of phi definitions

Browse source 
It could happen that at the time of a live-range split,
a phi was not yet placed in the new instruction vector,
and thus, instead of renamed, a new phi was created.

Fixes: dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_i8vec2
Cc: mesa-stable

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16248>
(cherry picked from commit 58bd9a379e)
This commit is contained in:
Daniel Schürmann 2022-04-29 17:05:10 +02:00 • committed by Dylan Baker
parent bedc452f8b
commit 965bdf7db2
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -229,7 +229,7 @@
"description": "aco/ra: fix live-range splits of phi definitions",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

29
src/amd/compiler/aco_register_allocation.cpp
View file

@ -2052,12 +2052,18 @@ void
get_regs_for_phis(ra_ctx& ctx, Block& block, RegisterFile& register_file,
std::vector<aco_ptr<Instruction>>& instructions, IDSet& live_in)
{
/* assign phis with all-matching registers to that register */
/* move all phis to instructions */
for (aco_ptr<Instruction>& phi : block.instructions) {
if (!is_phi(phi))
break;
if (!phi->definitions[0].isKill())
instructions.emplace_back(std::move(phi));
}
/* assign phis with all-matching registers to that register */
for (aco_ptr<Instruction>& phi : instructions) {
Definition& definition = phi->definitions[0];
if (definition.isKill() || definition.isFixed())
if (definition.isFixed())
continue;
if (!phi->operands[0].isTemp())
@ -2079,11 +2085,9 @@ get_regs_for_phis(ra_ctx& ctx, Block& block, RegisterFile& register_file,
}
/* try to find a register that is used by at least one operand */
for (aco_ptr<Instruction>& phi : block.instructions) {
if (!is_phi(phi))
break;
for (aco_ptr<Instruction>& phi : instructions) {
Definition& definition = phi->definitions[0];
if (definition.isKill() || definition.isFixed())
if (definition.isFixed())
continue;
/* use affinity if available */
@ -2116,25 +2120,16 @@ get_regs_for_phis(ra_ctx& ctx, Block& block, RegisterFile& register_file,
}
/* find registers for phis where the register was blocked or no operand was assigned */
for (aco_ptr<Instruction>& phi : block.instructions) {
if (!is_phi(phi))
break;
for (aco_ptr<Instruction>& phi : instructions) {
Definition& definition = phi->definitions[0];
if (definition.isKill())
if (definition.isFixed())
continue;
if (definition.isFixed()) {
instructions.emplace_back(std::move(phi));
continue;
}
definition.setFixed(
get_reg_phi(ctx, live_in, register_file, instructions, block, phi, definition.getTemp()));
register_file.fill(definition);
ctx.assignments[definition.tempId()].set(definition);
instructions.emplace_back(std::move(phi));
}
}