This is an archive of the discontinued LLVM Phabricator instance.

Differential D133557

[mlir][linalg] Retire LinalgStrategyEnablePass
ClosedPublic

Authored by guraypp on Sep 9 2022, 1:20 AM.

Details

Reviewers
nicolasvasilache
springerm
Commits
rG1e2b4ff93687: [mlir][linalg] Retire LinalgStrategyEnablePass
Summary

This revision retires LinalgStrategyEnablePass.

Diff Detail

Event Timeline

guraypp created this revision.Sep 9 2022, 1:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 9 2022, 1:20 AM
Herald added subscribers: bzcheeseman, sdasgup3, wenzhicui and 19 others. · View Herald Transcript
guraypp requested review of this revision.Sep 9 2022, 1:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 9 2022, 1:20 AM
Herald added subscribers: limo1996, stephenneuendorffer. · View Herald Transcript
guraypp updated this revision to Diff 458980.Sep 9 2022, 1:21 AM

Removed commented code

nicolasvasilache accepted this revision.Sep 9 2022, 1:27 AM

Thanks!

This revision is now accepted and ready to land.Sep 9 2022, 1:27 AM
Harbormaster completed remote builds in B185786: Diff 458980.Sep 9 2022, 1:42 AM
guraypp updated this revision to Diff 459023.Sep 9 2022, 5:43 AM

Fix clang-format

Harbormaster completed remote builds in B185817: Diff 459023.Sep 9 2022, 6:09 AM
Closed by commit rG1e2b4ff93687: [mlir][linalg] Retire LinalgStrategyEnablePass (authored by guraypp). · Explain WhySep 9 2022, 6:13 AM
This revision was automatically updated to reflect the committed changes.
guraypp added a commit: rG1e2b4ff93687: [mlir][linalg] Retire LinalgStrategyEnablePass.

Revision Contents

PathSize
mlir/
include/
mlir/
Dialect/
Linalg/
6 lines
12 lines
lib/
Dialect/
Linalg/
Transforms/
2 lines
59 lines

Diff 459033

mlir/include/mlir/Dialect/Linalg/Passes.h

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines
std::unique_ptr<OperationPass<func::FuncOp>> createLinalgStrategyVectorizePass( std::unique_ptr<OperationPass<func::FuncOp>> createLinalgStrategyVectorizePass(
StringRef opName = "", StringRef opName = "",
linalg::LinalgVectorizationOptions opt = linalg::LinalgVectorizationOptions opt =
linalg::LinalgVectorizationOptions(), linalg::LinalgVectorizationOptions(),
const linalg::LinalgTransformationFilter &filter = const linalg::LinalgTransformationFilter &filter =
linalg::LinalgTransformationFilter(), linalg::LinalgTransformationFilter(),
bool padVectorize = false); bool padVectorize = false);
/// Create a LinalgStrategyEnablePass.
std::unique_ptr<OperationPass<func::FuncOp>> createLinalgStrategyEnablePass(
linalg::LinalgEnablingOptions opt = linalg::LinalgEnablingOptions(),
const linalg::LinalgTransformationFilter &filter =
linalg::LinalgTransformationFilter());
/// Create a LinalgStrategyLowerVectorsPass. /// Create a LinalgStrategyLowerVectorsPass.
std::unique_ptr<OperationPass<func::FuncOp>> std::unique_ptr<OperationPass<func::FuncOp>>
createLinalgStrategyLowerVectorsPass( createLinalgStrategyLowerVectorsPass(
linalg::LinalgVectorLoweringOptions opt = linalg::LinalgVectorLoweringOptions opt =
linalg::LinalgVectorLoweringOptions(), linalg::LinalgVectorLoweringOptions(),
const linalg::LinalgTransformationFilter &filter = const linalg::LinalgTransformationFilter &filter =
linalg::LinalgTransformationFilter()); linalg::LinalgTransformationFilter());
Show All 15 Lines

mlir/include/mlir/Dialect/Linalg/Passes.td

