Skip to content

Add the configuration identifier to the weight cache look up key for batch-matrix-multiply-nc. #8886

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

Closed
wants to merge 1 commit into from
Closed

Add the configuration identifier to the weight cache look up key for batch-matrix-multiply-nc. #8886

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
17 changes: 17 additions & 0 deletions include/experimental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,23 @@ enum xnn_status xnn_update_runtime_with_threadpool(
xnn_runtime_t runtime,
xnn_threadpool_t threadpool);


typedef struct xnn_config_identifier {
uint64_t identifier;
} xnn_config_identifier;

/// Check whether the given configuration matches one that is currently in use.
///
/// @returns True if the configuration matches.
bool xnn_check_config_version(const struct xnn_config_identifier* identifier);

/// Returns a valid microkernel configuration.
///
/// This is useful for consumers of this API that want to test their checks
/// against kernel configurations.
const struct xnn_config_identifier* xnn_get_test_config();


#ifdef __cplusplus
} // extern "C"
#endif
Expand Down
5 changes: 5 additions & 0 deletions include/xnnpack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2294,6 +2294,11 @@ struct xnn_weights_cache_look_up_key {
const void* kernel;
/// Pointer to the original bias, could be NULL.
const void* bias;
/// Pointer to the operation configuration, can be NULL.
///
/// If this is set, then the cache is allowed to compare the configuration to
/// previous runs and maybe reuse those run results.
const struct xnn_config_identifier* config;
};

