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

r600/sfn: Fix AR use tracking off-by-one error

Browse Source 
The evauation of loading the AR register was off by one, so that
splitting an ALU group could actually happen after AR was loaded
resulting in a failure to lower to assembly.

Fixes: d617052db6 ("r600/sfn: take address loads into account when scheduling")

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36742>
This commit is contained in:
Gert Wollny
2025-08-11 14:55:16 +02:00
committed by Marge Bot
parent 63c801e8c2
commit 5d0f212d81
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
+10 -7
View File
@@ -526,6 +526,7 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
{
bool success = false;
AluGroup *group = nullptr;
int expected_ar_uses = m_current_block->expected_ar_uses();
sfn_log << SfnLog::schedule << "Schedule alu with " <<
m_current_block->expected_ar_uses()
@@ -544,6 +545,7 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
if (m_current_block->type() != Block::alu) {
start_new_block(out_blocks, Block::alu);
m_alu_groups_scheduled = 0;
expected_ar_uses = 0;
}
}
@@ -565,7 +567,7 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
alu_groups_ready.erase(alu_groups_ready.begin());
success = true;
} else {
if (m_current_block->expected_ar_uses() == 0) {
if (expected_ar_uses == 0) {
start_new_block(out_blocks, Block::alu);
if (!m_current_block->try_reserve_kcache(*group))
@@ -621,7 +623,9 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
// AR is loaded but not all uses are done, we don't want
// to start a new CF here
assert(m_current_block->expected_ar_uses() ==0);
// TODO this can explode, if kcache reservation fails with
// an instruction that also requires AR
assert(expected_ar_uses == 0);
// kcache reservation failed, so we have to start a new CF
start_new_block(out_blocks, Block::alu);
@@ -649,13 +653,13 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
if (is_index) {
if (addr->sel() == AddressRegister::idx0 && m_idx0_pending) {
assert(!group->has_lds_group_start());
assert(m_current_block->expected_ar_uses() == 0);
assert(expected_ar_uses == 0);
start_new_block(out_blocks, Block::alu);
m_current_block->try_reserve_kcache(*group);
}
if (addr->sel() == AddressRegister::idx1 && m_idx1_pending) {
assert(!group->has_lds_group_start());
assert(m_current_block->expected_ar_uses() == 0);
assert(expected_ar_uses == 0);
start_new_block(out_blocks, Block::alu);
m_current_block->try_reserve_kcache(*group);
}
@@ -671,8 +675,7 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
m_idx1_pending |= m_idx1_loading;
m_idx1_loading = false;
if (!m_current_block->lds_group_active() &&
m_current_block->expected_ar_uses() == 0 &&
if (!m_current_block->lds_group_active() && expected_ar_uses == 0 &&
(!addr || is_index)) {
group->set_instr_flag(Instr::no_lds_or_addr_group);
}
@@ -685,7 +688,7 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
if (group->has_kill_op()) {
assert(!group->has_lds_group_start());
assert(m_current_block->expected_ar_uses() == 0);
assert(expected_ar_uses == 0);
start_new_block(out_blocks, Block::alu);
}
group->update_readport_reserver();