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 1

r600/sfn: extract function to update group after instr insert

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:00:04 +01:00 • committed by Marge Bot
parent b82044c31b
commit a7f477b51f
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,14 @@ AluGroup::AluGroup()
m_free_slots = has_t() ? 0x1f : 0xf; m_free_slots = has_t() ? 0x1f : 0xf;
} }
void
AluGroup::apply_add_instr(AluInstr *instr)
{
instr->set_parent_group(this);
instr->pin_dest_to_chan();
m_has_kill_op |= instr->is_kill();
}
bool bool
AluGroup::add_instruction(AluInstr *instr) AluGroup::add_instruction(AluInstr *instr)
{ {
@ -32,17 +40,13 @@ AluGroup::add_instruction(AluInstr *instr)
ASSERTED auto opinfo = alu_ops.find(instr->opcode()); ASSERTED auto opinfo = alu_ops.find(instr->opcode());
assert(opinfo->second.can_channel(AluOp::t, s_chip_class)); assert(opinfo->second.can_channel(AluOp::t, s_chip_class));
if (add_trans_instructions(instr)) { if (add_trans_instructions(instr)) {
instr->set_parent_group(this); apply_add_instr(instr);
instr->pin_dest_to_chan();
m_has_kill_op |= instr->is_kill();
return true; return true;
} }
} }
if (add_vec_instructions(instr) && !instr->has_alu_flag(alu_is_trans)) { if (add_vec_instructions(instr) && !instr->has_alu_flag(alu_is_trans)) {
instr->set_parent_group(this); apply_add_instr(instr);
instr->pin_dest_to_chan();
m_has_kill_op |= instr->is_kill();
return true; return true;
} }
@ -51,9 +55,7 @@ AluGroup::add_instruction(AluInstr *instr)
if (s_max_slots > 4 && opinfo->second.can_channel(AluOp::t, s_chip_class) && if (s_max_slots > 4 && opinfo->second.can_channel(AluOp::t, s_chip_class) &&
add_trans_instructions(instr)) { add_trans_instructions(instr)) {
instr->set_parent_group(this); apply_add_instr(instr);
instr->pin_dest_to_chan();
m_has_kill_op |= instr->is_kill();
return true; return true;
} }

3
src/gallium/drivers/r600/sfn/sfn_instr_alugroup.h
View file

@ -21,6 +21,7 @@ public:
using iterator = Slots::iterator; using iterator = Slots::iterator;
using const_iterator = Slots::const_iterator; using const_iterator = Slots::const_iterator;
void extracted(AluInstr *& instr);
bool add_instruction(AluInstr *instr); bool add_instruction(AluInstr *instr);
bool add_trans_instructions(AluInstr *instr); bool add_trans_instructions(AluInstr *instr);
bool add_vec_instructions(AluInstr *instr); bool add_vec_instructions(AluInstr *instr);
@ -100,6 +101,8 @@ private:
bool update_indirect_access(AluInstr *instr); bool update_indirect_access(AluInstr *instr);
bool try_readport(AluInstr *instr, AluBankSwizzle cycle); bool try_readport(AluInstr *instr, AluBankSwizzle cycle);
void apply_add_instr(AluInstr * instr);
Slots m_slots; Slots m_slots;
uint8_t m_next_slot_assignemnt{0}; uint8_t m_next_slot_assignemnt{0};
std::array<int8_t, 5> m_slot_assignemnt_order{-1, -1, -1, -1, -1}; std::array<int8_t, 5> m_slot_assignemnt_order{-1, -1, -1, -1, -1};

2
src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
View file

@ -869,7 +869,7 @@ BlockScheduler::schedule_alu_to_group_vec(AluGroup *group)
bool success = false; bool success = false;
auto i = alu_vec_ready.begin(); auto i = alu_vec_ready.begin();
auto e = alu_vec_ready.end(); auto e = alu_vec_ready.end();
bool group_has_kill = false; bool group_has_kill = group->has_kill_op();
bool group_has_update_pred = false; bool group_has_update_pred = false;
while (i != e) { while (i != e) {
sfn_log << SfnLog::schedule << "Try schedule to vec " << **i; sfn_log << SfnLog::schedule << "Try schedule to vec " << **i;