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

[mlir][Pass] Fix dropped statistics with nested adaptors.

Browse Source 
When running in parallel, nesting more than once caused
statistics to be dropped.

Fix by also preparing "async" pass managers before merging,
as they may also have "async" pass managers within.

Add test checking reported statistics have expected values
with and without threading enabled.

Reviewed By: rriddle

Differential Revision: https://reviews.llvm.org/D139459
This commit is contained in:
Will Dietz
2022-12-06 14:44:12 -06:00
parent c621c1a8e8
commit d41b3bf7c3
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mlir/lib/Pass/PassStatistics.cpp
View File

@@ -226,10 +226,12 @@ static void prepareStatistics(OpPassManager &pm) {
MutableArrayRef<OpPassManager> nestedPms = adaptor->getPassManagers();
// Merge the statistics from the async pass managers into the main nested
// pass managers.
// pass managers. Prepare recursively before merging.
for (auto &asyncPM : adaptor->getParallelPassManagers()) {
for (unsigned i = 0, e = asyncPM.size(); i != e; ++i)
for (unsigned i = 0, e = asyncPM.size(); i != e; ++i) {
prepareStatistics(asyncPM[i]);
asyncPM[i].mergeStatisticsInto(nestedPms[i]);
}
}
// Prepare the statistics of each of the nested passes.

24
mlir/test/Pass/pipeline-stats-nested.mlir Normal file
View File

@@ -0,0 +1,24 @@
// REQUIRES: asserts
// Check that statistics in nested pipelines are not ignored and that this works with and without threading.
// RUN: mlir-opt %s -verify-each=true -pass-pipeline='builtin.module(builtin.module(func.func(test-stats-pass,test-stats-pass)))' -mlir-pass-statistics -mlir-pass-statistics-display=list -mlir-disable-threading 2>&1 | FileCheck -check-prefix=LIST %s
// RUN: mlir-opt %s -verify-each=true -pass-pipeline='builtin.module(builtin.module(func.func(test-stats-pass,test-stats-pass)))' -mlir-pass-statistics -mlir-pass-statistics-display=list 2>&1 | FileCheck -check-prefix=LIST %s
// RUN: mlir-opt %s -verify-each=true -pass-pipeline='builtin.module(builtin.module(func.func(test-stats-pass,test-stats-pass)))' -mlir-pass-statistics -mlir-pass-statistics-display=pipeline -mlir-disable-threading 2>&1 | FileCheck -check-prefix=PIPELINE %s
// RUN: mlir-opt %s -verify-each=true -pass-pipeline='builtin.module(builtin.module(func.func(test-stats-pass,test-stats-pass)))' -mlir-pass-statistics -mlir-pass-statistics-display=pipeline 2>&1 | FileCheck -check-prefix=PIPELINE %s
// Check for the correct statistic values.
// Each test-stats-pass will count two ops: the func.func and the func.return .
// LIST: (S) 4 num-ops
// LIST-NEXT: (S) 4 num-ops2
// PIPELINE: (S) 2 num-ops
// PIPELINE-NEXT: (S) 2 num-ops2
// PIPELINE: (S) 2 num-ops
// PIPELINE-NEXT: (S) 2 num-ops2
module {
module {
func.func @foo() {
return
}
}
}