vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added worker threads sticking to a single core for Linux

Browse source
This commit is contained in:
mann1x 2024-04-27 13:00:33 +02:00
parent d55ae1513c
commit b01716a653
1 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

40
ggml.c
View file

@ -18727,17 +18727,43 @@ enum ggml_status ggml_graph_compute(struct ggml_cgraph * cgraph, struct ggml_cpl
#endif #endif
#if defined(__x86_64__) && defined(__linux__) #if defined(__x86_64__) && defined(__linux__)
cpu_set_t procMask; cpu_set_t procMask;
cpu_set_t threadMask; cpu_set_t newprocessAffinityMask;
CPU_ZERO(&newprocessAffinityMask);
//fprintf(stderr, "\nThread %d checking\n\n", j);
//fprintf(stdout, "sched_getaffinity init\n"); //fprintf(stdout, "sched_getaffinity init\n");
if (sched_getaffinity(0, sizeof(cpu_set_t), &procMask) == -1) { if (sched_getaffinity(0, sizeof(cpu_set_t), &procMask) == -1) {
fprintf(stderr, "ggml_thread_create sched_getaffinity error\n"); fprintf(stderr, "ggml_thread_create sched_getaffinity error\n");
} else { } else {
int result = pthread_setaffinity_np(workers[j].thrd, sizeof(cpu_set_t), &procMask); int posCore = 0;
if (result !=0) fprintf(stderr, "ggml_thread_create pthread_setaffinity_np: %d", result); for (int32_t i = 0; i < 64; ++i) {
//printf("Set returned by sched_getaffinity() contained:\n"); if (CPU_ISSET(i, &procMask) ) {
//for (size_t k = 0; k < CPU_SETSIZE; k++) //fprintf(stderr, "Check thread %d for core %d poscore %d\n", thread, i, posCore);
//if (CPU_ISSET(k, &procMask)) if ((posCore+1) == j) {
//printf(" CPU %zu\n", k); CPU_SET(i, &newprocessAffinityMask);
//fprintf(stderr, "\nThread %d is assigned to core %d\n\n", j, i);
break;
} else {
CPU_CLR(i, &newprocessAffinityMask);
//fprintf(stderr, "Thread %d is NOT assigned to core %d\n\n", j, i);
}
posCore++;
}
}
int result = pthread_setaffinity_np(workers[j].thrd, sizeof(cpu_set_t), &newprocessAffinityMask);
if (result !=0) fprintf(stderr, "\n\nggml_thread_create pthread_setaffinity_np for thread %d\n", j);
/*
printf("Set returned by sched_getaffinity() contained:\n");
cpu_set_t nprocMask;
CPU_ZERO(&nprocMask);
for (size_t k = 0; k < CPU_SETSIZE; k++)
if (CPU_ISSET(k, &procMask))
printf(" CPU %zu\n", k);
pthread_getaffinity_np(workers[j].thrd, sizeof(cpu_set_t), &nprocMask);
printf("Set returned by pthread_getaffinity_np() contained:\n");
for (size_t k = 0; k < CPU_SETSIZE; k++)
if (CPU_ISSET(k, &nprocMask))
printf(" CPU %zu\n", k);
*/
} }
/* /*
int s; int s;