From b1242e6b30510d595fa8cc577bf0b23919a37537 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 6 Aug 2025 06:24:08 +1000 Subject: [PATCH] spirv: move cmat store barrier after the store. Fixes: b98f87612bc ("spirv: Implement SPV_KHR_cooperative_matrix") Reviewed-by: Faith Ekstrand Reviewed-by: Caio Oliveira Part-of: --- src/compiler/spirv/vtn_cmat.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/compiler/spirv/vtn_cmat.c b/src/compiler/spirv/vtn_cmat.c index 98cacdea2e2..6cefd027139 100644 --- a/src/compiler/spirv/vtn_cmat.c +++ b/src/compiler/spirv/vtn_cmat.c @@ -139,6 +139,10 @@ vtn_handle_cooperative_instruction(struct vtn_builder *b, SpvOp opcode, const SpvCooperativeMatrixLayout layout = vtn_constant_uint(b, w[3]); nir_def *stride = count > 4 ? vtn_get_nir_ssa(b, w[4]) : nir_imm_zero(&b->nb, 1, 32); + nir_deref_instr *src = vtn_get_cmat_deref(b, w[2]); + nir_cmat_store(&b->nb, vtn_pointer_to_ssa(b, dest), &src->def, stride, + .matrix_layout = vtn_matrix_layout_to_glsl(layout)); + SpvMemoryAccessMask access = SpvMemoryAccessMaskNone; if (count > 5) { unsigned idx = 5, alignment; @@ -147,9 +151,6 @@ vtn_handle_cooperative_instruction(struct vtn_builder *b, SpvOp opcode, vtn_emit_make_available_barrier(b, access, scope, dest->mode); } - nir_deref_instr *src = vtn_get_cmat_deref(b, w[2]); - nir_cmat_store(&b->nb, vtn_pointer_to_ssa(b, dest), &src->def, stride, - .matrix_layout = vtn_matrix_layout_to_glsl(layout)); break; }