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

r600/sfn: remove extra parameter from alu assemebly emission

Browse source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9874>
This commit is contained in:
Gert Wollny 2021-03-14 17:05:24 +01:00 • committed by Marge Bot
parent a976a50958
commit 56e4a46510
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/r600/sfn/sfn_instruction_alu.h
View file

@ -100,7 +100,6 @@ public:
PValue src2,
const std::set<AluModifiers>& m_flags);
void set_flag(AluModifiers flag);
unsigned n_sources() const;

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

@ -46,6 +46,7 @@ IfInstruction::IfInstruction(AluInstruction *pred):
{
PValue *v = m_pred->psrc(0);
add_remappable_src_value(v);
pred->set_cf_type(cf_alu_push_before);
}
void IfInstruction::do_evalue_liveness(LiverangeEvaluator& eval) const

27
src/gallium/drivers/r600/sfn/sfn_ir_to_assembly.cpp
View file

@ -39,14 +39,18 @@ namespace r600 {
using std::vector;
struct AssemblyFromShaderLegacyImpl {
struct AssemblyFromShaderLegacyImpl {
AssemblyFromShaderLegacyImpl(r600_shader *sh, r600_shader_key *key);
bool emit(const Instruction::Pointer i);
void reset_addr_register() {m_last_addr.reset();}
private:
bool emit_alu(const AluInstruction& ai, ECFAluOpCode cf_op);
bool emit_alu(const AluInstruction& ai);
bool emit_export(const ExportInstruction & exi);
bool emit_streamout(const StreamOutIntruction& instr);
bool emit_memringwrite(const MemRingOutIntruction& instr);
@ -165,7 +169,7 @@ bool AssemblyFromShaderLegacyImpl::emit(const Instruction::Pointer i)
sfn_log << SfnLog::assembly << "Emit from '" << *i << "\n";
switch (i->type()) {
case Instruction::alu:
return emit_alu(static_cast<const AluInstruction&>(*i), cf_alu_undefined);
return emit_alu(static_cast<const AluInstruction&>(*i));
case Instruction::exprt:
return emit_export(static_cast<const ExportInstruction&>(*i));
case Instruction::tex:
@ -242,7 +246,7 @@ bool AssemblyFromShaderLegacyImpl::emit_load_addr(PValue addr)
return true;
}
bool AssemblyFromShaderLegacyImpl::emit_alu(const AluInstruction& ai, ECFAluOpCode cf_op)
bool AssemblyFromShaderLegacyImpl::emit_alu(const AluInstruction& ai)
{
struct r600_bytecode_alu alu;
@ -353,8 +357,7 @@ bool AssemblyFromShaderLegacyImpl::emit_alu(const AluInstruction& ai, ECFAluOpCo
m_last_addr.reset();
}
if (cf_op == cf_alu_undefined)
cf_op = ai.cf_type();
auto cf_op = ai.cf_type();
unsigned type = 0;
switch (cf_op) {
@ -518,11 +521,13 @@ bool AssemblyFromShaderLegacyImpl::emit_if_start(const IfInstruction & if_instr)
auto op = cf_alu_push_before;
if (needs_workaround) {
r600_bytecode_add_cfinst(m_bc, CF_OP_PUSH);
m_bc->cf_last->cf_addr = m_bc->cf_last->id + 2;
op = cf_alu;
}
emit_alu(pred, op);
r600_bytecode_add_cfinst(m_bc, CF_OP_PUSH);
m_bc->cf_last->cf_addr = m_bc->cf_last->id + 2;
auto new_pred = pred;
new_pred.set_cf_type(cf_alu);
emit_alu(new_pred);
} else
emit_alu(pred);
r600_bytecode_add_cfinst(m_bc, CF_OP_JUMP);