[CINN] Delete unused shape_analysis in group merge (#61680)

zyfncg · web-flow · commit c5c37e51abb0 · 2024-02-20T16:56:20.000+08:00
* delete unused shape analysis in group merge

* update header
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/divide_group_op_to_fusion_op_pass.cc b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/divide_group_op_to_fusion_op_pass.cc
@@ -180,12 +180,11 @@ class GroupOpPattern : public pir::OpRewritePattern<cinn::dialect::GroupOp> {
     // op fusion
     auto group_list = cinn::dialect::ir::OpFusionPassInternal(
         GetOpListNotIncludeYield(group_op.GetOperators()),
-        GetOutputOpList(group_op.GetOperators()),
-        nullptr);
+        GetOutputOpList(group_op.GetOperators()));
 
     // fusion merge
     auto merged_group_list =
-        cinn::dialect::ir::GeneralFusionMergePassInternal(group_list, nullptr);
+        cinn::dialect::ir::GeneralFusionMergePassInternal(group_list);
 
     auto& shape_analysis =
         pir::ShapeAnalysisManager::Instance().Get(group_op->GetParentProgram());
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/group_with_group_merge_pass.cc b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/group_with_group_merge_pass.cc
@@ -1080,10 +1080,7 @@ class FusionPassRegistrar final : public Registrar {
 // code generation.
 class GeneralFusionMergePassHelper {
  public:
-  explicit GeneralFusionMergePassHelper(
-      const GroupList& group_list,
-      const std::shared_ptr<pir::ShapeConstraintIRAnalysis>& shape_analysis)
-      : shape_analysis_(shape_analysis) {
+  explicit GeneralFusionMergePassHelper(const GroupList& group_list) {
     fusion_groups_ = group_list;
     // init input to consumers.
     InitInputToConsumers();
@@ -2213,29 +2210,21 @@ class GeneralFusionMergePassHelper {
     }
   }
 
-  std::shared_ptr<pir::ShapeConstraintIRAnalysis> shape_analysis() const {
-    return CHECK_NOTNULL(shape_analysis_.lock());
-  }
-
   GroupList fusion_groups_;
   std::unordered_map<GroupPtr, int> fusion_groups_index_;
   std::unordered_set<const ::pir::Operation*> output_ops_set_;
   std::unordered_map<::pir::Value,
                      std::unordered_set<GroupPtr, Hasher, Comparator>>
       input_to_consumers_;
-  std::weak_ptr<pir::ShapeConstraintIRAnalysis> shape_analysis_;
 };
 
-GroupList GeneralFusionMergePassInternal(
-    const GroupList& group_list,
-    const std::shared_ptr<pir::ShapeConstraintIRAnalysis>& shape_analysis) {
+GroupList GeneralFusionMergePassInternal(const GroupList& group_list) {
   if (group_list.size() <= 1) {
     VLOG(3) << "Don't do Fusoin Merge Pass...!";
     return group_list;
   }
 
-  GeneralFusionMergePassHelper fusion_merge_pass_helper(group_list,
-                                                        shape_analysis);
+  GeneralFusionMergePassHelper fusion_merge_pass_helper(group_list);
   auto res = fusion_merge_pass_helper();
 
   if (VLOG_IS_ON(6)) {
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_pass.cc b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_pass.cc
@@ -248,10 +248,7 @@ class OpFusionPassHelper {
  public:
   explicit OpFusionPassHelper(
       const std::vector<pir::Operation*>& op_list,
-      const std::vector<pir::Operation*>& output_op_list = {},
-      const std::shared_ptr<pir::ShapeConstraintIRAnalysis>& shape_analysis =
-          nullptr)
-      : shape_analysis_(shape_analysis) {
+      const std::vector<pir::Operation*>& output_op_list = {}) {
     // init fusion relation
     InitFusionRelation();
     // filter op data, create group for each op
@@ -625,10 +622,6 @@ class OpFusionPassHelper {
     return false;
   }
 
-  std::shared_ptr<pir::ShapeConstraintIRAnalysis> shape_analysis() const {
-    return CHECK_NOTNULL(shape_analysis_.lock());
-  }
-
   std::vector<::pir::Operation*> ops_;
   std::unordered_map<const ::pir::Operation*, GroupPtr> fusion_groups_;
   std::unordered_set<const ::pir::Operation*> output_ops_set_;
@@ -646,17 +639,14 @@ class OpFusionPassHelper {
     std::unordered_map<OpPatternKind, ConditionFunction> fusion_op_kind = {};
   };
   std::unordered_map<OpPatternKind, FusionRelation> fusion_relation_map_;
-  std::weak_ptr<pir::ShapeConstraintIRAnalysis> shape_analysis_;
 };
 
 GroupList OpFusionPassInternal(
     const std::vector<pir::Operation*>& op_list,
-    const std::vector<pir::Operation*>& output_op_list,
-    const std::shared_ptr<pir::ShapeConstraintIRAnalysis>& shape_analysis) {
+    const std::vector<pir::Operation*>& output_op_list) {
   VLOG(3) << "OpFusionPass...!";
 
-  auto op_fusion_helper =
-      OpFusionPassHelper(op_list, output_op_list, shape_analysis);
+  auto op_fusion_helper = OpFusionPassHelper(op_list, output_op_list);
   auto res = op_fusion_helper();
 
   if (VLOG_IS_ON(6)) {
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_pass.h b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_pass.h
@@ -27,14 +27,9 @@ using GroupList = std::vector<GroupPtr>;
 
 GroupList OpFusionPassInternal(
     const std::vector<pir::Operation*>& op_list,
-    const std::vector<pir::Operation*>& output_op_list = {},
-    const std::shared_ptr<pir::ShapeConstraintIRAnalysis>& shape_analysis =
-        nullptr);
+    const std::vector<pir::Operation*>& output_op_list = {});
 
-GroupList GeneralFusionMergePassInternal(
-    const GroupList& group_list,
-    const std::shared_ptr<pir::ShapeConstraintIRAnalysis>& shape_analysis =
-        nullptr);
+GroupList GeneralFusionMergePassInternal(const GroupList& group_list);
 
 }  // namespace ir
 }  // namespace dialect
