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

metal : use virtual GPU address for private buffers

Browse Source 
ggml-ci
This commit is contained in:
Georgi Gerganov
2025-09-14 14:20:06 +03:00
parent a14bd35014
commit 626fa1de36
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ggml/src/ggml-metal/ggml-metal.m
View File

@@ -9,6 +9,8 @@
#import <Metal/Metal.h> #import <Metal/Metal.h>
#include <stdatomic.h>
#undef MIN #undef MIN
#undef MAX #undef MAX
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -6327,8 +6329,10 @@ static ggml_backend_buffer_t ggml_backend_metal_buffer_type_alloc_buffer(ggml_ba
ctx->all_data = ggml_metal_host_malloc(size_aligned); ctx->all_data = ggml_metal_host_malloc(size_aligned);
ctx->is_shared = true; ctx->is_shared = true;
} else { } else {
// dummy, non-NULL value - we'll populate this after creating the Metal buffer below // virtual address for GPU memory allocations
ctx->all_data = (void *) 0x000000400ULL; static atomic_uintptr_t addr_device = 0x000000400ULL;
ctx->all_data = (void *) atomic_fetch_add_explicit(&addr_device, size_aligned, memory_order_relaxed);
ctx->is_shared = false; ctx->is_shared = false;
} }
ctx->all_size = size_aligned; ctx->all_size = size_aligned;
@@ -6351,7 +6355,10 @@ static ggml_backend_buffer_t ggml_backend_metal_buffer_type_alloc_buffer(ggml_ba
} else { } else {
ctx->buffers[0].metal = [device newBufferWithLength:size_aligned options:MTLResourceStorageModePrivate]; ctx->buffers[0].metal = [device newBufferWithLength:size_aligned options:MTLResourceStorageModePrivate];
ctx->all_data = (void *) (ctx->buffers[0].metal.gpuAddress); // MTLBuffer.gpuAddress is not available on early OSes, so we use a virtual address instead
//if (@available(macOS 10.13, iOS 16.0, *)) {
// ctx->all_data = (void *) (ctx->buffers[0].metal.gpuAddress);
//}
} }
} }