KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aco: Fix constant address offset calculation for ds_read2 instructions. 

Cc: mesa-stable
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9678>
This commit is contained in:
Timur Kristóf 2021-03-18 10:15:14 +01:00 committed by Marge Bot
parent 0b090d8e67
commit 89c8e22cc6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/amd/compiler/aco_instruction_selection.cpp
View File

@ -3517,14 +3517,16 @@ Temp lds_load_callback(Builder& bld, const LoadEmitInfo &info,
op = aco_opcode::ds_read_u8;
}
unsigned max_offset_plus_one = read2 ? 254 * (size / 2u) + 1 : 65536;
if (const_offset >= max_offset_plus_one) {
offset = bld.vadd32(bld.def(v1), offset, Operand(const_offset / max_offset_plus_one));
const_offset %= max_offset_plus_one;
unsigned const_offset_unit = read2 ? size / 2u : 1u;
unsigned const_offset_range = read2 ? 255 * const_offset_unit : 65536;
if (const_offset > (const_offset_range - const_offset_unit)) {
unsigned excess = const_offset - (const_offset % const_offset_range);
offset = bld.vadd32(bld.def(v1), offset, Operand(excess));
const_offset -= excess;
}
if (read2)
const_offset /= (size / 2u);
const_offset /= const_offset_unit;
RegClass rc = RegClass(RegType::vgpr, DIV_ROUND_UP(size, 4));
Temp val = rc == info.dst.regClass() && dst_hint.id() ? dst_hint : bld.tmp(rc);