/// A group of function pointers to manage weights cache. All functions may be
Expand Down
1 change: 1 addition & 0 deletions src/configs/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ xnnpack_cc_library(
"avgpool-config.c",
"binary-elementwise-config.c",
"cmul-config.c",
"config-identifier.c",
"conv-hwc2chw-config.c",
"dwconv-config.c",
"dwconv2d-chw-config.c",
Expand Down
79 changes: 79 additions & 0 deletions src/configs/config-identifier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
// Copyright 2025 Google LLC
//
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree.

#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>

#include "include/experimental.h"
#include "src/xnnpack/config-types.h"
#include "src/xnnpack/config.h"

xnn_config_identifier xnn_create_config_identifier(xnn_config_name name,
uint32_t version) {
struct xnn_config_identifier id = {((uint64_t)name) << 32 | version};
return id;
}

xnn_config_name xnn_get_config_name(const xnn_config_identifier* identifier) {
return identifier->identifier >> 32;
}

xnn_config_name xnn_get_config_version(
const xnn_config_identifier* identifier) {
return identifier->identifier & 0xffffffff;
}

const xnn_config_identifier* xnn_get_test_config() {
const struct xnn_gemm_config* f32_config =
xnn_init_f32_gemm_config(/*flags=*/0);
return &(f32_config->identifier);
}

#define XNNPACK_CHECK_CONFIG(CONFIG_NAME, ...) \
if (config_name == xnn_config_name_##CONFIG_NAME) { \
const struct xnn_gemm_config* kernel_config = \
xnn_init_##CONFIG_NAME##_config(__VA_ARGS__); \
return kernel_config && \
identifier->identifier == kernel_config->identifier.identifier; \
}

bool xnn_check_config_version(const xnn_config_identifier* identifier) {
if (identifier == NULL) {
return false;
}
const xnn_config_name config_name = xnn_get_config_name(identifier);
XNNPACK_CHECK_CONFIG(bf16_f32_gemm);
XNNPACK_CHECK_CONFIG(f16_gemm);
XNNPACK_CHECK_CONFIG(f32_gemm, /*flags=*/0);
XNNPACK_CHECK_CONFIG(f32_gemm_nr2, /*flags=*/0);
XNNPACK_CHECK_CONFIG(f32_igemm);
XNNPACK_CHECK_CONFIG(f32_qc8w_gemm);
XNNPACK_CHECK_CONFIG(f32_qc4w_gemm);
XNNPACK_CHECK_CONFIG(pf16_gemm);
XNNPACK_CHECK_CONFIG(pf32_gemm);
XNNPACK_CHECK_CONFIG(pqs8_qc8w_gemm);
XNNPACK_CHECK_CONFIG(qd8_f16_qb4w_gemm);
XNNPACK_CHECK_CONFIG(qd8_f16_qc4w_gemm);
XNNPACK_CHECK_CONFIG(qd8_f16_qc8w_gemm);
XNNPACK_CHECK_CONFIG(qd8_f16_qc8w_igemm);
XNNPACK_CHECK_CONFIG(qd8_f32_qb4w_gemm);
XNNPACK_CHECK_CONFIG(qd8_f32_qc4w_gemm);
XNNPACK_CHECK_CONFIG(qd8_f32_qc8w_gemm);
XNNPACK_CHECK_CONFIG(qp8_f32_qc4w_gemm);
XNNPACK_CHECK_CONFIG(qp8_f32_qc8w_gemm);
XNNPACK_CHECK_CONFIG(qp8_f32_qb4w_gemm);
XNNPACK_CHECK_CONFIG(qdu8_f32_qc4w_gemm);
XNNPACK_CHECK_CONFIG(qdu8_f16_qc8w_gemm);
XNNPACK_CHECK_CONFIG(qdu8_f32_qc8w_gemm);
XNNPACK_CHECK_CONFIG(qdu8_f32_qb4w_gemm);
XNNPACK_CHECK_CONFIG(qdu8_f16_qc4w_gemm);
XNNPACK_CHECK_CONFIG(qdu8_f32_qc8w_igemm);
XNNPACK_CHECK_CONFIG(qs8_qc4w_gemm);
XNNPACK_CHECK_CONFIG(qs8_qc8w_gemm);
XNNPACK_CHECK_CONFIG(qu8_gemm);
return false;
}
25 changes: 25 additions & 0 deletions src/configs/dwconv-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ XNN_INIT_ONCE_GUARD(qu8_dwconv);
xnn_log_info("Using dwconv microkernel '%s'.", #ukernel);

static void init_f16_dwconv_config(void) {
// LINT.IfChange(f16_dwconv_identifier)
f16_dwconv_config.identifier = xnn_create_config_identifier(xnn_config_name_f16_dwconv, /*version=*/0);
// LINT.ThenChange(:f16_dwconv_config)
// LINT.IfChange(f16_dwconv_config)
#if XNN_ARCH_ARM && XNN_ENABLE_ARM_FP16_VECTOR && XNN_ENABLE_ARM_FP16_SCALAR
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
assert(hardware_config != NULL);
Expand Down Expand Up @@ -107,9 +111,14 @@ static void init_f16_dwconv_config(void) {
f16_dwconv_config[3].primary_tile = 25;
}
#endif
// LINT.ThenChange(:f16_dwconv_identifier)
}

static void init_f32_dwconv_config(void) {
// LINT.IfChange(f32_dwconv_identifier)
f32_dwconv_config.identifier = xnn_create_config_identifier(xnn_config_name_f32_dwconv, /*version=*/0);
// LINT.ThenChange(:f32_dwconv_config)
// LINT.IfChange(f32_dwconv_config)
#if XNN_ARCH_ARM
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
assert(hardware_config != NULL);
Expand Down Expand Up @@ -441,9 +450,14 @@ static void init_f32_dwconv_config(void) {
f32_dwconv_config[3].channel_tile = 1;
f32_dwconv_config[3].primary_tile = 25;
#endif
// LINT.ThenChange(:f32_dwconv_identifier)
}

static void init_qs8_qc8w_dwconv_config(void) {
// LINT.IfChange(qs8_qc8w_dwconv_identifier)
qs8_qc8w_dwconv_config.identifier = xnn_create_config_identifier(xnn_config_name_qs8_qc8w_dwconv, /*version=*/0);
// LINT.ThenChange(:qs8_qc8w_dwconv_config)
// LINT.IfChange(qs8_qc8w_dwconv_config)
#if XNN_ARCH_ARM
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
assert(hardware_config != NULL);
Expand Down Expand Up @@ -603,9 +617,14 @@ static void init_qs8_qc8w_dwconv_config(void) {
qs8_qc8w_dwconv_config[2].channel_tile = 2;
qs8_qc8w_dwconv_config[2].primary_tile = 25;
#endif
// LINT.ThenChange(:qs8_qc8w_dwconv_identifier)
}

static void init_qs8_dwconv_config(void) {
// LINT.IfChange(qs8_dwconv_identifier)
qs8_dwconv_config.identifier = xnn_create_config_identifier(xnn_config_name_qs8_dwconv, /*version=*/0);
// LINT.ThenChange(:qs8_dwconv_config)
// LINT.IfChange(qs8_dwconv_config)
#if XNN_ARCH_ARM
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
assert(hardware_config != NULL);
Expand Down Expand Up @@ -710,9 +729,14 @@ static void init_qs8_dwconv_config(void) {
qs8_dwconv_config[1].channel_tile = 2;
qs8_dwconv_config[1].primary_tile = 25;
#endif
// LINT.ThenChange(:qs8_dwconv_identifier)
}

static void init_qu8_dwconv_config(void) {
// LINT.IfChange(qu8_dwconv_identifier)
qu8_dwconv_config.identifier = xnn_create_config_identifier(xnn_config_name_qu8_dwconv, /*version=*/0);
// LINT.ThenChange(:qu8_dwconv_config)
// LINT.IfChange(qu8_dwconv_config)
#if XNN_ARCH_ARM
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
assert(hardware_config != NULL);
Expand Down Expand Up @@ -817,6 +841,7 @@ static void init_qu8_dwconv_config(void) {
qu8_dwconv_config[1].channel_tile = 2;
qu8_dwconv_config[1].primary_tile = 25;
#endif
// LINT.ThenChange(:qu8_dwconv_identifier)
}

const struct xnn_dwconv_config* xnn_init_f16_dwconv_config() {
Expand Down
10 changes: 10 additions & 0 deletions src/configs/dwconv2d-chw-config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ XNN_INIT_ONCE_GUARD(f32_dwconv2d_chw);
xnn_log_info("Using dwconv2d_chw microkernel '%s'.", #ukernel);

static void init_f16_dwconv2d_chw_config(void) {
// LINT.IfChange(f16_dwconv2d_chw_config_identifier)
f16_dwconv2d_chw_config.identifier = xnn_create_config_identifier(xnn_config_name_f16_dwconv2d_chw, /*version=*/0);
// LINT.ThenChange(:f16_dwconv2d_chw_config_config)
// LINT.IfChange(:f16_dwconv2d_chw_config_config)
#if XNN_ARCH_ARM && XNN_ENABLE_ARM_FP16_VECTOR && XNN_ENABLE_ARM_FP16_SCALAR
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
assert(hardware_config != NULL);
Expand Down Expand Up @@ -69,9 +73,14 @@ static void init_f16_dwconv2d_chw_config(void) {
f16_dwconv2d_chw_config.dwconv2d_chw_5x5s2.output_width_tile = 8;
}
#endif
// LINT.ThenChange(f16_dwconv2d_chw_config_identifier)
}

static void init_f32_dwconv2d_chw_config(void) {
// LINT.IfChange(f32_dwconv2d_chw_config_identifier)
f32_dwconv2d_chw_config.identifier = xnn_create_config_identifier(xnn_config_name_f32_dwconv2d_chw, /*version=*/0);
// LINT.ThenChange(:f32_dwconv2d_chw_config_config)
// LINT.IfChange(:f32_dwconv2d_chw_config_config)
#if XNN_ARCH_ARM
const struct xnn_hardware_config* hardware_config = xnn_init_hardware_config();
assert(hardware_config != NULL);
Expand Down Expand Up @@ -218,6 +227,7 @@ static void init_f32_dwconv2d_chw_config(void) {
f32_dwconv2d_chw_config.dwconv2d_chw_5x5s2.init.f32 = xnn_init_f32_minmax_scalar_params;
f32_dwconv2d_chw_config.dwconv2d_chw_5x5s2.output_width_tile = 1;
#endif
// LINT.ThenChange(f32_dwconv2d_chw_config_identifier)
}

const struct xnn_dwconv2d_chw_config* xnn_init_f16_dwconv2d_chw_config() {
Expand Down
Loading
Loading