pali112
/
ollama
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 176e9097cf into d087e46bd1

This commit is contained in:
shalinib-ibm 2026-01-05 09:22:10 -07:00 committed by GitHub
parent d087e46bd1 176e9097cf
commit 6151d0d425
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 2480 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
llama/patches/0032-ggml-fix-vector-macro-collision-on-Power.patch Normal file
View File

@ -0,0 +1,44 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shalini Salomi Bodapati <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 22 Dec 2025 01:57:01 -0600
Subject: [PATCH] ggml: fix vector macro collision on Power
When compiling with MMA enabled, 'vector' may conflict with
compiler headers or language keywords on Power platforms.
Map 'vector' to '__vector' to avoid macro collisions and
restore successful compilation.
Signed-off-by: Shalini Salomi Bodapati <Shalini.Salomi.Bodapati@ibm.com>
---
ggml/src/ggml-cpu/llamafile/sgemm.cpp | 3 +++
ggml/src/ggml-cpu/simd-mappings.h | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ggml/src/ggml-cpu/llamafile/sgemm.cpp b/ggml/src/ggml-cpu/llamafile/sgemm.cpp
index a0cce10aa..f1331de21 100644
--- a/ggml/src/ggml-cpu/llamafile/sgemm.cpp
+++ b/ggml/src/ggml-cpu/llamafile/sgemm.cpp
@@ -117,6 +117,9 @@ inline float32x4_t mul(float32x4_t x, float32x4_t y) { return vec_mul(x, y); }
#endif
#if defined(__MMA__)
+#ifndef vector
+#define vector __vector
+#endif
#include "sgemm-ppc.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/ggml/src/ggml-cpu/simd-mappings.h b/ggml/src/ggml-cpu/simd-mappings.h
index 101a9c086..6f742d2d6 100644
--- a/ggml/src/ggml-cpu/simd-mappings.h
+++ b/ggml/src/ggml-cpu/simd-mappings.h
@@ -631,7 +631,7 @@ static inline void __avx_f32cx8_store(ggml_fp16_t *x, __m256 y) {
#define GGML_F32_STEP 32
#define GGML_F32_EPR 4
-#define GGML_F32x4 vector float
+#define GGML_F32x4 __vector float
#define GGML_F32x4_ZERO {0.0f}
#define GGML_F32x4_SET1 vec_splats
#define GGML_F32x4_LOAD(p) vec_xl(0, p)

36
llama/patches/0033-ggml-conditionally-enable-POWER11-CPU-backend-based-.patch Normal file
View File

@ -0,0 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shalini Salomi Bodapati <Shalini.Salomi.Bodapati@ibm.com>
Date: Mon, 22 Dec 2025 01:58:58 -0600
Subject: [PATCH] ggml: conditionally enable POWER11 CPU backend based on
compiler support
Guard POWER11 backend creation behind a compiler flag check for
-mcpu=power11. This avoids build failures on current GCC/Clang
toolchains while preserving forward compatibility once POWER11
support becomes available.
Signed-off-by: Shalini Salomi Bodapati <Shalini.Salomi.Bodapati@ibm.com>
---
ggml/src/CMakeLists.txt | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index 9a134b7af..ce2208201 100644
--- a/ggml/src/CMakeLists.txt
+++ b/ggml/src/CMakeLists.txt
@@ -403,7 +403,14 @@ if (GGML_CPU_ALL_VARIANTS)
ggml_add_cpu_backend_variant(power8_2 POWER8 VSX)
ggml_add_cpu_backend_variant(power9 POWER9 VSX)
ggml_add_cpu_backend_variant(power10 POWER10 VSX)
- ggml_add_cpu_backend_variant(power11 POWER11 VSX)
+ # POWER11 backend: only if compiler supports -mcpu=power11
+ check_cxx_compiler_flag("-mcpu=power11" GGML_CXX_SUPPORTS_POWER11)
+ if (GGML_CXX_SUPPORTS_POWER11)
+ message(STATUS "Compiler supports -mcpu=power11, enabling POWER11 backend")
+ ggml_add_cpu_backend_variant(power11 POWER11 VSX)
+ else()
+ message(STATUS "Skipping POWER11 backend: compiler does not support -mcpu=power11")
+ endif()
else()
message(FATAL_ERROR "Unsupported PowerPC target OS: ${CMAKE_SYSTEM_NAME}")
endif()

1
ml/backend/ggml/ggml/.rsync-filter
View File

@ -13,6 +13,7 @@ include /src/ggml-cpu/
include /src/ggml-cpu/amx/
include /src/ggml-cpu/arch/
include /src/ggml-cpu/arch/arm/
include /src/ggml-cpu/arch/powerpc/
include /src/ggml-cpu/arch/x86/
include /src/ggml-cpu/llamafile/
include /src/ggml-cuda/

7
ml/backend/ggml/ggml/src/CMakeLists.txt vendored
View File

@ -403,7 +403,14 @@ if (GGML_CPU_ALL_VARIANTS)
ggml_add_cpu_backend_variant(power8_2 POWER8 VSX)
ggml_add_cpu_backend_variant(power9 POWER9 VSX)
ggml_add_cpu_backend_variant(power10 POWER10 VSX)
# POWER11 backend: only if compiler supports -mcpu=power11
check_cxx_compiler_flag("-mcpu=power11" GGML_CXX_SUPPORTS_POWER11)
if (GGML_CXX_SUPPORTS_POWER11)
message(STATUS "Compiler supports -mcpu=power11, enabling POWER11 backend")
ggml_add_cpu_backend_variant(power11 POWER11 VSX)
else()
message(STATUS "Skipping POWER11 backend: compiler does not support -mcpu=power11")
endif()
else()
message(FATAL_ERROR "Unsupported PowerPC target OS: ${CMAKE_SYSTEM_NAME}")
endif()

82
ml/backend/ggml/ggml/src/ggml-cpu/arch/powerpc/cpu-feats.cpp vendored Normal file
View File

@ -0,0 +1,82 @@
# include "ggml-backend-impl.h"
#if defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__)
#if defined(__linux__)
#include <sys/auxv.h>
#endif
#include <string>
struct powerpc_features {
std::string platform = "";
int power_version = -1;
bool has_vsx = false;
powerpc_features() {
#if defined(__linux__)
unsigned long auxval = getauxval(AT_PLATFORM);
if (auxval) {
platform = std::string(reinterpret_cast<const char*>(auxval));
// TBD: Do systems exist that return this in uppercase?
if (platform.substr(0, 5) == "power") {
// Extractt a numeric suffix, if one exists
int vpos = -1;
for (int i = platform.length() - 1; i >= 0; i--) {
if (std::isdigit(platform[i])) {
vpos = i;
} else {
break;
}
}
if (vpos > -1) {
power_version = std::stoi(platform.substr(vpos));
}
}
}
#endif
if (power_version >= 9) {
has_vsx = true;
}
}
};
static int ggml_backend_cpu_powerpc_score() {
int score = 1;
powerpc_features pf;
// Platform scores
#if defined(GGML_USE_POWER7)
if (pf.power_version < 7) { return 0; }
score += 1<<1;
#endif
#if defined(GGML_USE_POWER8)
if (pf.power_version < 8) { return 0; }
score += 1<<2;
#endif
#if defined(GGML_USE_POWER9)
if (pf.power_version < 9) { return 0; }
score += 1<<3;
#endif
#if defined(GGML_USE_POWER10)
if (pf.power_version < 10) { return 0; }
score += 1<<4;
#endif
#if defined(GGML_USE_POWER11)
if (pf.power_version < 11) { return 0; }
score += 1<<5;
#endif
// Feature scores
#if defined(GGML_USE_VSX)
if (!pf.has_vsx) { return 0; }
score += 1<<6;
#endif
return score;
}
GGML_BACKEND_DL_SCORE_IMPL(ggml_backend_cpu_powerpc_score)
#endif // defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__)

2305
ml/backend/ggml/ggml/src/ggml-cpu/arch/powerpc/quants.c vendored Normal file
View File

File diff suppressed because it is too large Load Diff

3
ml/backend/ggml/ggml/src/ggml-cpu/llamafile/sgemm.cpp vendored
View File

@ -117,6 +117,9 @@ inline float32x4_t mul(float32x4_t x, float32x4_t y) { return vec_mul(x, y); }
#endif
#if defined(__MMA__)
#ifndef vector
#define vector __vector
#endif
#include "sgemm-ppc.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////

2
ml/backend/ggml/ggml/src/ggml-cpu/simd-mappings.h vendored
View File

@ -631,7 +631,7 @@ static inline void __avx_f32cx8_store(ggml_fp16_t *x, __m256 y) {
#define GGML_F32_STEP 32
#define GGML_F32_EPR 4
#define GGML_F32x4 vector float
#define GGML_F32x4 __vector float
#define GGML_F32x4_ZERO {0.0f}
#define GGML_F32x4_SET1 vec_splats
#define GGML_F32x4_LOAD(p) vec_xl(0, p)