Skip to content

Rename xnn_init_*_config to xnn_get_*_config #8594

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

Rename xnn_init_*_config to xnn_get_*_config #8594

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
6 changes: 3 additions & 3 deletions bench/f32-conv-hwc2chw.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,21 +161,21 @@ static void f32_conv_hwc2chw_3x3s2p1c3x2v__rvv_1x1(benchmark::State& state,
const char* net) {
f32_conv_hwc2chw(state, xnn_f32_conv_hwc2chw_ukernel_3x3s2p1c3x2v__rvv_1x1,
xnn_init_f32_minmax_scalar_params,
2 * xnn_init_hardware_config()->vlenb / sizeof(float) /* output channel tile */);
2 * xnn_get_hardware_config()->vlenb / sizeof(float) /* output channel tile */);
}

static void f32_conv_hwc2chw_3x3s2p1c3x2v__rvv_2x1(benchmark::State& state,
const char* net) {
f32_conv_hwc2chw(state, xnn_f32_conv_hwc2chw_ukernel_3x3s2p1c3x2v__rvv_2x1,
xnn_init_f32_minmax_scalar_params,
2 * xnn_init_hardware_config()->vlenb / sizeof(float) /* output channel tile */);
2 * xnn_get_hardware_config()->vlenb / sizeof(float) /* output channel tile */);
}

static void f32_conv_hwc2chw_3x3s2p1c3x2v__rvv_2x2(benchmark::State& state,
const char* net) {
f32_conv_hwc2chw(state, xnn_f32_conv_hwc2chw_ukernel_3x3s2p1c3x2v__rvv_2x2,
xnn_init_f32_minmax_scalar_params,
2 * xnn_init_hardware_config()->vlenb / sizeof(float) /* output channel tile */);
2 * xnn_get_hardware_config()->vlenb / sizeof(float) /* output channel tile */);
}

BENCHMARK_DCONV(f32_conv_hwc2chw_3x3s2p1c3x2v__rvv_1x1);
Expand Down
4 changes: 2 additions & 2 deletions bench/f32-gemm-minmax.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
xnn_f32_gemm_minmax_ukernel_1x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_f32_gemm_goi_w,
/*mr=*/1, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(float), /*kr=*/1, /*sr=*/1,
/*mr=*/1, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(float), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -326,7 +326,7 @@
xnn_f32_gemm_minmax_ukernel_7x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_f32_gemm_goi_w,
/*mr=*/7, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(float), /*kr=*/1, /*sr=*/1,
/*mr=*/7, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(float), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand Down
16 changes: 8 additions & 8 deletions bench/qd8-f32-qc4w-gemm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_1x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/1, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/1, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -37,7 +37,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_2x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/2, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/2, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -48,7 +48,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_3x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/3, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/3, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -59,7 +59,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_4x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/4, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/4, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -70,7 +70,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_5x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/5, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/5, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -81,7 +81,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_6x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/6, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/6, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -92,7 +92,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_7x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/7, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/7, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -103,7 +103,7 @@
xnn_qd8_f32_qc4w_gemm_minmax_ukernel_8x4v__rvv,
xnn_init_f32_qc4w_minmax_scalar_params,
xnn_pack_qs8_qc4w_gemm_goi_w,
/*mr=*/8, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/8, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand Down
16 changes: 8 additions & 8 deletions bench/qd8-f32-qc8w-gemm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_1x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/1, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/1, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -37,7 +37,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_2x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/2, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/2, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -48,7 +48,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_3x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/3, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/3, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -59,7 +59,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_4x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/4, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/4, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -70,7 +70,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_5x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/5, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/5, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -81,7 +81,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_6x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/6, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/6, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -92,7 +92,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_7x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/7, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/7, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -103,7 +103,7 @@
xnn_qd8_f32_qc8w_gemm_minmax_ukernel_8x4v__rvv,
xnn_init_f32_minmax_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/8, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/8, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand Down
6 changes: 3 additions & 3 deletions bench/qs8-qc8w-gemm-fp32.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
xnn_qs8_qc8w_gemm_minmax_fp32_ukernel_1x4v__rvv,
xnn_init_qs8_qc8w_conv_minmax_fp32_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/1, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/1, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -480,7 +480,7 @@
xnn_qs8_qc8w_gemm_minmax_fp32_ukernel_4x4v__rvv,
xnn_init_qs8_qc8w_conv_minmax_fp32_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/4, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/4, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand All @@ -491,7 +491,7 @@
xnn_qs8_qc8w_gemm_minmax_fp32_ukernel_7x4v__rvv,
xnn_init_qs8_qc8w_conv_minmax_fp32_scalar_params,
xnn_pack_qs8_gemm_goi_w,
/*mr=*/7, /*nr=*/4 * xnn_init_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*mr=*/7, /*nr=*/4 * xnn_get_hardware_config()->vlenb / sizeof(int32_t), /*kr=*/1, /*sr=*/1,
/*arch_flags=*/xnn_arch_riscv_vector);
}

