PaddlePaddle
diff --git a/‎paddle/cinn/common/broadcast_tree.cc
Copy file name to clipboard
+2-5Lines changed: 2 additions & 5 deletions b/‎paddle/cinn/common/broadcast_tree.cc
Copy file name to clipboard
+2-5Lines changed: 2 additions & 5 deletions
diff --git a/‎paddle/cinn/common/broadcast_tree.h
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎paddle/cinn/common/broadcast_tree.h
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/dialect/operator/transforms/group_merge/divide_group_op_to_fusion_op_pass.cc
Copy file name to clipboard
+3-96Lines changed: 3 additions & 96 deletions b/‎paddle/cinn/hlir/dialect/operator/transforms/group_merge/divide_group_op_to_fusion_op_pass.cc
Copy file name to clipboard
+3-96Lines changed: 3 additions & 96 deletions
@@ -137,7 +137,8 @@ std::optional<symbol::Broadcastable<symbol::DimExpr>> GetFirstCstrBroadcastable(
       }
     }
     if (lhs_symbol.has_value() && rhs_symbol.has_value()) {
-      CHECK(lhs_symbol != rhs_symbol);
+      CHECK(lhs_symbol != rhs_symbol)
+          << lhs_symbol.value() << " != " << rhs_symbol.value();
       ret = symbol::Broadcastable<symbol::DimExpr>{lhs_symbol.value(),
                                                    rhs_symbol.value()};
       return true;
@@ -341,8 +342,4 @@ std::string ToTxtString(const BroadcastTree& tree) {
                     tree.variant());
 }
 
-std::ostream& operator<<(std::ostream& os, const BroadcastTree& tree) {
-  os << ToTxtString(tree);
-}
-
 }  // namespace cinn::common
@@ -33,6 +33,4 @@ BroadcastTree ConstructBroadcastTree(const BroadcastLeaf& leaves);
 
 std::string ToTxtString(const BroadcastTree&);
 
-std::ostream& operator<<(std::ostream& os, const BroadcastTree& tree);
-
 }  // namespace cinn::common
@@ -19,11 +19,13 @@
 #include <unordered_map>
 
 #include "paddle/cinn/adt/generate_map_expr.h"
+#include "paddle/cinn/common/broadcast_tree.h"
+#include "paddle/cinn/hlir/dialect/operator/ir/cinn_op.h"
+#include "paddle/cinn/hlir/dialect/operator/ir/generate_shape_util.h"
 #include "paddle/cinn/hlir/dialect/operator/ir/manual_op.h"
 #include "paddle/cinn/hlir/dialect/operator/ir/op_attribute.h"
 #include "paddle/cinn/hlir/dialect/operator/ir/op_dialect.h"
 #include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_pass.h"
-#include "paddle/cinn/hlir/dialect/runtime/ir/jit_kernel_op.h"
 #include "paddle/cinn/hlir/dialect/runtime/ir/runtime_dialect.h"
 #include "paddle/cinn/hlir/framework/pir_compiler.h"
 #include "paddle/cinn/runtime/flags.h"
