Date: Thu, 3 Dec 2020 19:26:22 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368308 - head/contrib/llvm-project/llvm/lib/Support/Unix Message-ID: <202012031926.0B3JQMlB095726@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Dec 3 19:26:21 2020 New Revision: 368308 URL: https://svnweb.freebsd.org/changeset/base/368308 Log: Revert r367815, so we can apply the slightly different version that landed upstream: 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 Modified: head/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc Modified: head/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc ============================================================================== --- head/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc Thu Dec 3 17:12:31 2020 (r368307) +++ head/contrib/llvm-project/llvm/lib/Support/Unix/Threading.inc Thu Dec 3 19:26:21 2020 (r368308) @@ -26,10 +26,6 @@ #include <pthread_np.h> // For pthread_getthreadid_np() / pthread_set_name_np() #endif -#if defined(__FreeBSD__) -#include <sys/cpuset.h> -#endif - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include <errno.h> #include <sys/sysctl.h> @@ -286,13 +282,6 @@ SetThreadPriorityResult llvm::set_thread_priority(Thre #include <thread> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012031926.0B3JQMlB095726>