Fix check_depency check_dependency, etc (#62458)

co63oc · web-flow · commit eb639c601715 · 2024-03-06T18:04: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
@@ -2220,7 +2220,7 @@ class GeneralFusionMergePassHelper {
 
 GroupList GeneralFusionMergePassInternal(const GroupList& group_list) {
   if (group_list.size() <= 1) {
-    VLOG(3) << "Don't do Fusoin Merge Pass...!";
+    VLOG(3) << "Don't do Fusion Merge Pass...!";
     return group_list;
   }
 
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/group_with_group_merge_util.h b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/group_with_group_merge_util.h
@@ -146,7 +146,7 @@ inline bool horizontal_elementwise_fuse_reduce(
   auto ele_node_shape =
       GetValueShape((*ele_group->master_ops.begin())->result(0));
   int32_t size_ele = ::common::product(ele_node_shape);
-  // TODO(phlrain): seems extrame danger herem, why compare multi Master Node?
+  // TODO(phlrain): seems extreme danger here, why compare multi Master Node?
   for (auto* master : reduce_group->master_ops) {
     auto master_node_shape = GetValueShape(master->result(0));
     int32_t size_master = ::common::product(master_node_shape);
@@ -349,7 +349,7 @@ inline bool horizontal_relation(const std::shared_ptr<ir::Group>& first,
   };
   auto selected_nodes = select_node_set(second_set, op_pattern_kind);
 
-  auto check_depency = [&](::pir::Operation* node) {
+  auto check_dependency = [&](::pir::Operation* node) {
     std::queue<::pir::Operation*> candidates;
     std::unordered_set<::pir::Operation*> visited_set;
     candidates.push(node);
@@ -381,7 +381,7 @@ inline bool horizontal_relation(const std::shared_ptr<ir::Group>& first,
   };
 
   for (auto node : selected_nodes) {
-    if (check_depency(node)) {
+    if (check_dependency(node)) {
       return false;
     }
   }
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_util.h b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_util.h
@@ -181,7 +181,7 @@ inline bool reduce_fuse_reduce(
 
 inline bool is_horizontal_relation(::pir::Operation* producer,
                                    const std::shared_ptr<Group>& consumer) {
-  auto check_depency = [&](::pir::Operation* op) {
+  auto check_dependency = [&](::pir::Operation* op) {
     std::queue<::pir::Operation*> candidates;
     std::unordered_set<::pir::Operation*> visited_set;
     candidates.push(op);
@@ -192,7 +192,7 @@ inline bool is_horizontal_relation(::pir::Operation* producer,
       // visit all producer op
       for (size_t i = 0; i < candidate->num_operands(); ++i) {
         auto tmp_op = candidate->operand_source(i).defining_op();
-        // check depency.
+        // check dependency.
         if (producer == tmp_op) {
           return true;
         }
@@ -216,7 +216,7 @@ inline bool is_horizontal_relation(::pir::Operation* producer,
         consumer->op_pattern_kind) {
       continue;
     }
-    if (check_depency(op)) {
+    if (check_dependency(op)) {
       return false;
     }
   }
@@ -276,22 +276,22 @@ inline bool horizontal_or_vertical_reduce_relation(
     return false;
   }
 
-  int succesive_reduce_dimension = reduce_shape.at(reduce_axes.back());
+  int successive_reduce_dimension = reduce_shape.at(reduce_axes.back());
   for (int idx = reduce_axes.size() - 2; idx >= 0; --idx) {
     if (reduce_axes[idx] == reduce_axes[idx + 1] - 1) {
-      succesive_reduce_dimension *= reduce_shape[reduce_axes[idx]];
+      successive_reduce_dimension *= reduce_shape[reduce_axes[idx]];
       continue;
     }
     break;
   }
 
   // helper->target_ == cinn::common::DefaultNVGPUTarget()
-  // succesive_reduce_dimension <= helper->target_.max_num_threads()
+  // successive_reduce_dimension <= helper->target_.max_num_threads()
   // TODO(phlrain): support is_gpu_target and max_thread
   bool is_gpu_target = true;
   int max_thread = 32 * 1024;
   return is_gpu_target
-             ? (succesive_reduce_dimension <= max_thread ? true : false)
+             ? (successive_reduce_dimension <= max_thread ? true : false)
              : true;
 }
 
diff --git a/paddle/cinn/hlir/pass/fusion_merge_pass.cc b/paddle/cinn/hlir/pass/fusion_merge_pass.cc
@@ -199,13 +199,13 @@ class FusionMergePassHelper : public FusionHelperBase {
       // check dependency
       if (IsDependencySimplify(producer, candidate, candidates)) {
         VLOG(4) << "IsDependencySimplify, Can't fuse " << candidate->group_id
-                << ", As it depency others!";
+                << ", As it dependency others!";
         continue;
       }
 
       if (IsDependency(producer, candidate, candidates)) {
         VLOG(4) << "IsDependency, Can't fuse " << candidate->group_id
-                << ", As it depency others!";
+                << ", As it dependency others!";
         continue;
       }
 
@@ -698,7 +698,7 @@ class FusionMergePassHelper : public FusionHelperBase {
           sub_group->nodes.insert(sub_group->nodes.begin(),
                                   producer->CollectNodes()[0]);
           sub_group->nodes_set.insert(producer->CollectNodes()[0]);
-          // remove depency.
+          // remove dependency.
           consumer->input_nodes.erase(producer->CollectNodes()[0]);
           consumer->mut_producer_groups()->erase(producer);
           producer->mut_consumer_groups()->erase(consumer);
diff --git a/paddle/cinn/hlir/pass/fusion_merge_pass_util.h b/paddle/cinn/hlir/pass/fusion_merge_pass_util.h
@@ -330,7 +330,7 @@ inline bool horizontal_relation(
   };
   auto selected_nodes = select_node_set(second_set, op_pattern_kind);
 
-  auto check_depency = [&](const Node* node) {
+  auto check_dependency = [&](const Node* node) {
     std::queue<const Node*> candidates;
     std::unordered_set<const Node*> visited_set;
     candidates.push(node);
@@ -360,7 +360,7 @@ inline bool horizontal_relation(
   };
 
   for (auto node : selected_nodes) {
-    if (check_depency(node)) {
+    if (check_dependency(node)) {
       return false;
     }
   }
diff --git a/paddle/cinn/hlir/pass/general_fusion_merge_pass.cc b/paddle/cinn/hlir/pass/general_fusion_merge_pass.cc
@@ -833,7 +833,7 @@ class GeneralFusionMergePassHelper : public FusionHelperBase {
           sub_group->nodes.insert(sub_group->nodes.begin(),
                                   producer->CollectNodes()[0]);
           sub_group->nodes_set.insert(producer->CollectNodes()[0]);
-          // remove depency.
+          // remove dependency.
           consumer->input_nodes.erase(producer->CollectNodes()[0]);
           consumer->mut_producer_groups()->erase(producer);
           producer->mut_consumer_groups()->erase(consumer);
diff --git a/paddle/cinn/hlir/pass/op_fusion_pass_util.h b/paddle/cinn/hlir/pass/op_fusion_pass_util.h
@@ -124,7 +124,7 @@ CONDITION_FUNC(reduce_fuse_reduce) {
 }
 
 CONDITION_FUNC(is_horizontal_relation) {
-  auto check_depency = [&](const Node* node) {
+  auto check_dependency = [&](const Node* node) {
     std::queue<const Node*> candidates;
     std::unordered_set<const Node*> visited_set;
     candidates.push(node);
@@ -157,7 +157,7 @@ CONDITION_FUNC(is_horizontal_relation) {
     if (helper->GetOpKind(node) != consumer->op_pattern_kind) {
       continue;
     }
-    if (check_depency(node)) {
+    if (check_dependency(node)) {
       return false;
     }
   }
@@ -207,17 +207,17 @@ CONDITION_FUNC(horizontal_or_vertical_reduce_relation) {
     return false;
   }
 
-  int succesive_reduce_dimension = reduce_shape.at(reduce_axes.back());
+  int successive_reduce_dimension = reduce_shape.at(reduce_axes.back());
   for (int idx = reduce_axes.size() - 2; idx >= 0; --idx) {
     if (reduce_axes[idx] == reduce_axes[idx + 1] - 1) {
-      succesive_reduce_dimension *= reduce_shape[reduce_axes[idx]];
+      successive_reduce_dimension *= reduce_shape[reduce_axes[idx]];
       continue;
     }
     break;
   }
 
   return helper->target_ == cinn::common::DefaultNVGPUTarget()
-             ? (succesive_reduce_dimension <= helper->target_.max_num_threads()
+             ? (successive_reduce_dimension <= helper->target_.max_num_threads()
                     ? true
                     : false)
              : true;
diff --git a/paddle/fluid/framework/paddle2cinn/cinn_subgraph_detector.cc b/paddle/fluid/framework/paddle2cinn/cinn_subgraph_detector.cc
@@ -169,11 +169,11 @@ bool CinnSubgraphDetector::FuseSubGraph(CinnSubGraphPtr subgraph_ptr) {
     if (!consumer->substitute) {
       continue;
     }
-    // fast depency check.
+    // fast dependency check.
     if (IsDependencySimplify(producer, consumer, consumers)) {
       continue;
     }
-    // global depency check.
+    // global dependency check.
     if (IsDependency(producer, consumer, consumers)) {
       continue;
     }
@@ -196,7 +196,7 @@ bool CinnSubgraphDetector::FuseSubGraph(CinnSubGraphPtr subgraph_ptr) {
     producer->node_set.insert(candidate->node_set.begin(),
                               candidate->node_set.end());
 
-    // update bound for check depency
+    // update bound for check dependency
     producer->max_depth = std::max(producer->max_depth, candidate->max_depth);
     producer->min_depth = std::min(producer->min_depth, candidate->min_depth);
 
@@ -219,7 +219,7 @@ bool CinnSubgraphDetector::FuseSubGraph(CinnSubGraphPtr subgraph_ptr) {
       tmp->producers.erase(candidate);
     }
 
-    // remove candicate in producer/consumer
+    // remove candidate in producer/consumer
     producer->producers.erase(candidate);
     producer->consumers.erase(candidate);
 
diff --git a/paddle/fluid/framework/paddle2cinn/cinn_subgraph_detector.h b/paddle/fluid/framework/paddle2cinn/cinn_subgraph_detector.h
@@ -78,7 +78,7 @@ class CinnSubgraphDetector {
   // SubGraph Fusion
   void DoSubGraphFusion();
   bool FuseSubGraph(CinnSubGraphPtr);
-  // check exist depency.
+  // check exist dependency.
   bool IsDependency(const CinnSubGraphPtr &,
                     const CinnSubGraphPtr &,
                     const std::unordered_set<CinnSubGraphPtr> &);

Original file line number	Diff line number	Diff line change
`@@ -2220,7 +2220,7 @@ class GeneralFusionMergePassHelper {`
`2220`	`2220`
`2221`	`2221`	`GroupList GeneralFusionMergePassInternal(const GroupList& group_list) {`
`2222`	`2222`	`if (group_list.size() <= 1) {`
`2223`		`- VLOG(3) << "Don't do Fusoin Merge Pass...!";`
	`2223`	`+ VLOG(3) << "Don't do Fusion Merge Pass...!";`
`2224`	`2224`	`return group_list;`
`2225`	`2225`	`}`
`2226`	`2226`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ CONDITION_FUNC(reduce_fuse_reduce) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`CONDITION_FUNC(is_horizontal_relation) {`
`127`		`- auto check_depency = [&](const Node* node) {`
	`127`	`+ auto check_dependency = [&](const Node* node) {`
`128`	`128`	`std::queue<const Node*> candidates;`
`129`	`129`	`std::unordered_set<const Node*> visited_set;`
`130`	`130`	`candidates.push(node);`
`@@ -157,7 +157,7 @@ CONDITION_FUNC(is_horizontal_relation) {`
`157`	`157`	`if (helper->GetOpKind(node) != consumer->op_pattern_kind) {`
`158`	`158`	`continue;`
`159`	`159`	`}`
`160`		`- if (check_depency(node)) {`
	`160`	`+ if (check_dependency(node)) {`
`161`	`161`	`return false;`
`162`	`162`	`}`
`163`	`163`	`}`
`@@ -207,17 +207,17 @@ CONDITION_FUNC(horizontal_or_vertical_reduce_relation) {`
`207`	`207`	`return false;`
`208`	`208`	`}`
`209`	`209`
`210`		`- int succesive_reduce_dimension = reduce_shape.at(reduce_axes.back());`
	`210`	`+ int successive_reduce_dimension = reduce_shape.at(reduce_axes.back());`
`211`	`211`	`for (int idx = reduce_axes.size() - 2; idx >= 0; --idx) {`
`212`	`212`	`if (reduce_axes[idx] == reduce_axes[idx + 1] - 1) {`
`213`		`- succesive_reduce_dimension *= reduce_shape[reduce_axes[idx]];`
	`213`	`+ successive_reduce_dimension *= reduce_shape[reduce_axes[idx]];`
`214`	`214`	`continue;`
`215`	`215`	`}`
`216`	`216`	`break;`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`return helper->target_ == cinn::common::DefaultNVGPUTarget()`
`220`		`- ? (succesive_reduce_dimension <= helper->target_.max_num_threads()`
	`220`	`+ ? (successive_reduce_dimension <= helper->target_.max_num_threads()`
`221`	`221`	`? true`
`222`	`222`	`: false)`
`223`	`223`	`: true;`