Merge into one pass

Author: niuxiaog

include/gc/Transforms/Passes.h

@@ -124,7 +124,6 @@ void populateGPUPipeline(mlir::OpPassManager &);
 #define GEN_PASS_DECL_CONSTANTTENSORFOLDING
 #include "gc/Transforms/Passes.h.inc"
 
-std::unique_ptr<Pass> createConstantSubgraphAnalysisPass();
 std::unique_ptr<Pass> createConstantTensorFoldingPass();
 
 #define GEN_PASS_REGISTRATION

include/gc/Transforms/Passes.td

@@ -169,14 +169,6 @@ def MergeNestedForall : Pass<"merge-nested-forall"> {
   let dependentDialects = ["scf::SCFDialect"];
 }
 
-def ConstantSubgraphAnalysis : Pass<"constant-subgraph-analysis"> {
-  let summary = "Constant Subgraph Analysis";
-  let description = [{
-    This pass implements a constant subgraph analysis.
-  }];
-  let constructor = "mlir::gc::createConstantSubgraphAnalysisPass()";
-}
-
 def ConstantTensorFolding : Pass<"constant-tensor-folding"> {
   let summary = "Constant Tensor Folding Transform";
   let description = [{

lib/gc/Transforms/CMakeLists.txt

@@ -16,7 +16,6 @@ gc_add_mlir_library(GcPasses
   IterativeTilingAndFusion.cpp
   TilingUsingInterfaceX.cpp
   VerifyTargetDescription.cpp
-  ConstantSubgraphAnalysis.cpp
   ConstantTensorFolding.cpp
   DecomposeAggregatedOps.cpp
   DeepTileContractionOp.cpp

lib/gc/Transforms/ConstantSubgraphAnalysis.cpp

@@ -13,6 +13,7 @@
 #include <iostream>
 #include <unordered_set>
 
+#include "gc/Analysis/DataFlow/ConstantSubgraphAnalyser.h"
 #include "mlir/Transforms/Passes.h"
 
 #include "mlir/Dialect/Arith/IR/Arith.h"
@@ -766,6 +767,10 @@ void ConstantTensorFolding::runOnOperation() {
   MLIRContext *context = topOp->getContext();
   auto &topFunc =
       topOp->getRegions().front().getBlocks().front().getOperations().front();
+
+  dataflow::RunConstantSubgraphAnalyser runAnalyser;
+  (void)runAnalyser.run(&topFunc);
+
   OpBuilder builder(context);
   Region &region = topFunc.getRegions().front();
   Block &block = region.getBlocks().front();

lib/gc/Transforms/ConstantTensorFolding.cpp

@@ -52,8 +52,6 @@ void populateFrontendPasses(mlir::OpPassManager &pm) {
 void populateTensorPasses(mlir::OpPassManager &pm) {
   // todo: padding propagation pass
   // todo: layout propagation pass
-  // todo: tensor constant propagation pass
-  pm.addPass(createConstantSubgraphAnalysisPass());
   pm.addPass(createConstantTensorFoldingPass());
   // linalg.matmul lowering to (scf.loop + linalg.brgemm) pass
   pm.addNestedPass<func::FuncOp>(createDeepTileContractionOp());

lib/gc/Transforms/Pipeline.cpp

@@ -1,4 +1,4 @@
-// RUN: gc-opt --split-input-file -pass-pipeline="builtin.module(constant-subgraph-analysis,constant-tensor-folding)" %s | FileCheck %s
+// RUN: gc-opt --split-input-file -pass-pipeline="builtin.module(constant-tensor-folding)" %s | FileCheck %s
 
 // COM：A complete example of compile-time and runtime folding.
 

test/gc/Transforms/test_constant_tensor_folding-0.mlir

@@ -1,4 +1,4 @@
-// RUN: gc-opt --split-input-file -pass-pipeline="builtin.module(constant-subgraph-analysis,constant-tensor-folding)" %s | FileCheck %s
+// RUN: gc-opt --split-input-file -pass-pipeline="builtin.module(constant-tensor-folding)" %s | FileCheck %s
 
 // COM: Test the 'postponeBroadcast' feature of constant tensor folding.