fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 18:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

aco/scheduler: refactor downwards dependency check

Browse source 
We can also ignore killed operands when checking for RAR dependencies
as these cannot appear later anymore.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38135>
This commit is contained in:
Daniel Schürmann 2025-10-28 08:14:07 +01:00 • committed by Marge Bot
parent ce3cc03153
commit 65ba8a0e8b
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/amd/compiler/aco_scheduler.cpp
View file

@ -30,7 +30,7 @@ namespace aco {
namespace { namespace {
enum MoveResult { enum MoveResult {
move_success, move_success = 0,
move_fail_ssa, move_fail_ssa,
move_fail_rar, move_fail_rar,
move_fail_pressure, move_fail_pressure,
@ -94,6 +94,7 @@ struct MoveState {
/* for moving instructions before the current instruction to after it */ /* for moving instructions before the current instruction to after it */
DownwardsCursor downwards_init(int current_idx, bool improved_rar); DownwardsCursor downwards_init(int current_idx, bool improved_rar);
MoveResult downwards_check_deps(Instruction* instr);
MoveResult downwards_move(DownwardsCursor&); MoveResult downwards_move(DownwardsCursor&);
MoveResult downwards_move_clause(DownwardsCursor&); MoveResult downwards_move_clause(DownwardsCursor&);
void downwards_skip(DownwardsCursor&); void downwards_skip(DownwardsCursor&);
@ -183,23 +184,27 @@ MoveState::downwards_init(int current_idx, bool improved_rar_)
return cursor; return cursor;
} }
bool MoveResult
check_dependencies(Instruction* instr, std::vector<bool>& def_dep, MoveState::downwards_check_deps(Instruction* instr)
aco::unordered_map<unsigned, unsigned>& rar_deps, bool improved_rar)
{ {
for (const Definition& def : instr->definitions) { for (const Definition& def : instr->definitions) {
if (def.isTemp() && def_dep[def.tempId()]) if (def.isTemp() && depends_on[def.tempId()])
return true; return move_fail_ssa;
} }
for (const Operand& op : instr->operands) { for (const Operand& op : instr->operands) {
if (op.isTemp()) { if (!op.isTemp() || op.isKill())
if ((improved_rar && rar_deps.count(op.tempId())) || continue;
(!improved_rar && def_dep[op.tempId()]))
// FIXME: account for difference in register pressure if (!improved_rar && depends_on[op.tempId()])
return true; return move_fail_rar;
}
if (improved_rar && rar_dependencies.count(op.tempId()))
// FIXME: account for difference in register pressure
return move_fail_rar;
} }
return false;
return move_success;
} }
/* The instruction at source_idx is moved below the instruction at insert_idx. */ /* The instruction at source_idx is moved below the instruction at insert_idx. */
@ -209,8 +214,9 @@ MoveState::downwards_move(DownwardsCursor& cursor)
aco_ptr<Instruction>& candidate = block->instructions[cursor.source_idx]; aco_ptr<Instruction>& candidate = block->instructions[cursor.source_idx];
/* check if one of candidate's operands is killed by depending instruction */ /* check if one of candidate's operands is killed by depending instruction */
if (check_dependencies(candidate.get(), depends_on, rar_dependencies, improved_rar)) MoveResult res = downwards_check_deps(candidate.get());
return move_fail_ssa; if (res != move_success)
return res;
/* Check the new demand of the instructions being moved over: /* Check the new demand of the instructions being moved over:
* total_demand doesn't include the current clause which consists of exactly 1 instruction. * total_demand doesn't include the current clause which consists of exactly 1 instruction.
@ -281,8 +287,9 @@ MoveState::downwards_move_clause(DownwardsCursor& cursor)
while (should_form_clause(block->instructions[clause_begin_idx].get(), instr)) { while (should_form_clause(block->instructions[clause_begin_idx].get(), instr)) {
Instruction* candidate = block->instructions[clause_begin_idx--].get(); Instruction* candidate = block->instructions[clause_begin_idx--].get();
if (check_dependencies(candidate, depends_on, rar_dependencies, true)) MoveResult res = downwards_check_deps(candidate);
return move_fail_ssa; if (res != move_success)
return res;
max_clause_demand.update(candidate->register_demand); max_clause_demand.update(candidate->register_demand);
} }