fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-06 01:40:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600/sfn: Handle MOVA_INT in sfn assembler

Browse source 
To properly emit ALU clauses we have to make sure the backend doesn't
add instructions for the address emission.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21347>
This commit is contained in:
Gert Wollny 2023-01-26 17:11:02 +01:00 • committed by Marge Bot
parent 077f7d25df
commit c5ea9182b4
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@ public:
std::set<int> vtx_fetch_results;
std::set<int> tex_fetch_results;
PRegister m_last_addr{nullptr};
const VirtualValue *m_last_addr{nullptr};
unsigned m_max_color_exports{0};
int m_loop_nesting{0};
@ -288,6 +288,16 @@ AssamblerVisitor::emit_alu_op(const AluInstr& ai)
if (m_legacy_math_rules)
opcode = translate_for_mathrules(opcode);
if (opcode == op1_mova_int) {
m_bc->ar_loaded = 1;
m_last_addr = ai.psrc(0);
m_bc->ar_chan = m_last_addr->chan();
m_bc->ar_reg = m_last_addr->sel();
// TODO: this must be deducted correctly or in the scheduler
// we have to inject nop instructions to fix the aliasing problem
r600_load_ar(m_bc, true);
}
auto hw_opcode = opcode_map.find(opcode);
if (hw_opcode == opcode_map.end()) {
@ -399,8 +409,6 @@ AssamblerVisitor::emit_alu_op(const AluInstr& ai)
m_result = !r600_bytecode_add_alu_type(m_bc, &alu, type);
if (ai.opcode() == op1_mova_int)
m_bc->ar_loaded = 0;
if (ai.opcode() == op1_set_cf_idx0)
m_bc->index_loaded[0] = 1;

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

@ -115,6 +115,7 @@ public:
int dest_chan() const { return m_dest ? m_dest->chan() : m_fallback_chan; }
const VirtualValue *psrc(unsigned i) const { return i < m_src.size() ? m_src[i] : nullptr; }
PVirtualValue psrc(unsigned i) { return i < m_src.size() ? m_src[i] : nullptr; }
VirtualValue& src(unsigned i)
{