[Mlir-commits] [mlir] 24edbdf - [MLIR] Clean up `shape` to `std` lowering

[Frederik Gossen]

Author: Frederik Gossen
Date: 2020-06-08T08:59:53Z
New Revision: 24edbdf99b02742591ffa7655bbd1fa1fa03c6d5

URL: https://github.com/llvm/llvm-project/commit/24edbdf99b02742591ffa7655bbd1fa1fa03c6d5
DIFF: https://github.com/llvm/llvm-project/commit/24edbdf99b02742591ffa7655bbd1fa1fa03c6d5.diff

LOG: [MLIR] Clean up `shape` to `std` lowering

Apply post-commit suggestions to the new lowering.

Differential Revision: https://reviews.llvm.org/D81160

Added: 
    

Modified: 
    mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
    mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h b/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
index 6b5ce8bfd274..74e4ff758022 100644
--- a/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
+++ b/mlir/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
@@ -9,7 +9,7 @@
 #ifndef MLIR_CONVERSION_SHAPETOSTANDARD_SHAPETOSTANDARD_H_
 #define MLIR_CONVERSION_SHAPETOSTANDARD_SHAPETOSTANDARD_H_
 
-#include "mlir/Transforms/DialectConversion.h"
+#include <memory>
 
 namespace mlir {
 
@@ -17,6 +17,7 @@ class MLIRContext;
 class ModuleOp;
 template <typename T>
 class OperationPass;
+class OwningRewritePatternList;
 
 void populateShapeToStandardConversionPatterns(
     OwningRewritePatternList &patterns, MLIRContext *ctx);

diff  --git a/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp b/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp
index 0083ebdfa21b..1ddd681ea675 100644
--- a/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp
+++ b/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp
@@ -14,7 +14,8 @@
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Transforms/DialectConversion.h"
 
-namespace mlir {
+using namespace mlir;
+
 namespace {
 
 /// Conversion patterns.
@@ -90,7 +91,7 @@ class ConvertShapeToStandardPass
 
 } // namespace
 
-void populateShapeToStandardConversionPatterns(
+void mlir::populateShapeToStandardConversionPatterns(
     OwningRewritePatternList &patterns, MLIRContext *ctx) {
   // clang-format off
   patterns.insert<
@@ -99,8 +100,7 @@ void populateShapeToStandardConversionPatterns(
   // clang-format on
 }
 
-std::unique_ptr<OperationPass<ModuleOp>> createConvertShapeToStandardPass() {
+std::unique_ptr<OperationPass<ModuleOp>>
+mlir::createConvertShapeToStandardPass() {
   return std::make_unique<ConvertShapeToStandardPass>();
 }
-
-} // namespace mlir