aco: fix interaction with 3f branch workaround and p_constaddr
The offset was incorrect if we inserted a nop before the p_constaddr.
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Fixes: 93c8ebfa
('aco: Initial commit of independent AMD compiler')
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5164>
This commit is contained in:
parent
1fc1b87762
commit
8aa98cebc1
|
@ -42,8 +42,6 @@ static uint32_t get_sdwa_sel(unsigned sel, PhysReg reg)
|
|||
|
||||
void emit_instruction(asm_context& ctx, std::vector<uint32_t>& out, Instruction* instr)
|
||||
{
|
||||
uint32_t instr_offset = out.size() * 4u;
|
||||
|
||||
/* lower remaining pseudo-instructions */
|
||||
if (instr->opcode == aco_opcode::p_constaddr) {
|
||||
unsigned dest = instr->definitions[0].physReg();
|
||||
|
@ -68,7 +66,7 @@ void emit_instruction(asm_context& ctx, std::vector<uint32_t>& out, Instruction*
|
|||
encoding |= 255 << 8;
|
||||
out.push_back(encoding);
|
||||
ctx.constaddrs.push_back(out.size());
|
||||
out.push_back(-(instr_offset + 4) + offset);
|
||||
out.push_back(offset);
|
||||
|
||||
/* s_addc_u32 dest[1], dest[1], 0 */
|
||||
encoding = (0b10 << 30);
|
||||
|
@ -797,7 +795,7 @@ void fix_branches(asm_context& ctx, std::vector<uint32_t>& out)
|
|||
void fix_constaddrs(asm_context& ctx, std::vector<uint32_t>& out)
|
||||
{
|
||||
for (unsigned addr : ctx.constaddrs)
|
||||
out[addr] += out.size() * 4u;
|
||||
out[addr] += (out.size() - addr + 1u) * 4u;
|
||||
}
|
||||
|
||||
unsigned emit_program(Program* program,
|
||||
|
|
Loading…
Reference in New Issue