[PIR]Support while op #57937

phlrain · 2023-10-09T01:28:22Z

PR types

New features

PR changes

Others

Description

支持最简单的while op cpu场景跑通
i = 0 while( i <= 10) i += 1

Pcard-67164

…e/Paddle into support_while_op

… support_while_op

paddle-bot · 2023-10-09T01:28:27Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

paddle-bot · 2023-10-09T01:28:29Z

❌ The PR is not created using PR's template. You can refer to this Demo.
Please use PR's template, it helps save our maintainers' time so that more developers get helped.

… support_while_op

winter-wang · 2023-10-11T07:21:30Z

paddle/fluid/framework/new_executor/instruction/instruction_util.cc

@@ -190,5 +190,76 @@ OpFuncType AnalyseOpFuncType(pir::Operation* op, const platform::Place& place) {
  return OpFuncType::kGpuAsync;
 }

+std::vector<pir::Value> GetCondYiedOpInputs(pir::Block* block) {
+  std::vector<pir::Value> vec_res;
+  for (auto op : (*block)) {


yield一定是block的最后一个算子。

Suggested change

for (auto op : (*block)) {

if (block && !block->empty() && block->back()->isa<pir::CondYieldOp>()) {

auto *op = block->back();

for (size_t i = 0; i < op->num_operands(); ++i) {

vec_res.emplace_back(op->operand_source(i));

}

}

winter-wang · 2023-10-11T07:25:43Z

paddle/fluid/framework/new_executor/instruction/instruction_util.cc

+
+std::vector<pir::Value> GetYiedOpInputs(pir::Block* block) {
+  std::vector<pir::Value> vec_res;
+  for (auto op : (*block)) {


Suggested change

for (auto op : (*block)) {

if (block && !block->empty() && block->back()->isa<pir::YieldOp>()) {

auto *op = block->back();

for (size_t i = 0; i < op->num_operands(); ++i) {

vec_res.emplace_back(op->operand_source(i));

}

}

winter-wang · 2023-10-11T07:38:19Z

paddle/fluid/framework/new_executor/instruction/while_instruction.cc

+  }
+  body_inter_->SetSkipGcVars(body_skip_gc_names_set);
+
+  // the true branch and false branch input will be the if_op inputs


while里面没有true branch和false branch之说。这儿应该是写错了吧

winter-wang · 2023-10-11T08:04:06Z

paddle/fluid/framework/new_executor/instruction/while_instruction.cc

+
+void WhileInstruction::CopyStepOutput() {
+  for (size_t i = 0; i < body_skip_gc_names_.size(); ++i) {
+    auto* inner_var =


如果body_block一次都没有执行的话，这儿的拷贝是否安全？

是不安全的，这个地方需要适配下

zhangbo9674 · 2023-10-11T09:32:50Z

paddle/fluid/framework/new_executor/instruction/while_instruction.h

+  std::vector<Variable*> while_op_inputs_;
+  std::vector<Variable*> while_op_outputs_;
+
+  NewIRInterpreter* cond_inter_;


析构函数没有对这两个指针delete，会存在内存泄露问题

winter-wang

LGTM

… support_while_op

winter-wang · 2023-10-13T02:27:13Z

paddle/fluid/framework/new_executor/instruction/instruction_util.cc

@@ -190,5 +191,76 @@ OpFuncType AnalyseOpFuncType(pir::Operation* op, const platform::Place& place) {
  return OpFuncType::kGpuAsync;
 }

+std::vector<pir::Value> GetCondYiedOpInputs(pir::Block* block) {


CondYieldOp已经被我删了。现在cond_block的最后一个算子也是YieldOp，且只Yield一个布尔值。这个函数应该只返回一个Value就可以吧。没必要返回 vector了

winter-wang · 2023-10-13T02:33:49Z

paddle/fluid/framework/new_executor/instruction/instruction_util.cc

@@ -190,5 +191,76 @@ OpFuncType AnalyseOpFuncType(pir::Operation* op, const platform::Place& place) {
  return OpFuncType::kGpuAsync;
 }

+std::vector<pir::Value> GetCondYiedOpInputs(pir::Block* block) {


Suggested change

std::vector<pir::Value> GetCondYiedOpInputs(pir::Block* block) {

pir::Value GetCondYiedOpInputs(pir::Block* block) {

// 可以用paddle_enforce判断一下block非空，且最后一个op是YieldOp，且只有一个输入，且为bool类型。

return block->back()->operand_source(0);

}

winter-wang · 2023-10-13T02:48:15Z

paddle/fluid/framework/new_executor/instruction/while_instruction.cc

+    if (cond_var->Get<phi::DenseTensor>().data<bool>()[0]) {
+      body_inter_->Run({}, false);
+
+      CopyStepOutputToBlockArgs(cond_inter_.get(), cond_block_);


这个cond_block的输出拷贝是不是已经不需要了啊？

winter-wang

LGTM

Aurelius84

LGTM overall, comment 可以单独提PR fix

Aurelius84 · 2023-10-13T08:32:30Z

paddle/fluid/framework/new_executor/instruction/while_instruction.cc

+void WhileInstruction::CopyStepOutputToBlockArgs(const NewIRInterpreter* inter,
+                                                 ::pir::Block* block) {
+  for (size_t i = 0; i < block->args_size(); ++i) {
+    auto out_var_name = body_skip_gc_names_[i];


Suggested change

auto out_var_name = body_skip_gc_names_[i];

auto& out_var_name = body_skip_gc_names_[i];

Aurelius84 · 2023-10-13T08:33:54Z

paddle/fluid/framework/new_executor/instruction/while_instruction.h

+
+  void Run() override;
+
+  const std::string& Name() const override { return cond_name_; }


Suggested change

const std::string& Name() const override { return cond_name_; }

const std::string& Name() const override { return name_; }

Aurelius84 · 2023-10-13T08:34:01Z

paddle/fluid/framework/new_executor/instruction/while_instruction.h

+  void CopyStepOutputToBlockArgs(const NewIRInterpreter* inter,
+                                 ::pir::Block* block);
+
+  std::string cond_name_{"while_instruction"};


Suggested change

std::string cond_name_{"while_instruction"};

std::string name_{"while_instruction"};

Aurelius84 · 2023-10-13T08:34:26Z

paddle/fluid/framework/new_executor/instruction/while_instruction.h

+
+  Variable* cond_var;
+
+  std::vector<Variable*> while_op_inputs_;


Suggested change

std::vector<Variable*> while_op_inputs_;

std::vector<Variable*> inputs_;

Aurelius84 · 2023-10-13T08:34:34Z

paddle/fluid/framework/new_executor/instruction/while_instruction.h

+  Variable* cond_var;
+
+  std::vector<Variable*> while_op_inputs_;
+  std::vector<Variable*> while_op_outputs_;


Suggested change

std::vector<Variable*> while_op_outputs_;

std::vector<Variable*> outputs_;

Aurelius84 · 2023-10-13T08:36:06Z

paddle/fluid/pir/transforms/pd_op_to_kernel_pass.cc

    const pir::Value cur_in,
-    const std::unordered_map<pir::Value, pir::OpResult>& map_value_pair,
+    const std::unordered_map<pir::Value, pir::Value>& map_value_pair,
    const int index,
    const std::string op_name) {


Suggested change

const std::string op_name) {

const std::string& op_name) {

Aurelius84 · 2023-10-13T08:37:22Z

paddle/fluid/pir/transforms/pd_op_to_kernel_pass.cc

@@ -863,7 +935,7 @@ void HandleForSpecialOp(
    }
  }

-  if (op_item->name() == "cf.yield") {
+  if (op_item->name() == "cf.yield" || op_item->name() == "cf.cond_yield") {


Suggested change

if (op_item->name() == "cf.yield" || op_item->name() == "cf.cond_yield") {

if (op_item->isa<YieldOp>() || op_item->isa<CondYieldOp>()) {

这里的判断建议解耦固定的string

* [PIR] add print function for pd_op.while * support while op lowering * update * update * update * fix bug * remove useless code --------- Co-authored-by: winter-wang <1030748926@qq.com>

winter-wang and others added 5 commits October 8, 2023 07:32

[PIR] add print function for pd_op.while

8163de1

support while op lowering

62ea660

Merge commit 'refs/pull/57917/head' of https://github.com/PaddlePaddl…

e916f2e

…e/Paddle into support_while_op

update

34dd3ad

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

933db9b

… support_while_op

phlrain added 4 commits October 10, 2023 09:15

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

fb8e7d0

… support_while_op

update

e092e3b

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

52623ce

… support_while_op

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

6bee2f8

… support_while_op

phlrain changed the title ~~Support while op~~ [PIR]Support while op Oct 11, 2023

winter-wang reviewed Oct 11, 2023

View reviewed changes

This comment was marked as outdated.

Sign in to view

zhangbo9674 reviewed Oct 11, 2023

View reviewed changes

winter-wang previously approved these changes Oct 11, 2023

View reviewed changes

phlrain added 2 commits October 12, 2023 01:11

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

0af51d0

… support_while_op

update

28052d5

phlrain dismissed winter-wang’s stale review via 28052d5 October 12, 2023 02:33

phlrain added 3 commits October 12, 2023 10:05

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

528ceee

… support_while_op

fix bug

97cc82c

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

2e7188a

… support_while_op

winter-wang reviewed Oct 13, 2023

View reviewed changes

remove useless code

5b32ab1

zhangbo9674 approved these changes Oct 13, 2023

View reviewed changes

winter-wang reviewed Oct 13, 2023

View reviewed changes

winter-wang approved these changes Oct 13, 2023

View reviewed changes

Aurelius84 approved these changes Oct 13, 2023

View reviewed changes

phlrain merged commit 3bed3dc into PaddlePaddle:develop Oct 13, 2023
28 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PIR]Support while op #57937

[PIR]Support while op #57937

phlrain commented Oct 9, 2023 •

edited

Loading

paddle-bot bot commented Oct 9, 2023

paddle-bot bot commented Oct 9, 2023

winter-wang Oct 11, 2023

winter-wang Oct 11, 2023 •

edited

Loading

phlrain Oct 12, 2023

winter-wang Oct 11, 2023 •

edited

Loading

phlrain Oct 12, 2023

winter-wang Oct 11, 2023

phlrain Oct 12, 2023

winter-wang Oct 11, 2023

phlrain Oct 12, 2023

This comment was marked as outdated.

zhangbo9674 Oct 11, 2023

phlrain Oct 12, 2023

winter-wang left a comment

winter-wang Oct 13, 2023 •

edited

Loading

winter-wang Oct 13, 2023

winter-wang Oct 13, 2023

winter-wang left a comment

Aurelius84 left a comment

Aurelius84 Oct 13, 2023

Aurelius84 Oct 13, 2023

Aurelius84 Oct 13, 2023

Aurelius84 Oct 13, 2023

Aurelius84 Oct 13, 2023

Aurelius84 Oct 13, 2023

Aurelius84 Oct 13, 2023

-  for (auto op : (*block)) {
+    if (block && !block->empty() && block->back()->isa<pir::CondYieldOp>()) {
+        auto *op = block->back();
+        for (size_t i = 0; i < op->num_operands(); ++i) {
+            vec_res.emplace_back(op->operand_source(i));
+    }
+  }

-std::vector<pir::Value> GetCondYiedOpInputs(pir::Block* block) {
+pir::Value GetCondYiedOpInputs(pir::Block* block) {
+   // 可以用paddle_enforce判断一下block非空，且最后一个op是YieldOp， 且只有一个输入，且为bool类型。
+   return block->back()->operand_source(0);
+}

	auto out_var_name = body_skip_gc_names_[i];
	auto& out_var_name = body_skip_gc_names_[i];


		void Run() override;

		const std::string& Name() const override { return cond_name_; }

	std::string cond_name_{"while_instruction"};
	std::string name_{"while_instruction"};

	std::vector<Variable*> while_op_inputs_;
	std::vector<Variable*> inputs_;

	std::vector<Variable*> while_op_outputs_;
	std::vector<Variable*> outputs_;

	if (op_item->name() == "cf.yield" \|\| op_item->name() == "cf.cond_yield") {
	if (op_item->isa<YieldOp>() \|\| op_item->isa<CondYieldOp>()) {

[PIR]Support while op #57937

[PIR]Support while op #57937

Conversation

phlrain commented Oct 9, 2023 • edited Loading

PR types

PR changes

Description

paddle-bot bot commented Oct 9, 2023

paddle-bot bot commented Oct 9, 2023

Choose a reason for hiding this comment

winter-wang Oct 11, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

winter-wang Oct 11, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as outdated.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

winter-wang left a comment

Choose a reason for hiding this comment

winter-wang Oct 13, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

winter-wang left a comment

Choose a reason for hiding this comment

Aurelius84 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

phlrain commented Oct 9, 2023 •

edited

Loading

winter-wang Oct 11, 2023 •

edited

Loading

winter-wang Oct 11, 2023 •

edited

Loading

winter-wang Oct 13, 2023 •

edited

Loading