From b9797ce180ec9790b270e4e51682191ca69ef9f7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 12 Jan 2026 15:38:11 +1000 Subject: [PATCH] radv/coopmat: fix deref stride This at least fixes the nir debug output to have correct values. Fixes: 48fc8c8d1c934e ("radv/nir/lower_cmat: set optimal load/store alignment") Reviewed-by: Georg Lehmann (cherry picked from commit ab9e904f24fd0454ace095ccd1efe86eac623840) Part-of: --- .pick_status.json | 2 +- src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5e60ba16594..3c6f78e1eca 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1474,7 +1474,7 @@ "description": "radv/coopmat: fix deref stride", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "48fc8c8d1c934e75c6ea7da72f8639761cea98c2", "notes": null diff --git a/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c b/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c index 8f9abc7bcb5..0f5d736c717 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c +++ b/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c @@ -337,7 +337,7 @@ lower_cmat_load_store(nir_builder *b, nir_intrinsic_instr *intr, const lower_cma if (align_mul) { unsigned align_offset = row_iter * radv_nir_cmat_bits(desc) / 8 % align_mul; iter_deref = nir_build_deref_cast_with_alignment(b, &iter_deref->def, deref->modes, iter_deref->type, - iter_deref->cast.ptr_stride, align_mul, align_offset); + radv_nir_cmat_bits(desc) / 8, align_mul, align_offset); } if (is_load) {