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

r600/sfn: move kill handling to fully scheduling

Browse source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23647>
This commit is contained in:
Gert Wollny 2023-05-14 14:48:51 +02:00 • committed by Marge Bot
parent f7e6171f3a
commit d6280a8eef
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/r600/sfn/sfn_assembler.cpp
View file

@ -435,9 +435,6 @@ AssamblerVisitor::emit_alu_op(const AluInstr& ai)
m_bc->index_loaded[1] = 1;
m_bc->index_reg[1] = -1;
}
m_bc->force_add_cf |=
ai.opcode() == op2_kille || ai.opcode() == op2_killne_int;
}
void

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

@ -140,7 +140,6 @@ AluGroup::add_trans_instructions(AluInstr *instr)
/* We added a vector op in the trans channel, so we have to
* make sure the corresponding vector channel is used */
assert(instr->has_alu_flag(alu_is_trans) || m_slots[instr->dest_chan()]);
m_has_kill_op |= instr->is_kill();
return true;
}
@ -161,7 +160,7 @@ AluGroup::free_slots() const
bool
AluGroup::add_vec_instructions(AluInstr *instr)
{
{
int param_src = -1;
for (auto& s : instr->sources()) {
auto is = s->as_inline_const();
@ -220,7 +219,6 @@ AluGroup::add_vec_instructions(AluInstr *instr)
sfn_log << SfnLog::schedule << "V: Try force channel " << free_chan << "\n";
dest->set_chan(free_chan);
if (instr->bank_swizzle() != alu_vec_unknown) {
if (try_readport(instr, instr->bank_swizzle())) {
m_has_kill_op |= instr->is_kill();
return true;

1
src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp
View file

@ -180,7 +180,6 @@ FragmentShader::process_stage_intrinsic(nir_intrinsic_instr *intr)
value_factory().zero(),
value_factory().zero(),
{AluInstr::last}));
start_new_block(0);
return true;
case nir_intrinsic_load_sample_mask_in:
if (m_apply_sample_mask) {