CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-10-29 08:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ggml: code cleanup

Browse Source 
Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
This commit is contained in:
Aaron Teo
2025-10-26 13:37:26 +08:00
parent decb5cc06e
commit c376979647
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ggml/src/ggml-cpu/CMakeLists.txt
View File

@@ -510,7 +510,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
list(APPEND ARCH_DEFINITIONS GGML_VXE) list(APPEND ARCH_DEFINITIONS GGML_VXE)
endif() 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") elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "wasm")
message(STATUS "Wasm detected") message(STATUS "Wasm detected")
list (APPEND GGML_CPU_SOURCES ggml-cpu/arch/wasm/quants.c) list (APPEND GGML_CPU_SOURCES ggml-cpu/arch/wasm/quants.c)

7
ggml/src/ggml-cpu/arch/s390/cpu-feats.cpp
View File

@@ -1,4 +1,3 @@
#include "ggml-impl.h"
#include "ggml-backend-impl.h" #include "ggml-backend-impl.h"
#if defined(__s390x__) #if defined(__s390x__)
@@ -24,14 +23,12 @@ struct s390x_features {
s390x_features() { s390x_features() {
uint32_t hwcap = getauxval(AT_HWCAP); uint32_t hwcap = getauxval(AT_HWCAP);
uint32_t hwcap2 = getauxval(AT_HWCAP2); // NOTE: use hwcap2 with DFLT for z17 and later
// uint32_t hwcap2 = getauxval(AT_HWCAP2);
has_vxe = !!(hwcap & HWCAP_VXRS_EXT); has_vxe = !!(hwcap & HWCAP_VXRS_EXT);
has_vxe2 = !!(hwcap & HWCAP_VXRS_EXT2); has_vxe2 = !!(hwcap & HWCAP_VXRS_EXT2);
has_nnpa = !!(hwcap & HWCAP_NNPA); has_nnpa = !!(hwcap & HWCAP_NNPA);
GGML_LOG_INFO("s390x features detected: VXE=%d, VXE2=%d, NNPA=%d",
has_vxe, has_vxe2, has_nnpa);
} }
}; };