OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: fix self-intersecting register swaps

Browse Source 
Splitting self-intersecting register swaps into
3 sections was unnecessary and only worked because
the middle section was always empty for full dword
swaps.

No fossil-db changes.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11823>
This commit is contained in:
Daniel Schürmann
2021-07-07 17:41:56 +02:00
parent 9d225c43cb
commit 98136bda05
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/amd/compiler/aco_lower_to_hw_instr.cpp
View File

@@ -1716,23 +1716,14 @@ handle_operands(std::map<PhysReg, copy_operation>& copy_map, lower_context* ctx,
unsigned offset = abs((int)src.reg_b - (int)dst.reg_b);
RegType type = swap.def.regClass().type();
copy_operation middle;
copy_operation remaining;
src.reg_b += offset;
dst.reg_b += offset;
middle.bytes = swap.bytes - offset * 2;
memcpy(middle.uses, swap.uses + offset, middle.bytes);
middle.op = Operand(src, RegClass::get(type, middle.bytes));
middle.def = Definition(dst, RegClass::get(type, middle.bytes));
copy_map[dst] = middle;
copy_operation end;
src.reg_b += middle.bytes;
dst.reg_b += middle.bytes;
end.bytes = swap.bytes - (offset + middle.bytes);
memcpy(end.uses, swap.uses + offset + middle.bytes, end.bytes);
end.op = Operand(src, RegClass::get(type, end.bytes));
end.def = Definition(dst, RegClass::get(type, end.bytes));
copy_map[dst] = end;
remaining.bytes = swap.bytes - offset;
memcpy(remaining.uses, swap.uses + offset, remaining.bytes);
remaining.op = Operand(src, RegClass::get(type, remaining.bytes));
remaining.def = Definition(dst, RegClass::get(type, remaining.bytes));
copy_map[dst] = remaining;
memset(swap.uses + offset, 0, swap.bytes - offset);
swap.bytes = offset;