Refactor optimize() back

src/contrib/mlir/compiler.cpp

@@ -234,31 +234,20 @@ MLIRCompiler::TensorInfo MLIRCompiler::get_tensor_value(descriptor::Tensor* tens
 void MLIRCompiler::lower_ng_dialect()
 {
     // Lower NG dialect to Affine
-    {
-        mlir::PassManager pm;
-        pm.addPass(mlir::createDialectLoweringPass(this));
-        pm.addPass(mlir::createCanonicalizerPass());
-
-        pm.run(m_module.get());
+    mlir::PassManager pm;
+    pm.addPass(mlir::createDialectLoweringPass(this));
+    pm.addPass(mlir::createCanonicalizerPass());
 
-        if (failed(m_module->verify()))
-        {
-            NGRAPH_CHECK(false, "Incorrect module after dialect lowering");
-        }
+    pm.run(m_module.get());
 
-        dump_mlir_module("Affine Dialect Dump:");
+    if (failed(m_module->verify()))
+    {
+        NGRAPH_CHECK(false, "Incorrect module after dialect lowering");
     }
 
-    // Lower Affine to Std Dialect
-    {
-        mlir::PassManager pm;
-        // Lower affine ops
-        pm.addPass(mlir::createLowerAffinePass());
-        auto rr = pm.run(m_module.get());
-        NGRAPH_CHECK(succeeded(rr), "Affine loop lowering failed");
+    dump_mlir_module("Affine Dialect Dump:");
 
-        dump_mlir_module("Standard Dialect Dump:");
-    }
+    optimize();
 
     NGRAPH_CHECK(m_module, "MLIR module is not ready.");
 
@@ -296,6 +285,18 @@ void MLIRCompiler::lower_ng_dialect()
     m_engine = std::move(maybeEngine.get());
 }
 
+void MLIRCompiler::optimize()
+{
+    // Lower Affine to Std Dialect
+    mlir::PassManager pm;
+    // Lower affine ops
+    pm.addPass(mlir::createLowerAffinePass());
+    auto rr = pm.run(m_module.get());
+    NGRAPH_CHECK(succeeded(rr), "Affine loop lowering failed");
+
+    dump_mlir_module("Standard Dialect Dump:");
+}
+
 // MLIR builders
 #define TI(x) std::type_index(typeid(x))
 

src/contrib/mlir/compiler.hpp

@@ -67,6 +67,7 @@ namespace ngraph
 
                 /// Compiles a subgraph with MLIR
                 void compile();
+
                 /// Executes a pre-compiled subgraph
                 void run(std::vector<void*>& external_tensors);
 
@@ -88,6 +89,7 @@ namespace ngraph
             private:
                 void build_ng_dialect_module();
                 void lower_ng_dialect();
+                void optimize();
                 void bind_arguments(std::vector<void*>& external_tensors);
                 void execute();
                 void cleanup();