AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco/ssa_elimination: add instr_accesses helper

Browse Source 
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19070>
This commit is contained in:
Georg Lehmann
2024-08-27 15:47:30 +02:00
committed by Marge Bot
parent 7ec0b62341
commit 61ab33c883
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_ssa_elimination.cpp
+30 -18
View File
@@ -295,6 +295,27 @@ regs_intersect(const T& a, const U& b)
return a_hi > b_lo && b_hi > a_lo;
}
template <typename T>
bool
instr_accesses(Instruction* instr, const T& a, bool ignore_reads)
{
if (!ignore_reads) {
for (const Operand& op : instr->operands)
if (regs_intersect(a, op))
return true;
}
for (const Definition& def : instr->definitions)
if (regs_intersect(a, def))
return true;
if (instr->isPseudo() && instr->pseudo().needs_scratch_reg &&
regs_intersect(a, Definition(instr->pseudo().scratch_sgpr, s1)))
return true;
return false;
}
void
try_optimize_branching_sequence(ssa_elimination_ctx& ctx, Block& block, const int exec_val_idx,
const int exec_copy_idx)
@@ -394,24 +415,6 @@ try_optimize_branching_sequence(ssa_elimination_ctx& ctx, Block& block, const in
/* When exec_val and exec_copy are non-adjacent, check whether there are any
* instructions inbetween (besides p_logical_end) which may inhibit the optimization.
*/
for (int idx = exec_val_idx + 1; idx < exec_copy_idx; ++idx) {
aco_ptr<Instruction>& instr = block.instructions[idx];
if (save_original_exec) {
/* Check if the instruction uses the exec_copy_def register, in which case we can't
* optimize. */
for (const Operand& op : instr->operands)
if (regs_intersect(exec_copy_def, op))
return;
for (const Definition& def : instr->definitions)
if (regs_intersect(exec_copy_def, def))
return;
if (instr->isPseudo() && instr->pseudo().needs_scratch_reg &&
regs_intersect(exec_copy_def, Definition(instr->pseudo().scratch_sgpr, s1)))
return;
}
}
if (save_original_exec) {
/* We insert the exec copy before exec_val, so exec_val can't use those registers. */
for (const Operand& op : exec_val->operands)
@@ -421,6 +424,15 @@ try_optimize_branching_sequence(ssa_elimination_ctx& ctx, Block& block, const in
if (((vopc && !vcmpx_exec_only) || !can_remove_copy) &&
regs_intersect(exec_copy_def, exec_wr_def))
return;
for (int idx = exec_val_idx + 1; idx < exec_copy_idx; ++idx) {
Instruction* instr = block.instructions[idx].get();
/* Check if the instruction uses the exec_copy_def register, in which case we can't
* optimize. */
if (instr_accesses(instr, exec_copy_def, false))
return;
}
}
if (vopc) {