From 89c8e22cc65bae26160134145b6c3ef313174713 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timur=20Krist=C3=B3f?= Date: Thu, 18 Mar 2021 10:15:14 +0100 Subject: [PATCH] aco: Fix constant address offset calculation for ds_read2 instructions. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Signed-off-by: Timur Kristóf Reviewed-by: Rhys Perry Part-of: --- src/amd/compiler/aco_instruction_selection.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 7b95984..feb746a 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -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); -- 2.7.4