fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 12:50:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

r600/sfn: Add a free-channel mask when testing whether a register can switch channel

Browse source 
This should avoid making 4 slot ops out of 3-slot ops on Cayman

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18619>
This commit is contained in:
Gert Wollny 2022-09-12 19:00:53 +02:00 • committed by Marge Bot
parent 668167aac1
commit 56ded410af
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,10 +137,17 @@ public:
using AluInstrVisitor::visit;
void visit(AluInstr *alu) {
yes = (alu->alu_slots() == 1 || alu->has_alu_flag(alu_is_cayman_trans));
if (alu->alu_slots() != 1) {
if (alu->has_alu_flag(alu_is_cayman_trans)) {
free_mask &= (1 << alu->alu_slots()) - 1;
} else {
yes = false;
}
}
}
bool yes{false};
bool yes{true};
uint8_t free_mask{0xf};
};
@ -182,18 +189,19 @@ bool AluGroup::add_vec_instructions(AluInstr *instr)
auto dest = instr->dest();
if (dest && dest->pin() == pin_free) {
AluAllowSlotSwitch swich_allowed;
for (auto u : dest->uses()) {
AluAllowSlotSwitch swich_allowed;
u->accept(swich_allowed);
if (!swich_allowed.yes)
return false;
}
int free_chan = 0;
while (m_slots[free_chan] && free_chan < 4)
while (free_chan < 4 && (m_slots[free_chan] ||
!(swich_allowed.free_mask & (1 << free_chan))))
free_chan++;
if (!m_slots[free_chan] && free_chan < 4) {
if (free_chan < 4) {
sfn_log << SfnLog::schedule << "V: Try force channel " << free_chan << "\n";
dest->set_chan(free_chan);
if (instr->bank_swizzle() != alu_vec_unknown) {