Add processor topology calculation implementation for Darwin/OSX targets.
The implementation for bootstrapping SWR on Darwin targets is based on the Linux version. Instead of reading the output of /proc/cpuinfo, sysctlbyname is used to determine the physical identifiers, processor identifiers, core counts and thread-processor affinities. With this patch, it is possible to use SWR as an alternate renderer on OSX to softpipe and llvmpipe. Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
committed by
Jeremy Huddleston Sequoia
parent
4b15b5e803
commit
67f27b1e18
@@ -36,6 +36,11 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
#include "common/os.h"
|
||||
#include "context.h"
|
||||
#include "frontend.h"
|
||||
@@ -219,6 +224,56 @@ void CalculateProcessorTopology(CPUNumaNodes& out_nodes, uint32_t& out_numThread
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
|
||||
auto numProcessors = 0;
|
||||
auto numCores = 0;
|
||||
auto numPhysicalIds = 0;
|
||||
|
||||
int value;
|
||||
size_t size = sizeof(value);
|
||||
|
||||
int result = sysctlbyname("hw.packages", &value, &size, NULL, 0);
|
||||
SWR_ASSERT(result == 0);
|
||||
numPhysicalIds = value;
|
||||
|
||||
result = sysctlbyname("hw.logicalcpu", &value, &size, NULL, 0);
|
||||
SWR_ASSERT(result == 0);
|
||||
numProcessors = value;
|
||||
|
||||
result = sysctlbyname("hw.physicalcpu", &value, &size, NULL, 0);
|
||||
SWR_ASSERT(result == 0);
|
||||
numCores = value;
|
||||
|
||||
out_nodes.resize(numPhysicalIds);
|
||||
|
||||
for (auto physId = 0; physId < numPhysicalIds; ++physId)
|
||||
{
|
||||
auto &numaNode = out_nodes[physId];
|
||||
auto procId = 0;
|
||||
|
||||
numaNode.cores.resize(numCores);
|
||||
|
||||
while (procId < numProcessors)
|
||||
{
|
||||
for (auto coreId = 0; coreId < numaNode.cores.size(); ++coreId, ++procId)
|
||||
{
|
||||
auto &core = numaNode.cores[coreId];
|
||||
|
||||
core.procGroup = coreId;
|
||||
core.threadIds.push_back(procId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
out_numThreadsPerProcGroup = 0;
|
||||
|
||||
for (auto &node : out_nodes)
|
||||
{
|
||||
for (auto &core : node.cores)
|
||||
{
|
||||
out_numThreadsPerProcGroup += core.threadIds.size();
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#error Unsupported platform
|
||||
@@ -253,7 +308,6 @@ void CalculateProcessorTopology(CPUNumaNodes& out_nodes, uint32_t& out_numThread
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void bindThread(SWR_CONTEXT* pContext, uint32_t threadId, uint32_t procGroupId = 0, bool bindProcGroup=false)
|
||||
{
|
||||
// Only bind threads when MAX_WORKER_THREADS isn't set.
|
||||
|
||||
Reference in New Issue
Block a user