Fix GetFusableConsumerGroupLists GetFusibleConsumerGroupLists, etc (#62459)

co63oc · web-flow · commit 7bfde2483b18 · 2024-03-06T18:26:20.000+08:00
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
@@ -1328,7 +1328,7 @@ class GeneralFusionMergePassHelper {
   bool GeneralHorizontalFuse(const GroupPtr& producer) {
     VLOG(3) << "GeneralHorizontalFuse handling producer : "
             << producer->group_id;
-    const auto& GetFusableConsumerGroupLists =
+    const auto& GetFusibleConsumerGroupLists =
         [&]() -> std::vector<OpGroupList> {
       std::vector<OpGroupList> tagged_lists;
       const auto& MarkFusible = [&](const OpGroupList& candidates) {
@@ -1339,8 +1339,8 @@ class GeneralFusionMergePassHelper {
       EnableFusedHorizontalGroups(&fuse_ctx);
       return tagged_lists;
     };
-    const auto& GetFusableConsumerGroupList = [&]() -> std::vector<GroupList> {
-      const auto& group_lists = GetFusableConsumerGroupLists();
+    const auto& GetFusibleConsumerGroupList = [&]() -> std::vector<GroupList> {
+      const auto& group_lists = GetFusibleConsumerGroupLists();
       if (group_lists.empty()) {
         return std::vector<GroupList>{};
       }
@@ -1355,7 +1355,7 @@ class GeneralFusionMergePassHelper {
       return ret;
     };
 
-    const auto& group_lists = GetFusableConsumerGroupList();
+    const auto& group_lists = GetFusibleConsumerGroupList();
     if (group_lists.empty()) {
       return false;
     }
@@ -1387,7 +1387,7 @@ class GeneralFusionMergePassHelper {
   bool CallGeneralInputFusePass(
       const std::unordered_set<GroupPtr, Hasher, Comparator>& consumers) {
     VLOG(3) << "CallGeneralInputFusePass...!";
-    const auto& GetFusableConsumerGroupLists =
+    const auto& GetFusibleConsumerGroupLists =
         [&]() -> std::vector<OpGroupList> {
       std::vector<OpGroupList> tagged_lists;
       const auto& MarkFusible = [&](const OpGroupList& candidates) {
@@ -1402,8 +1402,8 @@ class GeneralFusionMergePassHelper {
       EnableFusedInputGroups(&fuse_ctx);
       return tagged_lists;
     };
-    const auto& GetFusableConsumerGroupList = [&]() -> std::vector<GroupList> {
-      const auto& group_lists = GetFusableConsumerGroupLists();
+    const auto& GetFusibleConsumerGroupList = [&]() -> std::vector<GroupList> {
+      const auto& group_lists = GetFusibleConsumerGroupLists();
       if (group_lists.empty()) {
         return std::vector<GroupList>{};
       }
@@ -1418,7 +1418,7 @@ class GeneralFusionMergePassHelper {
       return ret;
     };
 
-    const auto& group_lists = GetFusableConsumerGroupList();
+    const auto& group_lists = GetFusibleConsumerGroupList();
     if (group_lists.empty()) {
       return false;
     }
@@ -1613,7 +1613,7 @@ class GeneralFusionMergePassHelper {
   bool GeneralVerticalFuse(const GroupPtr& producer) {
     VLOG(3) << "GeneralVerticalFuse...!";
     using GroupSets = std::vector<std::pair<OpGroupPtr, OpGroupPtr>>;
-    const auto& GetFusableConsumerOpGroupSets = [&]() -> GroupSets {
+    const auto& GetFusibleConsumerOpGroupSets = [&]() -> GroupSets {
       GroupSets tagged_sets;
       const auto& MarkFusible = [&](const OpGroupPtr& first,
                                     const OpGroupPtr& second) {
@@ -1625,9 +1625,9 @@ class GeneralFusionMergePassHelper {
       return tagged_sets;
     };
 
-    auto GetFusableConsumerGroupSet =
+    auto GetFusibleConsumerGroupSet =
         [&]() -> std::unordered_set<GroupPtr, Hasher, Comparator> {
-      const auto& group_sets = GetFusableConsumerOpGroupSets();
+      const auto& group_sets = GetFusibleConsumerOpGroupSets();
       if (group_sets.empty()) {
         return {};
       }
@@ -1639,7 +1639,7 @@ class GeneralFusionMergePassHelper {
     };
 
     bool update = false;
-    auto consumer_groups = GetFusableConsumerGroupSet();
+    auto consumer_groups = GetFusibleConsumerGroupSet();
     if (consumer_groups.size()) {
       SelectConsumerToFuse(producer, &consumer_groups);
     }
@@ -1868,7 +1868,7 @@ class GeneralFusionMergePassHelper {
     VLOG(3) << "GeneralRecomputeFuse handling producer : "
             << producer->group_id;
     using GroupSets = std::set<std::pair<OpGroupPtr, OpGroupPtr>>;
-    const auto& GetFusableConsumerOpGroupSets = [&]() -> GroupSets {
+    const auto& GetFusibleConsumerOpGroupSets = [&]() -> GroupSets {
       GroupSets tagged_sets;
       const auto& MarkFusible = [&](const OpGroupPtr& first,
                                     const OpGroupPtr& second) {
@@ -1880,9 +1880,9 @@ class GeneralFusionMergePassHelper {
       return tagged_sets;
     };
 
-    auto GetFusableConsumerGroupSet =
+    auto GetFusibleConsumerGroupSet =
         [&]() -> std::unordered_set<GroupPtr, Hasher, Comparator> {
-      const auto& group_sets = GetFusableConsumerOpGroupSets();
+      const auto& group_sets = GetFusibleConsumerOpGroupSets();
       if (group_sets.empty()) {
         return {};
       }
@@ -1894,7 +1894,7 @@ class GeneralFusionMergePassHelper {
     };
 
     bool update = false;
-    auto consumer_groups = GetFusableConsumerGroupSet();
+    auto consumer_groups = GetFusibleConsumerGroupSet();
     if (consumer_groups.size() > 0) {
       CHECK(consumer_groups.size() == producer->mut_consumer_groups()->size())
           << "Recompute requires fuse all consumers!";
diff --git a/paddle/cinn/hlir/framework/op_lowering_impl.h b/paddle/cinn/hlir/framework/op_lowering_impl.h
@@ -28,9 +28,9 @@
 #include "paddle/cinn/lang/packed_func.h"
 
 // Fusion Op lowering, there are four kinds of lowering function:
-// Elementwise/Broadcast/Injective,Reduce,OutEWiseFusable,NonFusible.
+// Elementwise/Broadcast/Injective,Reduce,OutEWiseFusible,NonFusible.
 // Elementwise/Broadcast/Injective Ops is with same schedule.
-// Reduce,OutEWiseFusable,NonFusible are using different schedule.
+// Reduce,OutEWiseFusible,NonFusible are using different schedule.
 
 namespace cinn {
 namespace hlir {
diff --git a/paddle/cinn/hlir/framework/op_lowering_impl_base.h b/paddle/cinn/hlir/framework/op_lowering_impl_base.h
@@ -19,9 +19,9 @@
 #include "paddle/cinn/ir/lowered_func.h"
 
 // Fusion Op lowering, there are four kinds of lowering function:
-// Elementwise/Broadcast/Injective,Reduce,OutEWiseFusable,NonFusible.
+// Elementwise/Broadcast/Injective,Reduce,OutEWiseFusible,NonFusible.
 // Elementwise/Broadcast/Injective Ops is with same schedule.
-// Reduce,OutEWiseFusable,NonFusible are using different schedule.
+// Reduce,OutEWiseFusible,NonFusible are using different schedule.
 
 namespace cinn {
 namespace hlir {
diff --git a/paddle/cinn/hlir/framework/op_lowering_util.cc b/paddle/cinn/hlir/framework/op_lowering_util.cc
@@ -805,7 +805,7 @@ void LoopAssignReduceWithLast(ir::IRSchedule& ir_sch,  // NOLINT
       ir_sch.Fuse(block_name, {axes[index + 1], axes[index + 1] + 1});
     }
     LoopOrderAssignReduce(ir_sch, block_name, first_axes, target, true);
-    // fuse axis before reduce to bind blockidx.
+    // fuse axis before reduce to bind block idx.
     for (int idx = 0; idx < static_cast<int>(inshape.size() - axes.size()) - 1;
          ++idx) {
       ir_sch.Fuse(block_name, {0, 1});
diff --git a/paddle/cinn/hlir/framework/pir/op_lowering_impl.h b/paddle/cinn/hlir/framework/pir/op_lowering_impl.h
@@ -30,9 +30,9 @@
 #include "paddle/pir/include/core/operation.h"
 
 // Fusion Op lowering, there are four kinds of lowering function:
-// Elementwise/Broadcast/Injective,Reduce,OutEWiseFusable,NonFusible.
+// Elementwise/Broadcast/Injective,Reduce,OutEWiseFusible,NonFusible.
 // Elementwise/Broadcast/Injective Ops is with same schedule.
-// Reduce,OutEWiseFusable,NonFusible are using different schedule.
+// Reduce,OutEWiseFusible,NonFusible are using different schedule.
 
 namespace cinn {
 namespace hlir {
diff --git a/paddle/cinn/hlir/pass/fusion_merge_pass.cc b/paddle/cinn/hlir/pass/fusion_merge_pass.cc
@@ -55,7 +55,7 @@ class FusionMergePassHelper : public FusionHelperBase {
   }
 
   GroupList operator()() {
-    // run fusion merge untill no update.
+    // run fusion merge until no update.
     DoFusionMerge();
     for (auto& group : fusion_groups_) {
       VLOG(3) << "Fusion Group -> " << group->group_id;
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass.cc b/paddle/cinn/hlir/pass/general_fusion_merge_pass.cc
@@ -244,7 +244,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
   bool GeneralHorizontalFuse(const GroupPtr& producer) {
     VLOG(3) << "GeneralHorizontalFuse handling producer : "
             << producer->group_id;
-    const auto& GetFusableConsumerGroupLists =
+    const auto& GetFusibleConsumerGroupLists =
         [&]() -> std::vector<OpGroupList> {
       std::vector<OpGroupList> tagged_lists;
       const auto& MarkFusible = [&](const OpGroupList& candidates) {
@@ -255,8 +255,8 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
       EnableFusedHorizontalGroups(&fuse_ctx);
       return tagged_lists;
     };
-    const auto& GetFusableConsumerGroupList = [&]() -> std::vector<GroupList> {
-      const auto& group_lists = GetFusableConsumerGroupLists();
+    const auto& GetFusibleConsumerGroupList = [&]() -> std::vector<GroupList> {
+      const auto& group_lists = GetFusibleConsumerGroupLists();
       if (group_lists.empty()) {
         return std::vector<GroupList>{};
       }
@@ -271,7 +271,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
       return ret;
     };
 
-    const auto& group_lists = GetFusableConsumerGroupList();
+    const auto& group_lists = GetFusibleConsumerGroupList();
     if (group_lists.empty()) {
       return false;
     }
@@ -303,7 +303,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
   bool CallGeneralInputFusePass(
       const std::unordered_set<GroupPtr, Hasher, Comparator>& consumers) {
     VLOG(3) << "CallGeneralInputFusePass...!";
-    const auto& GetFusableConsumerGroupLists =
+    const auto& GetFusibleConsumerGroupLists =
         [&]() -> std::vector<OpGroupList> {
       std::vector<OpGroupList> tagged_lists;
       const auto& MarkFusible = [&](const OpGroupList& candidates) {
@@ -318,8 +318,8 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
       EnableFusedInputGroups(&fuse_ctx);
       return tagged_lists;
     };
-    const auto& GetFusableConsumerGroupList = [&]() -> std::vector<GroupList> {
-      const auto& group_lists = GetFusableConsumerGroupLists();
+    const auto& GetFusibleConsumerGroupList = [&]() -> std::vector<GroupList> {
+      const auto& group_lists = GetFusibleConsumerGroupLists();
       if (group_lists.empty()) {
         return std::vector<GroupList>{};
       }
@@ -334,7 +334,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
       return ret;
     };
 
-    const auto& group_lists = GetFusableConsumerGroupList();
+    const auto& group_lists = GetFusibleConsumerGroupList();
     if (group_lists.empty()) {
       return false;
     }
@@ -522,7 +522,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
   bool GeneralVerticalFuse(const GroupPtr& producer) {
     VLOG(3) << "GeneralVerticalFuse...!";
     using GroupSets = std::vector<std::pair<OpGroupPtr, OpGroupPtr>>;
-    const auto& GetFusableConsumerOpGroupSets = [&]() -> GroupSets {
+    const auto& GetFusibleConsumerOpGroupSets = [&]() -> GroupSets {
       GroupSets tagged_sets;
       const auto& MarkFusible = [&](const OpGroupPtr& first,
                                     const OpGroupPtr& second) {
@@ -534,9 +534,9 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
       return tagged_sets;
     };
 
-    auto GetFusableConsumerGroupSet =
+    auto GetFusibleConsumerGroupSet =
         [&]() -> std::unordered_set<GroupPtr, Hasher, Comparator> {
-      const auto& group_sets = GetFusableConsumerOpGroupSets();
+      const auto& group_sets = GetFusibleConsumerOpGroupSets();
       if (group_sets.empty()) {
         return {};
       }
@@ -548,7 +548,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
     };
 
     bool update = false;
-    auto consumer_groups = GetFusableConsumerGroupSet();
+    auto consumer_groups = GetFusibleConsumerGroupSet();
     if (consumer_groups.size()) {
       SelectConsumerToFuse(producer, &consumer_groups);
     }
@@ -771,7 +771,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
     VLOG(3) << "GeneralRecomputeFuse handling producer : "
             << producer->group_id;
     using GroupSets = std::set<std::pair<OpGroupPtr, OpGroupPtr>>;
-    const auto& GetFusableConsumerOpGroupSets = [&]() -> GroupSets {
+    const auto& GetFusibleConsumerOpGroupSets = [&]() -> GroupSets {
       GroupSets tagged_sets;
       const auto& MarkFusible = [&](const OpGroupPtr& first,
                                     const OpGroupPtr& second) {
@@ -783,9 +783,9 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
       return tagged_sets;
     };
 
-    auto GetFusableConsumerGroupSet =
+    auto GetFusibleConsumerGroupSet =
         [&]() -> std::unordered_set<GroupPtr, Hasher, Comparator> {
-      const auto& group_sets = GetFusableConsumerOpGroupSets();
+      const auto& group_sets = GetFusibleConsumerOpGroupSets();
       if (group_sets.empty()) {
         return {};
       }
@@ -797,7 +797,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
     };
 
     bool update = false;
-    auto consumer_groups = GetFusableConsumerGroupSet();
+    auto consumer_groups = GetFusibleConsumerGroupSet();
     if (consumer_groups.size() > 0) {
       CHECK(consumer_groups.size() == producer->mut_consumer_groups()->size())
           << "Recompute requires fuse all consumers!";
diff --git a/paddle/cinn/hlir/pass/opfusion.cc b/paddle/cinn/hlir/pass/opfusion.cc
@@ -83,7 +83,7 @@ class DomTree {
       const std::vector<GraphNode*>& nodes) {
     int size = nodes.size();
     dom_nodes_.resize(nodes.size());
-    // construct postdom tree, reverse topological_order
+    // construct post dom tree, reverse topological_order
     for (int i = size - 1; i >= 0; i--) {
       auto* dom_node = CreateDomNode(nodes[i]);
       CHECK(dom_node);
@@ -160,7 +160,7 @@ class DomTree {
           parent = dom_node;
           CHECK(parent);
         } else {
-          // if the out_var links to more than one opnode, then we need to find
+          // if the out_var links to more than one op_node, then we need to find
           // the LCA
           parent = LCA(parent, dom_node, pattern);
         }
@@ -170,7 +170,7 @@ class DomTree {
         VLOG(2) << sink->id() << "'s op pattern is " << op_pattern;
         if (op_node->attrs.attr_store.count("pre_run") &&
             absl::get<bool>(op_node->attrs.attr_store["pre_run"])) {
-          // not fuse pre_run opnode
+          // not fuse pre_run op_node
           op_pattern = framework::kNonFusible;
           VLOG(3) << op_node->op()->name << " do pre_run and not fuse";
         }
@@ -264,7 +264,7 @@ class GraphPartition {
         auto pattern = op_pattern_dict[op_node->op()];
         if (op_node->attrs.attr_store.count("pre_run") &&
             absl::get<bool>(op_node->attrs.attr_store["pre_run"])) {
-          // not fuse pre_run opnode
+          // not fuse pre_run op_node
           pattern = framework::kNonFusible;
           VLOG(3) << op_node->op()->name << " do pre_run and not fuse";
         }
@@ -549,7 +549,7 @@ class GraphPartition {
 void OpFusionPass(Graph* graph) {
   auto store_nodes = std::get<0>(graph->topological_order());
   int node_size = store_nodes.size();
-  // construct postdom tree, reverse topological_order
+  // construct post dom tree, reverse topological_order
   DomTree tree;
   auto& dom_nodes = tree.CreatePostDomTree(store_nodes);
   // graph partition
diff --git a/paddle/cinn/hlir/pass/reduce_split_pass.cc b/paddle/cinn/hlir/pass/reduce_split_pass.cc
@@ -71,7 +71,7 @@ uint32_t NextPowerOf2(uint32_t n) {
 
 class ReduceSplitPass {
  public:
-  // Find the reduce op with nwhc format and large shape, split it into two ops
+  // Find the reduce op with NWHC format and large shape, split it into two ops
   static int Apply(framework::Graph* graph) {
     int MAX_NUM_THREADS = cinn::common::DefaultNVGPUTarget().max_num_threads();
     constexpr int MAX_ITER_PER_THREAD = 32;  // empirical value
diff --git a/paddle/cinn/hlir/pass/single_group_optimize_pass.cc b/paddle/cinn/hlir/pass/single_group_optimize_pass.cc
@@ -201,7 +201,7 @@ void SingleGroupOptimizePass::InitNodeToGroups() {
 
 CINN_REGISTER_HELPER(SingleGroupOptimizePass) {
   CINN_REGISTER_PASS(SingleGroupOptimizePass)
-      .describe("Optimize singel group to improve performance.")
+      .describe("Optimize single group to improve performance.")
       .set_change_structure(true)
       .set_body(cinn::hlir::pass::SingleGroupOptimizePassImpl);
 

Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ void LoopAssignReduceWithLast(ir::IRSchedule& ir_sch, // NOLINT`
`805`	`805`	`ir_sch.Fuse(block_name, {axes[index + 1], axes[index + 1] + 1});`
`806`	`806`	`}`
`807`	`807`	`LoopOrderAssignReduce(ir_sch, block_name, first_axes, target, true);`
`808`		`- // fuse axis before reduce to bind blockidx.`
	`808`	`+ // fuse axis before reduce to bind block idx.`
`809`	`809`	`for (int idx = 0; idx < static_cast<int>(inshape.size() - axes.size()) - 1;`
`810`	`810`	`++idx) {`
`811`	`811`	`ir_sch.Fuse(block_name, {0, 1});`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class FusionMergePassHelper : public FusionHelperBase {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`GroupList operator()() {`
`58`		`- // run fusion merge untill no update.`
	`58`	`+ // run fusion merge until no update.`
`59`	`59`	`DoFusionMerge();`
`60`	`60`	`for (auto& group : fusion_groups_) {`
`61`	`61`	`VLOG(3) << "Fusion Group -> " << group->group_id;`