fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600/sfn: unify and fix naming of group readport reserver

Browse source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36572>
This commit is contained in:
Gert Wollny 2025-06-19 22:37:28 +02:00 • committed by Marge Bot
parent 9ce6d9ff1f
commit 68d5f1c456
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,10 +112,10 @@ AluGroup::add_trans_instructions(AluInstr *instr)
return false;
for (AluBankSwizzle i = sq_alu_scl_201; i != sq_alu_scl_unknown; ++i) {
AluReadportReservation readports_evaluator = m_readports_evaluator;
AluReadportReservation readports_evaluator = m_readports_reserver;
if (readports_evaluator.schedule_trans_instruction(*instr, i) &&
update_indirect_access(instr)) {
m_readports_evaluator = readports_evaluator;
m_readports_reserver = readports_evaluator;
m_slots[4] = instr;
m_free_slots &= ~0x10;
instr->pin_sources_to_chan();
@ -249,10 +249,10 @@ bool
AluGroup::try_readport(AluInstr *instr, AluBankSwizzle cycle)
{
int preferred_chan = instr->dest_chan();
AluReadportReservation readports_evaluator = m_readports_evaluator;
AluReadportReservation readports_evaluator = m_readports_reserver;
if (readports_evaluator.schedule_vec_instruction(*instr, cycle) &&
update_indirect_access(instr)) {
m_readports_evaluator = readports_evaluator;
m_readports_reserver = readports_evaluator;
m_slots[preferred_chan] = instr;
m_free_slots &= ~(1 << preferred_chan);
m_has_lds_op |= instr->has_lds_access();
@ -322,7 +322,7 @@ bool AluGroup::replace_source(PRegister old_src, PVirtualValue new_src)
}
}
m_readports_evaluator = rpr_sum;
m_readports_reserver = rpr_sum;
return success;
}
@ -453,7 +453,7 @@ AluGroup::forward_set_blockid(int id, int index)
uint32_t
AluGroup::slots() const
{
uint32_t result = (m_readports_evaluator.m_nliterals + 1) >> 1;
uint32_t result = (m_readports_reserver.m_nliterals + 1) >> 1;
for (int i = 0; i < s_max_slots; ++i) {
if (m_slots[i])
++result;

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

@ -65,10 +65,13 @@ public:
bool has_lds_group_end() const;
const auto& readport_reserer() const { return m_readports_evaluator; }
void set_readport_reserer(const AluReadportReservation& rr)
const auto& readport_reserver() const
{
m_readports_evaluator = rr;
return m_readports_reserver;
}
void readport_reserver(const AluReadportReservation& rr)
{
m_readports_reserver = rr;
};
void update_readport_reserver();
@ -92,7 +95,7 @@ private:
Slots m_slots;
AluReadportReservation m_readports_evaluator;
AluReadportReservation m_readports_reserver;
static int s_max_slots;
static r600_chip_class s_chip_class;