From f692013cc2c09e129607c8db6c034bdee53f9ef5 Mon Sep 17 00:00:00 2001 From: Xiuchuan Zhai Date: Fri, 17 Apr 2026 14:59:07 +0800 Subject: [PATCH 1/2] Revert "Revert "cpu: x64: matmul: add missing VDISPATCH_REORDER_IC check"" This reverts commit 6b6492b1ea9ef5ca9ff3c5c59ed71dcca683a446. --- src/cpu/x64/matmul/brgemm_matmul_reorders.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp b/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp index f6fed0515bd..df2a010d1a5 100644 --- a/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp +++ b/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp @@ -79,10 +79,12 @@ status_t calculate_plain_transpose_blocks(dim_t &batch, dim_t &M, dim_t &K, } memory_desc_t src_md_reduced, dst_md_reduced; - CHECK(memory_desc_reshape( - src_md_reduced, src_md, non_unit_dim, non_unit_dims)); - CHECK(memory_desc_reshape( - dst_md_reduced, dst_md, non_unit_dim, non_unit_dims)); + VDISPATCH_REORDER_IC(memory_desc_reshape(src_md_reduced, src_md, + non_unit_dim, non_unit_dims), + VERBOSE_UNSUPPORTED_TENSOR_LAYOUT, "src"); + VDISPATCH_REORDER_IC(memory_desc_reshape(dst_md_reduced, dst_md, + non_unit_dim, non_unit_dims), + VERBOSE_UNSUPPORTED_TENSOR_LAYOUT, "dst"); const memory_desc_wrapper id(src_md_reduced), od(dst_md_reduced); From da00166a3e99e15413cf8e3f642561c10c24f687 Mon Sep 17 00:00:00 2001 From: Anna Sztukowska Date: Fri, 17 Apr 2026 08:25:50 +0200 Subject: [PATCH 2/2] cpu: x64: matmul: fix VDISPATCH_REORDER_IC use with memory_desc_reshape --- src/cpu/x64/matmul/brgemm_matmul_reorders.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp b/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp index df2a010d1a5..e2111dec2dd 100644 --- a/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp +++ b/src/cpu/x64/matmul/brgemm_matmul_reorders.cpp @@ -80,10 +80,12 @@ status_t calculate_plain_transpose_blocks(dim_t &batch, dim_t &M, dim_t &K, memory_desc_t src_md_reduced, dst_md_reduced; VDISPATCH_REORDER_IC(memory_desc_reshape(src_md_reduced, src_md, - non_unit_dim, non_unit_dims), + non_unit_dim, non_unit_dims) + == status::success, VERBOSE_UNSUPPORTED_TENSOR_LAYOUT, "src"); VDISPATCH_REORDER_IC(memory_desc_reshape(dst_md_reduced, dst_md, - non_unit_dim, non_unit_dims), + non_unit_dim, non_unit_dims) + == status::success, VERBOSE_UNSUPPORTED_TENSOR_LAYOUT, "dst"); const memory_desc_wrapper id(src_md_reduced), od(dst_md_reduced); @@ -388,7 +390,7 @@ status_t brgemm_matmul_copy_reorder_t::execute_body( = dst_d.size() - dst_d.additional_buffer_size(); const size_t s8s8_comp_size_bytes = kernel_conf.s8s8_compensation_required ? dst_d.additional_buffer_size( - memory_extra_flags::compensation_conv_s8s8) + memory_extra_flags::compensation_conv_s8s8) : 0; const size_t zp_comp_offset_bytes = comp_offset_bytes + s8s8_comp_size_bytes; @@ -471,7 +473,7 @@ status_t brgemm_matmul_copy_reorder_t::execute_body( const auto src_offset = !kernel_conf.blocked_B ? get_blk_off(src_d, sdt_sz, batch, k, n) : get_blk_off(src_d, sdt_sz, batch, k_blk_idx, - n_blk_idx); + n_blk_idx); ker_exec_ctx.src = (void *)&src[src_offset / src_typesz_scale]; ker_exec_ctx.tr_src = (void *)&dst[get_blk_off( @@ -485,7 +487,7 @@ status_t brgemm_matmul_copy_reorder_t::execute_body( const auto src_offset = !kernel_conf.blocked_B ? get_blk_off(src_d, sdt_sz, batch, k, n) : get_blk_off(src_d, sdt_sz, batch, k_blk_idx, - n_blk_idx); + n_blk_idx); ker_exec_ctx.src = (void *)&src[src_offset / src_typesz_scale]; const auto dst_offset = get_blk_off(