Internal change only.

PiperOrigin-RevId: 745037841

Author: gonnet

build_params.bzl

@@ -36,115 +36,115 @@ def xnnpack_select_if(cond = None, val_true = [], val_false = []):
 
 def xnnpack_configurable_defines():
     return xnnpack_select_if(
-        ":cpuinfo_enabled",
+        "//:cpuinfo_enabled",
         ["XNN_ENABLE_CPUINFO=1"],
         ["XNN_ENABLE_CPUINFO=0"],
     ) + xnnpack_select_if(
-        ":memopt_enabled",
+        "//:memopt_enabled",
         ["XNN_ENABLE_MEMOPT=1"],
         ["XNN_ENABLE_MEMOPT=1"],
     ) + xnnpack_select_if(
-        ":sparse_enabled",
+        "//:sparse_enabled",
         ["XNN_ENABLE_SPARSE=1"],
         ["XNN_ENABLE_SPARSE=0"],
     ) + xnnpack_select_if(
-        ":assembly_enabled",
+        "//:assembly_enabled",
         ["XNN_ENABLE_ASSEMBLY=1"],
         ["XNN_ENABLE_ASSEMBLY=0"],
     ) + xnnpack_select_if(
-        ":arm_fp16_scalar_enabled",
+        "//:arm_fp16_scalar_enabled",
         ["XNN_ENABLE_ARM_FP16_SCALAR=1"],
         ["XNN_ENABLE_ARM_FP16_SCALAR=0"],
     ) + xnnpack_select_if(
-        ":arm_fp16_vector_enabled",
+        "//:arm_fp16_vector_enabled",
         ["XNN_ENABLE_ARM_FP16_VECTOR=1"],
         ["XNN_ENABLE_ARM_FP16_VECTOR=0"],
     ) + xnnpack_select_if(
-        ":arm_bf16_enabled",
+        "//:arm_bf16_enabled",
         ["XNN_ENABLE_ARM_BF16=1"],
         ["XNN_ENABLE_ARM_BF16=0"],
     ) + xnnpack_select_if(
-        ":arm_dotprod_enabled",
+        "//:arm_dotprod_enabled",
         ["XNN_ENABLE_ARM_DOTPROD=1"],
         ["XNN_ENABLE_ARM_DOTPROD=0"],
     ) + xnnpack_select_if(
-        ":arm_i8mm_enabled",
+        "//:arm_i8mm_enabled",
         ["XNN_ENABLE_ARM_I8MM=1"],
         ["XNN_ENABLE_ARM_I8MM=0"],
     ) + xnnpack_select_if(
-        ":riscv_fp16_vector_enabled",
+        "//:riscv_fp16_vector_enabled",
         ["XNN_ENABLE_RISCV_FP16_VECTOR=1"],
         ["XNN_ENABLE_RISCV_FP16_VECTOR=0"],
     ) + xnnpack_select_if(
-        ":avx512amx_enabled",
+        "//:avx512amx_enabled",
         ["XNN_ENABLE_AVX512AMX=1"],
         ["XNN_ENABLE_AVX512AMX=0"],
     ) + xnnpack_select_if(
-        ":avx512fp16_enabled",
+        "//:avx512fp16_enabled",
         ["XNN_ENABLE_AVX512FP16=1"],
         ["XNN_ENABLE_AVX512FP16=0"],
     ) + xnnpack_select_if(
-        ":avx512bf16_enabled",
+        "//:avx512bf16_enabled",
         ["XNN_ENABLE_AVX512BF16=1"],
         ["XNN_ENABLE_AVX512BF16=0"],
     ) + xnnpack_select_if(
-        ":avxvnni_enabled",
+        "//:avxvnni_enabled",
         ["XNN_ENABLE_AVXVNNI=1"],
         ["XNN_ENABLE_AVXVNNI=0"],
     ) + xnnpack_select_if(
-        ":avxvnniint8_enabled",
+        "//:avxvnniint8_enabled",
         ["XNN_ENABLE_AVXVNNIINT8=1"],
         ["XNN_ENABLE_AVXVNNIINT8=0"],
     ) + xnnpack_select_if(
-        ":avx512f_enabled",
+        "//:avx512f_enabled",
         ["XNN_ENABLE_AVX512F=1"],
         ["XNN_ENABLE_AVX512F=0"],
     ) + xnnpack_select_if(
-        ":avx256skx_enabled",
+        "//:avx256skx_enabled",
         ["XNN_ENABLE_AVX256SKX=1"],
         ["XNN_ENABLE_AVX256SKX=0"],
     ) + xnnpack_select_if(
-        ":avx256vnni_enabled",
+        "//:avx256vnni_enabled",
         ["XNN_ENABLE_AVX256VNNI=1"],
         ["XNN_ENABLE_AVX256VNNI=0"],
     ) + xnnpack_select_if(
-        ":avx256vnnigfni_enabled",
+        "//:avx256vnnigfni_enabled",
         ["XNN_ENABLE_AVX256VNNIGFNI=1"],
         ["XNN_ENABLE_AVX256VNNIGFNI=0"],
     ) + xnnpack_select_if(
-        ":avx512skx_enabled",
+        "//:avx512skx_enabled",
         ["XNN_ENABLE_AVX512SKX=1"],
         ["XNN_ENABLE_AVX512SKX=0"],
     ) + xnnpack_select_if(
-        ":avx512vbmi_enabled",
+        "//:avx512vbmi_enabled",
         ["XNN_ENABLE_AVX512VBMI=1"],
         ["XNN_ENABLE_AVX512VBMI=0"],
     ) + xnnpack_select_if(
-        ":avx512vnni_enabled",
+        "//:avx512vnni_enabled",
         ["XNN_ENABLE_AVX512VNNI=1"],
         ["XNN_ENABLE_AVX512VNNI=0"],
     ) + xnnpack_select_if(
-        ":avx512vnnigfni_enabled",
+        "//:avx512vnnigfni_enabled",
         ["XNN_ENABLE_AVX512VNNIGFNI=1"],
         ["XNN_ENABLE_AVX512VNNIGFNI=0"],
     ) + xnnpack_select_if(
-        ":hvx_enabled",
+        "//:hvx_enabled",
         ["XNN_ENABLE_HVX=1"],
         ["XNN_ENABLE_HVX=0"],
     ) + xnnpack_select_if(
-        ":kleidiai_enabled",
+        "//:kleidiai_enabled",
         ["XNN_ENABLE_KLEIDIAI=1"],
         ["XNN_ENABLE_KLEIDIAI=0"],
     ) + xnnpack_select_if(
-        ":arm_sme_enabled",
+        "//:arm_sme_enabled",
         ["XNN_ENABLE_ARM_SME=1"],
         ["XNN_ENABLE_SRM_SME=0"],
     ) + xnnpack_select_if(
-        ":arm_sme2_enabled",
+        "//:arm_sme2_enabled",
         ["XNN_ENABLE_ARM_SME2=1"],
         ["XNN_ENABLE_ARM_SME2=0"],
     ) + xnnpack_select_if(
-        ":wasm_revectorize_enabled",
+        "//:wasm_revectorize_enabled",
         ["XNN_ENABLE_WASM_REVECTORIZE=1"],
         ["XNN_ENABLE_WASM_REVECTORIZE=0"],
     ) + xnnpack_slinky_defines()

