public_git
/
whisper.cpp
mirror of https://github.com/ggml-org/whisper.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

metal: fix memory unwire if model is freed without any GPU operations (llama/26082) 

* metal: fix memory leak if model is freed without any GPU operations

* metal: run dummy work only if residency sets are used

* metal: wrap function in #if defined

* metal: measure system-wide wired memory in test

* metal: always build regression test

Co-authored-by: YiChen Lv <63285796+forforever73@users.noreply.github.com>

---------

Co-authored-by: YiChen Lv <63285796+forforever73@users.noreply.github.com>
This commit is contained in:
Niklas Wenzel 2026-07-30 10:11:27 +02:00 committed by Georgi Gerganov
parent c2b2ecb6bd
commit 2b8f0f1817
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ggml/src/ggml-metal/ggml-metal-device.h
View File

@ -213,7 +213,7 @@ typedef void * ggml_metal_rset_t;
// a collection of residency sets (non-owning) // a collection of residency sets (non-owning)
typedef struct ggml_metal_rsets * ggml_metal_rsets_t; typedef struct ggml_metal_rsets * ggml_metal_rsets_t;
ggml_metal_rsets_t ggml_metal_rsets_init(void); ggml_metal_rsets_t ggml_metal_rsets_init(ggml_metal_device_t dev);
void ggml_metal_rsets_free(ggml_metal_rsets_t rsets); void ggml_metal_rsets_free(ggml_metal_rsets_t rsets);
// //

39
ggml/src/ggml-metal/ggml-metal-device.m
View File

@ -557,7 +557,32 @@ struct ggml_metal_rsets {
dispatch_group_t d_group; dispatch_group_t d_group;
}; };
ggml_metal_rsets_t ggml_metal_rsets_init(void) { #if defined(GGML_METAL_HAS_RESIDENCY_SETS)
static void ggml_metal_dummy_work(ggml_metal_device_t dev) {
if (dev->mtl_queue == nil) {
return;
}
@autoreleasepool {
// perform a minimal dummy operation on the GPU
id<MTLBuffer> buf = [dev->mtl_device newBufferWithLength:1 options:MTLResourceStorageModePrivate];
id<MTLCommandBuffer> cmd_buf = [dev->mtl_queue commandBuffer];
{
id<MTLBlitCommandEncoder> encoder = [cmd_buf blitCommandEncoder];
[encoder fillBuffer:buf range:NSMakeRange(0, 1) value:0];
[encoder endEncoding];
}
[cmd_buf commit];
[buf release];
}
}
#endif
ggml_metal_rsets_t ggml_metal_rsets_init(ggml_metal_device_t dev) {
ggml_metal_rsets_t res = calloc(1, sizeof(struct ggml_metal_rsets)); ggml_metal_rsets_t res = calloc(1, sizeof(struct ggml_metal_rsets));
res->lock = [[NSLock alloc] init]; res->lock = [[NSLock alloc] init];
@ -610,6 +635,15 @@ ggml_metal_rsets_t ggml_metal_rsets_init(void) {
#endif #endif
}); });
#if defined(GGML_METAL_HAS_RESIDENCY_SETS)
if (@available(macOS 15.0, iOS 18.0, tvOS 18.0, visionOS 2.0, *)) {
// workaround for residency set memory not being released if no GPU operation occurs
// https://developer.apple.com/forums/thread/839089
// https://github.com/ggml-org/llama.cpp/issues/25937
ggml_metal_dummy_work(dev);
}
#endif
return res; return res;
} }
@ -864,7 +898,7 @@ ggml_metal_device_t ggml_metal_device_init(int device) {
} }
if (dev->props.use_residency_sets) { if (dev->props.use_residency_sets) {
dev->rsets = ggml_metal_rsets_init(); dev->rsets = ggml_metal_rsets_init(dev);
} else { } else {
dev->rsets = nil; dev->rsets = nil;
} }
@ -1484,6 +1518,7 @@ static void ggml_metal_buffer_rset_free(ggml_metal_buffer_t buf) {
if (buf->rset) { if (buf->rset) {
[buf->rset endResidency]; [buf->rset endResidency];
[buf->rset removeAllAllocations]; [buf->rset removeAllAllocations];
[buf->rset commit];
[buf->rset release]; [buf->rset release];
} }
} }