From f9b33147321d8df88e4482286bd7e0939491a450 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 25 May 2023 14:01:44 -0700 Subject: [PATCH] aco: fix alignment check in emit_load align_offset already takes const_offset into consideration. Remove the adjustment. Fixes: 542733dbbf7 ("aco: add emit_load helper") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9097 Part-of: (cherry picked from commit 750d641ca6daa164f0f7ca51d3d96608e587e420) --- .pick_status.json | 2 +- src/amd/compiler/aco_instruction_selection.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bc289e5512e..3c29f6b9a9f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -922,7 +922,7 @@ "description": "aco: fix alignment check in emit_load", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "542733dbbf7ae49e2df81da6dde31aa2dcd9afe8" }, diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 19fc12c0ade..df7312b7475 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -4063,7 +4063,7 @@ emit_load(isel_context* ctx, Builder& bld, const LoadEmitInfo& info, unsigned const_offset = info.const_offset; const unsigned align_mul = info.align_mul ? info.align_mul : component_size; - unsigned align_offset = (info.align_offset + const_offset) % align_mul; + unsigned align_offset = info.align_offset % align_mul; unsigned bytes_read = 0; while (bytes_read < load_size) {