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

aco/spill: refactor spill decision taking

Browse source 
No fossil-db changes.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9196>
This commit is contained in:
Daniel Schürmann 2021-02-17 18:29:48 +01:00 • committed by Marge Bot
parent 17429b8ad4
commit beb292343a
1 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1134,31 +1134,21 @@ void process_block(spill_ctx& ctx, unsigned block_idx, Block* block,
unsigned distance = 0;
Temp to_spill;
bool do_rematerialize = false;
if (new_demand.vgpr - spilled_registers.vgpr > ctx.target_pressure.vgpr) {
for (std::pair<Temp, uint32_t> pair : local_next_use_distance[idx]) {
bool can_rematerialize = ctx.remat.count(pair.first);
if (pair.first.type() == RegType::vgpr &&
((pair.second > distance && can_rematerialize == do_rematerialize) ||
(can_rematerialize && !do_rematerialize && pair.second > idx)) &&
current_spills.find(pair.first) == current_spills.end() &&
ctx.spills_exit[block_idx].find(pair.first) == ctx.spills_exit[block_idx].end()) {
to_spill = pair.first;
distance = pair.second;
do_rematerialize = can_rematerialize;
}
}
} else {
for (std::pair<Temp, uint32_t> pair : local_next_use_distance[idx]) {
bool can_rematerialize = ctx.remat.count(pair.first);
if (pair.first.type() == RegType::sgpr &&
((pair.second > distance && can_rematerialize == do_rematerialize) ||
(can_rematerialize && !do_rematerialize && pair.second > idx)) &&
current_spills.find(pair.first) == current_spills.end() &&
ctx.spills_exit[block_idx].find(pair.first) == ctx.spills_exit[block_idx].end()) {
to_spill = pair.first;
distance = pair.second;
do_rematerialize = can_rematerialize;
}
RegType type = RegType::sgpr;
if (new_demand.vgpr - spilled_registers.vgpr > ctx.target_pressure.vgpr)
type = RegType::vgpr;
for (std::pair<Temp, uint32_t> pair : local_next_use_distance[idx]) {
if (pair.first.type() != type)
continue;
bool can_rematerialize = ctx.remat.count(pair.first);
if (((pair.second > distance && can_rematerialize == do_rematerialize) ||
(can_rematerialize && !do_rematerialize && pair.second > idx)) &&
current_spills.find(pair.first) == current_spills.end() &&
ctx.spills_exit[block_idx].find(pair.first) == ctx.spills_exit[block_idx].end()) {
to_spill = pair.first;
distance = pair.second;
do_rematerialize = can_rematerialize;
}
}