PaddlePaddle
diff --git a/‎paddle/cinn/hlir/dialect/operator/transforms/check_infer_symbolic_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/cinn/hlir/dialect/operator/transforms/check_infer_symbolic_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/cinn/hlir/dialect/operator/transforms/insert_broadcast_pass.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/cinn/hlir/dialect/operator/transforms/insert_broadcast_pass.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/cinn/hlir/dialect/operator/transforms/split_generate_shape_into_shape_ops_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/cinn/hlir/dialect/operator/transforms/split_generate_shape_into_shape_ops_pass.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/new_executor/instruction/instruction_util.cc
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎paddle/fluid/framework/new_executor/instruction/instruction_util.cc
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎paddle/fluid/ir_adaptor/translator/op_translator.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/ir_adaptor/translator/op_translator.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.cc
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.cc
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.h
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.h
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/ir/manual_op.cc
Copy file name to clipboard
+6-4Lines changed: 6 additions & 4 deletions b/‎paddle/fluid/pir/dialect/operator/ir/manual_op.cc
Copy file name to clipboard
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/utils/utils.cc
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎paddle/fluid/pir/dialect/operator/utils/utils.cc
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
@@ -216,7 +216,7 @@ class BlockDimExprsAsserter {
   }
 
   pir::Value BuildShapeTensorFromInferMeta(pir::Value output) {
-    return builder_.Build<paddle::dialect::ShapeOp>(output).out();
+    return builder_.Build<paddle::dialect::Shape64Op>(output).out();
   }
 
   void TryAssertDimExprsForOutputData(const pir::Operation* op,
 
@@ -37,8 +37,8 @@ namespace {
 pir::Value GetOutputDimTensor(pir::PatternRewriter* rewriter,
                               pir::Value x,
                               pir::Value y) {
-  pir::Operation* x_shape_op = rewriter->Build<paddle::dialect::ShapeOp>(x);
-  pir::Operation* y_shape_op = rewriter->Build<paddle::dialect::ShapeOp>(y);
+  pir::Operation* x_shape_op = rewriter->Build<paddle::dialect::Shape64Op>(x);
+  pir::Operation* y_shape_op = rewriter->Build<paddle::dialect::Shape64Op>(y);
   pir::Operation* shape_broadcast_op =
       rewriter->Build<paddle::dialect::ShapeBroadcastOp>(x_shape_op->result(0),
                                                          y_shape_op->result(0));
 
@@ -1110,7 +1110,7 @@ class FlattenOpPattern
                       .dims()
                       .size();
     auto x_shape =
-        rewriter.Build<paddle::dialect::ShapeOp>(op->operand_source(0))
+        rewriter.Build<paddle::dialect::Shape64Op>(op->operand_source(0))
             .result(0);
     for (size_t i = 0; i < x_rank;) {
       if (i == static_cast<size_t>(start_axis)) {
 
@@ -75,7 +75,7 @@ struct CachedDimExprToValueConverter {
     auto iter = tensor2shape_.find(input_tensor);
     if (iter == tensor2shape_.end()) {
       pir::Value shape =
-          rewriter->Build<paddle::dialect::ShapeOp>(input_tensor).out();
+          rewriter->Build<paddle::dialect::Shape64Op>(input_tensor).out();
       pir::Value cast_shape =
           rewriter->Build<paddle::dialect::CastOp>(shape, phi::DataType::INT64)
               .out();
 
@@ -235,7 +235,8 @@ OpFuncType AnalyseOpFuncType(pir::Operation* op, const phi::Place& place) {
       return OpFuncType::kGpuSync;
     }
 
-    if (op_name.compare(paddle::dialect::ShapeOp::name()) == 0) {
+    if (op_name.compare(paddle::dialect::ShapeOp::name()) == 0 ||
+        op_name.compare(paddle::dialect::Shape64Op::name()) == 0) {
       return OpFuncType::kGpuSync;
     }
   }
 
@@ -2897,10 +2897,10 @@ struct ElementwiseTranscriber : public OpTranscriber {
               << y_tensor_type.dims() << " to "
               << common::make_ddim(y_new_shape);
     } else {
-      auto shape_op = builder.Build<dialect::ShapeOp>(y_value);
+      auto shape_op = builder.Build<dialect::Shape64Op>(y_value);
       auto append_shape_op = builder.Build<dialect::FullIntArrayOp>(
           std::vector<int64_t>(append_size, 1),
-          phi::DataType::INT32,
+          phi::DataType::INT64,
           phi::CPUPlace());
       auto y_true_shape_op = builder.Build<pir::CombineOp>(
           std::vector<pir::Value>{shape_op.out(), append_shape_op.out()});
 
@@ -3088,6 +3088,19 @@ bool ShapeOpInferSymbolicShape(pir::Operation *op,
   return true;
 }
 
+bool Shape64OpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  const symbol::ShapeOrDataDimExprs &operand_shape_or_data =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0));
+  const auto &out_data = operand_shape_or_data.shape();
+  const std::vector<symbol::DimExpr> shape{std::int64_t(out_data.size())};
+  symbol::ShapeOrDataDimExprs shape_or_data{
+      symbol::TensorShapeOrDataDimExprs(shape, out_data)};
+
+  infer_context->SetShapeOrDataForValue(op->result(0), shape_or_data);
+  return true;
+}
+
 bool ShardIndexOpInferSymbolicShape(
     pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
   const auto &in_shape_or_data =
@@ -3182,6 +3195,10 @@ bool ShapeSrOpInferSymbolicShape(
   return ShapeOpInferSymbolicShape(op, infer_context);
 }
 
+bool Shape64SrOpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  return Shape64OpInferSymbolicShape(op, infer_context);
+}
 // bool ShardIndexOpInferSymbolicShape(pir::Operation *op,
 //                                     pir::InferSymbolicShapeContext
 //                                     *infer_context) {
 
@@ -126,8 +126,10 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(Reshape_)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Rrelu)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(SequencePool)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Shape)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(Shape64)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(ShardIndex)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(ShapeSr)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(Shape64Sr)
 // OP_DECLARE_INFER_SYMBOLIC_SHAPE(ShardIndex)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(ShuffleChannel)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Slice)
 
@@ -3563,7 +3563,8 @@ std::vector<pir::Type> ExpandOp::InferMeta(
         vec_shape.insert(vec_shape.end(), tmp.begin(), tmp.end());
       }
     } else if (shape.isa<pir::OpResult>() &&
-               shape.defining_op()->isa<paddle::dialect::ShapeOp>()) {
+               (shape.defining_op()->isa<paddle::dialect::ShapeOp>() ||
+                shape.defining_op()->isa<paddle::dialect::Shape64Op>())) {
       // tensor_shape may come from shape op
       // x0.shape = [-1,3]
       // tensor_shape = shape(x0)
@@ -3598,7 +3599,8 @@ std::vector<pir::Type> ExpandOp::InferMeta(
         if (shape_dim.size() == 1 &&
             shape_dim[0] == static_cast<int64_t>(inputs.size())) {
           for (auto item : inputs) {
-            if (item.defining_op()->isa<paddle::dialect::ShapeOp>()) {
+            if (item.defining_op()->isa<paddle::dialect::ShapeOp>() ||
+                item.defining_op()->isa<paddle::dialect::Shape64Op>()) {
               pir::Value shape_input = item.defining_op()->operand_source(0);
               int64_t value = shape_input.type()
                                   .dyn_cast<paddle::dialect::DenseTensorType>()
@@ -4448,11 +4450,11 @@ bool ShapeBroadcastOp::InferSymbolicShape(
   PADDLE_ENFORCE_EQ(x_data_shape.data().has_value(),
                     true,
                     common::errors::InvalidArgument(
-                        "Value x comes from ShapeOp, it must have data"));
+                        "Value x comes from Shape64Op, it must have data"));
   PADDLE_ENFORCE_EQ(y_data_shape.data().has_value(),
                     true,
                     common::errors::InvalidArgument(
-                        "Value y comes from ShapeOp, it must have data"));
+                        "Value y comes from Shape64Op, it must have data"));
   const auto &x_data = x_data_shape.data().value();
   const auto &y_data = y_data_shape.data().value();
 
 
@@ -446,7 +446,8 @@ std::vector<int64_t> ParseValueShape(const pir::Value& shape,
       vec_shape.insert(vec_shape.end(), tmp.begin(), tmp.end());
     }
   } else if (shape.isa<pir::OpResult>() &&
-             shape.defining_op()->isa<paddle::dialect::ShapeOp>() &&
+             (shape.defining_op()->isa<paddle::dialect::ShapeOp>() ||
+              shape.defining_op()->isa<paddle::dialect::Shape64Op>()) &&
              shape.type().isa<paddle::dialect::DenseTensorType>()) {
     // tensor_shape may come from shape op
     // x0.shape = [-1,3]
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ class BlockDimExprsAsserter {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`pir::Value BuildShapeTensorFromInferMeta(pir::Value output) {`
`219`		`- return builder_.Build<paddle::dialect::ShapeOp>(output).out();`
	`219`	`+ return builder_.Build<paddle::dialect::Shape64Op>(output).out();`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`void TryAssertDimExprsForOutputData(const pir::Operation* op,`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,8 @@ OpFuncType AnalyseOpFuncType(pir::Operation* op, const phi::Place& place) {`
`235`	`235`	`return OpFuncType::kGpuSync;`
`236`	`236`	`}`
`237`	`237`
`238`		`- if (op_name.compare(paddle::dialect::ShapeOp::name()) == 0) {`
	`238`	`+ if (op_name.compare(paddle::dialect::ShapeOp::name()) == 0 \|\|`
	`239`	`+ op_name.compare(paddle::dialect::Shape64Op::name()) == 0) {`
`239`	`240`	`return OpFuncType::kGpuSync;`
`240`	`241`	`}`
`241`	`242`	`}`