cdabce0c1b
When a `CompositePass` is created programmatically, it incorrectly
prepends an extra `any` to the inner pipeline string. For example:
```c++
passManager.nestAny().addPass(createCompositeFixedPointPass(
"Pass1AndPass2",
[](OpPassManager &nestedPassManger) {
nestedPassManger.addPass(createPass1());
nestedPassManger.addPass(createPass2());
},
```
This would result in the following pipeline string:
```
any(composite-fixed-point-pass{max-iterations=3 name=Pass1AndPass2
pipeline=any(pass1,pass2)})
```
This commit fixes this issue, resulting in the pipeline string:
```
any(composite-fixed-point-pass{max-iterations=3 name=Pass1AndPass2
pipeline=pass1,pass2})
```
108 lines
3.2 KiB
C++
108 lines
3.2 KiB
C++
//===- CompositePass.cpp - Composite pass code ----------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// CompositePass allows to run set of passes until fixed point is reached.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "mlir/Transforms/Passes.h"
|
|
|
|
#include "mlir/Pass/Pass.h"
|
|
#include "mlir/Pass/PassManager.h"
|
|
|
|
namespace mlir {
|
|
#define GEN_PASS_DEF_COMPOSITEFIXEDPOINTPASS
|
|
#include "mlir/Transforms/Passes.h.inc"
|
|
} // namespace mlir
|
|
|
|
using namespace mlir;
|
|
|
|
namespace {
|
|
struct CompositeFixedPointPass final
|
|
: public impl::CompositeFixedPointPassBase<CompositeFixedPointPass> {
|
|
using CompositeFixedPointPassBase::CompositeFixedPointPassBase;
|
|
|
|
CompositeFixedPointPass(
|
|
std::string name_, llvm::function_ref<void(OpPassManager &)> populateFunc,
|
|
int maxIterations) {
|
|
name = std::move(name_);
|
|
maxIter = maxIterations;
|
|
populateFunc(dynamicPM);
|
|
|
|
llvm::raw_string_ostream os(pipelineStr);
|
|
llvm::interleave(
|
|
dynamicPM, [&](mlir::Pass &pass) { pass.printAsTextualPipeline(os); },
|
|
[&]() { os << ","; });
|
|
}
|
|
|
|
LogicalResult initializeOptions(
|
|
StringRef options,
|
|
function_ref<LogicalResult(const Twine &)> errorHandler) override {
|
|
if (failed(CompositeFixedPointPassBase::initializeOptions(options,
|
|
errorHandler)))
|
|
return failure();
|
|
|
|
if (failed(parsePassPipeline(pipelineStr, dynamicPM)))
|
|
return errorHandler("Failed to parse composite pass pipeline");
|
|
|
|
return success();
|
|
}
|
|
|
|
LogicalResult initialize(MLIRContext *context) override {
|
|
if (maxIter <= 0)
|
|
return emitError(UnknownLoc::get(context))
|
|
<< "Invalid maxIterations value: " << maxIter << "\n";
|
|
|
|
return success();
|
|
}
|
|
|
|
void getDependentDialects(DialectRegistry ®istry) const override {
|
|
dynamicPM.getDependentDialects(registry);
|
|
}
|
|
|
|
void runOnOperation() override {
|
|
auto op = getOperation();
|
|
OperationFingerPrint fp(op);
|
|
|
|
int currentIter = 0;
|
|
int maxIterVal = maxIter;
|
|
while (true) {
|
|
if (failed(runPipeline(dynamicPM, op)))
|
|
return signalPassFailure();
|
|
|
|
if (currentIter++ >= maxIterVal) {
|
|
op->emitWarning("Composite pass \"" + llvm::Twine(name) +
|
|
"\"+ didn't converge in " + llvm::Twine(maxIterVal) +
|
|
" iterations");
|
|
break;
|
|
}
|
|
|
|
OperationFingerPrint newFp(op);
|
|
if (newFp == fp)
|
|
break;
|
|
|
|
fp = newFp;
|
|
}
|
|
}
|
|
|
|
protected:
|
|
llvm::StringRef getName() const override { return name; }
|
|
|
|
private:
|
|
OpPassManager dynamicPM;
|
|
};
|
|
} // namespace
|
|
|
|
std::unique_ptr<Pass> mlir::createCompositeFixedPointPass(
|
|
std::string name, llvm::function_ref<void(OpPassManager &)> populateFunc,
|
|
int maxIterations) {
|
|
|
|
return std::make_unique<CompositeFixedPointPass>(std::move(name),
|
|
populateFunc, maxIterations);
|
|
}
|