From 7741de94358b827086a4542202fdb2aac99687d4 Mon Sep 17 00:00:00 2001 From: Nicolas Vasilache Date: Wed, 15 Jan 2020 09:48:49 -0500 Subject: [PATCH] [mlir][Linalg] NFC - Cleanup Linalg Pass locations and namespacing Summary: This diff moves the conversion pass declaration closer to its definition and makes the namespacing of passes consistent with the rest of the infrastructure (i.e. `mlir::linalg::createXXXPass` -> `mlir::createXXXPass`). Reviewers: ftynse, jpienaar, mehdi_amini Subscribers: rriddle, burmako, shauheen, antiagainst, arpith-jacob, mgester, lucyrfox, aartbik, liufengdb, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D72766 --- mlir/include/mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h | 5 +++++ mlir/include/mlir/Dialect/Linalg/Passes.h | 5 ----- mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp | 3 +-- mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp | 2 +- mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp | 5 ++--- mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp | 2 +- mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/mlir/include/mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h b/mlir/include/mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h index 2795017..b660983 100644 --- a/mlir/include/mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h +++ b/mlir/include/mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h @@ -13,6 +13,8 @@ namespace mlir { class MLIRContext; +class ModuleOp; +template class OpPassBase; class LinalgTypeConverter : public LLVMTypeConverter { public: @@ -25,6 +27,9 @@ void populateLinalgToLLVMConversionPatterns(LinalgTypeConverter &converter, OwningRewritePatternList &patterns, MLIRContext *ctx); +/// Create a pass to convert Linalg operations to the LLVMIR dialect. +std::unique_ptr> createConvertLinalgToLLVMPass(); + } // namespace mlir #endif // MLIR_CONVERSION_LINALGTOLLVM_LINALGTOLLVM_H_ diff --git a/mlir/include/mlir/Dialect/Linalg/Passes.h b/mlir/include/mlir/Dialect/Linalg/Passes.h index 86cf6fd..fdf3e3c 100644 --- a/mlir/include/mlir/Dialect/Linalg/Passes.h +++ b/mlir/include/mlir/Dialect/Linalg/Passes.h @@ -21,7 +21,6 @@ class FuncOp; class ModuleOp; template class OpPassBase; -namespace linalg { std::unique_ptr> createLinalgFusionPass(); std::unique_ptr> @@ -39,10 +38,6 @@ std::unique_ptr> createConvertLinalgToLoopsPass(); /// Placeholder for now, this is NYI. std::unique_ptr> createConvertLinalgToAffineLoopsPass(); -/// Create a pass to convert Linalg operations to the LLVMIR dialect. -std::unique_ptr> createConvertLinalgToLLVMPass(); - -} // namespace linalg } // namespace mlir #endif // MLIR_DIALECT_LINALG_PASSES_H_ diff --git a/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp b/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp index a88c9c4..d2cbcfd 100644 --- a/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp +++ b/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp @@ -594,8 +594,7 @@ void ConvertLinalgToLLVMPass::runOnModule() { signalPassFailure(); } -std::unique_ptr> -mlir::linalg::createConvertLinalgToLLVMPass() { +std::unique_ptr> mlir::createConvertLinalgToLLVMPass() { return std::make_unique(); } diff --git a/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp index 6ad73ee..f76d637 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp @@ -360,7 +360,7 @@ struct LinalgFusionPass : public FunctionPass { }; } // namespace -std::unique_ptr> mlir::linalg::createLinalgFusionPass() { +std::unique_ptr> mlir::createLinalgFusionPass() { return std::make_unique(); } diff --git a/mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp b/mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp index 7e1176f..db2ad3e 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp @@ -562,8 +562,7 @@ void LowerLinalgToLoopsPass::runOnFunction() { /// Create a pass to convert Linalg operations to loop.for loops and /// std.load/std.store accesses. -std::unique_ptr> -mlir::linalg::createConvertLinalgToLoopsPass() { +std::unique_ptr> mlir::createConvertLinalgToLoopsPass() { return std::make_unique< LowerLinalgToLoopsPass>(); } @@ -572,7 +571,7 @@ mlir::linalg::createConvertLinalgToLoopsPass() { /// affine_load/affine_store accesses. /// Placeholder for now, this is NYI. std::unique_ptr> -mlir::linalg::createConvertLinalgToAffineLoopsPass() { +mlir::createConvertLinalgToAffineLoopsPass() { return std::make_unique< LowerLinalgToLoopsPass>(); } diff --git a/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp index 3caa8c8..57c369a 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp @@ -238,7 +238,7 @@ struct LinalgPromotionPass : public FunctionPass { } // namespace std::unique_ptr> -mlir::linalg::createLinalgPromotionPass(bool dynamicBuffers) { +mlir::createLinalgPromotionPass(bool dynamicBuffers) { return std::make_unique(dynamicBuffers); } diff --git a/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp b/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp index 003707b..2de709f 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp @@ -457,7 +457,7 @@ LinalgTilingPass::LinalgTilingPass(ArrayRef sizes) { } std::unique_ptr> -mlir::linalg::createLinalgTilingPass(ArrayRef tileSizes) { +mlir::createLinalgTilingPass(ArrayRef tileSizes) { return std::make_unique(tileSizes); } -- 2.7.4