intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-24 17:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[mlir] Use thread-pool's notion of thread count instead of requerying system.

Browse Source 
The computed number of hardware threads can change over the life of the process based on affinity changes. Since we need a data structure that is at least as large as the maximum parallelism, it is important to use the value that was actually latched for the thread pool we will be dispatching work to.

Also adds an assert specifically for if it doesn't line up (I was getting a crash on an index into the vector).

Differential Revision: https://reviews.llvm.org/D116257
This commit is contained in:
Stella Laurenzo
2021-12-23 16:13:54 -08:00
parent a6114ff0cd
commit 8ff42766d1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mlir/lib/Transforms/Inliner.cpp
View File

@@ -663,7 +663,7 @@ LogicalResult InlinerPass::optimizeSCC(CallGraph &cg, CGUseList &useList,
// Optimize each of the nodes within the SCC in parallel.
if (failed(optimizeSCCAsync(nodesToVisit, context)))
return failure();
return failure();
// Recompute the uses held by each of the nodes.
for (CallGraphNode *node : nodesToVisit)
@@ -674,11 +674,13 @@ LogicalResult InlinerPass::optimizeSCC(CallGraph &cg, CGUseList &useList,
LogicalResult
InlinerPass::optimizeSCCAsync(MutableArrayRef<CallGraphNode *> nodesToVisit,
MLIRContext *ctx) {
// Ensure that there are enough pipeline maps for the optimizer to run in
// parallel. Note: The number of pass managers here needs to remain constant
// We must maintain a fixed pool of pass managers which is at least as large
// as the maximum parallelism of the failableParallelForEach below.
// Note: The number of pass managers here needs to remain constant
// to prevent issues with pass instrumentations that rely on having the same
// pass manager for the main thread.
size_t numThreads = llvm::hardware_concurrency().compute_thread_count();
llvm::ThreadPool &threadPool = ctx->getThreadPool();
size_t numThreads = threadPool.getThreadCount();
if (opPipelines.size() < numThreads) {
// Reserve before resizing so that we can use a reference to the first
// element.
@@ -700,6 +702,8 @@ InlinerPass::optimizeSCCAsync(MutableArrayRef<CallGraphNode *> nodesToVisit,
bool expectedInactive = false;
return isActive.compare_exchange_strong(expectedInactive, true);
});
assert(it != activePMs.end() &&
"could not find inactive pass manager for thread");
unsigned pmIndex = it - activePMs.begin();
// Optimize this callable node.