[PIR] rectify yield input from opresult to value. (#57635)

winter-wang · web-flow · commit 9269321940b8 · 2023-09-23T16:29:58.000+08:00
diff --git a/paddle/pir/dialect/control_flow/ir/cf_ops.cc b/paddle/pir/dialect/control_flow/ir/cf_ops.cc
@@ -18,8 +18,8 @@ namespace pir {
 
 void YieldOp::Build(Builder &builder,
                     OperationArgument &argument,
-                    std::vector<OpResult> &&inputs) {
-  argument.AddInputs(inputs.begin(), inputs.end());
+                    const std::vector<Value> &inputs) {
+  argument.AddInputs(inputs);
 }
 }  // namespace pir
 
diff --git a/paddle/pir/dialect/control_flow/ir/cf_ops.h b/paddle/pir/dialect/control_flow/ir/cf_ops.h
@@ -27,7 +27,7 @@ class IR_API YieldOp : public Op<YieldOp> {
 
   static void Build(Builder &builder,             // NOLINT
                     OperationArgument &argument,  // NOLINT
-                    std::vector<OpResult> &&inputs);
+                    const std::vector<Value> &Value);
   void Verify() {}
 };
 }  // namespace pir
diff --git a/test/cpp/new_executor/standalone_executor_new_ir_test.cc b/test/cpp/new_executor/standalone_executor_new_ir_test.cc
@@ -242,15 +242,15 @@ TEST(StandaloneExecutor, if_op) {
 
   auto full_op_1 = builder.Build<paddle::dialect::FullOp>(
       std::vector<int64_t>{2}, true, phi::DataType::BOOL);
-  builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_1.out()});
+  builder.Build<pir::YieldOp>(std::vector<pir::Value>{full_op_1.out()});
 
   pir::Block* false_block = if_op.false_block();
 
   builder.SetInsertionPointToStart(false_block);
 
   auto full_op_2 = builder.Build<paddle::dialect::FullOp>(
       std::vector<int64_t>{3}, true, phi::DataType::BOOL);
-  builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_2.out()});
+  builder.Build<pir::YieldOp>(std::vector<pir::Value>{full_op_2.out()});
 
   auto kernel_program = paddle::dialect::PdOpLowerToKernelPass(&program);
 
diff --git a/test/cpp/pir/cinn/group_op_test.cc b/test/cpp/pir/cinn/group_op_test.cc
@@ -55,7 +55,7 @@ std::shared_ptr<::pir::Program> BuildGroupProgram() {
   builder.SetInsertionPointToEnd(block1);
   auto full_op_x = builder.Build<paddle::dialect::FullOp>(
       shape, value_one, phi::DataType::FLOAT32, phi::GPUPlace());
-  builder.Build<::pir::YieldOp>(std::vector<::pir::OpResult>{full_op_x.out()});
+  builder.Build<::pir::YieldOp>(std::vector<::pir::Value>{full_op_x.out()});
 
   builder.SetInsertionPointToEnd(program->block());
   auto group_op2 = builder.Build<cinn::dialect::GroupOp>(
@@ -67,7 +67,7 @@ std::shared_ptr<::pir::Program> BuildGroupProgram() {
   auto relu_op_x = builder.Build<paddle::dialect::ReluOp>(tan_op_x->result(0));
   auto tan_op_y = builder.Build<paddle::dialect::TanOp>(relu_op_x->result(0));
   auto relu_op_y = builder.Build<paddle::dialect::ReluOp>(tan_op_y->result(0));
-  builder.Build<::pir::YieldOp>(std::vector<::pir::OpResult>{relu_op_y.out()});
+  builder.Build<::pir::YieldOp>(std::vector<::pir::Value>{relu_op_y.out()});
   return program;
 }
 
diff --git a/test/cpp/pir/control_flow_dialect/if_op_test.cc b/test/cpp/pir/control_flow_dialect/if_op_test.cc
@@ -44,15 +44,15 @@ TEST(if_op_test, base) {
 
   auto full_op_1 = builder.Build<paddle::dialect::FullOp>(
       std::vector<int64_t>{2}, true, phi::DataType::BOOL);
-  builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_1.out()});
+  builder.Build<pir::YieldOp>(std::vector<pir::Value>{full_op_1.out()});
 
   pir::Block* false_block = if_op.false_block();
 
   builder.SetInsertionPointToStart(false_block);
 
   auto full_op_2 = builder.Build<paddle::dialect::FullOp>(
       std::vector<int64_t>{3}, true, phi::DataType::BOOL);
-  builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_2.out()});
+  builder.Build<pir::YieldOp>(std::vector<pir::Value>{full_op_2.out()});
 
   std::stringstream ss;
   program.Print(ss);
diff --git a/test/cpp/pir/kernel_dialect/ir_kernel_dialect_pass_test.cc b/test/cpp/pir/kernel_dialect/ir_kernel_dialect_pass_test.cc
@@ -195,15 +195,15 @@ TEST(kernel_dialect, cond_op_test) {
 
   auto full_op_1 = builder.Build<paddle::dialect::FullOp>(
       std::vector<int64_t>{2}, true, phi::DataType::BOOL);
-  builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_1.out()});
+  builder.Build<pir::YieldOp>(std::vector<pir::Value>{full_op_1.out()});
 
   pir::Block* false_block = if_op.false_block();
 
   builder.SetInsertionPointToStart(false_block);
 
   auto full_op_2 = builder.Build<paddle::dialect::FullOp>(
       std::vector<int64_t>{3}, true, phi::DataType::BOOL);
-  builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_2.out()});
+  builder.Build<pir::YieldOp>(std::vector<pir::Value>{full_op_2.out()});
 
   program.Print(std::cout);
   auto kernel_program = paddle::dialect::PdOpLowerToKernelPass(&program);

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ namespace pir {`
`18`	`18`
`19`	`19`	`void YieldOp::Build(Builder &builder,`
`20`	`20`	`OperationArgument &argument,`
`21`		`- std::vector<OpResult> &&inputs) {`
`22`		`- argument.AddInputs(inputs.begin(), inputs.end());`
	`21`	`+ const std::vector<Value> &inputs) {`
	`22`	`+ argument.AddInputs(inputs);`
`23`	`23`	`}`
`24`	`24`	`} // namespace pir`
`25`	`25`