LLM inference in C/C++
C++ ggml
opencl: cache compiled cl_program binaries on disk (#26050)
Hongqiang Wanged7adbfefd5e
diff --git a/docs/backend/OPENCL.md b/docs/backend/OPENCL.mdindex 76f56bb106..337b0c82a0 100644--- a/docs/backend/OPENCL.md+++ b/docs/backend/OPENCL.md@@ -98,6 +98,24 @@ The OpenCL backend has the following CMake options that control the behavior of| `GGML_OPENCL_USE_ADRENO_KERNELS` | `ON` | Use kernels optimized for Adreno. || `GGML_OPENCL_USE_ADRENO_BIN_KERNELS` | `OFF` | Allow using binary kernel lib for Adreno. |+## Program Binary Cache++Compiled `cl_program` binaries are cached on disk, so subsequent runs skip the expensive+compile-from-source step when nothing relevant has changed (kernel source, compile options,+device, driver, or platform version).++The cache is controlled with the `GGML_OPENCL_KERNEL_CACHE_DIR` environment variable:++| Value | Behavior |+|:---------------------------------------|:-----------------------------------------------|+| unset / empty / `1` / `default` | Enabled in the platform default cache directory: `%LOCALAPPDATA%\llama.cpp\cl-cache` (Windows), `~/Library/Caches/llama.cpp/cl-cache` (macOS), `<temp dir>/llama.cpp/cl-cache` elsewhere. |+| `0` / `off` / `none` / `disable(d)` | Disabled. |+| any other value | Used verbatim as the cache directory path. |++If the chosen directory cannot be created or used, the cache disables itself for the process+and kernels are compiled from source as usual. Set `GGML_OPENCL_KERNEL_CACHE_DEBUG=1` to+print a HIT/MISS/SAVE trace to stderr.+## AndroidUbuntu 22.04 is used for targeting Android. Make sure the following tools are accessible from command line,diff --git a/ggml/src/ggml-opencl/CMakeLists.txt b/ggml/src/ggml-opencl/CMakeLists.txtindex 1a534f884f..1dc7071771 100644--- a/ggml/src/ggml-opencl/CMakeLists.txt+++ b/ggml/src/ggml-opencl/CMakeLists.txt@@ -5,6 +5,8 @@ set(TARGET_NAME ggml-opencl)ggml_add_backend_library(${TARGET_NAME}ggml-opencl.cpp+ cl-program-cache.cpp+ cl-program-cache.h../../include/ggml-opencl.h)target_link_libraries(${TARGET_NAME} PRIVATE ${OpenCL_LIBRARIES})target_include_directories(${TARGET_NAME} PRIVATE ${OpenCL_INCLUDE_DIRS})diff --git a/ggml/src/ggml-opencl/cl-program-cache.cpp b/ggml/src/ggml-opencl/cl-program-cache.cppnew file mode 100644index 0000000000..1a4a281173--- /dev/null+++ b/ggml/src/ggml-opencl/cl-program-cache.cpp@@ -0,0 +1,453 @@+// Match the version setup ggml-opencl.cpp uses, so any cl.h declarations we+// touch are consistent across this backend's translation units.+#define CL_TARGET_OPENCL_VERSION GGML_OPENCL_TARGET_VERSION+#define CL_USE_DEPRECATED_OPENCL_1_2_APIS++#include "cl-program-cache.h"++#include "ggml-impl.h" // GGML_LOG_INFO / WARN++#include <cstdint>+#include <cstdio>+#include <cstdlib>+#include <cstring>+#include <filesystem>+#include <fstream>+#include <system_error>+#include <vector>++#if defined(_WIN32)+# ifndef WIN32_LEAN_AND_MEAN+# define WIN32_LEAN_AND_MEAN+# endif+# ifndef NOMINMAX+# define NOMINMAX+# endif+# include <windows.h>+# include <process.h>+# define ggml_getpid() ((int) GetCurrentProcessId())+#else+# include <unistd.h>+# define ggml_getpid() ((int) getpid())+#endif++namespace fs = std::filesystem;++// ----------------------------------------------------------------------------+// SHA-256 (FIPS 180-4). Self-contained, ~80 lines, public-domain reference.+// Hot path is a few KB of source per kernel ⇒ <1 ms total per process init.+// ----------------------------------------------------------------------------++namespace {++struct sha256_ctx {+ uint32_t state[8];+ uint64_t bitlen;+ uint8_t buf[64];+ size_t buf_len;+};++const uint32_t K256[64] = {+ 0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5,+ 0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174,+ 0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da,+ 0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7,0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967,+ 0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13,0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85,+ 0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3,0xd192e819,0xd6990624,0xf40e3585,0x106aa070,+ 0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5,0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3,+ 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2,+};++inline uint32_t rotr32(uint32_t x, unsigned n) { return (x >> n) | (x << (32 - n)); }++void sha256_compress(uint32_t state[8], const uint8_t block[64]) {+ uint32_t w[64];+ for (int i = 0; i < 16; ++i) {+ w[i] = ((uint32_t)block[i*4 ] << 24) |+ ((uint32_t)block[i*4 + 1] << 16) |+ ((uint32_t)block[i*4 + 2] << 8) |+ ((uint32_t)block[i*4 + 3] );+ }+ for (int i = 16; i < 64; ++i) {+ uint32_t s0 = rotr32(w[i-15], 7) ^ rotr32(w[i-15], 18) ^ (w[i-15] >> 3);+ uint32_t s1 = rotr32(w[i-2], 17) ^ rotr32(w[i-2], 19) ^ (w[i-2] >> 10);+ w[i] = w[i-16] + s0 + w[i-7] + s1;+ }++ uint32_t a = state[0],b = state[1],c = state[2],d = state[3],e = state[4],f = state[5],g = state[6],h = state[7];++ for (int i = 0; i < 64; ++i) {+ uint32_t S1 = rotr32(e, 6) ^ rotr32(e, 11) ^ rotr32(e, 25);+ uint32_t ch = (e & f) ^ ((~e) & g);+ uint32_t t1 = h + S1 + ch + K256[i] + w[i];+ uint32_t S0 = rotr32(a, 2) ^ rotr32(a, 13) ^ rotr32(a, 22);+ uint32_t maj = (a & b) ^ (a & c) ^ (b & c);+ uint32_t t2 = S0 + maj;+ h = g; g = f; f = e; e = d + t1;+ d = c; c = b; b = a; a = t1 + t2;+ }+ state[0]+=a; state[1]+=b; state[2]+=c; state[3]+=d;+ state[4]+=e; state[5]+=f; state[6]+=g; state[7]+=h;+}++void sha256_init(sha256_ctx & c) {+ c.state[0]=0x6a09e667; c.state[1]=0xbb67ae85; c.state[2]=0x3c6ef372; c.state[3]=0xa54ff53a;+ c.state[4]=0x510e527f; c.state[5]=0x9b05688c; c.state[6]=0x1f83d9ab; c.state[7]=0x5be0cd19;+ c.bitlen = 0;+ c.buf_len = 0;+}++void sha256_update(sha256_ctx & c, const void * data, size_t len) {+ const uint8_t * p = (const uint8_t *) data;+ c.bitlen += (uint64_t) len * 8;+ if (c.buf_len > 0) {+ size_t n = 64 - c.buf_len;+ if (n > len) { n = len; }+ memcpy(c.buf + c.buf_len, p, n);+ c.buf_len += n;+ p += n;+ len -= n;+ if (c.buf_len == 64) {+ sha256_compress(c.state, c.buf);+ c.buf_len = 0;+ }+ }+ while (len >= 64) {+ sha256_compress(c.state, p);+ p += 64;+ len -= 64;+ }+ if (len > 0) {+ memcpy(c.buf, p, len);+ c.buf_len = len;+ }+}++void sha256_final(sha256_ctx & c, uint8_t out[32]) {+ uint64_t bitlen = c.bitlen;+ c.buf[c.buf_len++] = 0x80;+ if (c.buf_len > 56) {+ while (c.buf_len < 64) { c.buf[c.buf_len++] = 0; }+ sha256_compress(c.state, c.buf);+ c.buf_len = 0;+ }+ while (c.buf_len < 56) { c.buf[c.buf_len++] = 0; }+ for (int i = 7; i >= 0; --i) { c.buf[c.buf_len++] = (uint8_t) (bitlen >> (i * 8)); }+ sha256_compress(c.state, c.buf);+ for (int i = 0; i < 8; ++i) {+ out[i*4 ] = (uint8_t) (c.state[i] >> 24);+ out[i*4 + 1] = (uint8_t) (c.state[i] >> 16);+ out[i*4 + 2] = (uint8_t) (c.state[i] >> 8);+ out[i*4 + 3] = (uint8_t) (c.state[i] );+ }+}++std::string sha256_hex(const uint8_t digest[32]) {+ static const char hex[] = "0123456789abcdef";+ std::string s(64, '0');+ for (int i = 0; i < 32; ++i) {+ s[i*2 ] = hex[digest[i] >> 4];+ s[i*2 + 1] = hex[digest[i] & 0xf];+ }+ return s;+}++std::string compute_key(const std::string & key_suffix,+ const char * source,+ const std::string & compile_opts) {+ sha256_ctx c;+ sha256_init(c);++ static const uint8_t sep = 0;+ sha256_update(c, source, strlen(source));+ sha256_update(c, &sep, 1);+ sha256_update(c, compile_opts.data(), compile_opts.size());+ sha256_update(c, &sep, 1);+ sha256_update(c, key_suffix.data(), key_suffix.size());++ uint8_t digest[32];+ sha256_final(c, digest);+ return sha256_hex(digest);+}++bool make_dir_recursive(const std::string & path) {+ if (path.empty()) { return false; }+ // create_directories() already creates missing parents. It returns false+ // (with ec clear) when the directory is already there, so re-check.+ const fs::path p = fs::u8path(path);+ std::error_code ec;+ if (fs::create_directories(p, ec)) { return true; }+ std::error_code ec_stat;+ return fs::is_directory(p, ec_stat);+}++std::string default_cache_dir() {+#if defined(_WIN32)+ const char * base = std::getenv("LOCALAPPDATA");+ if (!base || !*base) { base = std::getenv("APPDATA"); }+ if (!base || !*base) { base = std::getenv("TEMP"); }+ if (!base || !*base) { base = "."; }+ return std::string(base) + "\\llama.cpp\\cl-cache";+#elif defined(__APPLE__)+ const char * home = std::getenv("HOME");+ if (!home || !*home) { home = "."; }+ return std::string(home) + "/Library/Caches/llama.cpp/cl-cache";+#else+ // The throwing overload aborts the process when no usable temp directory+ // exists (e.g. Android app contexts with TMPDIR unset); an empty return+ // here just disables the cache instead.+ std::error_code ec;+ const fs::path tmp_path = fs::temp_directory_path(ec);+ if (ec || tmp_path.empty()) { return {}; }+ return tmp_path.string() + "/llama.cpp/cl-cache";+#endif+}++// Query a NUL-terminated string from clGetDeviceInfo / clGetPlatformInfo.+template <typename GetInfoFn, typename Object>+std::string query_string(GetInfoFn fn, Object obj, cl_uint name) {+ size_t sz = 0;+ if (fn(obj, name, 0, nullptr, &sz) != CL_SUCCESS || sz == 0) {+ return {};+ }+ std::string s(sz, '\0');+ if (fn(obj, name, sz, &s[0], nullptr) != CL_SUCCESS) {+ return {};+ }+ if (!s.empty() && s.back() == '\0') {+ s.pop_back();+ }+ return s;+}++std::string compute_key_suffix(cl_device_id device) {+ cl_platform_id platform = nullptr;+ clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(platform), &platform, nullptr);++ std::string s;+ s.reserve(512);+ s += query_string(clGetDeviceInfo, device, CL_DEVICE_NAME); s.push_back('\0');+ s += query_string(clGetDeviceInfo, device, CL_DRIVER_VERSION); s.push_back('\0');+ s += query_string(clGetDeviceInfo, device, CL_DEVICE_VERSION); s.push_back('\0');+ if (platform) {+ s += query_string(clGetPlatformInfo, platform, CL_PLATFORM_VERSION); s.push_back('\0');+ }+ s += "fmt=" + std::to_string(CL_PROGRAM_CACHE_FORMAT_VERSION);+ return s;+}++const uint8_t MAGIC[8] = { 'G','G','M','L','C','L','B','C' };++bool read_all(const std::string & path, std::vector<uint8_t> & out) {+ std::ifstream f(fs::u8path(path), std::ios::binary);+ if (!f) { return false; }+ f.seekg(0, std::ios::end);+ std::streamsize sz = f.tellg();+ if (sz < 0) { return false; }+ f.seekg(0, std::ios::beg);+ out.resize((size_t) sz);+ if (sz > 0) { f.read((char *) out.data(), sz); }+ return f.good() || f.eof();+}++bool write_atomic(const std::string & path, const uint8_t * data, size_t len) {+ const fs::path dst = fs::u8path(path);+ const fs::path tmp = fs::u8path(path + ".tmp." + std::to_string(ggml_getpid()));+ {+ std::ofstream f(tmp, std::ios::binary | std::ios::trunc);+ if (!f) { return false; }+ f.write((const char *) data, (std::streamsize) len);+ if (!f.good()) {+ std::error_code ec_rm;+ fs::remove(tmp, ec_rm);+ return false;+ }+ }++ std::error_code ec;+ fs::rename(tmp, dst, ec);+ if (ec) {+ std::error_code ec_rm;+ fs::remove(tmp, ec_rm);+ return false;+ }+ return true;+}++} // namespace++static bool cache_debug_enabled() {+ static int cached = -1;+ if (cached < 0) {+ const char * e = std::getenv("GGML_OPENCL_KERNEL_CACHE_DEBUG");+ cached = (e && *e) ? 1 : 0;+ }+ return cached != 0;+}++static std::string opts_preview(const std::string & opts, size_t n = 120) {+ if (opts.size() <= n) { return opts; }+ return opts.substr(0, n) + "...";+}++// Running cache tally (diagnostic; plain ints — a benign race in the rare+// multi-threaded lazy-compile case at worst miscounts by one).+static int g_cache_hits = 0, g_cache_misses = 0, g_cache_saves = 0;++// Debug trace directly to stderr+static void cache_debug_line(const char * kind, const std::string & key,+ const char * source, const std::string & opts) {+ if (!cache_debug_enabled()) { return; }+ fprintf(stderr, "ggml_opencl: cache %-4s [h=%d m=%d s=%d] key=%s src=%zuB opts='%s'\n",+ kind, g_cache_hits, g_cache_misses, g_cache_saves,+ key.substr(0, 16).c_str(), strlen(source), opts_preview(opts).c_str());+ fflush(stderr);+}++cl_program_cache_state cl_program_cache_init(cl_device_id device) {+ cl_program_cache_state st;++ const char * env = std::getenv("GGML_OPENCL_KERNEL_CACHE_DIR");+ if (env && (!std::strcmp(env, "0") || !std::strcmp(env, "off") ||+ !std::strcmp(env, "none") || !std::strcmp(env, "disable") ||+ !std::strcmp(env, "disabled"))) {+ if (cache_debug_enabled()) {+ fprintf(stderr, "ggml_opencl: kernel cache disabled by GGML_OPENCL_KERNEL_CACHE_DIR=%s\n", env);+ fflush(stderr);+ }+ return st;+ }++ std::string dir;+ if (!env || !*env || !std::strcmp(env, "1") || !std::strcmp(env, "default")) {+ dir = default_cache_dir();+ if (dir.empty()) {+ GGML_LOG_INFO("ggml_opencl: kernel cache disabled (no usable default cache directory)\n");+ return st;+ }+ } else {+ dir = env;+ }++ if (!make_dir_recursive(dir)) {+ GGML_LOG_INFO("ggml_opencl: kernel cache disabled (cannot create directory '%s')\n", dir.c_str());+ return st;+ }++ st.dir = dir;+ st.key_suffix = compute_key_suffix(device);+ GGML_LOG_INFO("ggml_opencl: kernel cache enabled at '%s'\n", st.dir.c_str());+ if (cache_debug_enabled()) {+ fprintf(stderr, "ggml_opencl: kernel cache enabled at '%s' "+ "(GGML_OPENCL_KERNEL_CACHE_DIR=off to disable)\n", st.dir.c_str());+ fflush(stderr);+ }+ return st;+}++cl_program cl_program_cache_try_load(+ const cl_program_cache_state & state,+ cl_context context,+ cl_device_id device,+ const char * source,+ const std::string & compile_opts) {++ if (state.dir.empty() || !source) { return nullptr; }++ const std::string key = compute_key(state.key_suffix, source, compile_opts);+ const std::string path = state.dir + "/" + key + ".clbin";++ std::vector<uint8_t> file;+ if (!read_all(path, file)) {+ ++g_cache_misses;+ cache_debug_line("MISS", key, source, compile_opts);+ return nullptr;+ }+ if (file.size() < 16 || std::memcmp(file.data(), MAGIC, 8) != 0) { return nullptr; }++ uint32_t fmt =+ ((uint32_t) file[ 8]) | ((uint32_t) file[ 9] << 8) |+ ((uint32_t) file[10] << 16) | ((uint32_t) file[11] << 24);+ if (fmt != CL_PROGRAM_CACHE_FORMAT_VERSION) { return nullptr; }++ const size_t hdr_len = 16;+ const unsigned char * bin = file.data() + hdr_len;+ const size_t bin_len = file.size() - hdr_len;++ cl_int err = CL_SUCCESS;+ cl_int bin_err = CL_SUCCESS;+ cl_program p = clCreateProgramWithBinary(context, 1, &device, &bin_len, &bin, &bin_err, &err);+ if (err != CL_SUCCESS || bin_err != CL_SUCCESS || p == nullptr) {+ if (p) { clReleaseProgram(p); }+ return nullptr;+ }++ err = clBuildProgram(p, 0, nullptr, compile_opts.c_str(), nullptr, nullptr);+ if (err != CL_SUCCESS) {+ clReleaseProgram(p);+ return nullptr;+ }+ ++g_cache_hits;+ cache_debug_line("HIT", key, source, compile_opts);+ return p;+}++void cl_program_cache_try_save(+ const cl_program_cache_state & state,+ cl_program program,+ cl_device_id /*device*/,+ const char * source,+ const std::string & compile_opts) {++ if (state.dir.empty() || !program || !source) {+ return;+ }++ cl_uint n_dev = 0;+ if (clGetProgramInfo(program, CL_PROGRAM_NUM_DEVICES, sizeof(n_dev), &n_dev, nullptr) != CL_SUCCESS || n_dev == 0) {+ return;+ }++ std::vector<size_t> sizes(n_dev);+ if (clGetProgramInfo(program, CL_PROGRAM_BINARY_SIZES, sizeof(size_t) * n_dev, sizes.data(), nullptr) != CL_SUCCESS) {+ return;+ }+ if (sizes.empty() || sizes[0] == 0) {+ return;+ }++ std::vector<std::vector<uint8_t>> binaries(n_dev);+ std::vector<unsigned char *> bin_ptrs(n_dev);+ for (cl_uint i = 0; i < n_dev; ++i) {+ binaries[i].resize(sizes[i]);+ bin_ptrs[i] = binaries[i].data();+ }+ if (clGetProgramInfo(program, CL_PROGRAM_BINARIES, sizeof(unsigned char *) * n_dev, bin_ptrs.data(), nullptr) != CL_SUCCESS) {+ return;+ }++ // We only care about the first device's binary — that's the one we'd+ // re-load with on a future cache hit. Multi-device contexts aren't a+ // pattern this backend uses today.+ const std::vector<uint8_t> & bin = binaries[0];++ std::vector<uint8_t> file;+ file.reserve(16 + bin.size());+ file.insert(file.end(), MAGIC, MAGIC + 8);+ uint32_t fmt = CL_PROGRAM_CACHE_FORMAT_VERSION;+ file.push_back((uint8_t) (fmt & 0xff));+ file.push_back((uint8_t) ((fmt >> 8) & 0xff));+ file.push_back((uint8_t) ((fmt >> 16) & 0xff));+ file.push_back((uint8_t) ((fmt >> 24) & 0xff));+ file.push_back(0); file.push_back(0); file.push_back(0); file.push_back(0); // reserved+ file.insert(file.end(), bin.begin(), bin.end());++ const std::string key = compute_key(state.key_suffix, source, compile_opts);+ const std::string path = state.dir + "/" + key + ".clbin";+ if (!write_atomic(path, file.data(), file.size())) {+ GGML_LOG_INFO("ggml_opencl: kernel cache: failed to write '%s'\n", path.c_str());+ } else {+ ++g_cache_saves;+ cache_debug_line("SAVE", key, source, compile_opts);+ }+}diff --git a/ggml/src/ggml-opencl/cl-program-cache.h b/ggml/src/ggml-opencl/cl-program-cache.hnew file mode 100644index 0000000000..49aa2d1e82--- /dev/null+++ b/ggml/src/ggml-opencl/cl-program-cache.h@@ -0,0 +1,75 @@+// On-disk cache for OpenCL cl_program binaries. Lets a fresh process skip the+// expensive clBuildProgram-from-source step when a binary for the exact same+// (source, compile options, device, driver, platform) was previously saved.+//+// Activation: default on via GGML_OPENCL_KERNEL_CACHE_DIR:+// unset / empty / "1" / "default" : platform default cache dir+// (%LOCALAPPDATA%\llama.cpp\cl-cache,+// ~/Library/Caches/llama.cpp/cl-cache,+// <temp dir>/llama.cpp/cl-cache elsewhere)+// "0" / "off" / "none" / "disable(d)" : disabled (all functions no-op)+// any other value : used verbatim as the cache path+// If the chosen directory cannot be created/used, the cache silently disables+// itself for the process and falls back to source compile.+// GGML_OPENCL_KERNEL_CACHE_DEBUG=1 prints a HIT/MISS/SAVE trace (with a running+// tally) straight to stderr — visible even in tools that filter INFO/WARN logs;+// redirect stderr to record it.+//+// Cache key (SHA-256 hex):+// sha256(source_bytes || '\x00' ||+// compile_opts || '\x00' ||+// CL_DEVICE_NAME || '\x00' ||+// CL_DRIVER_VERSION || '\x00' ||+// CL_PLATFORM_VERSION || '\x00' ||+// CL_PROGRAM_CACHE_FORMAT_VERSION)+//+// The key fully captures everything that can affect the produced binary,+// without needing the host source revision (a kernel source change shows up+// in source_bytes; a compile-option change shows up in compile_opts).+//+// File layout per cache entry: <cache_dir>/<sha256-hex>.clbin+// bytes [0..7] : magic "GGMLCLBC"+// bytes [8..11] : uint32_t format version (CL_PROGRAM_CACHE_FORMAT_VERSION)+// bytes [12..15] : uint32_t reserved (0)+// bytes [16..] : raw cl_program binary as returned by+// clGetProgramInfo(CL_PROGRAM_BINARIES)+//+// Concurrency: writes go to <name>.tmp.<pid> then atomic rename. On race,+// last-writer-wins. No locks.++#pragma once++#include <CL/cl.h>+#include <string>++// Bumped manually if host-side OpenCL API usage changes in a way that+// affects compile semantics but does not show up in source_bytes /+// compile_opts (e.g. switching from clCreateProgramWithSource to+// clCompileProgram + clLinkProgram, or changing how multiple sources+// are concatenated). Most commits — including kernel changes — do NOT+// require bumping this; the source bytes already capture those.+#define CL_PROGRAM_CACHE_FORMAT_VERSION 1u++struct cl_program_cache_state {+ // Empty string means cache is disabled.+ std::string dir;+ // Concatenated device/driver/platform identity + cache format version,+ // computed once at init and folded into every key.+ std::string key_suffix;+};++cl_program_cache_state cl_program_cache_init(cl_device_id device);++cl_program cl_program_cache_try_load(+ const cl_program_cache_state & state,+ cl_context context,+ cl_device_id device,+ const char * source,+ const std::string & compile_opts);++void cl_program_cache_try_save(+ const cl_program_cache_state & state,+ cl_program program,+ cl_device_id device,+ const char * source,+ const std::string & compile_opts);diff --git a/ggml/src/ggml-opencl/ggml-opencl.cpp b/ggml/src/ggml-opencl/ggml-opencl.cppindex daffd825b5..b6079d0808 100644--- a/ggml/src/ggml-opencl/ggml-opencl.cpp+++ b/ggml/src/ggml-opencl/ggml-opencl.cpp@@ -13,6 +13,8 @@#include "ggml-backend-impl.h"#include "ggml.h"+#include "cl-program-cache.h"+#ifdef GGML_OPENCL_USE_ADRENO_BIN_KERNELS#include "libdl.h"#ifdef _WIN32@@ -594,6 +596,10 @@ struct ggml_backend_opencl_context {cl_context context;cl_command_queue queue;+ // On-disk compiled-program cache (see GGML_OPENCL_KERNEL_CACHE_DIR).+ cl_program_cache_state program_cache;+ bool program_cache_initialized = false;+// prealloc buffers for transposing weights and activationsggml_cl_buffer prealloc_quant_trans;ggml_cl_buffer prealloc_scales_trans;@@ -1192,8 +1198,25 @@ static cl_program build_program_from_source_ex(cl_context ctx, cl_device_id dev,return NULL;}-static cl_program build_program_from_source(cl_context ctx, cl_device_id dev, const char* program_buffer, const std::string &compile_opts) {- return build_program_from_source_ex(ctx, dev, program_buffer, compile_opts, /*fatal=*/true);+static cl_program build_program_from_source(ggml_backend_opencl_context * backend_ctx, const char* program_buffer, const std::string &compile_opts) {+ cl_context ctx = backend_ctx->context;+ cl_device_id dev = backend_ctx->device;++ // Try the on-disk binary cache first. Falls through silently on miss or+ // any failure; never blocks the build path. Disabled cache => nullptr.+ cl_program p_cached = cl_program_cache_try_load(+ backend_ctx->program_cache, ctx, dev, program_buffer, compile_opts);+ if (p_cached != nullptr) {+ return p_cached;+ }++ cl_program p = build_program_from_source_ex(ctx, dev, program_buffer, compile_opts, /*fatal=*/true);++ // Best-effort save of the freshly-built binary (no-op if cache disabled).+ if (p != nullptr) {+ cl_program_cache_try_save(backend_ctx->program_cache, p, dev, program_buffer, compile_opts);+ }+ return p;}static cl_program build_program_from_binary(cl_context ctx, cl_device_id dev, const char* program_buffer, const std::string &compile_opts, size_t bin_size = 0) {@@ -1241,7 +1264,7 @@ static void load_cl_kernels_argsort(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("argsort.cl");#endifbackend_ctx->program_argsort_f32_i32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_argsort_f32_i32 = clCreateKernel(backend_ctx->program_argsort_f32_i32, "kernel_argsort_f32_i32", &err), err));backend_ctx->kernels_loaded_argsort = true;@@ -1291,7 +1314,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("add.cl");#endifbackend_ctx->program_add =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_add = clCreateKernel(backend_ctx->program_add, "kernel_add", &err), err));CL_CHECK((backend_ctx->kernel_add_row = clCreateKernel(backend_ctx->program_add, "kernel_add_row", &err), err));@@ -1310,7 +1333,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("add_id.cl");#endifbackend_ctx->program_add_id =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_add_id = clCreateKernel(backend_ctx->program_add_id, "kernel_add_id", &err), err));GGML_LOG_CONT(".");@@ -1326,7 +1349,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("tri.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_tri = clCreateKernel(prog, "kernel_tri_f32", &err), err));GGML_LOG_CONT(".");@@ -1344,7 +1367,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("fill.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_fill = clCreateKernel(prog, "kernel_fill_f32", &err), err));GGML_LOG_CONT(".");@@ -1362,7 +1385,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("clamp.cl");#endifbackend_ctx->program_clamp =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_clamp = clCreateKernel(backend_ctx->program_clamp, "kernel_clamp", &err), err));GGML_LOG_CONT(".");@@ -1378,7 +1401,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("cpy.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_cpy_f16_f16 = clCreateKernel(prog, "kernel_cpy_f16_f16", &err), err));CL_CHECK((backend_ctx->kernel_cpy_f16_f32 = clCreateKernel(prog, "kernel_cpy_f16_f32", &err), err));@@ -1399,7 +1422,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("cvt.cl");#endifbackend_ctx->program_cvt =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_convert_block_q1_0 = clCreateKernel(backend_ctx->program_cvt, "kernel_convert_block_q1_0", &err), err));CL_CHECK((backend_ctx->kernel_restore_block_q1_0 = clCreateKernel(backend_ctx->program_cvt, "kernel_restore_block_q1_0", &err), err));@@ -1482,7 +1505,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("diag_mask_inf.cl");#endifbackend_ctx->program_diag_mask_inf =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_diag_mask_inf_8 = clCreateKernel(backend_ctx->program_diag_mask_inf, "kernel_diag_mask_inf_8", &err), err));CL_CHECK((backend_ctx->kernel_diag_mask_inf = clCreateKernel(backend_ctx->program_diag_mask_inf, "kernel_diag_mask_inf", &err), err));@@ -1499,7 +1522,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("diag.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_diag_f32 = clCreateKernel(prog, "kernel_diag_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1516,7 +1539,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gelu.cl");#endifbackend_ctx->program_gelu =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gelu = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu", &err), err));CL_CHECK((backend_ctx->kernel_gelu_4 = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_4", &err), err));@@ -1537,7 +1560,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("glu.cl");#endifbackend_ctx->program_glu =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_geglu = clCreateKernel(backend_ctx->program_glu, "kernel_geglu", &err), err));CL_CHECK((backend_ctx->kernel_reglu = clCreateKernel(backend_ctx->program_glu, "kernel_reglu", &err), err));@@ -1563,7 +1586,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("get_rows.cl");#endifbackend_ctx->program_get_rows =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_get_rows_f32 = clCreateKernel(backend_ctx->program_get_rows, "kernel_get_rows_f32", &err), err));CL_CHECK((backend_ctx->kernel_get_rows_f16 = clCreateKernel(backend_ctx->program_get_rows, "kernel_get_rows_f16", &err), err));@@ -1581,7 +1604,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("solve_tri.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_solve_tri_f32 = clCreateKernel(prog, "kernel_solve_tri_f32", &err), err));GGML_LOG_CONT(".");@@ -1598,7 +1621,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("im2col_f32.cl");#endifbackend_ctx->program_im2col_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_im2col_f32 = clCreateKernel(backend_ctx->program_im2col_f32, "kernel_im2col_f32", &err), err));GGML_LOG_CONT(".");@@ -1614,7 +1637,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("im2col_f16.cl");#endifbackend_ctx->program_im2col_f16 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_im2col_f16 = clCreateKernel(backend_ctx->program_im2col_f16, "kernel_im2col_f16", &err), err));GGML_LOG_CONT(".");@@ -1630,7 +1653,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_0_f32.cl");#endifbackend_ctx->program_mul_mv_q4_0_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_q4_0_f32 = clCreateKernel(backend_ctx->program_mul_mv_q4_0_f32, "kernel_mul_mat_q4_0_f32", &err), err));GGML_LOG_CONT(".");@@ -1646,7 +1669,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_0_f32_v.cl");#endifbackend_ctx->program_mul_mv_q4_0_f32_v =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_q4_0_f32_v = clCreateKernel(backend_ctx->program_mul_mv_q4_0_f32_v, "kernel_mul_mat_q4_0_f32_v", &err), err));GGML_LOG_CONT(".");@@ -1662,7 +1685,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_0_f32_8x_flat.cl");#endifbackend_ctx->program_mul_mv_q4_0_f32_8x_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_q4_0_f32_8x_flat = clCreateKernel(backend_ctx->program_mul_mv_q4_0_f32_8x_flat, "kernel_mul_mat_q4_0_f32_8x_flat", &err), err));GGML_LOG_CONT(".");@@ -1683,7 +1706,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_0_f32_1d_8x_flat.cl");#endifbackend_ctx->program_mul_mv_q4_0_f32_1d_8x_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_q4_0_f32_1d_8x_flat = clCreateKernel(backend_ctx->program_mul_mv_q4_0_f32_1d_8x_flat, "kernel_mul_mat_q4_0_f32_1d_8x_flat", &err), err));GGML_LOG_CONT(".");@@ -1703,7 +1726,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_0_f32_1d_16x_flat.cl");#endifbackend_ctx->program_mul_mv_q4_0_f32_1d_16x_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_q4_0_f32_1d_16x_flat = clCreateKernel(backend_ctx->program_mul_mv_q4_0_f32_1d_16x_flat, "kernel_mul_mat_q4_0_f32_1d_16x_flat", &err), err));GGML_LOG_CONT(".");@@ -1719,7 +1742,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_1_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q4_1_f32 = clCreateKernel(prog, "kernel_mul_mv_q4_1_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1736,7 +1759,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_1_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q4_1_f32_flat = clCreateKernel(prog, "kernel_mul_mv_q4_1_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1753,7 +1776,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_k_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q4_K_f32 = clCreateKernel(prog, "kernel_mul_mv_q4_K_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1770,7 +1793,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q4_k_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q4_K_f32_flat = clCreateKernel(prog, "kernel_mul_mv_q4_K_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1787,7 +1810,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q5_0_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q5_0_f32 = clCreateKernel(prog, "kernel_mul_mv_q5_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1804,7 +1827,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q5_0_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q5_0_f32_flat = clCreateKernel(prog, "kernel_mul_mv_q5_0_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1821,7 +1844,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q5_1_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q5_1_f32 = clCreateKernel(prog, "kernel_mul_mv_q5_1_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1838,7 +1861,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q5_1_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q5_1_f32_flat = clCreateKernel(prog, "kernel_mul_mv_q5_1_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1855,7 +1878,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q5_k_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q5_K_f32 = clCreateKernel(prog, "kernel_mul_mv_q5_K_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1872,7 +1895,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q5_k_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q5_K_f32_flat = clCreateKernel(prog, "kernel_mul_mv_q5_K_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1888,7 +1911,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q6_k_f32.cl");#endifbackend_ctx->program_mul_mv_q6_K =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q6_K_f32 = clCreateKernel(backend_ctx->program_mul_mv_q6_K, "kernel_mul_mv_q6_K_f32", &err), err));GGML_LOG_CONT(".");@@ -1904,7 +1927,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q6_k_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q6_K_f32_flat = clCreateKernel(prog, "kernel_mul_mv_q6_K_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1921,7 +1944,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q8_0_f32.cl");#endifbackend_ctx->program_mul_mv_q8_0_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q8_0_f32 = clCreateKernel(backend_ctx->program_mul_mv_q8_0_f32, "kernel_mul_mv_q8_0_f32", &err), err));GGML_LOG_CONT(".");@@ -1937,7 +1960,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q8_0_f32_flat.cl");#endifbackend_ctx->program_mul_mv_q8_0_f32_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q8_0_f32_flat = clCreateKernel(backend_ctx->program_mul_mv_q8_0_f32_flat, "kernel_mul_mv_q8_0_f32_flat", &err), err));GGML_LOG_CONT(".");@@ -1953,7 +1976,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q1_0_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q1_0_f32 = clCreateKernel(prog, "kernel_mul_mv_q1_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1970,7 +1993,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_q1_0_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_q1_0_f32_flat = clCreateKernel(prog, "kernel_mul_mv_q1_0_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -1987,7 +2010,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_iq4_nl_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_iq4_nl_f32 = clCreateKernel(prog, "kernel_mul_mv_iq4_nl_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2004,7 +2027,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_iq4_nl_f32_flat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_iq4_nl_f32_flat = clCreateKernel(prog, "kernel_mul_mv_iq4_nl_f32_flat", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2021,7 +2044,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_mxfp4_f32.cl");#endifbackend_ctx->program_mul_mv_mxfp4_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_mxfp4_f32 = clCreateKernel(backend_ctx->program_mul_mv_mxfp4_f32, "kernel_mul_mv_mxfp4_f32", &err), err));GGML_LOG_CONT(".");@@ -2037,7 +2060,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_mxfp4_f32_flat.cl");#endifbackend_ctx->program_mul_mv_mxfp4_f32_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_mxfp4_f32_flat = clCreateKernel(backend_ctx->program_mul_mv_mxfp4_f32_flat, "kernel_mul_mv_mxfp4_f32_flat", &err), err));GGML_LOG_CONT(".");@@ -2053,7 +2076,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_f16_f16.cl");#endifbackend_ctx->program_mul_mv_f16_f16 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_f16_f16 = clCreateKernel(backend_ctx->program_mul_mv_f16_f16, "kernel_mul_mat_f16_f16", &err), err));GGML_LOG_CONT(".");@@ -2069,7 +2092,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_f16_f32_1row.cl");#endifbackend_ctx->program_mul_mv_f16_f32_1row =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_f16_f32_1row = clCreateKernel(backend_ctx->program_mul_mv_f16_f32_1row, "kernel_mul_mat_f16_f32_1row", &err), err));GGML_LOG_CONT(".");@@ -2085,7 +2108,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_f16_f32_l4.cl");#endifbackend_ctx->program_mul_mv_f16_f32_l4 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_f16_f32_l4 = clCreateKernel(backend_ctx->program_mul_mv_f16_f32_l4, "kernel_mul_mat_f16_f32_l4", &err), err));CL_CHECK((backend_ctx->kernel_mul_mat_f16_f32_l4_dr = clCreateKernel(backend_ctx->program_mul_mv_f16_f32_l4, "kernel_mul_mat_f16_f32_l4_dr", &err), err));@@ -2151,7 +2174,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_f16_f32.cl");#endifbackend_ctx->program_mul_mv_f16_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_f16_f32 = clCreateKernel(backend_ctx->program_mul_mv_f16_f32, "kernel_mul_mat_f16_f32", &err), err));GGML_LOG_CONT(".");@@ -2167,7 +2190,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_f32_f32.cl");#endifbackend_ctx->program_mul_mv_f32_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_f32_f32 = clCreateKernel(backend_ctx->program_mul_mv_f32_f32, "kernel_mul_mat_f32_f32", &err), err));GGML_LOG_CONT(".");@@ -2183,7 +2206,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mat_f16_f32.cl");#endifbackend_ctx->program_mul_mat_f16_f32_tiled =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mat_f16_f32_tiled = clCreateKernel(backend_ctx->program_mul_mat_f16_f32_tiled, "mul_mat_f16_f32", &err), err));GGML_LOG_CONT(".");@@ -2200,7 +2223,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_xmem_f16_f32_os8.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_adreno_xmem_pack_src_f32 =clCreateKernel(prog, "adreno_xmem_pack_src_f32", &err), err));@@ -2225,7 +2248,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_f32_f32_l4_lm.cl");#endifbackend_ctx->program_mul_mm_f32_f32_l4_lm =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_f32_f32_l4_lm = clCreateKernel(backend_ctx->program_mul_mm_f32_f32_l4_lm, "kernel_mul_mm_f32_f32_l4_lm", &err), err));GGML_LOG_CONT(".");@@ -2241,7 +2264,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_f16_f32_l4_lm.cl");#endifbackend_ctx->program_mul_mm_f16_f32_l4_lm =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_f16_f32_l4_lm = clCreateKernel(backend_ctx->program_mul_mm_f16_f32_l4_lm, "kernel_mul_mm_f16_f32_l4_lm", &err), err));GGML_LOG_CONT(".");@@ -2257,7 +2280,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q4_0_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q4_0_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q4_0_f32_l4_lm", &err), err));GGML_LOG_CONT(".");@@ -2273,7 +2296,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q4_1_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q4_1_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q4_1_f32_l4_lm", &err), err));GGML_LOG_CONT(".");@@ -2289,7 +2312,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q5_0_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q5_0_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q5_0_f32_l4_lm", &err), err));GGML_LOG_CONT(".");@@ -2305,7 +2328,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q5_1_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q5_1_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q5_1_f32_l4_lm", &err), err));GGML_LOG_CONT(".");@@ -2321,7 +2344,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q8_0_f32_l4_lm.cl");#endifbackend_ctx->program_mul_mm_q8_0_f32_l4_lm =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q8_0_f32_l4_lm = clCreateKernel(backend_ctx->program_mul_mm_q8_0_f32_l4_lm, "kernel_mul_mm_q8_0_f32_l4_lm", &err), err));GGML_LOG_CONT(".");@@ -2337,7 +2360,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q1_0_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q1_0_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q1_0_f32_l4_lm", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2354,7 +2377,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_iq4_nl_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_iq4_nl_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_iq4_nl_f32_l4_lm", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2371,7 +2394,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q4_k_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q4_k_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q4_k_f32_l4_lm", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2388,7 +2411,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q6_k_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q6_k_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q6_k_f32_l4_lm", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2405,7 +2428,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_q5_k_f32_l4_lm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_q5_k_f32_l4_lm = clCreateKernel(prog, "kernel_mul_mm_q5_k_f32_l4_lm", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2422,9 +2445,9 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mm_f16_f32_kq_kqv.cl");#endifbackend_ctx->program_mul_mm_f16_f32_kqv =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts+" -DKQV ");+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts+" -DKQV ");backend_ctx->program_mul_mm_f16_f32_kq =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mm_f16_f32_kqv = clCreateKernel(backend_ctx->program_mul_mm_f16_f32_kqv, "mul_mm_f16_f32_kqv", &err), err));CL_CHECK((backend_ctx->kernel_mul_mm_f16_f32_kq = clCreateKernel(backend_ctx->program_mul_mm_f16_f32_kq, "mul_mm_f16_f32_kq", &err), err));@@ -2441,7 +2464,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul.cl");#endifbackend_ctx->program_mul =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul = clCreateKernel(backend_ctx->program_mul, "kernel_mul", &err), err));CL_CHECK((backend_ctx->kernel_mul_row = clCreateKernel(backend_ctx->program_mul, "kernel_mul_row", &err), err));@@ -2460,7 +2483,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("norm.cl");#endifbackend_ctx->program_norm =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_norm = clCreateKernel(backend_ctx->program_norm, "kernel_norm", &err), err));CL_CHECK((backend_ctx->kernel_norm_mul_add = clCreateKernel(backend_ctx->program_norm, "kernel_norm_mul_add", &err), err));@@ -2477,7 +2500,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("relu.cl");#endifbackend_ctx->program_relu =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_relu = clCreateKernel(backend_ctx->program_relu, "kernel_relu", &err), err));GGML_LOG_CONT(".");@@ -2493,7 +2516,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("rms_norm.cl");#endifbackend_ctx->program_rms_norm =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_rms_norm = clCreateKernel(backend_ctx->program_rms_norm, "kernel_rms_norm", &err), err));CL_CHECK((backend_ctx->kernel_rms_norm_mul = clCreateKernel(backend_ctx->program_rms_norm, "kernel_rms_norm_mul", &err), err));@@ -2510,7 +2533,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("l2_norm.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_l2_norm_f32 = clCreateKernel(prog, "kernel_l2_norm_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -2527,7 +2550,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("rope.cl");#endifbackend_ctx->program_rope =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_rope_norm_f32 = clCreateKernel(backend_ctx->program_rope, "kernel_rope_norm_f32", &err), err));CL_CHECK((backend_ctx->kernel_rope_norm_f16 = clCreateKernel(backend_ctx->program_rope, "kernel_rope_norm_f16", &err), err));@@ -2550,7 +2573,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("scale.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_scale_f32 = clCreateKernel(prog, "kernel_scale_f32", &err), err));CL_CHECK((backend_ctx->kernel_scale_f32_4 = clCreateKernel(prog, "kernel_scale_f32_4", &err), err));@@ -2568,7 +2591,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("silu.cl");#endifbackend_ctx->program_silu =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_silu = clCreateKernel(backend_ctx->program_silu, "kernel_silu", &err), err));CL_CHECK((backend_ctx->kernel_silu_4 = clCreateKernel(backend_ctx->program_silu, "kernel_silu_4", &err), err));@@ -2585,7 +2608,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("softmax_f32.cl");#endifbackend_ctx->program_softmax_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_soft_max = clCreateKernel(backend_ctx->program_softmax_f32, "kernel_soft_max", &err), err));GGML_LOG_CONT(".");@@ -2601,7 +2624,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("softmax_f16.cl");#endifbackend_ctx->program_softmax_f16 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_soft_max_f16 = clCreateKernel(backend_ctx->program_softmax_f16, "kernel_soft_max_f16", &err), err));GGML_LOG_CONT(".");@@ -2617,7 +2640,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("softmax_4_f32.cl");#endifbackend_ctx->program_softmax_4_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_soft_max_4 = clCreateKernel(backend_ctx->program_softmax_4_f32, "kernel_soft_max_4", &err), err));GGML_LOG_CONT(".");@@ -2633,7 +2656,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("softmax_4_f16.cl");#endifbackend_ctx->program_softmax_4_f16 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_soft_max_4_f16 = clCreateKernel(backend_ctx->program_softmax_4_f16, "kernel_soft_max_4_f16", &err), err));GGML_LOG_CONT(".");@@ -2652,7 +2675,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {" -cl-mad-enable -cl-finite-math-only ";backend_ctx->program_div =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_div = clCreateKernel(backend_ctx->program_div, "kernel_div", &err), err));CL_CHECK((backend_ctx->kernel_div_row = clCreateKernel(backend_ctx->program_div, "kernel_div_row", &err), err));@@ -2671,7 +2694,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("sqr.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_sqr_cont_f32 = clCreateKernel(prog, "kernel_sqr_cont_f32", &err), err));CL_CHECK((backend_ctx->kernel_sqr_cont_f32_4 = clCreateKernel(prog, "kernel_sqr_cont_f32_4", &err), err));@@ -2692,7 +2715,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("sqrt.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_sqrt_cont_f32 = clCreateKernel(prog, "kernel_sqrt_cont_f32", &err), err));CL_CHECK((backend_ctx->kernel_sqrt_cont_f32_4 = clCreateKernel(prog, "kernel_sqrt_cont_f32_4", &err), err));@@ -2713,7 +2736,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mean.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mean_f32 = clCreateKernel(prog, "kernel_mean_f32", &err), err));CL_CHECK((backend_ctx->kernel_mean_f32_4 = clCreateKernel(prog, "kernel_mean_f32_4", &err), err));@@ -2732,7 +2755,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("sub.cl");#endifbackend_ctx->program_sub =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_sub = clCreateKernel(backend_ctx->program_sub, "kernel_sub", &err), err));CL_CHECK((backend_ctx->kernel_sub_row = clCreateKernel(backend_ctx->program_sub, "kernel_sub_row", &err), err));@@ -2751,7 +2774,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("sum_rows.cl");#endifbackend_ctx->program_sum_rows_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_sum_rows_f32 = clCreateKernel(backend_ctx->program_sum_rows_f32, "kernel_sum_rows_f32", &err), err));CL_CHECK((backend_ctx->kernel_sum_rows_f32_4 = clCreateKernel(backend_ctx->program_sum_rows_f32, "kernel_sum_rows_f32_4", &err), err));@@ -2768,7 +2791,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("cumsum.cl");#endifcl_program prog;- prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_cumsum_blk = clCreateKernel(prog, "kernel_cumsum_blk", &err), err));CL_CHECK((backend_ctx->kernel_cumsum_add = clCreateKernel(prog, "kernel_cumsum_add", &err), err));@@ -2786,7 +2809,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("sigmoid.cl");#endifbackend_ctx->program_sigmoid =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_sigmoid_f32 = clCreateKernel(backend_ctx->program_sigmoid, "kernel_sigmoid_f32", &err), err));CL_CHECK((backend_ctx->kernel_sigmoid_f16 = clCreateKernel(backend_ctx->program_sigmoid, "kernel_sigmoid_f16", &err), err));@@ -2803,7 +2826,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("group_norm.cl");#endifbackend_ctx->program_group_norm =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_group_norm = clCreateKernel(backend_ctx->program_group_norm, "kernel_group_norm", &err), err));CL_CHECK((backend_ctx->kernel_group_norm_mul_add = clCreateKernel(backend_ctx->program_group_norm, "kernel_group_norm_mul_add", &err), err));@@ -2820,7 +2843,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("repeat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_repeat_f32 = clCreateKernel(prog, "kernel_repeat_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -2837,7 +2860,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#endifif (!kernel_src.empty()) {backend_ctx->program_pad =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_pad = clCreateKernel(backend_ctx->program_pad, "kernel_pad", &err), err));GGML_LOG_CONT(".");} else {@@ -2857,7 +2880,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("tanh.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_tanh_f32 = clCreateKernel(prog, "kernel_tanh_f32", &err), err));CL_CHECK((backend_ctx->kernel_tanh_f32_4 = clCreateKernel(prog, "kernel_tanh_f32_4", &err), err));CL_CHECK((backend_ctx->kernel_tanh_f32_nc = clCreateKernel(prog, "kernel_tanh_f32_nc", &err), err));@@ -2878,7 +2901,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("neg.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_neg_f32 = clCreateKernel(prog, "kernel_neg_f32", &err), err));CL_CHECK((backend_ctx->kernel_neg_f32_4 = clCreateKernel(prog, "kernel_neg_f32_4", &err), err));CL_CHECK((backend_ctx->kernel_neg_f32_nc = clCreateKernel(prog, "kernel_neg_f32_nc", &err), err));@@ -2899,7 +2922,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("exp.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_exp_f32 = clCreateKernel(prog, "kernel_exp_f32", &err), err));CL_CHECK((backend_ctx->kernel_exp_f32_4 = clCreateKernel(prog, "kernel_exp_f32_4", &err), err));CL_CHECK((backend_ctx->kernel_exp_f32_nc = clCreateKernel(prog, "kernel_exp_f32_nc", &err), err));@@ -2920,7 +2943,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("expm1.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_expm1_f32 = clCreateKernel(prog, "kernel_expm1_f32", &err), err));CL_CHECK((backend_ctx->kernel_expm1_f32_4 = clCreateKernel(prog, "kernel_expm1_f32_4", &err), err));CL_CHECK((backend_ctx->kernel_expm1_f32_nc = clCreateKernel(prog, "kernel_expm1_f32_nc", &err), err));@@ -2941,7 +2964,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("abs.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_abs_f32 = clCreateKernel(prog, "kernel_abs_f32", &err), err));CL_CHECK((backend_ctx->kernel_abs_f32_4 = clCreateKernel(prog, "kernel_abs_f32_4", &err), err));CL_CHECK((backend_ctx->kernel_abs_f32_nc = clCreateKernel(prog, "kernel_abs_f32_nc", &err), err));@@ -2962,7 +2985,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("softplus.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_softplus_f32 = clCreateKernel(prog, "kernel_softplus_f32", &err), err));CL_CHECK((backend_ctx->kernel_softplus_f32_4 = clCreateKernel(prog, "kernel_softplus_f32_4", &err), err));CL_CHECK((backend_ctx->kernel_softplus_f32_nc = clCreateKernel(prog, "kernel_softplus_f32_nc", &err), err));@@ -2984,7 +3007,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#endifif (!kernel_src.empty()) {backend_ctx->program_upscale =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_upscale = clCreateKernel(backend_ctx->program_upscale, "kernel_upscale", &err), err));if (backend_ctx->program_upscale) {cl_int err_bilinear;@@ -3015,7 +3038,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("concat.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_concat_f32 = clCreateKernel(prog, "kernel_concat_f32", &err), err));CL_CHECK((backend_ctx->kernel_concat_f32_pack = clCreateKernel(prog, "kernel_concat_f32_pack", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3034,7 +3057,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#endifif (!kernel_src.empty()) {backend_ctx->program_tsembd =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_timestep_embedding = clCreateKernel(backend_ctx->program_tsembd, "kernel_timestep_embedding", &err), err));GGML_LOG_CONT(".");} else {@@ -3054,7 +3077,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("set_rows.cl");#endifbackend_ctx->program_set_rows =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_set_rows_f32_i64 = clCreateKernel(backend_ctx->program_set_rows, "kernel_set_rows_f32_i64", &err), err));CL_CHECK((backend_ctx->kernel_set_rows_f32_i32 = clCreateKernel(backend_ctx->program_set_rows, "kernel_set_rows_f32_i32", &err), err));@@ -3086,11 +3109,11 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#endifif (!kernel_src.empty()) {backend_ctx->program_conv_2d_f16 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), (std::string(compile_opts) + " -DUSE_FP16=1").c_str());+ build_program_from_source(backend_ctx, kernel_src.c_str(), (std::string(compile_opts) + " -DUSE_FP16=1").c_str());CL_CHECK((backend_ctx->kernel_conv_2d_f16 = clCreateKernel(backend_ctx->program_conv_2d_f16, "kernel_conv_2d", &err), err));GGML_LOG_CONT(".");backend_ctx->program_conv_2d_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_conv_2d_f32 = clCreateKernel(backend_ctx->program_conv_2d_f32, "kernel_conv_2d", &err), err));GGML_LOG_CONT(".");} else {@@ -3102,7 +3125,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {}if (!kernel_src_f16_f32.empty()) {backend_ctx->program_conv_2d_f16_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src_f16_f32.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src_f16_f32.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_conv_2d_f16_f32 = clCreateKernel(backend_ctx->program_conv_2d_f16_f32, "kernel_conv_2d", &err), err));GGML_LOG_CONT(".");} else {@@ -3122,7 +3145,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("ssm_conv.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_ssm_conv_f32_f32 = clCreateKernel(prog, "kernel_ssm_conv_f32_f32", &err), err));CL_CHECK((backend_ctx->kernel_ssm_conv_f32_f32_4 = clCreateKernel(prog, "kernel_ssm_conv_f32_f32_4", &err), err));@@ -3198,8 +3221,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {// Please remember to implement code to handle it.opts += " -DSUBGROUPS_PER_WG=" + std::to_string(spw);- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), opts);CL_CHECK((backend_ctx->kernel_gated_delta_net_f32[si][kda][tgpp] =clCreateKernel(prog, "kernel_gated_delta_net", &err), err));@@ -3220,7 +3242,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("moe_combine.cl");#endifcl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_moe_combine_f32 =clCreateKernel(prog, "kernel_moe_combine_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3237,7 +3259,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_id_q4_0_f32_8x_flat.cl");#endifbackend_ctx->program_mul_mv_id_q4_0_f32_8x_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_id_q4_0_f32_8x_flat = clCreateKernel(backend_ctx->program_mul_mv_id_q4_0_f32_8x_flat, "kernel_mul_mv_id_q4_0_f32_8x_flat", &err), err));GGML_LOG_CONT(".");@@ -3253,7 +3275,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_id_q8_0_f32.cl");#endifbackend_ctx->program_mul_mv_id_q8_0_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_id_q8_0_f32 = clCreateKernel(backend_ctx->program_mul_mv_id_q8_0_f32, "kernel_mul_mv_id_q8_0_f32", &err), err));GGML_LOG_CONT(".");@@ -3269,7 +3291,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_id_q8_0_f32_flat.cl");#endifbackend_ctx->program_mul_mv_id_q8_0_f32_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_id_q8_0_f32_flat = clCreateKernel(backend_ctx->program_mul_mv_id_q8_0_f32_flat, "kernel_mul_mv_id_q8_0_f32_flat", &err), err));GGML_LOG_CONT(".");@@ -3285,7 +3307,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_id_mxfp4_f32.cl");#endifbackend_ctx->program_mul_mv_id_mxfp4_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_id_mxfp4_f32 = clCreateKernel(backend_ctx->program_mul_mv_id_mxfp4_f32, "kernel_mul_mv_id_mxfp4_f32", &err), err));GGML_LOG_CONT(".");@@ -3301,7 +3323,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("mul_mv_id_mxfp4_f32_flat.cl");#endifbackend_ctx->program_mul_mv_id_mxfp4_f32_flat =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_mul_mv_id_mxfp4_f32_flat = clCreateKernel(backend_ctx->program_mul_mv_id_mxfp4_f32_flat, "kernel_mul_mv_id_mxfp4_f32_flat", &err), err));GGML_LOG_CONT(".");@@ -3319,7 +3341,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("transpose.cl");#endifbackend_ctx->program_transpose =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_transpose_32_16 = clCreateKernel(backend_ctx->program_transpose, "kernel_transpose_32_16", &err), err));CL_CHECK((backend_ctx->kernel_transpose_32 = clCreateKernel(backend_ctx->program_transpose, "kernel_transpose_32", &err), err));@@ -3340,7 +3362,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q1_0_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q1_0_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q1_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3361,8 +3383,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src_CL_gemv_general = read_file("gemv_noshuffle_q1_0_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src_CL_gemv_general.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src_CL_gemv_general.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q1_0_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q1_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3387,8 +3408,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src_CL_gemv_general = read_file("gemv_noshuffle_q4_0_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src_CL_gemv_general.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src_CL_gemv_general.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q4_0_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q4_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3416,8 +3436,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src_CL_gemv = read_file("gemv_noshuffle_q4_0_f32_spec.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q4_0_f32_4096_1_4096 = clCreateKernel(prog, "kernel_gemv_noshuffle_q4_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3433,8 +3452,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {CL_gemv_compile_opts += " -DVECTOR_SUB_GROUP_BROADCAST ";}- prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);+ prog = build_program_from_source(backend_ctx, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q4_0_f32_4096_1_11008 = clCreateKernel(prog, "kernel_gemv_noshuffle_q4_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3450,8 +3468,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {CL_gemv_compile_opts += " -DVECTOR_SUB_GROUP_BROADCAST ";}- prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);+ prog = build_program_from_source(backend_ctx, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q4_0_f32_11008_1_4096 = clCreateKernel(prog, "kernel_gemv_noshuffle_q4_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3468,8 +3485,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {CL_gemv_compile_opts += " -DVECTOR_SUB_GROUP_BROADCAST ";}- prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);+ prog = build_program_from_source(backend_ctx, kernel_src_CL_gemv.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q4_0_f32_32000_1_4096 = clCreateKernel(prog, "kernel_gemv_noshuffle_q4_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3484,7 +3500,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src_CL_gemm = read_file("gemm_noshuffle_q4_0_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src_CL_gemm.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src_CL_gemm.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q4_0_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q4_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3499,7 +3515,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q4_1_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q4_1_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q4_1_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3521,8 +3537,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_noshuffle_q4_1_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q4_1_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q4_1_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3538,7 +3553,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q5_0_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q5_0_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q5_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3553,7 +3568,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q5_0_q8_1_dp4a.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q5_0_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_noshuffle_q5_0_q8_1_dp4a", &err), err));CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q5_0_q8_1_dp4a_wimg = clCreateKernel(prog, "kernel_gemm_noshuffle_q5_0_q8_1_dp4a_wimg", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3575,8 +3590,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemv_noshuffle_q5_0_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q5_0_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q5_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3591,7 +3605,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q5_1_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q5_1_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q5_1_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3612,8 +3626,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemv_noshuffle_q5_1_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q5_1_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q5_1_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3628,7 +3641,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_iq4_nl_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_iq4_nl_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_iq4_nl_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3643,7 +3656,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_iq4_nl_q8_1_dp4a.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_iq4_nl_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_noshuffle_iq4_nl_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3658,7 +3671,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q4_0_q8_1_dp4a.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q4_0_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_noshuffle_q4_0_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3680,8 +3693,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_noshuffle_iq4_nl_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_iq4_nl_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_iq4_nl_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3697,7 +3709,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q8_0_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q8_0_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q8_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3739,8 +3751,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src_CL_gemv_general = read_file("gemv_noshuffle_q8_0_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src_CL_gemv_general.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src_CL_gemv_general.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q8_0_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q8_0_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3756,7 +3767,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q4_k_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q4_k_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q4_k_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3775,9 +3786,9 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {// X1 (1152 B/WG -> few resident WGs); TILESIZE_N=8 (288 B) lifts occupancy on// X1, byte-identical. X2E keeps 32. Env override wins.int q4k_dp4a_ts = (backend_ctx->adreno_gen == ADRENO_GPU_GEN::X1E) ? 8 : 32;- if (const char * e = getenv("GGML_OPENCL_Q4K_DP4A_TS")) q4k_dp4a_ts = atoi(e);+ if (const char * e = getenv("GGML_OPENCL_Q4K_DP4A_TS")) { q4k_dp4a_ts = atoi(e); }std::string dp4a_opts = compile_opts + " -DTILESIZE_N=" + std::to_string(q4k_dp4a_ts);- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), dp4a_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), dp4a_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q4_k_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_noshuffle_q4_k_q8_1_dp4a", &err), err));CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q4_k_q8_1_dp4a_wimg = clCreateKernel(prog, "kernel_gemm_noshuffle_q4_k_q8_1_dp4a_wimg", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3793,7 +3804,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q8_0_q8_1_dp4a.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q8_0_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_noshuffle_q8_0_q8_1_dp4a", &err), err));CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q8_0_q8_1_dp4a_wimg = clCreateKernel(prog, "kernel_gemm_noshuffle_q8_0_q8_1_dp4a_wimg", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3809,7 +3820,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q5_k_q8_1_dp4a.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q5_k_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_noshuffle_q5_k_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3824,7 +3835,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q6_k_q8_1_dp4a.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q6_k_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_noshuffle_q6_k_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3839,7 +3850,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("quant_a_q8_1.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_quant_a_q8_1 = clCreateKernel(prog, "kernel_quant_a_q8_1", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -3861,8 +3872,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_noshuffle_q4_k_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q4_k_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q4_k_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3882,7 +3892,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemv_moe_q4_1_f32_ns.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_q4_1_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_q4_1_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3898,7 +3908,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_moe_q4_1_f32_ns.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q4_1_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q4_1_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3933,7 +3943,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_mxfp4_f32.cl");#endifbackend_ctx->program_gemv_moe_mxfp4_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_mxfp4_f32 = clCreateKernel(backend_ctx->program_gemv_moe_mxfp4_f32, "kernel_gemv_moe_mxfp4_f32", &err), err));GGML_LOG_CONT(".");@@ -3949,7 +3959,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_mxfp4_f32.cl");#endifbackend_ctx->program_gemm_moe_mxfp4_f32 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_mxfp4_f32 = clCreateKernel(backend_ctx->program_gemm_moe_mxfp4_f32, "kernel_gemm_moe_mxfp4_f32", &err), err));GGML_LOG_CONT(".");@@ -3965,7 +3975,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_q4_0_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_q4_0_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_q4_0_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -3982,7 +3992,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q4_0_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q4_0_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q4_0_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4017,7 +4027,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q8_0_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q8_0_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q8_0_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4034,7 +4044,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_q5_0_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_q5_0_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_q5_0_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4051,7 +4061,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q5_0_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q5_0_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q5_0_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4068,7 +4078,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_q5_1_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_q5_1_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_q5_1_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4085,7 +4095,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q5_1_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q5_1_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q5_1_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4102,7 +4112,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_q4_k_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_q4_k_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_q4_k_f32_ns", &err), err));CL_CHECK((backend_ctx->kernel_gemv_moe_q4_k_f32_ns_wimg = clCreateKernel(prog, "kernel_gemv_moe_q4_k_f32_ns_wimg", &err), err));@@ -4120,7 +4130,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q4_k_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q4_k_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q4_k_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4155,7 +4165,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q4_k_q8_1_dp4a.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q4_k_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_moe_q4_k_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4172,7 +4182,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_mxfp4_q8_1_dp4a.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_mxfp4_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_moe_mxfp4_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4189,7 +4199,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q4_0_q8_1_dp4a.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q4_0_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_moe_q4_0_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4207,19 +4217,19 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#endifconst std::string opts80 = CL_moe_compile_opts + " -DMOE_QT=80";cl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), opts80.c_str());+ build_program_from_source(backend_ctx, kernel_src.c_str(), opts80.c_str());CL_CHECK((backend_ctx->kernel_gemm_moe_q8_1_dp4a_q80 = clCreateKernel(prog, "kernel_gemm_moe_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));const std::string opts50 = CL_moe_compile_opts + " -DMOE_QT=50";cl_program prog50 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), opts50.c_str());+ build_program_from_source(backend_ctx, kernel_src.c_str(), opts50.c_str());CL_CHECK((backend_ctx->kernel_gemm_moe_q8_1_dp4a_q50 = clCreateKernel(prog50, "kernel_gemm_moe_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog50));const std::string opts5 = CL_moe_compile_opts + " -DMOE_QT=5";cl_program prog5 =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), opts5.c_str());+ build_program_from_source(backend_ctx, kernel_src.c_str(), opts5.c_str());CL_CHECK((backend_ctx->kernel_gemm_moe_q8_1_dp4a_q5k = clCreateKernel(prog5, "kernel_gemm_moe_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog5));GGML_LOG_CONT(".");@@ -4235,7 +4245,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("moe_reorder_quant_a_q8_1.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_moe_reorder_quant_a_q8_1 = clCreateKernel(prog, "kernel_moe_reorder_quant_a_q8_1", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4252,7 +4262,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_q5_k_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_q5_k_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_q5_k_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4269,7 +4279,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q5_k_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q5_k_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q5_k_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4286,7 +4296,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_q6_k_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_q6_k_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_q6_k_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4303,7 +4313,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q6_k_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q6_k_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_q6_k_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4338,7 +4348,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_q6_k_q8_1_dp4a.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_q6_k_q8_1_dp4a = clCreateKernel(prog, "kernel_gemm_moe_q6_k_q8_1_dp4a", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4355,7 +4365,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_moe_mxfp4_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_moe_mxfp4_f32_ns = clCreateKernel(prog, "kernel_gemv_moe_mxfp4_f32_ns", &err), err));CL_CHECK((backend_ctx->kernel_gemv_moe_mxfp4_f32_ns_wimg = clCreateKernel(prog, "kernel_gemv_moe_mxfp4_f32_ns_wimg", &err), err));@@ -4373,7 +4383,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_moe_mxfp4_f32_ns.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_moe_mxfp4_f32_ns = clCreateKernel(prog, "kernel_gemm_moe_mxfp4_f32_ns", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4408,7 +4418,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("moe_reorder_b.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_moe_reorder_b = clCreateKernel(prog, "kernel_moe_reorder_b", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4425,7 +4435,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("moe_sort_by_expert.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_moe_histogram = clCreateKernel(prog, "kernel_moe_histogram", &err), err));CL_CHECK((backend_ctx->kernel_moe_scan = clCreateKernel(prog, "kernel_moe_scan", &err), err));@@ -4452,7 +4462,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {}cl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_gemv_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q6_K_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q6_K_f32", &err), err));GGML_LOG_CONT(".");@@ -4468,7 +4478,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemm_noshuffle_q6_k_f32.cl");#endifcl_program prog =- build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_moe_compile_opts);+ build_program_from_source(backend_ctx, kernel_src.c_str(), CL_moe_compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q6_K_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q6_K_f32", &err), err));GGML_LOG_CONT(".");@@ -4490,8 +4500,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {const std::string kernel_src = read_file("gemv_noshuffle_q5_k_f32.cl");#endif- cl_program prog = build_program_from_source(- backend_ctx->context, backend_ctx->device, kernel_src.c_str(), CL_gemv_compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), CL_gemv_compile_opts);CL_CHECK((backend_ctx->kernel_gemv_noshuffle_q5_k_f32 = clCreateKernel(prog, "kernel_gemv_noshuffle_q5_k_f32", &err), err));CL_CHECK(clReleaseProgram(prog));@@ -4507,7 +4516,7 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx) {#elseconst std::string kernel_src = read_file("gemm_noshuffle_q5_k_f32.cl");#endif- cl_program prog = build_program_from_source(backend_ctx->context, backend_ctx->device, kernel_src.c_str(), compile_opts);+ cl_program prog = build_program_from_source(backend_ctx, kernel_src.c_str(), compile_opts);CL_CHECK((backend_ctx->kernel_gemm_noshuffle_q5_k_f32 = clCreateKernel(prog, "kernel_gemm_noshuffle_q5_k_f32", &err), err));CL_CHECK(clReleaseProgram(prog));GGML_LOG_CONT(".");@@ -10636,6 +10645,11 @@ static const char * ggml_backend_opencl_buffer_type_get_name(ggml_backend_bufferstatic ggml_backend_buffer_t ggml_backend_opencl_buffer_type_alloc_buffer(ggml_backend_buffer_type_t buffer_type, size_t size) {ggml_backend_opencl_context *backend_ctx = ggml_cl_init(buffer_type->device);++ if (!backend_ctx->program_cache_initialized) {+ backend_ctx->program_cache = cl_program_cache_init(backend_ctx->device);+ backend_ctx->program_cache_initialized = true;+ }load_cl_kernels(backend_ctx);// clCreateBuffer returns -61 for size 0