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

aco/spill: Insert p_start_linear_vgpr right after p_logical_end

Browse source 
If p_start_linear_vgpr allocates a VGPR that is already blocked, RA
will try moving the blocking VGPR somewhere else. If
p_start_linear_vgpr is inserted right before the branch, that move will
be inserted after exec has been overwritten, which might cause the move
to be skipped for some threads.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28041>
(cherry picked from commit 590ea76104)
This commit is contained in:
Friedrich Vock 2024-05-14 06:50:55 +02:00 • committed by Eric Engestrom
parent 5f5ebee70b
commit f8d7ef05b3
3 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -114,7 +114,7 @@
"description": "aco/spill: Insert p_start_linear_vgpr right after p_logical_end",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

20
src/amd/compiler/aco_reduce_assign.cpp
View file

@ -103,11 +103,16 @@ setup_reduce_temp(Program* program)
* would insert at the end instead of using this one. */
} else {
assert(last_top_level_block_idx < block.index);
/* insert before the branch at last top level block */
/* insert after p_logical_end of the last top-level block */
std::vector<aco_ptr<Instruction>>& instructions =
program->blocks[last_top_level_block_idx].instructions;
instructions.insert(std::next(instructions.begin(), instructions.size() - 1),
std::move(create));
auto insert_point =
std::find_if(instructions.rbegin(), instructions.rend(),
[](const auto& iter) {
return iter->opcode == aco_opcode::p_logical_end;
})
.base();
instructions.insert(insert_point, std::move(create));
inserted_at = last_top_level_block_idx;
}
}
@ -146,8 +151,13 @@ setup_reduce_temp(Program* program)
assert(last_top_level_block_idx < block.index);
std::vector<aco_ptr<Instruction>>& instructions =
program->blocks[last_top_level_block_idx].instructions;
instructions.insert(std::next(instructions.begin(), instructions.size() - 1),
std::move(create));
auto insert_point =
std::find_if(instructions.rbegin(), instructions.rend(),
[](const auto& iter) {
return iter->opcode == aco_opcode::p_logical_end;
})
.base();
instructions.insert(insert_point, std::move(create));
vtmp_inserted_at = last_top_level_block_idx;
}
}

20
src/amd/compiler/aco_spill.cpp
View file

@ -1604,10 +1604,16 @@ assign_spill_slots(spill_ctx& ctx, unsigned spills_to_vgpr)
instructions.emplace_back(std::move(create));
} else {
assert(last_top_level_block_idx < block.index);
/* insert before the branch at last top level block */
/* insert after p_logical_end of the last top-level block */
std::vector<aco_ptr<Instruction>>& block_instrs =
ctx.program->blocks[last_top_level_block_idx].instructions;
block_instrs.insert(std::prev(block_instrs.end()), std::move(create));
auto insert_point =
std::find_if(block_instrs.rbegin(), block_instrs.rend(),
[](const auto& iter) {
return iter->opcode == aco_opcode::p_logical_end;
})
.base();
block_instrs.insert(insert_point, std::move(create));
}
}
@ -1644,10 +1650,16 @@ assign_spill_slots(spill_ctx& ctx, unsigned spills_to_vgpr)
instructions.emplace_back(std::move(create));
} else {
assert(last_top_level_block_idx < block.index);
/* insert before the branch at last top level block */
/* insert after p_logical_end of the last top-level block */
std::vector<aco_ptr<Instruction>>& block_instrs =
ctx.program->blocks[last_top_level_block_idx].instructions;
block_instrs.insert(std::prev(block_instrs.end()), std::move(create));
auto insert_point =
std::find_if(block_instrs.rbegin(), block_instrs.rend(),
[](const auto& iter) {
return iter->opcode == aco_opcode::p_logical_end;
})
.base();
block_instrs.insert(insert_point, std::move(create));
}
}