fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/coopmat: fix non square load/store lowering for flexible dimensions

Browse source 
This shouldn't affect radv, but we should do the calculations correctly for
when non-square matters.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37879>
This commit is contained in:
Dave Airlie 2025-10-10 11:51:16 +10:00
parent 836e1d65f6
commit 543c9be87a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/compiler/nir/nir_lower_cooperative_matrix.c
View file

@ -524,11 +524,10 @@ split_cmat_load_store(nir_builder *b,
const struct glsl_type *scalar_type = glsl_get_scalar_type(glsl_get_cmat_element(var->type));
unsigned elem_size = glsl_get_explicit_size(scalar_type, false);
struct glsl_cmat_description desc = *glsl_get_cmat_description(split->split_vars[i]->type);
unsigned offset = desc.cols;
unsigned row_offset, col_offset;
row_offset = i % split->num_col_splits;
col_offset = i / split->num_col_splits;
row_offset = (i % split->num_col_splits) * desc.cols;
col_offset = (i / split->num_col_splits) * desc.rows;
if (layout == GLSL_MATRIX_LAYOUT_ROW_MAJOR)
SWAP(row_offset, col_offset);
@ -537,9 +536,9 @@ split_cmat_load_store(nir_builder *b,
stride = nir_udiv_imm(b, nir_imul_imm(b, stride, deref_bytes_size), elem_size);
if (col_offset)
this_index = nir_imm_intN_t(b, col_offset * offset, dst_bit_size);
this_index = nir_imm_intN_t(b, col_offset, dst_bit_size);
if (row_offset)
this_index = nir_iadd(b, this_index, nir_u2uN(b, nir_imul_imm(b, stride, row_offset * offset), dst_bit_size));
this_index = nir_iadd(b, this_index, nir_u2uN(b, nir_imul_imm(b, stride, row_offset), dst_bit_size));
ptr_deref = nir_build_deref_ptr_as_array(b, ptr_deref, this_index);
ptr = &ptr_deref->def;
}