Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixes
  • Loading branch information
Butygin
Butygin committed Mar 10, 2021
commit aa0b0b608c4578955fc216da851a5265314ad99e
25 changes: 23 additions & 2 deletions mlir-compiler/mlir-compiler/src/pipelines/plier_to_linalg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,28 @@ void PostPlierToLinalgPass::runOnOperation()
(void)mlir::applyPatternsAndFoldGreedily(getOperation(), std::move(patterns));
}

struct TensorFusionPass :
public mlir::PassWrapper<TensorFusionPass, mlir::OperationPass<mlir::ModuleOp>>
{
void runOnOperation() override;
};

void TensorFusionPass::runOnOperation()
{
mlir::OwningRewritePatternList patterns;

auto& context = getContext();
plier::populate_common_opts_patterns(context, patterns);

patterns.insert<
SimplifyExpandDims
>(&getContext());

mlir::populateLinalgTensorOpsFusionPatterns(&context, patterns);

(void)mlir::applyPatternsAndFoldGreedily(getOperation(), std::move(patterns));
}

struct CommonOptPass :
public mlir::PassWrapper<CommonOptPass, mlir::OperationPass<mlir::ModuleOp>>
{
Expand Down Expand Up @@ -1008,8 +1030,7 @@ void populate_plier_to_linalg_gen_pipeline(mlir::OpPassManager& pm)

void populate_plier_to_linalg_opt_pipeline(mlir::OpPassManager& pm)
{
pm.addPass(mlir::createLinalgFusionOfTensorOpsPass());
pm.addPass(std::make_unique<CommonOptPass>());
pm.addPass(std::make_unique<TensorFusionPass>());

pm.addPass(mlir::createTensorConstantBufferizePass());
pm.addNestedPass<mlir::FuncOp>(mlir::createSCFBufferizePass());
Expand Down
2 changes: 1 addition & 1 deletion mlir-compiler/plier/include/plier/rewrites/if_rewrites.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace plier
struct IfOpConstCond : public mlir::OpRewritePattern<mlir::scf::IfOp>
{
IfOpConstCond(mlir::MLIRContext *context):
mlir::OpRewritePattern<mlir::scf::IfOp>(context, /*benefit*/1) {}
mlir::OpRewritePattern<mlir::scf::IfOp>(context, /*benefit*/2) {}

mlir::LogicalResult matchAndRewrite(
mlir::scf::IfOp op, mlir::PatternRewriter &rewriter) const override;
Expand Down
4 changes: 2 additions & 2 deletions mlir-compiler/plier/src/rewrites/common_opts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ void plier::populate_common_opts_patterns(mlir::MLIRContext& context, mlir::Owni
plier::CmpLoopBoundsSimplify,
SimplifyEmptyIf,
plier::IfOpConstCond,
SimplifySelect,
plier::CSERewrite<mlir::FuncOp>
SimplifySelect
// plier::CSERewrite<mlir::FuncOp> // TODO
>(&context);

plier::populate_index_propagate_patterns(context, patterns);
Expand Down