Mesa (staging/22.0): broadcom/compiler: fix offset alignment for ldunifa when skipping

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: fabb6b5c5e7785214fefdfa89354146f3c50eaf0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fabb6b5c5e7785214fefdfa89354146f3c50eaf0

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Wed Feb  2 11:39:53 2022 +0100

broadcom/compiler: fix offset alignment for ldunifa when skipping

The intention was to align the address to 4 bytes (32-bit), not
16 bytes.

Fixes: bdb6201ea1 ("broadcom/compiler: use ldunifa with unaligned constant offset")

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14830>
(cherry picked from commit 0a8449b07c48477d97b6252e67562abdd466cf37)

---

 .pick_status.json                  | 2 +-
 src/broadcom/compiler/nir_to_vir.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2fce289e963..20718c7f8bf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -166,7 +166,7 @@
         "description": "broadcom/compiler: fix offset alignment for ldunifa when skipping",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "bdb6201ea1e7039732f047b8e545107615cb6e8e"
     },
diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c
index 56635f0a69e..9149b304c7b 100644
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -3034,7 +3034,7 @@ ntq_emit_load_ubo_unifa(struct v3d_compile *c, nir_intrinsic_instr *instr)
                          * alignment and skip over unused elements in result.
                          */
                         value_skips = (const_offset % 4) / (bit_size / 8);
-                        const_offset &= ~0xf;
+                        const_offset &= ~0x3;
                 }
         }