[mlir][Linalg] NFC - Cleanup Linalg Pass locations and namespacing

Nicolas Vasilache · Nicolas Vasilache · commit 7741de94358b · 2020-01-15T11:06:28.000-05:00
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
diff --git 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 <typename T> 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<OpPassBase<ModuleOp>> 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
@@ -21,7 +21,6 @@ class FuncOp;
 class ModuleOp;
 template <typename T> class OpPassBase;
 
-namespace linalg {
 std::unique_ptr<OpPassBase<FuncOp>> createLinalgFusionPass();
 
 std::unique_ptr<OpPassBase<FuncOp>>
@@ -39,10 +38,6 @@ std::unique_ptr<OpPassBase<FuncOp>> createConvertLinalgToLoopsPass();
 /// Placeholder for now, this is NYI.
 std::unique_ptr<OpPassBase<FuncOp>> createConvertLinalgToAffineLoopsPass();
 
-/// Create a pass to convert Linalg operations to the LLVMIR dialect.
-std::unique_ptr<OpPassBase<ModuleOp>> 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
@@ -594,8 +594,7 @@ void ConvertLinalgToLLVMPass::runOnModule() {
     signalPassFailure();
 }
 
-std::unique_ptr<OpPassBase<ModuleOp>>
-mlir::linalg::createConvertLinalgToLLVMPass() {
+std::unique_ptr<OpPassBase<ModuleOp>> mlir::createConvertLinalgToLLVMPass() {
   return std::make_unique<ConvertLinalgToLLVMPass>();
 }
 
diff --git a/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp
@@ -360,7 +360,7 @@ struct LinalgFusionPass : public FunctionPass<LinalgFusionPass> {
 };
 } // namespace
 
-std::unique_ptr<OpPassBase<FuncOp>> mlir::linalg::createLinalgFusionPass() {
+std::unique_ptr<OpPassBase<FuncOp>> mlir::createLinalgFusionPass() {
   return std::make_unique<LinalgFusionPass>();
 }
 
diff --git a/mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp b/mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp
@@ -562,8 +562,7 @@ void LowerLinalgToLoopsPass<LoopType, IndexedValueType>::runOnFunction() {
 
 /// Create a pass to convert Linalg operations to loop.for loops and
 /// std.load/std.store accesses.
-std::unique_ptr<OpPassBase<FuncOp>>
-mlir::linalg::createConvertLinalgToLoopsPass() {
+std::unique_ptr<OpPassBase<FuncOp>> mlir::createConvertLinalgToLoopsPass() {
   return std::make_unique<
       LowerLinalgToLoopsPass<loop::ForOp, IndexedStdValue>>();
 }
@@ -572,7 +571,7 @@ mlir::linalg::createConvertLinalgToLoopsPass() {
 /// affine_load/affine_store accesses.
 /// Placeholder for now, this is NYI.
 std::unique_ptr<OpPassBase<FuncOp>>
-mlir::linalg::createConvertLinalgToAffineLoopsPass() {
+mlir::createConvertLinalgToAffineLoopsPass() {
   return std::make_unique<
       LowerLinalgToLoopsPass<AffineForOp, IndexedAffineValue>>();
 }
diff --git a/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp
@@ -238,7 +238,7 @@ struct LinalgPromotionPass : public FunctionPass<LinalgPromotionPass> {
 } // namespace
 
 std::unique_ptr<OpPassBase<FuncOp>>
-mlir::linalg::createLinalgPromotionPass(bool dynamicBuffers) {
+mlir::createLinalgPromotionPass(bool dynamicBuffers) {
   return std::make_unique<LinalgPromotionPass>(dynamicBuffers);
 }
 
diff --git a/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp b/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp
@@ -457,7 +457,7 @@ LinalgTilingPass::LinalgTilingPass(ArrayRef<int64_t> sizes) {
 }
 
 std::unique_ptr<OpPassBase<FuncOp>>
-mlir::linalg::createLinalgTilingPass(ArrayRef<int64_t> tileSizes) {
+mlir::createLinalgTilingPass(ArrayRef<int64_t> tileSizes) {
   return std::make_unique<LinalgTilingPass>(tileSizes);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -594,8 +594,7 @@ void ConvertLinalgToLLVMPass::runOnModule() {`
`594`	`594`	`signalPassFailure();`
`595`	`595`	`}`
`596`	`596`
`597`		`-std::unique_ptr<OpPassBase<ModuleOp>>`
`598`		`-mlir::linalg::createConvertLinalgToLLVMPass() {`
	`597`	`+std::unique_ptr<OpPassBase<ModuleOp>> mlir::createConvertLinalgToLLVMPass() {`
`599`	`598`	`return std::make_unique<ConvertLinalgToLLVMPass>();`
`600`	`599`	`}`
`601`	`600`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ struct LinalgFusionPass : public FunctionPass<LinalgFusionPass> {`
`360`	`360`	`};`
`361`	`361`	`} // namespace`
`362`	`362`
`363`		`-std::unique_ptr<OpPassBase<FuncOp>> mlir::linalg::createLinalgFusionPass() {`
	`363`	`+std::unique_ptr<OpPassBase<FuncOp>> mlir::createLinalgFusionPass() {`
`364`	`364`	`return std::make_unique<LinalgFusionPass>();`
`365`	`365`	`}`
`366`	`366`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ struct LinalgPromotionPass : public FunctionPass<LinalgPromotionPass> {`
`238`	`238`	`} // namespace`
`239`	`239`
`240`	`240`	`std::unique_ptr<OpPassBase<FuncOp>>`
`241`		`-mlir::linalg::createLinalgPromotionPass(bool dynamicBuffers) {`
	`241`	`+mlir::createLinalgPromotionPass(bool dynamicBuffers) {`
`242`	`242`	`return std::make_unique<LinalgPromotionPass>(dynamicBuffers);`
`243`	`243`	`}`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ LinalgTilingPass::LinalgTilingPass(ArrayRef<int64_t> sizes) {`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`std::unique_ptr<OpPassBase<FuncOp>>`
`460`		`-mlir::linalg::createLinalgTilingPass(ArrayRef<int64_t> tileSizes) {`
	`460`	`+mlir::createLinalgTilingPass(ArrayRef<int64_t> tileSizes) {`
`461`	`461`	`return std::make_unique<LinalgTilingPass>(tileSizes);`
`462`	`462`	`}`
`463`	`463`