ggml : fix arm builds, unused var (#26991)

diff --git a/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp b/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp
index 13942560895eb56dea551fc1b30873f7da8a7c4c..84a11eabd4e110ea7186e4105d5940994161ec01 100644 (file)
--- a/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp
+++ b/ggml/src/ggml-cpu/arch/arm/cpu-feats.cpp
@@ -5,7 +5,8 @@
 
 static int ggml_backend_cpu_aarch64_score() {
     int score = 1;
-    ggml_feats_arch64_runtime_t af = ggml_get_aarch64_runtime_features();
+    const ggml_feats_arch64_runtime_t af = ggml_feats_get_arch64_runtime();
+    GGML_UNUSED(af);
 
 #ifdef GGML_USE_DOTPROD
     if (!af.has_dotprod) { return 0; }

diff --git a/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp b/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp
index c1cc33db275e3e2efeb4282fe426202ea8bfdca4..2266c168981038b994250aadd02c0d49a93b0760 100644 (file)
--- a/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp
+++ b/ggml/src/ggml-cpu/kleidiai/kleidiai.cpp
@@ -184,7 +184,7 @@ static void add_smcus_from_smidr(uint64_t smidr, size_t & num_private, std::map<
 }
 
 static size_t detect_num_smcus() {
-    auto runtime_feat = ggml_get_aarch64_runtime_features();
+    const auto runtime_feat = ggml_feats_get_arch64_runtime();
     if (!runtime_feat.has_sme) {
         return 0;
     }
@@ -310,7 +310,7 @@ static void init_kleidiai_context(void) {
         const char *env_threads     = getenv("GGML_TOTAL_THREADS");
         const char *env_chunk_mult  = getenv("GGML_KLEIDIAI_CHUNK_MULTIPLIER");
 
-        auto runtime_feat = ggml_get_aarch64_runtime_features();
+        const auto runtime_feat = ggml_feats_get_arch64_runtime();
 
         size_t detected_smcus = 0;
 

diff --git a/ggml/src/ggml-feats.h b/ggml/src/ggml-feats.h
index d4a8c83a7fd8e5521c9b76b8732bdf25a339ae11..79a0afd87a8775172a2e86e0641c01ee9915b8b1 100644 (file)
--- a/ggml/src/ggml-feats.h
+++ b/ggml/src/ggml-feats.h
@@ -92,7 +92,7 @@ typedef struct ggml_feats_arch64_runtime {
     int sve_cnt;
 } ggml_feats_arch64_runtime_t;
 
-static inline ggml_feats_arch64_runtime_t ggml_get_aarch64_runtime_features(void) {
+static inline ggml_feats_arch64_runtime_t ggml_feats_get_arch64_runtime(void) {
     ggml_feats_arch64_runtime_t runtime_feat = {};
 
 #if defined(__linux__)