fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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>
(cherry picked from commit 5d0f212d81)
This commit is contained in:
Gert Wollny 2025-08-11 14:55:16 +02:00 • committed by Eric Engestrom
parent a24427b5cf
commit fb2fbf03dd
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -7904,7 +7904,7 @@
"description": "r600/sfn: Fix AR use tracking off-by-one error",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d617052db6b2f359d7242875013603ec63b069fc",
"notes": null

17
src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
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;
}
}
@ -564,7 +566,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))
@ -620,7 +622,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);
@ -648,13 +652,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);
}
@ -670,8 +674,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);
}
@ -684,7 +687,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);
}