From 991f6e7534a9b1a99b7da711676e6714e2cf6680 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 18 Nov 2020 19:55:24 +0000 Subject: [PATCH] For llvm's internal function which retrieves the number of available "hardware threads", use cpuset_getaffinity(2) on FreeBSD, so it will honor processor sets configured by the cpuset(1) command. This should make it possible to avoid e.g. lld creating a huge number of threads on a machine with many cores, even for linking simple programs. This will also be submitted upstream. Submitted by: mjg MFC after: 1 week --- .../llvm-project/llvm/lib/Support/Unix/Threading.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc b/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc index 2d0aacabf09..df290d2262e 100644 --- a/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc +++ b/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc @@ -26,6 +26,10 @@ #include // For pthread_getthreadid_np() / pthread_set_name_np() #endif +#if defined(__FreeBSD__) +#include +#endif + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include #include @@ -282,6 +286,13 @@ SetThreadPriorityResult llvm::set_thread_priority(ThreadPriority Priority) { #include int computeHostNumHardwareThreads() { +#ifdef __FreeBSD__ + cpuset_t mask; + CPU_ZERO(&mask); + if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, sizeof(mask), + &mask) == 0) + return CPU_COUNT(&mask); +#endif #ifdef __linux__ cpu_set_t Set; if (sched_getaffinity(0, sizeof(Set), &Set) == 0) -- 2.45.0