diff options
author | Fangrui Song <i@maskray.me> | 2022-11-23 20:12:16 -0800 |
---|---|---|
committer | Fangrui Song <i@maskray.me> | 2022-11-23 20:12:16 -0800 |
commit | 93b553e3f2e4f53ce3dda13cd18dbc43643a535b (patch) | |
tree | 30cac24eceb7b916f1b003094ed2755d9a44c03b /llvm/lib/Support/Host.cpp | |
parent | 65abca4611256794176b791a1380ad83ccf0741f (diff) | |
download | llvm-93b553e3f2e4f53ce3dda13cd18dbc43643a535b.zip llvm-93b553e3f2e4f53ce3dda13cd18dbc43643a535b.tar.gz llvm-93b553e3f2e4f53ce3dda13cd18dbc43643a535b.tar.bz2 |
Revert "Host: Internalize computeHostNumPhysicalCores/computeHostNumHardwareThreads"
This reverts commit 9969ceb36b440eaafa17c486f29a69c7a7da3b3b.
On Windows:
lld-link: error: undefined symbol: int __cdecl computeHostNumPhysicalCores(void)
>>> referenced by LLVMSupport.lib(Support.Host.obj):(int __cdecl llvm::sys::getHostNumPhysicalCores(void))
Diffstat (limited to 'llvm/lib/Support/Host.cpp')
-rw-r--r-- | llvm/lib/Support/Host.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp index 8361997..6bb452a 100644 --- a/llvm/lib/Support/Host.cpp +++ b/llvm/lib/Support/Host.cpp @@ -1580,7 +1580,7 @@ VendorSignatures getVendorSignature(unsigned *MaxLeaf) { // On Linux, the number of physical cores can be computed from /proc/cpuinfo, // using the number of unique physical/core id pairs. The following // implementation reads the /proc/cpuinfo format on an x86_64 system. -static int computeHostNumPhysicalCores() { +int computeHostNumPhysicalCores() { // Enabled represents the number of physical id/core id pairs with at least // one processor id enabled by the CPU affinity mask. cpu_set_t Affinity, Enabled; @@ -1625,11 +1625,9 @@ static int computeHostNumPhysicalCores() { return CPU_COUNT(&Enabled); } #elif defined(__linux__) && defined(__s390x__) -static int computeHostNumPhysicalCores() { - return sysconf(_SC_NPROCESSORS_ONLN); -} +int computeHostNumPhysicalCores() { return sysconf(_SC_NPROCESSORS_ONLN); } #elif defined(__linux__) && !defined(__ANDROID__) -static int computeHostNumPhysicalCores() { +int computeHostNumPhysicalCores() { cpu_set_t Affinity; if (sched_getaffinity(0, sizeof(Affinity), &Affinity) == 0) return CPU_COUNT(&Affinity); @@ -1649,7 +1647,7 @@ static int computeHostNumPhysicalCores() { } #elif defined(__APPLE__) // Gets the number of *physical cores* on the machine. -static int computeHostNumPhysicalCores() { +int computeHostNumPhysicalCores() { uint32_t count; size_t len = sizeof(count); sysctlbyname("hw.physicalcpu", &count, &len, NULL, 0); @@ -1664,7 +1662,7 @@ static int computeHostNumPhysicalCores() { return count; } #elif defined(__MVS__) -static int computeHostNumPhysicalCores() { +int computeHostNumPhysicalCores() { enum { // Byte offset of the pointer to the Communications Vector Table (CVT) in // the Prefixed Save Area (PSA). The table entry is a 31-bit pointer and @@ -1687,7 +1685,7 @@ static int computeHostNumPhysicalCores() { } #elif defined(_WIN32) && LLVM_ENABLE_THREADS != 0 // Defined in llvm/lib/Support/Windows/Threading.inc -static int computeHostNumPhysicalCores(); +int computeHostNumPhysicalCores(); #else // On other systems, return -1 to indicate unknown. static int computeHostNumPhysicalCores() { return -1; } |