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

aco/spill: Don't spill scratch_rsrc-related temps

Browse source 
These temps are used to create the scratch_rsrc. Spilling them will
never benefit anything, because assign_spill_slots will insert code
that keeps them live. Since the spiller assumes all spilled variables
to be dead, this can cause more variables being live than intended and
spilling to fail.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35031>
This commit is contained in:
Natalie Vock 2025-02-17 18:42:49 +01:00 • committed by Marge Bot
parent acf29e403a
commit af86cc37d5
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -289,6 +289,19 @@ get_rematerialize_info(spill_ctx& ctx)
}
}
bool
is_spillable(spill_ctx& ctx, Temp var)
{
if (var.regClass().is_linear_vgpr())
return false;
auto is_current_var = [var](const Temp& test) { return var == test; };
return var != ctx.program->stack_ptr && var != ctx.program->static_scratch_rsrc &&
std::none_of(ctx.program->scratch_offsets.begin(), ctx.program->scratch_offsets.end(),
is_current_var) &&
std::none_of(ctx.program->private_segment_buffers.begin(),
ctx.program->private_segment_buffers.end(), is_current_var);
}
RegisterDemand
init_live_in_vars(spill_ctx& ctx, Block* block, unsigned block_idx)
{
@ -353,7 +366,7 @@ init_live_in_vars(spill_ctx& ctx, Block* block, unsigned block_idx)
for (unsigned t : live_in) {
Temp var = Temp(t, ctx.program->temp_rc[t]);
if (var.type() != type || ctx.spills_entry[block_idx].count(var) ||
var.regClass().is_linear_vgpr())
!is_spillable(ctx, var))
continue;
unsigned can_remat = ctx.remat.count(var);
@ -399,7 +412,7 @@ init_live_in_vars(spill_ctx& ctx, Block* block, unsigned block_idx)
continue;
Temp var = phi->definitions[0].getTemp();
if (var.type() == type && !ctx.spills_entry[block_idx].count(var) &&
ctx.ssa_infos[var.id()].score() > score) {
ctx.ssa_infos[var.id()].score() > score && is_spillable(ctx, var)) {
to_spill = var;
score = ctx.ssa_infos[var.id()].score();
}
@ -534,7 +547,7 @@ init_live_in_vars(spill_ctx& ctx, Block* block, unsigned block_idx)
while (it != partial_spills.end()) {
assert(!ctx.spills_entry[block_idx].count(it->first));
if (it->first.type() == type && !it->first.regClass().is_linear_vgpr() &&
if (it->first.type() == type && is_spillable(ctx, it->first) &&
((it->second && !is_partial_spill) ||
(it->second == is_partial_spill && ctx.ssa_infos[it->first.id()].score() > score))) {
score = ctx.ssa_infos[it->first.id()].score();
@ -940,7 +953,8 @@ process_block(spill_ctx& ctx, unsigned block_idx, Block* block, RegisterDemand s
for (unsigned t : ctx.program->live.live_in[block_idx]) {
RegClass rc = ctx.program->temp_rc[t];
Temp var = Temp(t, rc);
if (rc.type() != type || current_spills.count(var) || rc.is_linear_vgpr())
if (rc.type() != type || current_spills.count(var) || rc.is_linear_vgpr() ||
!is_spillable(ctx, var))
continue;
unsigned can_rematerialize = ctx.remat.count(var);