From c376979647b234442a0d1505690d271699d6fec7 Mon Sep 17 00:00:00 2001
From: Aaron Teo <aaron.teo1@ibm.com>
Date: Sun, 26 Oct 2025 13:37:26 +0800
Subject: [PATCH] ggml: code cleanup

Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
---
 ggml/src/ggml-cpu/CMakeLists.txt          | 2 +-
 ggml/src/ggml-cpu/arch/s390/cpu-feats.cpp | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt
index 5e1722bbc5..f989b8952d 100644
--- a/ggml/src/ggml-cpu/CMakeLists.txt
+++ b/ggml/src/ggml-cpu/CMakeLists.txt
@@ -510,7 +510,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
             list(APPEND ARCH_DEFINITIONS GGML_VXE)
         endif()
 
-        ggml_add_cpu_backend_features(${GGML_CPU_NAME} s390 ${ARCH_DEFINITIONS})
+        ggml_add_cpu_backend_features(${GGML_CPU_NAME} s390x ${ARCH_DEFINITIONS})
     elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "wasm")
         message(STATUS "Wasm detected")
         list (APPEND GGML_CPU_SOURCES ggml-cpu/arch/wasm/quants.c)
diff --git a/ggml/src/ggml-cpu/arch/s390/cpu-feats.cpp b/ggml/src/ggml-cpu/arch/s390/cpu-feats.cpp
index f0948a6e7e..2f8f0163b2 100644
--- a/ggml/src/ggml-cpu/arch/s390/cpu-feats.cpp
+++ b/ggml/src/ggml-cpu/arch/s390/cpu-feats.cpp
@@ -1,4 +1,3 @@
-#include "ggml-impl.h"
 #include "ggml-backend-impl.h"
 
 #if defined(__s390x__)
@@ -23,15 +22,13 @@ struct s390x_features {
     bool has_nnpa = false;
 
     s390x_features() {
-        uint32_t hwcap  = getauxval(AT_HWCAP);
-        uint32_t hwcap2 = getauxval(AT_HWCAP2);
+        uint32_t hwcap = getauxval(AT_HWCAP);
+        // NOTE: use hwcap2 with DFLT for z17 and later
+        // uint32_t hwcap2 = getauxval(AT_HWCAP2);
 
         has_vxe  = !!(hwcap & HWCAP_VXRS_EXT);
         has_vxe2 = !!(hwcap & HWCAP_VXRS_EXT2);
         has_nnpa = !!(hwcap & HWCAP_NNPA);
-
-        GGML_LOG_INFO("s390x features detected: VXE=%d, VXE2=%d, NNPA=%d",
-                      has_vxe, has_vxe2, has_nnpa);
     }
 };