vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ggml: Extend feature detection to include non aarch64 Arm arch

Browse source
This commit is contained in:
Dan Johansson 2024-09-19 12:45:11 +02:00
parent ce926fe879
commit 8fd848dd30
1 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

67
ggml/src/ggml.c
View file

@ -39,13 +39,13 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#if defined(__aarch64__) #if defined(__ARM_ARCH)
struct ggml_aarch64_features_type { struct ggml_arm_arch_features_type {
int has_neon; int has_neon;
int has_i8mm; int has_i8mm;
int has_sve; int has_sve;
int sve_cnt; int sve_cnt;
} ggml_aarch64_features = {-1, -1, -1, 0}; } ggml_arm_arch_features = {-1, -1, -1, 0};
#endif #endif
#if defined(__ARM_FEATURE_SVE) || defined(__ARM_FEATURE_MATMUL_INT8) #if defined(__ARM_FEATURE_SVE) || defined(__ARM_FEATURE_MATMUL_INT8)
@ -3679,24 +3679,25 @@ static inline int ggml_up(int n, int m) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#if defined(__aarch64__) #if defined(__ARM_ARCH)
#if defined(__linux__) #if defined(__linux__) && defined(__aarch64__)
#include <sys/auxv.h> #include <sys/auxv.h>
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
static void ggml_init_aarch64_features(void) { static void ggml_init_arm_arch_features(void) {
#if defined(__linux__) #if defined(__linux__) && defined(__aarch64__)
uint32_t hwcap = getauxval(AT_HWCAP); uint32_t hwcap = getauxval(AT_HWCAP);
uint32_t hwcap2 = getauxval(AT_HWCAP2); uint32_t hwcap2 = getauxval(AT_HWCAP2);
ggml_aarch64_features.has_neon = !!(hwcap & HWCAP_ASIMD); ggml_arm_arch_features.has_neon = !!(hwcap & HWCAP_ASIMD);
ggml_aarch64_features.has_i8mm = !!(hwcap2 & HWCAP2_I8MM); ggml_arm_arch_features.has_i8mm = !!(hwcap2 & HWCAP2_I8MM);
ggml_aarch64_features.has_sve = !!(hwcap & HWCAP_SVE); ggml_arm_arch_features.has_sve = !!(hwcap & HWCAP_SVE);
#if defined(__ARM_FEATURE_SVE) #if defined(__ARM_FEATURE_SVE)
ggml_aarch64_features.sve_cnt = PR_SVE_VL_LEN_MASK & prctl(PR_SVE_GET_VL); ggml_arm_arch_features.sve_cnt = PR_SVE_VL_LEN_MASK & prctl(PR_SVE_GET_VL);
#endif #endif
#elif defined(__APPLE__) #elif defined(__APPLE__)
int oldp = 0; int oldp = 0;
@ -3704,35 +3705,35 @@ static void ggml_init_aarch64_features(void) {
if (sysctlbyname("hw.optional.AdvSIMD", &oldp, &size, NULL, 0) != 0) { if (sysctlbyname("hw.optional.AdvSIMD", &oldp, &size, NULL, 0) != 0) {
oldp = 0; oldp = 0;
} }
ggml_aarch64_features.has_neon = oldp; ggml_arm_arch_features.has_neon = oldp;
if (sysctlbyname("hw.optional.arm.FEAT_I8MM", &oldp, &size, NULL, 0) != 0) { if (sysctlbyname("hw.optional.arm.FEAT_I8MM", &oldp, &size, NULL, 0) != 0) {
oldp = 0; oldp = 0;
} }
ggml_aarch64_features.has_i8mm = oldp; ggml_arm_arch_features.has_i8mm = oldp;
ggml_aarch64_features.has_sve = 0; ggml_arm_arch_features.has_sve = 0;
ggml_aarch64_features.sve_cnt = 0; ggml_arm_arch_features.sve_cnt = 0;
#else #else
// Run-time CPU feature detection not implemented for this platform, fallback to compile time // Run-time CPU feature detection not implemented for this platform, fallback to compile time
#if defined(__ARM_NEON) #if defined(__ARM_NEON)
ggml_aarch64_features.has_neon = 1; ggml_arm_arch_features.has_neon = 1;
#else #else
ggml_aarch64_features.has_neon = 0; ggml_arm_arch_features.has_neon = 0;
#endif #endif
#if defined(__ARM_FEATURE_MATMUL_INT8) #if defined(__ARM_FEATURE_MATMUL_INT8)
ggml_aarch64_features.has_i8mm = 1; ggml_arm_arch_features.has_i8mm = 1;
#else #else
ggml_aarch64_features.has_i8mm = 0; ggml_arm_arch_features.has_i8mm = 0;
#endif #endif
#if defined(__ARM_FEATURE_SVE) #if defined(__ARM_FEATURE_SVE)
ggml_aarch64_features.has_sve = 1; ggml_arm_arch_features.has_sve = 1;
ggml_aarch64_features.sve_cnt = 16; ggml_arm_arch_features.sve_cnt = 16;
#else #else
ggml_aarch64_features.has_sve = 0; ggml_arm_arch_features.has_sve = 0;
ggml_aarch64_features.sve_cnt = 0; ggml_arm_arch_features.sve_cnt = 0;
#endif #endif
#endif #endif
} }
@ -3788,8 +3789,8 @@ struct ggml_context * ggml_init(struct ggml_init_params params) {
GGML_PRINT_DEBUG("%s: g_state initialized in %f ms\n", __func__, (t_end - t_start)/1000.0f); GGML_PRINT_DEBUG("%s: g_state initialized in %f ms\n", __func__, (t_end - t_start)/1000.0f);
} }
#if defined(__aarch64__) #if defined(__ARM_ARCH)
ggml_init_aarch64_features(); ggml_init_arm_arch_features();
#endif #endif
is_first_call = false; is_first_call = false;
@ -23641,16 +23642,16 @@ int ggml_cpu_has_fma(void) {
} }
int ggml_cpu_has_neon(void) { int ggml_cpu_has_neon(void) {
#if defined(__aarch64__) #if defined(__ARM_ARCH)
return ggml_aarch64_features.has_neon; return ggml_arm_arch_features.has_neon;
#else #else
return 0; return 0;
#endif #endif
} }
int ggml_cpu_has_sve(void) { int ggml_cpu_has_sve(void) {
#if defined(__aarch64__) #if defined(__ARM_ARCH)
return ggml_aarch64_features.has_sve; return ggml_arm_arch_features.has_sve;
#else #else
return 0; return 0;
#endif #endif
@ -23797,16 +23798,16 @@ int ggml_cpu_has_vsx(void) {
} }
int ggml_cpu_has_matmul_int8(void) { int ggml_cpu_has_matmul_int8(void) {
#if defined(__aarch64__) #if defined(__ARM_ARCH)
return ggml_aarch64_features.has_i8mm; return ggml_arm_arch_features.has_i8mm;
#else #else
return 0; return 0;
#endif #endif
} }
int ggml_cpu_get_sve_cnt(void) { int ggml_cpu_get_sve_cnt(void) {
#if defined(__aarch64__) #if defined(__ARM_ARCH)
return ggml_aarch64_features.sve_cnt; return ggml_arm_arch_features.sve_cnt;
#else #else
return 0; return 0;
#endif #endif