Show First 20 Lines • Show All 247 Lines • ▼ Show 20 Lines Option<"anchorFuncName", "anchor-func", "std::string", /*default=*/"",
"Which func op is the anchor to latch on.">, "Which func op is the anchor to latch on.">,
Option<"anchorOpName", "anchor-op", "std::string", /*default=*/"", Option<"anchorOpName", "anchor-op", "std::string", /*default=*/"",
"Which linalg op within the func is the anchor to latch on.">, "Which linalg op within the func is the anchor to latch on.">,
Option<"vectorizePadding", "vectorize-padding", "bool", "false", Option<"vectorizePadding", "vectorize-padding", "bool", "false",
"Enable vectorization of padding ops.">, "Enable vectorization of padding ops.">,
]; ];
} }
def LinalgStrategyEnablePass
: Pass<"linalg-strategy-enable-pass", "func::FuncOp"> {
let summary = "Configurable pass to enable the application of other "
"pattern-based linalg passes.";
let constructor = "mlir::createLinalgStrategyEnablePass()";
let dependentDialects = ["linalg::LinalgDialect"];
let options = [
Option<"anchorFuncName", "anchor-func", "std::string", /*default=*/"",
"Which func op is the anchor to latch on.">,
];
}
def LinalgStrategyLowerVectorsPass def LinalgStrategyLowerVectorsPass
: Pass<"linalg-strategy-lower-vectors-pass", "func::FuncOp"> { : Pass<"linalg-strategy-lower-vectors-pass", "func::FuncOp"> {
let summary = "Configurable pass to lower vector operations."; let summary = "Configurable pass to lower vector operations.";
let constructor = "mlir::createLinalgStrategyLowerVectorsPass()"; let constructor = "mlir::createLinalgStrategyLowerVectorsPass()";
let dependentDialects = ["linalg::LinalgDialect"]; let dependentDialects = ["linalg::LinalgDialect"];
let options = [ let options = [
Option<"anchorFuncName", "anchor-func", "std::string", /*default=*/"", Option<"anchorFuncName", "anchor-func", "std::string", /*default=*/"",
"Which func op is the anchor to latch on.">, "Which func op is the anchor to latch on.">,
Show All 15 Lines

mlir/lib/Dialect/Linalg/Transforms/CodegenStrategy.cpp

Show All 36 Lines for (unsigned stepCount = 0, e = transformationSequence.size(); stepCount < e;
std::string nextStr = std::to_string(stepCount + 1); std::string nextStr = std::to_string(stepCount + 1);
auto nextState = StringAttr::get(context, nextStr); auto nextState = StringAttr::get(context, nextStr);
auto filter = (currentState.str() == std::to_string(0)) auto filter = (currentState.str() == std::to_string(0))
? linalg::LinalgTransformationFilter( ? linalg::LinalgTransformationFilter(
t->filter, ArrayRef<StringAttr>{}, nextState) t->filter, ArrayRef<StringAttr>{}, nextState)
: linalg::LinalgTransformationFilter( : linalg::LinalgTransformationFilter(
t->filter, currentState, nextState); t->filter, currentState, nextState);
t->addToPassPipeline(pm, filter); t->addToPassPipeline(pm, filter);
if (addEnablePass)
pm.addPass(createLinalgStrategyEnablePass(linalgEnablingOptions));
} }
pm.addPass(createLinalgStrategyRemoveMarkersPass()); pm.addPass(createLinalgStrategyRemoveMarkersPass());
} }

mlir/lib/Dialect/Linalg/Transforms/LinalgStrategyPasses.cpp

Show All 35 Lines
namespace mlir { namespace mlir {
#define GEN_PASS_DEF_LINALGSTRATEGYTILEANDFUSEPASS #define GEN_PASS_DEF_LINALGSTRATEGYTILEANDFUSEPASS
#define GEN_PASS_DEF_LINALGSTRATEGYTILEPASS #define GEN_PASS_DEF_LINALGSTRATEGYTILEPASS
#define GEN_PASS_DEF_LINALGSTRATEGYPADPASS #define GEN_PASS_DEF_LINALGSTRATEGYPADPASS
#define GEN_PASS_DEF_LINALGSTRATEGYDECOMPOSEPASS #define GEN_PASS_DEF_LINALGSTRATEGYDECOMPOSEPASS
#define GEN_PASS_DEF_LINALGSTRATEGYPEELPASS #define GEN_PASS_DEF_LINALGSTRATEGYPEELPASS
#define GEN_PASS_DEF_LINALGSTRATEGYVECTORIZEPASS #define GEN_PASS_DEF_LINALGSTRATEGYVECTORIZEPASS
#define GEN_PASS_DEF_LINALGSTRATEGYENABLEPASS
#define GEN_PASS_DEF_LINALGSTRATEGYLOWERVECTORSPASS #define GEN_PASS_DEF_LINALGSTRATEGYLOWERVECTORSPASS
#define GEN_PASS_DEF_LINALGSTRATEGYREMOVEMARKERSPASS #define GEN_PASS_DEF_LINALGSTRATEGYREMOVEMARKERSPASS
#include "mlir/Dialect/Linalg/Passes.h.inc" #include "mlir/Dialect/Linalg/Passes.h.inc"
} // namespace mlir } // namespace mlir
using namespace mlir; using namespace mlir;
using namespace mlir::vector; using namespace mlir::vector;
using namespace linalg; using namespace linalg;
▲ Show 20 Lines • Show All 214 Lines • ▼ Show 20 Lines if (vectorizePadding) {
(void)applyPatternsAndFoldGreedily(funcOp, std::move(patterns)); (void)applyPatternsAndFoldGreedily(funcOp, std::move(patterns));
} }
} }
LinalgVectorizationOptions options; LinalgVectorizationOptions options;
LinalgTransformationFilter filter; LinalgTransformationFilter filter;
}; };
/// Configurable pass to enable the application of other pattern-based linalg
/// passes.
struct LinalgStrategyEnablePass
: public impl::LinalgStrategyEnablePassBase<LinalgStrategyEnablePass> {
LinalgStrategyEnablePass(LinalgEnablingOptions opt,
LinalgTransformationFilter filt)
: options(opt), filter(std::move(filt)) {}
void runOnOperation() override {
auto funcOp = getOperation();
if (!anchorFuncName.empty() && funcOp.getName() != anchorFuncName)
return;
MLIRContext *context = funcOp.getContext();
RewritePatternSet patterns =
linalg::getLinalgTilingCanonicalizationPatterns(context);
scf::populateSCFForLoopCanonicalizationPatterns(patterns);
if (failed(applyPatternsAndFoldGreedily(funcOp, std::move(patterns))))
return signalPassFailure();
if (options.licm) {
funcOp->walk([&](LoopLikeOpInterface loopLike) {
moveLoopInvariantCode(loopLike);
});
}
// Gathers all innermost loops through a post order pruned walk.
funcOp.walk([](Operation *op) {
if (auto forOp = dyn_cast<AffineForOp>(op))
(void)promoteIfSingleIteration(forOp);
else if (auto forOp = dyn_cast<scf::ForOp>(op))
(void)promoteIfSingleIteration(forOp);
});
if (options.hoistRedundantVectorTransfers)
hoistRedundantVectorTransfers(funcOp);
if (options.hoistRedundantVectorTransfersOnTensor)
hoistRedundantVectorTransfersOnTensor(funcOp);
// Run CSE to cleanup after canonicalization.
OpPassManager dynamicPM("func.func");
dynamicPM.addPass(createCSEPass());
if (failed(runPipeline(dynamicPM, funcOp)))
return signalPassFailure();
}
LinalgEnablingOptions options;
LinalgTransformationFilter filter;
};
/// Configurable pass to lower vector operations. /// Configurable pass to lower vector operations.
struct LinalgStrategyLowerVectorsPass struct LinalgStrategyLowerVectorsPass
: public impl::LinalgStrategyLowerVectorsPassBase< : public impl::LinalgStrategyLowerVectorsPassBase<
LinalgStrategyLowerVectorsPass> { LinalgStrategyLowerVectorsPass> {
LinalgStrategyLowerVectorsPass(LinalgVectorLoweringOptions opt, LinalgStrategyLowerVectorsPass(LinalgVectorLoweringOptions opt,
LinalgTransformationFilter filt) LinalgTransformationFilter filt)
: options(opt), filter(std::move(filt)) {} : options(opt), filter(std::move(filt)) {}
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines
std::unique_ptr<OperationPass<func::FuncOp>> std::unique_ptr<OperationPass<func::FuncOp>>
mlir::createLinalgStrategyVectorizePass( mlir::createLinalgStrategyVectorizePass(
StringRef opName, LinalgVectorizationOptions opt, StringRef opName, LinalgVectorizationOptions opt,
const LinalgTransformationFilter &filter, bool padVectorize) { const LinalgTransformationFilter &filter, bool padVectorize) {
return std::make_unique<LinalgStrategyVectorizePass>(opName, opt, filter, return std::make_unique<LinalgStrategyVectorizePass>(opName, opt, filter,
padVectorize); padVectorize);
} }
/// Create a LinalgStrategyEnablePass.
std::unique_ptr<OperationPass<func::FuncOp>>
mlir::createLinalgStrategyEnablePass(LinalgEnablingOptions opt,
const LinalgTransformationFilter &filter) {
return std::make_unique<LinalgStrategyEnablePass>(opt, filter);
}
/// Create a LinalgStrategyLowerVectorsPass. /// Create a LinalgStrategyLowerVectorsPass.
std::unique_ptr<OperationPass<func::FuncOp>> std::unique_ptr<OperationPass<func::FuncOp>>
mlir::createLinalgStrategyLowerVectorsPass( mlir::createLinalgStrategyLowerVectorsPass(
LinalgVectorLoweringOptions opt, const LinalgTransformationFilter &filter) { LinalgVectorLoweringOptions opt, const LinalgTransformationFilter &filter) {
return std::make_unique<LinalgStrategyLowerVectorsPass>(opt, filter); return std::make_unique<LinalgStrategyLowerVectorsPass>(opt, filter);
} }
/// Create a LinalgStrategyRemoveMarkersPass. /// Create a LinalgStrategyRemoveMarkersPass.
std::unique_ptr<OperationPass<func::FuncOp>> std::unique_ptr<OperationPass<func::FuncOp>>
mlir::createLinalgStrategyRemoveMarkersPass() { mlir::createLinalgStrategyRemoveMarkersPass() {
return std::make_unique<LinalgStrategyRemoveMarkersPass>(); return std::make_unique<LinalgStrategyRemoveMarkersPass>();
} }