Skip to content

Enable AVXVNNI microkernels for mobile platforms #7828

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable AVXVNNI microkernels for mobile platforms #7828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
ENDIF()
ENDIF()
OPTION(XNNPACK_ENABLE_AVXVNNIINT8 "Build XNNPACK with AVX-VNNI-INT8 micro-kernels" ON)
IF(CMAKE_SYSTEM_NAME MATCHES "^(Android|Darwin|iOS)$")
IF(CMAKE_SYSTEM_NAME MATCHES "^(Darwin|iOS)$")
SET(XNNPACK_ENABLE_AVXVNNIINT8 OFF)
ENDIF()
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
Expand Down
12 changes: 6 additions & 6 deletions src/configs/gemm-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2865,7 +2865,7 @@ static void init_qdu8_f16_qc8w_gemm_config(void) {
} else
#endif
#if XNN_ENABLE_AVXVNNI
if (!XNN_PLATFORM_MOBILE && hardware_config->use_x86_avxvnni) {
if (!XNN_PLATFORM_IOS && hardware_config->use_x86_avxvnni) {
// AVX VNNI checked before AVX512SKX as it performs better with VNNI microkernels
qdu8_f16_qc8w_gemm_config.arch = xnn_arch_x86_avxvnni;
qdu8_f16_qc8w_gemm_config.minmax.dqgemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_dqgemm_ukernel((xnn_dqgemm_ukernel_fn) xnn_qd8_f16_qc8w_gemm_minmax_ukernel_1x8c8__avxvnni_prfm);
Expand Down Expand Up @@ -3225,7 +3225,7 @@ static void init_qdu8_f32_qc8w_gemm_config(void) {
} else
#endif
#if XNN_ENABLE_AVXVNNI
if (!XNN_PLATFORM_MOBILE && hardware_config->use_x86_avxvnni) {
if (!XNN_PLATFORM_IOS && hardware_config->use_x86_avxvnni) {
qdu8_f32_qc8w_gemm_config.arch = xnn_arch_x86_avxvnni;
qdu8_f32_qc8w_gemm_config.minmax.dqgemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_dqgemm_ukernel((xnn_dqgemm_ukernel_fn) xnn_qd8_f32_qc8w_gemm_minmax_ukernel_1x8c8__avxvnni_prfm);
qdu8_f32_qc8w_gemm_config.minmax.dqgemm[XNN_MR_TO_INDEX(5)] = xnn_init_hmp_dqgemm_ukernel((xnn_dqgemm_ukernel_fn) xnn_qd8_f32_qc8w_gemm_minmax_ukernel_5x8c8__avxvnni_prfm);
Expand Down Expand Up @@ -3281,7 +3281,7 @@ static void init_qdu8_f32_qc8w_igemm_config(void) {
} else
#endif
#if XNN_ENABLE_AVXVNNI
if (!XNN_PLATFORM_MOBILE && hardware_config->use_x86_avxvnni) {
if (!XNN_PLATFORM_IOS && hardware_config->use_x86_avxvnni) {
qdu8_f32_qc8w_igemm_config.arch = xnn_arch_x86_avxvnni;
qdu8_f32_qc8w_igemm_config.minmax.dqigemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_dqigemm_ukernel((xnn_dqigemm_ukernel_fn) xnn_qd8_f32_qc8w_igemm_minmax_ukernel_1x8c8__avxvnni_prfm);
qdu8_f32_qc8w_igemm_config.minmax.dqigemm[XNN_MR_TO_INDEX(5)] = xnn_init_hmp_dqigemm_ukernel((xnn_dqigemm_ukernel_fn) xnn_qd8_f32_qc8w_igemm_minmax_ukernel_5x8c8__avxvnni_prfm);
Expand Down Expand Up @@ -3341,7 +3341,7 @@ static void init_qdu8_f32_qc4w_gemm_config(void) {
} else
#endif
#if XNN_ENABLE_AVXVNNI
if (!XNN_PLATFORM_MOBILE && hardware_config->use_x86_avxvnni) {
if (!XNN_PLATFORM_IOS && hardware_config->use_x86_avxvnni) {
qdu8_f32_qc4w_gemm_config.arch = xnn_arch_x86_avxvnni;
qdu8_f32_qc4w_gemm_config.minmax.dqgemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_dqgemm_ukernel((xnn_dqgemm_ukernel_fn) xnn_qd8_f32_qc4w_gemm_minmax_ukernel_1x8c8__avxvnni_prfm);
qdu8_f32_qc4w_gemm_config.minmax.dqgemm[XNN_MR_TO_INDEX(5)] = xnn_init_hmp_dqgemm_ukernel((xnn_dqgemm_ukernel_fn) xnn_qd8_f32_qc4w_gemm_minmax_ukernel_5x8c8__avxvnni_prfm);
Expand Down Expand Up @@ -4484,7 +4484,7 @@ static void init_qs8_qc8w_gemm_config(void) {
} else
#endif
#if XNN_ENABLE_AVXVNNIINT8 && XNN_ENABLE_AVXVNNI
if (!XNN_PLATFORM_MOBILE && hardware_config->use_x86_avxvnniint8 && hardware_config->use_x86_avxvnni) {
if (!XNN_PLATFORM_IOS && hardware_config->use_x86_avxvnniint8 && hardware_config->use_x86_avxvnni) {
qs8_qc8w_gemm_config.minmax.gemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_gemm_ukernel((xnn_gemm_ukernel_fn) xnn_qs8_qc8w_gemm_minmax_fp32_ukernel_1x8c8__avxvnniint8_prfm);
qs8_qc8w_gemm_config.minmax.gemm[XNN_MR_TO_INDEX(5)] = xnn_init_hmp_gemm_ukernel((xnn_gemm_ukernel_fn) xnn_qs8_qc8w_gemm_minmax_fp32_ukernel_5x8c8__avxvnniint8_prfm);
qs8_qc8w_gemm_config.minmax.igemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_igemm_ukernel((xnn_igemm_ukernel_fn) xnn_qs8_qc8w_igemm_minmax_fp32_ukernel_1x8c8__avxvnniint8_prfm);
Expand All @@ -4503,7 +4503,7 @@ static void init_qs8_qc8w_gemm_config(void) {
} else
#endif
#if XNN_ENABLE_AVXVNNI
if (!XNN_PLATFORM_MOBILE && hardware_config->use_x86_avxvnni) {
if (!XNN_PLATFORM_IOS && hardware_config->use_x86_avxvnni) {
qs8_qc8w_gemm_config.minmax.gemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_gemm_ukernel((xnn_gemm_ukernel_fn) xnn_qs8_qc8w_gemm_minmax_fp32_ukernel_1x8c8__avxvnni_prfm);
qs8_qc8w_gemm_config.minmax.gemm[XNN_MR_TO_INDEX(5)] = xnn_init_hmp_gemm_ukernel((xnn_gemm_ukernel_fn) xnn_qs8_qc8w_gemm_minmax_fp32_ukernel_5x8c8__avxvnni_prfm);
qs8_qc8w_gemm_config.minmax.igemm[XNN_MR_TO_INDEX(1)] = xnn_init_hmp_igemm_ukernel((xnn_igemm_ukernel_fn) xnn_qs8_qc8w_igemm_minmax_fp32_ukernel_1x8c8__avxvnni_prfm);
Expand Down
2 changes: 1 addition & 1 deletion src/configs/reduce-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ static void init_qs8_rsum_config(void) {
} else
#endif
#if XNN_ENABLE_AVXVNNI
if (!XNN_PLATFORM_MOBILE && hardware_config->use_x86_avxvnni) {
if (!XNN_PLATFORM_IOS && hardware_config->use_x86_avxvnni) {
qs8_rsum_config = (struct xnn_reduce_config) {
.ukernel = (xnn_reduce_ukernel_fn) xnn_qs8_rsum_ukernel__avxvnni_u128_acc2,
};
Expand Down