Skip to content

Commit 0bcfcfe

Browse files
alankellyxnnpack-bot
authored andcommitted
Disable xnn_x32_packw_gemm_goi_ukernel_x32__avx512f_u4_prfm which crashes sometimes
PiperOrigin-RevId: 745100029
1 parent 1358d4e commit 0bcfcfe

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cmake/gen/avx512f_microkernels.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ SET(PROD_AVX512F_MICROKERNEL_SRCS
7676
src/f32-vunary/gen/f32-vsqr-avx512f.c
7777
src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c
7878
src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c
79-
src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.c
80-
src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c)
79+
src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.c)
8180

8281
SET(NON_PROD_AVX512F_MICROKERNEL_SRCS
8382
src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f-acc2.c
@@ -287,6 +286,7 @@ SET(NON_PROD_AVX512F_MICROKERNEL_SRCS
287286
src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u1-prfm.c
288287
src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u1.c
289288
src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8-prfm.c
289+
src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c
290290
src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4.c)
291291

292292
SET(ALL_AVX512F_MICROKERNEL_SRCS ${PROD_AVX512F_MICROKERNEL_SRCS} + ${NON_PROD_AVX512F_MICROKERNEL_SRCS})

gen/avx512f_microkernels.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ PROD_AVX512F_MICROKERNEL_SRCS = [
7373
"src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c",
7474
"src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
7575
"src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.c",
76-
"src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c",
7776
]
7877

7978
NON_PROD_AVX512F_MICROKERNEL_SRCS = [
@@ -284,6 +283,7 @@ NON_PROD_AVX512F_MICROKERNEL_SRCS = [
284283
"src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u1-prfm.c",
285284
"src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u1.c",
286285
"src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8-prfm.c",
286+
"src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c",
287287
"src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4.c",
288288
]
289289

src/configs/gemm-config.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ static void init_f32_gemm_config(void) {
707707
f32_gemm_config.minmax.gemm[XNN_MR_TO_INDEX(7)] = xnn_init_hmp_gemm_ukernel((xnn_gemm_ukernel_fn) xnn_f32_gemm_minmax_ukernel_7x32__avx512f_broadcast);
708708
f32_gemm_config.init.f32 = xnn_init_f32_minmax_scalar_params;
709709
f32_gemm_config.pack_gemm_gio = (xnn_packw_gemm_gio_ukernel_fn) xnn_x32_packw_gemm_gio_ukernel_x32__avx512f_u8;
710-
f32_gemm_config.pack_gemm_goi = (xnn_packw_gemm_goi_ukernel_fn) xnn_x32_packw_gemm_goi_ukernel_x32__avx512f_u4_prfm;
710+
f32_gemm_config.pack_gemm_goi = (xnn_packw_gemm_goi_ukernel_fn) xnn_pack_f32_gemm_goi_w;
711711
f32_gemm_config.mr = 7;
712712
f32_gemm_config.nr = 32;
713713
} else
@@ -1211,7 +1211,7 @@ static void init_f32_igemm_config(void) {
12111211
f32_igemm_config.minmax.igemm[XNN_MR_TO_INDEX(7)] = xnn_init_hmp_igemm_ukernel((xnn_igemm_ukernel_fn) xnn_f32_igemm_minmax_ukernel_7x32__avx512f_broadcast);
12121212
f32_igemm_config.init.f32 = xnn_init_f32_minmax_scalar_params;
12131213
f32_igemm_config.pack_gemm_gio = (xnn_packw_gemm_gio_ukernel_fn) xnn_x32_packw_gemm_gio_ukernel_x32__avx512f_u8;
1214-
f32_igemm_config.pack_gemm_goi = (xnn_packw_gemm_goi_ukernel_fn) xnn_x32_packw_gemm_goi_ukernel_x32__avx512f_u4_prfm;
1214+
f32_igemm_config.pack_gemm_goi = (xnn_packw_gemm_goi_ukernel_fn) xnn_pack_f32_gemm_goi_w;
12151215
f32_igemm_config.mr = 7;
12161216
f32_igemm_config.nr = 32;
12171217
} else

0 commit comments

Comments
 (0)