Expand Down
2 changes: 1 addition & 1 deletion bench/utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ size_t GetMaxCacheSize() {
}

bool CheckArchFlags(benchmark::State& state, uint64_t arch_flags) {
const xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const xnn_hardware_config* hardware_config = xnn_get_hardware_config();
if (hardware_config == nullptr) {
state.SkipWithError("no hardware config");
return false;
Expand Down
6 changes: 3 additions & 3 deletions src/configs/argmaxpool-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ XNN_INIT_ONCE_GUARD(f32_argmaxpool);

static void init_f32_argmaxpool_config(void) {
#if XNN_ARCH_ARM
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
assert(hardware_config != NULL);
if ((hardware_config->arch_flags & xnn_arch_arm_neon)) {
f32_argmaxpool_config = (struct xnn_argmaxpool_config) {
Expand Down Expand Up @@ -60,8 +60,8 @@ static void init_f32_argmaxpool_config(void) {
#endif
}

const struct xnn_argmaxpool_config* xnn_init_f32_argmaxpool_config() {
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_argmaxpool_config* xnn_get_f32_argmaxpool_config() {
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
if (hardware_config == NULL) {
return NULL;
}
Expand Down
16 changes: 8 additions & 8 deletions src/configs/avgpool-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ XNN_INIT_ONCE_GUARD(f32_avgpool);

static void init_f16_avgpool_config(void) {
#if (XNN_ARCH_ARM || XNN_ARCH_ARM64) && XNN_ENABLE_ARM_FP16_VECTOR
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
assert(hardware_config != NULL);
if ((hardware_config->arch_flags & xnn_arch_arm_neon_fp16_arith)) {
f16_avgpool_config.ukernel = (xnn_avgpool_ukernel_fn) xnn_f16_avgpool_minmax_ukernel_9p__neonfp16arith_u8;
Expand All @@ -30,7 +30,7 @@ static void init_f16_avgpool_config(void) {
f16_avgpool_config.channel_tile = 8;
}
#elif XNN_ARCH_X86 || XNN_ARCH_X86_64
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
assert(hardware_config != NULL);
if ((hardware_config->arch_flags & xnn_arch_x86_f16c)) {
f16_avgpool_config.ukernel = (xnn_avgpool_ukernel_fn) xnn_f16_avgpool_minmax_ukernel_9p__f16c_u8;
Expand All @@ -43,7 +43,7 @@ static void init_f16_avgpool_config(void) {

static void init_f32_avgpool_config(void) {
#if XNN_ARCH_ARM
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
assert(hardware_config != NULL);
if ((hardware_config->arch_flags & xnn_arch_arm_neon)) {
f32_avgpool_config.ukernel = (xnn_avgpool_ukernel_fn) xnn_f32_avgpool_minmax_ukernel_9p__neon_u4;
Expand All @@ -62,7 +62,7 @@ static void init_f32_avgpool_config(void) {
f32_avgpool_config.primary_tile = 9;
f32_avgpool_config.channel_tile = 4;
#elif XNN_ARCH_X86 || XNN_ARCH_X86_64
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
assert(hardware_config != NULL);
#if XNN_ENABLE_AVX512F
if ((hardware_config->arch_flags & xnn_arch_x86_avx512f)) {
Expand Down Expand Up @@ -101,17 +101,17 @@ static void init_f32_avgpool_config(void) {
#endif
}

const struct xnn_avgpool_config* xnn_init_f16_avgpool_config() {
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_avgpool_config* xnn_get_f16_avgpool_config() {
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
if (hardware_config == NULL || !xnn_is_f16_compatible_config(hardware_config)) {
return NULL;
}
XNN_INIT_ONCE(f16_avgpool);
return &f16_avgpool_config;
}

const struct xnn_avgpool_config* xnn_init_f32_avgpool_config() {
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
const struct xnn_avgpool_config* xnn_get_f32_avgpool_config() {
const struct xnn_hardware_config* hardware_config = xnn_get_hardware_config();
if (hardware_config == NULL) {
return NULL;
}
Expand Down
Loading
Loading