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

r600/sfn: Extract group fill failure handling

Browse source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Assisted-by: Copilot (auto mode)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41945>
This commit is contained in:
Gert Wollny 2026-04-20 18:00:50 +02:00 • committed by Marge Bot
parent 2e9f035060
commit e083a06bf5
1 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,6 +185,9 @@ private:
AluGroup& group,
bool& success,
const AluScheduleContext& alu_ctx);
bool handle_alu_group_fill_failure(Shader::ShaderBlocks& out_blocks,
AluGroup& group,
const AluScheduleContext& alu_ctx);
auto schedule_prebuilt_alu_group_first(Shader::ShaderBlocks& out_blocks,
bool& success,
const AluScheduleContext& alu_ctx) -> AluGroup*;
@ -614,35 +617,50 @@ BlockScheduler::fill_alu_group(Shader::ShaderBlocks& out_blocks,
if (success) {
++m_alu_groups_scheduled;
break;
} else if (m_current_block->kcache_reservation_failed()) {
// LDS read groups should not lead to impossible
// kcache constellations
assert(!m_current_block->lds_group_active());
// AR is loaded but not all uses are done, we don't want
// to start a new CF here
// TODO this can explode, if kcache reservation fails with
// an instruction that also requires AR
assert(alu_ctx.expected_ar_uses == 0);
// kcache reservation failed, so we have to start a new CF
start_new_block(out_blocks, Block::alu);
} else {
// Ready is not empty, but we didn't schedule anything, this
// means we had a indirect array read or write conflict that we
// can resolve with an extra group that has a NOP instruction
if (!alu_trans_ready.empty() || !alu_vec_ready.empty()) {
group.add_vec_instructions(new AluInstr(op0_nop, 0));
break;
} else {
return false;
}
}
if (!handle_alu_group_fill_failure(out_blocks, group, alu_ctx))
return false;
if (!group.empty())
break;
}
return true;
}
bool
BlockScheduler::handle_alu_group_fill_failure(Shader::ShaderBlocks& out_blocks,
AluGroup& group,
const AluScheduleContext& alu_ctx)
{
if (m_current_block->kcache_reservation_failed()) {
// LDS read groups should not lead to impossible
// kcache constellations
assert(!m_current_block->lds_group_active());
// AR is loaded but not all uses are done, we don't want
// to start a new CF here
// TODO this can explode, if kcache reservation fails with
// an instruction that also requires AR
assert(alu_ctx.expected_ar_uses == 0);
// kcache reservation failed, so we have to start a new CF
start_new_block(out_blocks, Block::alu);
return true;
}
// Ready is not empty, but we didn't schedule anything, this
// means we had a indirect array read or write conflict that we
// can resolve with an extra group that has a NOP instruction
if (!alu_trans_ready.empty() || !alu_vec_ready.empty()) {
group.add_vec_instructions(new AluInstr(op0_nop, 0));
return true;
}
return false;
}
auto
BlockScheduler::schedule_prebuilt_alu_group_first(Shader::ShaderBlocks& out_blocks,
bool& success,