Fix yiled yield, etc (#62457)

co63oc · web-flow · commit 8e8eb404aa23 · 2024-03-07T17:34:46.000+08:00
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/cinn_group_cluster_pass.cc b/paddle/cinn/hlir/dialect/operator/transforms/cinn_group_cluster_pass.cc
@@ -728,7 +728,7 @@ std::vector<GroupClusterNode> OpMergeWithOp(cinn::dialect::GroupOp group_op) {
     if (yield_output_ops.count(op) ||
         cinn::hlir::framework::pir::CompatibleInfo::OpKind(*op) ==
             cinn::hlir::framework::kReduction) {
-      // TODO(phlrain): yiled output no nedd to push into first stage output,
+      // TODO(phlrain): yield output no nedd to push into first stage output,
       // Update here
       if (!first_output_ops.count(op)) {
         first_stage_output.push_back(op_path[op]);
@@ -846,7 +846,7 @@ class CinnGroupClusterPattern
         auto find_it = all_output_values.find(output_values[i]);
         if ((find_it != all_output_values.end()) &&
             (find_it->second < group_op->num_results())) {
-          // id < num_results means yiled input
+          // id < num_results means yield input
           rewriter.ReplaceAllUsesWith(group_op.result(find_it->second),
                                       new_group_op->result(i));
         }
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
@@ -124,13 +124,13 @@ class GroupOpPattern : public pir::OpRewritePattern<cinn::dialect::GroupOp> {
     auto& shape_analysis =
         pir::ShapeAnalysisManager::Instance().Get(group_op->GetParentProgram());
     // Record map info for yield value to each fusion_op's result
-    std::unordered_map<::pir::Value, ::pir::Value> fusion_yiled_values;
+    std::unordered_map<::pir::Value, ::pir::Value> fusion_yield_values;
 
     const auto& TryReplaceOperandSource = [&](::pir::Operation* op) {
       for (auto& operand : op->operands()) {
         const auto value = operand.source();
-        if (fusion_yiled_values.find(value) != fusion_yiled_values.end()) {
-          operand.set_source(fusion_yiled_values.at(value));
+        if (fusion_yield_values.find(value) != fusion_yield_values.end()) {
+          operand.set_source(fusion_yield_values.at(value));
         }
       }
     };
@@ -158,9 +158,9 @@ class GroupOpPattern : public pir::OpRewritePattern<cinn::dialect::GroupOp> {
       auto fusion_op = CreateFusionOp(vec_outs, group);
 
       for (size_t i = 0; i < fusion_op.num_results(); ++i) {
-        CHECK(fusion_yiled_values.insert({vec_outs[i], fusion_op.result(i)})
+        CHECK(fusion_yield_values.insert({vec_outs[i], fusion_op.result(i)})
                   .second)
-            << "fusion_yiled_values already has key!";
+            << "fusion_yield_values already has key!";
         const auto& shape_expr =
             shape_analysis.GetShapeOrDataForValue(vec_outs[i]);
         shape_analysis.SetShapeOrDataForValue(fusion_op.result(i), shape_expr);
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
@@ -431,7 +431,7 @@ template <typename FusePassCtxT>
 struct HorizontalFuseUtil {
   using KindKeyT = std::pair<OpPatternKind, OpPatternKind>;
 
-  static bool DetectFusabilityByKind(FusePassCtxT* ctx,
+  static bool DetectFusibilityByKind(FusePassCtxT* ctx,
                                      const OpGroupPtr& src,
                                      const OpGroupPtr& dst) {
     const KindKeyT kind_pair(src.kind(), dst.kind());
@@ -590,7 +590,7 @@ class DefaultInputFusePass final : public InputFusePass {
       bool fusionable = false;
       for (auto& groups : fusionable_consumers) {
         auto& last = groups.back();
-        if (!HorizontalFuseUtil<InputFusePassCtx>::DetectFusabilityByKind(
+        if (!HorizontalFuseUtil<InputFusePassCtx>::DetectFusibilityByKind(
                 ctx, candidate, last)) {
           continue;
         }
@@ -681,7 +681,7 @@ class DefaultHorizontalFusePass final : public HorizontalFusePass {
       bool fusionable = false;
       for (auto& groups : fusionable_consumers) {
         auto& last = groups.back();
-        if (!HorizontalFuseUtil<LightwareFusePassCtx>::DetectFusabilityByKind(
+        if (!HorizontalFuseUtil<LightwareFusePassCtx>::DetectFusibilityByKind(
                 ctx, candidate, last)) {
           continue;
         }
@@ -752,7 +752,7 @@ class DefaultVerticalFusePass final : public VerticalFusePass {
     std::vector<OpGroupPtr> candidates;
     for (size_t i = 0; i < consumers.size(); ++i) {
       const auto& consumer = consumers.at(i);
-      if (!DetectFusabilityByKind(ctx, producer, consumer)) {
+      if (!DetectFusibilityByKind(ctx, producer, consumer)) {
         break;
       }
       candidates.push_back(consumer);
@@ -764,7 +764,7 @@ class DefaultVerticalFusePass final : public VerticalFusePass {
 
     for (size_t i = 0; i < consumers.size(); ++i) {
       const auto& consumer = consumers.at(i);
-      if (!DetectFusabilityByKind(ctx, producer, consumer)) {
+      if (!DetectFusibilityByKind(ctx, producer, consumer)) {
         continue;
       }
       if (ctx->fuse_helper().DetectCycleIfFuse(producer, consumer)) {
@@ -776,7 +776,7 @@ class DefaultVerticalFusePass final : public VerticalFusePass {
   }
 
   using KindKeyT = std::pair<OpPatternKind, OpPatternKind>;
-  bool DetectFusabilityByKind(LightwareFusePassCtx* ctx,
+  bool DetectFusibilityByKind(LightwareFusePassCtx* ctx,
                               const OpGroupPtr& src,
                               const OpGroupPtr& dst) const {
     const KindKeyT kind_pair(src.kind(), dst.kind());
@@ -941,7 +941,7 @@ class DefaultRecomputeFusePass final : public RecomputeFusePass {
     std::vector<OpGroupPtr> candidates;
     for (size_t i = 0; i < consumers.size(); ++i) {
       const auto& consumer = consumers.at(i);
-      if (!DetectFusabilityByKind(ctx, producer, consumer)) {
+      if (!DetectFusibilityByKind(ctx, producer, consumer)) {
         continue;
       }
       unsafe_candidates.push_back(consumer);
@@ -960,7 +960,7 @@ class DefaultRecomputeFusePass final : public RecomputeFusePass {
   }
 
   using KindKeyT = std::pair<OpPatternKind, OpPatternKind>;
-  bool DetectFusabilityByKind(LightwareFusePassCtx* ctx,
+  bool DetectFusibilityByKind(LightwareFusePassCtx* ctx,
                               const OpGroupPtr& src,
                               const OpGroupPtr& dst) const {
     const KindKeyT kind_pair(src.kind(), dst.kind());
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_horizontal_fuse_pass.cc b/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_horizontal_fuse_pass.cc
@@ -62,7 +62,7 @@ class DefaultHorizontalFusePass final : public HorizontalFusePass {
       bool fusionable = false;
       for (auto& groups : fusionable_consumers) {
         auto& last = groups.back();
-        if (!HorizontalFuseUtil<LightwareFusePassCtx>::DetectFusabilityByKind(
+        if (!HorizontalFuseUtil<LightwareFusePassCtx>::DetectFusibilityByKind(
                 ctx, candidate, last)) {
           continue;
         }
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_input_fuse_pass.cc b/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_input_fuse_pass.cc
@@ -63,7 +63,7 @@ class DefaultInputFusePass final : public InputFusePass {
       bool fusionable = false;
       for (auto& groups : fusionable_consumers) {
         auto& last = groups.back();
-        if (!HorizontalFuseUtil<InputFusePassCtx>::DetectFusabilityByKind(
+        if (!HorizontalFuseUtil<InputFusePassCtx>::DetectFusibilityByKind(
                 ctx, candidate, last)) {
           continue;
         }
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_recompute_fuse_pass.cc b/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_recompute_fuse_pass.cc
@@ -44,7 +44,7 @@ class DefaultRecomputeFusePass final : public RecomputeFusePass {
     std::vector<OpGroupPtr> candidates;
     for (int i = 0; i < consumers.size(); ++i) {
       const auto& consumer = consumers.at(i);
-      if (!VerticalFuseUtil::DetectFusabilityByKind(ctx, producer, consumer)) {
+      if (!VerticalFuseUtil::DetectFusibilityByKind(ctx, producer, consumer)) {
         continue;
       }
       unsafe_candidates.push_back(consumer);
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_vertical_fuse_pass.cc b/paddle/cinn/hlir/pass/general_fusion_merge_pass/default_vertical_fuse_pass.cc
@@ -46,7 +46,7 @@ class DefaultVerticalFusePass final : public VerticalFusePass {
     std::vector<OpGroupPtr> candidates;
     for (int i = 0; i < consumers.size(); ++i) {
       const auto& consumer = consumers.at(i);
-      if (!VerticalFuseUtil::DetectFusabilityByKind(ctx, producer, consumer)) {
+      if (!VerticalFuseUtil::DetectFusibilityByKind(ctx, producer, consumer)) {
         break;
       }
       candidates.push_back(consumer);
@@ -58,7 +58,7 @@ class DefaultVerticalFusePass final : public VerticalFusePass {
 
     for (int i = 0; i < consumers.size(); ++i) {
       const auto& consumer = consumers.at(i);
-      if (!VerticalFuseUtil::DetectFusabilityByKind(ctx, producer, consumer)) {
+      if (!VerticalFuseUtil::DetectFusibilityByKind(ctx, producer, consumer)) {
         continue;
       }
       if (ctx->fuse_helper().DetectCycleIfFuse(producer, consumer)) {
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass/horizontal_fuse_util.h b/paddle/cinn/hlir/pass/general_fusion_merge_pass/horizontal_fuse_util.h
@@ -29,7 +29,7 @@ template <typename FusePassCtxT>
 struct HorizontalFuseUtil {
   using KindKeyT = std::pair<OpPatternKind, OpPatternKind>;
 
-  static bool DetectFusabilityByKind(FusePassCtxT* ctx,
+  static bool DetectFusibilityByKind(FusePassCtxT* ctx,
                                      const OpGroupPtr& src,
                                      const OpGroupPtr& dst) {
     const KindKeyT kind_pair(src.kind(), dst.kind());
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass/vertical_fuse_util.h b/paddle/cinn/hlir/pass/general_fusion_merge_pass/vertical_fuse_util.h
@@ -29,7 +29,7 @@ using framework::OpPatternKind;
 struct VerticalFuseUtil {
   using KindKeyT = std::pair<OpPatternKind, OpPatternKind>;
 
-  static bool DetectFusabilityByKind(LightwareFusePassCtx* ctx,
+  static bool DetectFusibilityByKind(LightwareFusePassCtx* ctx,
                                      const OpGroupPtr& src,
                                      const OpGroupPtr& dst) {
     const KindKeyT kind_pair(src.kind(), dst.kind());

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class DefaultHorizontalFusePass final : public HorizontalFusePass {`
`62`	`62`	`bool fusionable = false;`
`63`	`63`	`for (auto& groups : fusionable_consumers) {`
`64`	`64`	`auto& last = groups.back();`
`65`		`- if (!HorizontalFuseUtil<LightwareFusePassCtx>::DetectFusabilityByKind(`
	`65`	`+ if (!HorizontalFuseUtil<LightwareFusePassCtx>::DetectFusibilityByKind(`
`66`	`66`	`ctx, candidate, last)) {`
`67`	`67`	`continue;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class DefaultInputFusePass final : public InputFusePass {`
`63`	`63`	`bool fusionable = false;`
`64`	`64`	`for (auto& groups : fusionable_consumers) {`
`65`	`65`	`auto& last = groups.back();`
`66`		`- if (!HorizontalFuseUtil<InputFusePassCtx>::DetectFusabilityByKind(`
	`66`	`+ if (!HorizontalFuseUtil<InputFusePassCtx>::DetectFusibilityByKind(`
`67`	`67`	`ctx, candidate, last)) {`
`68`	`68`	`continue;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class DefaultRecomputeFusePass final : public RecomputeFusePass {`
`44`	`44`	`std::vector<OpGroupPtr> candidates;`
`45`	`45`	`for (int i = 0; i < consumers.size(); ++i) {`
`46`	`46`	`const auto& consumer = consumers.at(i);`
`47`		`- if (!VerticalFuseUtil::DetectFusabilityByKind(ctx, producer, consumer)) {`
	`47`	`+ if (!VerticalFuseUtil::DetectFusibilityByKind(ctx, producer, consumer)) {`
`48`	`48`	`continue;`
`49`	`49`	`}`
`50`	`50`	`unsafe_candidates.push_back(consumer);`