fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-24 15:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r600/sfn: move some common code into try_readport

Browse source 
Fixes: 359bfc3138 ("r600/sfn: make sure that kill and update pred are not in the same group")

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38112>
This commit is contained in:
Gert Wollny 2025-10-28 16:23:49 +01:00 • committed by Marge Bot
parent a7f477b51f
commit 51e7c477d6
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/drivers/r600/sfn/sfn_instr_alugroup.cpp
View file

@ -172,17 +172,12 @@ AluGroup::add_vec_instructions(AluInstr *instr)
if (!m_slots[preferred_chan]) {
if (instr->bank_swizzle() != alu_vec_unknown) {
if (try_readport(instr, instr->bank_swizzle())) {
m_has_kill_op |= instr->is_kill();
m_slot_assignemnt_order[m_next_slot_assignemnt++] = preferred_chan;
return true;
}
} else {
for (AluBankSwizzle i = alu_vec_012; i != alu_vec_unknown; ++i) {
if (try_readport(instr, i)) {
m_has_kill_op |= instr->is_kill();
m_slot_assignemnt_order[m_next_slot_assignemnt++] = preferred_chan;
if (try_readport(instr, i))
return true;
}
}
}
} else {
@ -211,18 +206,12 @@ AluGroup::add_vec_instructions(AluInstr *instr)
sfn_log << SfnLog::schedule << "V: Try force channel " << free_chan << "\n";
dest->set_chan(free_chan);
if (instr->bank_swizzle() != alu_vec_unknown) {
if (try_readport(instr, instr->bank_swizzle())) {
m_has_kill_op |= instr->is_kill();
m_slot_assignemnt_order[m_next_slot_assignemnt++] = free_chan;
if (try_readport(instr, instr->bank_swizzle()))
return true;
}
} else {
for (AluBankSwizzle i = alu_vec_012; i != alu_vec_unknown; ++i) {
if (try_readport(instr, i)) {
m_has_kill_op |= instr->is_kill();
m_slot_assignemnt_order[m_next_slot_assignemnt++] = free_chan;
if (try_readport(instr, i))
return true;
}
}
}
}
@ -320,6 +309,8 @@ AluGroup::try_readport(AluInstr *instr, AluBankSwizzle cycle)
else if (dest->pin() == pin_group)
dest->set_pin(pin_chgr);
}
m_has_kill_op |= instr->is_kill();
m_slot_assignemnt_order[m_next_slot_assignemnt++] = preferred_chan;
return true;
}
return false;