@@ -42,77 +44,6 @@ PD_DECLARE_bool(cinn_enable_map_expr);
 namespace {
 
 /*
-using ShapeOrDataDimExprs4ValueT =
-    std::function<const symbol::ShapeOrDataDimExprs&(pir::Value)>;
-
-pir::Block::ConstIterator FindFirstExpandOp(pir::Block* block) {
-  for (auto iter = block->begin(); iter != block->end(); ++iter) {
-    if (iter->isa<paddle::dialect::ExpandOp>()) {
-      return iter;
-    }
-  }
-}
-
-bool SameInputOutputShape(
-    paddle::dialect::ExpandOp expand_op,
-    const ShapeOrDataDimExprs4ValueT& ShapeOrDataDimExprs4Value) {
-  const auto& x = ShapeOrDataDimExprs4Value(expand_op.x());
-  const auto& shape = ShapeOrDataDimExprs4Value(expand_op.shape());
-  const auto& out = ShapeOrDataDimExprs4Value(expand_op.out());
-  if (x.data().has_value()) return false;
-  if (!shape.data().has_value()) return false;
-  if (out.data().has_value()) return false;
-  CHECK(shape.data().value() == out.shape());
-  return x.shape() == out.shape();
-}
-
-void ReplaceAllUsesWithInput(paddle::dialect::ExpandOp expand) {
-  pir::Value x = expand.x();
-  expand.out().ReplaceAllUsesWith(x);
-}
-
-void EraseExpandOp(pir::Block* block, pir::Block::ConstIterator expand_it) {
-  block->erase(expand_it);
-}
-
-void EraseUpstreamGenerateShapeOp(
-    pir::Block* block, cinn::dialect::GenerateShapeOp generate_shape_op) {
-  for (auto iter = block->begin(); iter != block->end(); ++iter) {
-    if (iter->isa<cinn::dialect::GenerateShapeOp>()) {
-      if (iter->dyn_cast<cinn::dialect::GenerateShapeOp>() ==
-          generate_shape_op) {
-        block->erase(iter);
-      }
-    }
-  }
-}
-
-// Returns true if success
-bool EraseOneExpand(
-    pir::Block* block,
-    const ShapeOrDataDimExprs4ValueT& ShapeOrDataDimExprs4Value) {
-  for (auto expand_it = block->begin(); expand_it != block->end();
-       ++expand_it) {
-    if (!expand_it->isa<paddle::dialect::ExpandOp>()) continue;
-    auto expand = expand_it->dyn_cast<paddle::dialect::ExpandOp>();
-    if (!SameInputOutputShape(expand, ShapeOrDataDimExprs4Value)) continue;
-    auto generate_shape_op =
-        expand.shape().defining_op<cinn::dialect::GenerateShapeOp>();
-    CHECK_NOTNULL(generate_shape_op);
-    ReplaceAllUsesWithInput(expand);
-    EraseExpandOp(block, expand_it);
-    EraseUpstreamGenerateShapeOp(block, generate_shape_op);
-    return true;
-  }
-  return false;
-}
-
-void EraseExpands(pir::Block* block,
-                  const ShapeOrDataDimExprs4ValueT& ShapeOrDataDimExprs4Value) {
-  while (EraseOneExpand(block, ShapeOrDataDimExprs4Value)) {
-    // Do nothing.
-  }
-}
 
 std::vector<pir::Value> GetBlockOutsideInput(
     const std::vector<pir::Operation*> op_list) {
@@ -230,30 +161,6 @@ std::vector<pir::Operation*> GetOutputOpList(
   return vec_res;
 }
 
-std::unordered_map<::pir::Value, symbol::ShapeOrDataDimExprs>
-CreateGroupShapeOrDataExprs(const cinn::dialect::ir::GroupPtr& group,
-                            pir::ShapeConstraintIRAnalysis* shape_analysis) {
-  std::unordered_map<::pir::Value, symbol::ShapeOrDataDimExprs> value2shape;
-  for (auto* op : group->ops) {
-    for (size_t i = 0; i < op->num_operands(); ++i) {
-      auto operand = op->operand_source(i);
-      if (shape_analysis->HasShapeOrDataForValue(operand)) {
-        value2shape.insert(
-            {operand, shape_analysis->GetShapeOrDataForValue(operand)});
-      }
-    }
-    for (size_t i = 0; i < op->num_results(); ++i) {
-      auto result = op->result(i);
-      if (value2shape.find(result) == value2shape.end() &&
-          shape_analysis->HasShapeOrDataForValue(result)) {
-        value2shape.insert(
-            {result, shape_analysis->GetShapeOrDataForValue(result)});
-      }
-    }
-  }
-  return value2shape;
-}
-
 class GroupOpPattern : public pir::OpRewritePattern<cinn::dialect::GroupOp> {
  public:
   explicit GroupOpPattern(::pir::IrContext* context)
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,8 @@ std::optional<symbol::Broadcastable<symbol::DimExpr>> GetFirstCstrBroadcastable(`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`if (lhs_symbol.has_value() && rhs_symbol.has_value()) {`
`140`		`- CHECK(lhs_symbol != rhs_symbol);`
	`140`	`+ CHECK(lhs_symbol != rhs_symbol)`
	`141`	`+ << lhs_symbol.value() << " != " << rhs_symbol.value();`
`141`	`142`	`ret = symbol::Broadcastable<symbol::DimExpr>{lhs_symbol.value(),`
`142`	`143`	`rhs_symbol.value()};`
`143`	`144`	`return true;`
`@@ -341,8 +342,4 @@ std::string ToTxtString(const BroadcastTree& tree) {`
`341`	`342`	`tree.variant());`
`342`	`343`	`}`
`343`	`344`
`344`		`-std::ostream& operator<<(std::ostream& os, const BroadcastTree& tree) {`
`345`		`- os << ToTxtString(tree);`
`346`		`-}`
`347`		`-`
`348`	`345`	`} // namespace cinn::common`