Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport: cpu: x64: fixes matmul segfault #2309

Closed
wants to merge 3 commits into from
Closed

Backport: cpu: x64: fixes matmul segfault #2309

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cf9a8a
cpu: x64: matmul: fix segfault on group scales
xuxinzen Oct 23, 2024
e28a35a
cpu: x64: matmul: set wei_tag any layout into plain layout for int4 w…
xuxinzen Oct 23, 2024
9427647
cpu: x64: matmul: disable parallel_k_reduction for int8
xuxinzen Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/cpu/x64/matmul/brgemm_matmul_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ status_t brgemm_matmul_conf_utils_t::set_or_check_B_tag(memory_desc_t &B_md,
? get_default_n_block(format_tag::undef)
: bgmmc.N_blk;
bgmmc.wei_tag = blocked_B_layouts_allowed && !bgmmc.is_runtime_N
&& !bgmmc.is_int4_weights
? this->pick_blocked_B_layout(default_n_block)
: plain_tensor_layout_tag;
VCONDCHECK_BG(
Expand All @@ -311,6 +312,7 @@ status_t brgemm_matmul_conf_utils_t::set_or_check_B_tag(memory_desc_t &B_md,
}
} else {
bgmmc.wei_tag = blocked_B_layouts_allowed && !bgmmc.is_runtime_N
&& !bgmmc.is_int4_weights
? memory_desc_matches_one_of_tag(B_md, plain_tensor_layout_tag,
transposed_tensor_layout_tag, blocked_64n_B_layout_tag,
blocked_48n_B_layout_tag, blocked_32n_B_layout_tag,
Expand Down Expand Up @@ -890,6 +892,7 @@ float compute_blocking_heuristic_avx512(brgemm_matmul_conf_t &bgmmc,
// Parallelize across K for shapes with big 'K' dimension
bool bwd_w_par_k_blk = bgmmc.batch == 1
&& bm_conf_utils.check_is_transposed(bgmmc.src_tag)
&& !bm_conf_utils.is_int8()
&& IMPLICATION(bm_conf_utils.is_bf16(), math::is_pow2(matmul.K))
&& matmul.K >= 2048;
if (bwd_w_par_k_blk) {
Expand Down Expand Up @@ -1812,10 +1815,11 @@ void init_aux_values(brgemm_matmul_conf_t &bgmmc,
bgmmc.has_zero_point_b = bgmmc.wei_zp_type != brgemm_broadcast_t::none;
bgmmc.has_zero_point_c = bgmmc.dst_zp_type != brgemm_broadcast_t::none;
bgmmc.post_ops_applicable = one_of(true, bgmmc.with_sum, bgmmc.with_bias,
bgmmc.with_scales, bgmmc.with_eltwise, bgmmc.with_binary,
bgmmc.acc_dt != bgmmc.dst_dt, bgmmc.s8s8_compensation_required,
bgmmc.has_zero_point_a, bgmmc.has_zero_point_b,
bgmmc.has_zero_point_c, bgmmc.with_dst_scales);
bgmmc.with_scales && !bgmmc.apply_scales_in_buffer_b,
bgmmc.with_eltwise, bgmmc.with_binary, bgmmc.acc_dt != bgmmc.dst_dt,
bgmmc.s8s8_compensation_required, bgmmc.has_zero_point_a,
bgmmc.has_zero_point_b, bgmmc.has_zero_point_c,
bgmmc.with_dst_scales);

bgmmc.zp_a_comp_shift_n = bgmmc.wei_n_blk;
bgmmc.zp_a_comp_elems_per_thr
Expand Down
Loading