src/configs/hardware-config.c

@@ -3,6 +3,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
+#include <assert.h>
 #include <stddef.h>
 
 #if XNN_ENABLE_CPUINFO
@@ -68,8 +69,17 @@ static struct xnn_hardware_config hardware_config = {0};
 
 XNN_INIT_ONCE_GUARD(hardware);
 
+// TODO(b/409244409): Remove before end of 2025/Q2.
+#if XNN_ARCH_ARM64
+bool xnn_enable_arm_sme2_default = (bool)XNN_ENABLE_ARM_SME2;
+#endif  // XNN_ARCH_ARM64
+
 static void init_hardware_config(void) {
-  #if XNN_ARCH_ARM64 || XNN_ARCH_ARM
+  static bool already_called = false;
+  assert(!already_called);
+  already_called = true;
+
+#if XNN_ARCH_ARM64 || XNN_ARCH_ARM
     #if XNN_PLATFORM_WINDOWS
       SYSTEM_INFO system_info;
       GetSystemInfo(&system_info);
@@ -110,10 +120,11 @@ static void init_hardware_config(void) {
     hardware_config.use_arm_sve = cpuinfo_has_arm_sve();
     hardware_config.use_arm_sve2 = cpuinfo_has_arm_sve2();
     hardware_config.use_arm_sme = cpuinfo_has_arm_sme();
-    hardware_config.use_arm_sme2 = cpuinfo_has_arm_sme2();
-  #endif
+    hardware_config.use_arm_sme2 =
+        xnn_enable_arm_sme2_default && cpuinfo_has_arm_sme2();
+#endif
 
-  #if XNN_ARCH_X86 || XNN_ARCH_X86_64
+#if XNN_ARCH_X86 || XNN_ARCH_X86_64
     hardware_config.use_x86_ssse3 = cpuinfo_has_x86_ssse3();
     hardware_config.use_x86_sse4_1 = cpuinfo_has_x86_sse4_1();
     hardware_config.use_x86_avx = cpuinfo_has_x86_avx();

src/xnnpack/hardware-config.h

@@ -3,7 +3,8 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#pragma once
+#ifndef THIRD_PARTY_XNNPACK_SRC_XNNPACK_HARDWARE_CONFIG_H_
+#define THIRD_PARTY_XNNPACK_SRC_XNNPACK_HARDWARE_CONFIG_H_
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -221,3 +222,5 @@ static inline bool xnn_is_f16_supported_natively(
 #ifdef __cplusplus
 }  // extern "C"
 #endif
+
+#endif  // THIRD_PARTY_XNNPACK_SRC_XNNPACK_HARDWARE_CONFIG_H_