From 77f9bd7c2373be908ac5a2ac3f8a1cbcada46422 Mon Sep 17 00:00:00 2001 From: Przemyslaw Pawelczyk Date: Wed, 28 Jun 2023 10:09:17 +0200 Subject: [PATCH 1/3] llama : use posix_madvise() instead of madvise() derived from BSD sed -i 's,\,posix_&,g;s,\ 0) { // Advise the kernel to preload the mapped memory - if (madvise(addr, std::min(file->size, prefetch), MADV_WILLNEED)) { - fprintf(stderr, "warning: madvise(.., MADV_WILLNEED) failed: %s\n", + if (posix_madvise(addr, std::min(file->size, prefetch), POSIX_MADV_WILLNEED)) { + fprintf(stderr, "warning: posix_madvise(.., POSIX_MADV_WILLNEED) failed: %s\n", strerror(errno)); } } if (numa) { // advise the kernel not to use readahead // (because the next page might not belong on the same node) - if (madvise(addr, file->size, MADV_RANDOM)) { - fprintf(stderr, "warning: madvise(.., MADV_RANDOM) failed: %s\n", + if (posix_madvise(addr, file->size, POSIX_MADV_RANDOM)) { + fprintf(stderr, "warning: posix_madvise(.., POSIX_MADV_RANDOM) failed: %s\n", strerror(errno)); } } From 2c716c0441661d721d1f0b220ab69c313b70bba1 Mon Sep 17 00:00:00 2001 From: Przemyslaw Pawelczyk Date: Wed, 6 Sep 2023 01:37:55 +0200 Subject: [PATCH 2/3] ggml : use sysconf(_SC_PAGESIZE) instead of getpagesize() derived from BSD sed -i 's,getpagesize(),sysconf(_SC_PAGESIZE),g' ggml.c --- ggml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggml.c b/ggml.c index 38b1155c13bc2..50adf18ec7f42 100644 --- a/ggml.c +++ b/ggml.c @@ -194,7 +194,7 @@ typedef void * thread_ret_t; inline static void * ggml_aligned_malloc(size_t size) { void * aligned_memory = NULL; #ifdef GGML_USE_METAL - int result = posix_memalign(&aligned_memory, getpagesize(), size); + int result = posix_memalign(&aligned_memory, sysconf(_SC_PAGESIZE), size); #else int result = posix_memalign(&aligned_memory, GGML_MEM_ALIGN, size); #endif From 992b4ee1f377703b5c66a339e3b25d8ce58b61bf Mon Sep 17 00:00:00 2001 From: Przemyslaw Pawelczyk Date: Wed, 6 Sep 2023 01:38:40 +0200 Subject: [PATCH 3/3] metal : use sysconf(_SC_PAGESIZE) instead of getpagesize() derived from BSD sed -i 's,getpagesize(),sysconf(_SC_PAGESIZE),g' ggml-metal.m --- ggml-metal.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggml-metal.m b/ggml-metal.m index d0d23442eab5d..521ca180f085b 100644 --- a/ggml-metal.m +++ b/ggml-metal.m @@ -327,7 +327,7 @@ void ggml_metal_free(struct ggml_metal_context * ctx) { void * ggml_metal_host_malloc(size_t n) { void * data = NULL; - const int result = posix_memalign((void **) &data, getpagesize(), n); + const int result = posix_memalign((void **) &data, sysconf(_SC_PAGESIZE), n); if (result != 0) { metal_printf("%s: error: posix_memalign failed\n", __func__); return NULL; @@ -401,7 +401,7 @@ bool ggml_metal_add_buffer( } } - const size_t size_page = getpagesize(); + const size_t size_page = sysconf(_SC_PAGESIZE); size_t size_aligned = size; if ((size_aligned % size_page) != 0) {