PaddlePaddle
diff --git a/‎paddle/fluid/framework/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/new_executor/CMakeLists.txt
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎paddle/fluid/framework/new_executor/CMakeLists.txt
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎paddle/fluid/framework/new_executor/instruction/cond_instruction.cc
Copy file name to clipboard
+34-53Lines changed: 34 additions & 53 deletions b/‎paddle/fluid/framework/new_executor/instruction/cond_instruction.cc
Copy file name to clipboard
+34-53Lines changed: 34 additions & 53 deletions
diff --git a/‎paddle/fluid/framework/new_executor/instruction/cond_instruction.h
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions b/‎paddle/fluid/framework/new_executor/instruction/cond_instruction.h
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎paddle/fluid/framework/new_executor/instruction/instruction_util.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/new_executor/instruction/instruction_util.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/new_executor/instruction/legacy_kernel_instruction.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/new_executor/instruction/legacy_kernel_instruction.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/new_executor/instruction/phi_kernel_instruction.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/new_executor/instruction/phi_kernel_instruction.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/‎paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/‎paddle/fluid/framework/new_executor/interpreter/interpreter_util.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/new_executor/interpreter/interpreter_util.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -1049,7 +1049,7 @@ cc_library(
 cc_library(
   executor_cache
   SRCS executor_cache.cc
-  DEPS parallel_executor standalone_executor phi_kernel_adaptor pd_inplace_pass
+  DEPS parallel_executor standalone_executor pir_adaptor pd_inplace_pass
        pd_op_to_kernel_pass pir)
 if(WITH_PSCORE)
   get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS)
 
@@ -2,6 +2,7 @@ add_subdirectory(garbage_collector)
 add_subdirectory(instruction)
 add_subdirectory(interpreter)
 add_subdirectory(workqueue)
+add_subdirectory(pir_adaptor)
 
 set(STANDALONE_EXECUTOR_SRCS
     feed_fetch_utils.cc interpretercore.cc new_executor_defs.cc
@@ -13,7 +14,7 @@ set(STANDALONE_EXECUTOR_DEPS
     workqueue
     pd_op_dialect
     pd_op_to_kernel_pass
-    phi_kernel_adaptor
+    pir_adaptor
     program_translator
     instruction_base
     pd_inplace_pass
 
@@ -17,12 +17,12 @@
 #include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
 #include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
 #include "paddle/fluid/framework/new_executor/new_ir_interpreter.h"
+#include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/pir/dialect/operator/interface/infermeta.h"
 #include "paddle/fluid/pir/dialect/operator/interface/op_yaml_info.h"
 #include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
 #include "paddle/fluid/pir/dialect/operator/utils/op_yaml_info_parser.h"
-#include "paddle/fluid/pir/phi_kernel_adaptor/phi_kernel_util.h"
 #include "paddle/fluid/platform/collective_helper.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/phi/core/infermeta_utils.h"
@@ -123,40 +123,10 @@ CondInstruction::CondInstruction(
     pir::Operation* op,
     Scope* scope,
     Scope* local_scope,
-    const std::unordered_map<::pir::Value, std::string>& value_2_var_name,
-    const std::map<std::string, int>& var_name_2_id,
-    const std::unordered_map<const paddle::framework::Variable*, std::string>&
-        variable_2_var_name,
+    ValueExecutionInfo* parent_exe_info,
     const std::map<pir::Block*, paddle::framework::Scope*>& sub_blocks)
     : InstructionBase(id, place) {
   op_ = op;
-  // Todo: support paddle::dialect::DistAttribute
-  //   if (op_attributes.count("dist_attr") != 0) {
-  //     if (op_attributes.count("execution_stream") != 0) {
-  //         SetExecutionStream(op_attributes.at("execution_stream")
-  //                             .dyn_cast<::ir::StrAttribute>()
-  //                             .data());
-  //     }
-  //     if (op_attributes.count("stream_priority") != 0) {
-  //         SetStreamPriority(op_attributes.at("stream_priority")
-  //                             .dyn_cast<::ir::Int32Attribute>()
-  //                             .data());
-  //     }
-  //     if (op_attributes.count("scheduling_priority") != 0) {
-  //         SetSchedulingPriority(op_attributes.at("scheduling_priority")
-  //                                 .dyn_cast<::ir::Int64Attribute>()
-  //                                 .data());
-  //     }
-  //   } else {
-  //     if (interpreter::IsCommunicationOp(op)) {
-  //       // NOTE(Ruibiao): Dispatching computation before communication
-  //       improves
-  //       // multi-stream overlap when the time cost of communication less than
-  //       // that of the calculation (e.g., ResNet50_bs128_pure_fp16 N4C32
-  //       // training).
-  //       op_func_node.scheduling_priority_ = 1;
-  //     }
-  //   }
   VLOG(6) << "finish process dist attributes";
 
   SetKernelType(AnalyseOpFuncType(op, place));
@@ -173,12 +143,12 @@ CondInstruction::CondInstruction(
   auto if_op = op->dyn_cast<paddle::dialect::IfOp>();
 
   for (size_t i = 0; i < if_op.num_results(); ++i) {
-    if_op_outputs_.push_back(
-        inner_scope->GetVar(value_2_var_name.at(if_op.result(i))));
+    if_op_outputs_.push_back(inner_scope->GetVar(
+        parent_exe_info->GetValue2VarName().at(if_op.result(i))));
   }
 
   auto cond_value = if_op.operand_source(0);
-  auto var_name = value_2_var_name.at(cond_value);
+  auto var_name = parent_exe_info->GetValue2VarName().at(cond_value);
   cond_var = inner_scope->FindVar(var_name);
 
   auto true_branch_block = if_op.true_block();
@@ -189,7 +159,12 @@ CondInstruction::CondInstruction(
 
   auto true_scope = sub_blocks.at(true_branch_block);
   true_branch_inter =
-      new NewIRInterpreter(place, {}, true_branch_block, true_scope, {});
+      new NewIRInterpreter(place,
+                           {},
+                           true_branch_block,
+                           true_scope,
+                           parent_exe_info->NewChild(true_scope),
+                           {});
 
   std::set<std::string> true_skip_gc_names_set;
   for (auto value : true_branch_yied_inputs) {
@@ -200,7 +175,12 @@ CondInstruction::CondInstruction(
 
   auto false_scope = sub_blocks.at(false_branch_block);
   false_branch_inter =
-      new NewIRInterpreter(place, {}, false_branch_block, false_scope, {});
+      new NewIRInterpreter(place,
+                           {},
+                           false_branch_block,
+                           false_scope,
+                           parent_exe_info->NewChild(false_scope),
+                           {});
 
   std::set<std::string> false_skip_gc_names_set;
   for (auto value : false_branch_yied_inputs) {
@@ -214,22 +194,22 @@ CondInstruction::CondInstruction(
   std::unordered_map<pir::Value, std::vector<int>> inputs;
   GetInputIds(op,
               inner_scope,
-              value_2_var_name,
-              var_name_2_id,
-              variable_2_var_name,
+              parent_exe_info->GetValue2VarName(),
+              parent_exe_info->GetVarName2Id(),
+              parent_exe_info->GetVar2VarName(),
               &inputs);
   GetOutsideOpInputs(true_branch_block,
                      inner_scope,
-                     value_2_var_name,
-                     var_name_2_id,
-                     variable_2_var_name,
+                     parent_exe_info->GetValue2VarName(),
+                     parent_exe_info->GetVarName2Id(),
+                     parent_exe_info->GetVar2VarName(),
                      &inputs);
 
   GetOutsideOpInputs(false_branch_block,
                      inner_scope,
-                     value_2_var_name,
-                     var_name_2_id,
-                     variable_2_var_name,
+                     parent_exe_info->GetValue2VarName(),
+                     parent_exe_info->GetVarName2Id(),
+                     parent_exe_info->GetVar2VarName(),
                      &inputs);
   SetInputs(inputs);
 
@@ -238,17 +218,18 @@ CondInstruction::CondInstruction(
     pir::Value value = op->result(i);
     if (value && value.type()) {
       PADDLE_ENFORCE_NE(
-          value_2_var_name.find(value),
-          value_2_var_name.end(),
+          parent_exe_info->GetValue2VarName().find(value),
+          parent_exe_info->GetValue2VarName().end(),
           phi::errors::PreconditionNotMet(
               "input should in name map, [%d] 'th input of [%s] op",
               i,
               "if op"));
-      std::vector<int> outputs_id = GetValueIds(value,
-                                                inner_scope,
-                                                value_2_var_name,
-                                                var_name_2_id,
-                                                variable_2_var_name);
+      std::vector<int> outputs_id =
+          GetValueIds(value,
+                      inner_scope,
+                      parent_exe_info->GetValue2VarName(),
+                      parent_exe_info->GetVarName2Id(),
+                      parent_exe_info->GetVar2VarName());
       outputs.emplace(value, outputs_id);
     }
   }
 
@@ -25,6 +25,7 @@ namespace framework {
 class Scope;
 class Value;
 class NewIRInterpreter;
+class ValueExecutionInfo;
 
 class CondInstruction : public InstructionBase {
  public:
@@ -34,10 +35,7 @@ class CondInstruction : public InstructionBase {
       ::pir::Operation* op,
       Scope* scope,
       Scope* local_scope,
-      const std::unordered_map<::pir::Value, std::string>& value_2_var_name,
-      const std::map<std::string, int>& var_name_2_id,
-      const std::unordered_map<const paddle::framework::Variable*, std::string>&
-          variable_2_var_name,
+      ValueExecutionInfo* parent_exe_info,
       const std::map<pir::Block*, paddle::framework::Scope*>& sub_blocks);
 
   void Run() override;
 
@@ -28,7 +28,7 @@
 
 #include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
 #include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
-#include "paddle/fluid/pir/phi_kernel_adaptor/phi_kernel_util.h"
+#include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
 #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
 #include "paddle/fluid/platform/collective_helper.h"
 #include "paddle/phi/core/distributed/comm_context_manager.h"
 
@@ -17,12 +17,12 @@
 #include "paddle/fluid/framework/new_executor/instruction/instruction_util.h"
 #include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
 #include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
+#include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/pir/dialect/operator/interface/infermeta.h"
 #include "paddle/fluid/pir/dialect/operator/interface/op_yaml_info.h"
 #include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
 #include "paddle/fluid/pir/dialect/operator/utils/op_yaml_info_parser.h"
-#include "paddle/fluid/pir/phi_kernel_adaptor/phi_kernel_util.h"
 
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/phi/core/infermeta_utils.h"
 
@@ -16,12 +16,12 @@
 
 #include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
 #include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
+#include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/pir/dialect/operator/interface/infermeta.h"
 #include "paddle/fluid/pir/dialect/operator/interface/op_yaml_info.h"
 #include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
 #include "paddle/fluid/pir/dialect/operator/utils/op_yaml_info_parser.h"
-#include "paddle/fluid/pir/phi_kernel_adaptor/phi_kernel_util.h"
 #include "paddle/fluid/platform/collective_helper.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/phi/core/infermeta_utils.h"
 
@@ -23,6 +23,7 @@
 #include "paddle/fluid/framework/new_executor/interpreter/data_transfer.h"
 #include "paddle/fluid/framework/new_executor/interpreter/execution_config.h"
 #include "paddle/fluid/framework/new_executor/interpreter/static_build.h"
+#include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
 #include "paddle/fluid/memory/stats.h"
 #include "paddle/fluid/operators/controlflow/conditional_block_op_helper.h"
 #include "paddle/fluid/operators/controlflow/pylayer_op_helper.h"
@@ -32,7 +33,6 @@
 #include "paddle/fluid/pir/dialect/operator/interface/op_yaml_info.h"
 #include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
 #include "paddle/fluid/pir/dialect/operator/utils/op_yaml_info_parser.h"
-#include "paddle/fluid/pir/phi_kernel_adaptor/phi_kernel_util.h"
 #include "paddle/fluid/platform/flags.h"
 #include "paddle/phi/core/distributed/comm_context_manager.h"
 #include "paddle/phi/core/kernel_context.h"
@@ -1258,8 +1258,8 @@ const paddle::framework::Variable* GetVariableByName(
 
 void PrintValuesAndVariables(
     const pir::Block& block,
-    const std::unordered_map<pir::Value, std::string>* value_2_var_name,
-    const std::unordered_map<const paddle::framework::Variable*, std::string>*
+    const std::unordered_map<pir::Value, std::string>& value_2_var_name,
+    const std::unordered_map<const paddle::framework::Variable*, std::string>&
         variable_2_var_name) {
   std::stringstream ss;
   for (const auto& op : block) {
@@ -1272,10 +1272,10 @@ void PrintValuesAndVariables(
     std::string ret_variable_str = "Variable: (";
     if (!op->results().empty()) {
       for (auto& out_value : op->results()) {
-        if ((*value_2_var_name).count(out_value)) {
-          auto& var_name = (*value_2_var_name).at(out_value);
+        if (value_2_var_name.count(out_value)) {
+          auto& var_name = value_2_var_name.at(out_value);
           const paddle::framework::Variable* out_variable =
-              GetVariableByName(var_name, *variable_2_var_name);
+              GetVariableByName(var_name, variable_2_var_name);
           ss.str("");
           ss << out_value.impl();
           ret_value_str +=
@@ -1319,10 +1319,10 @@ void PrintValuesAndVariables(
     if (!op->operands().empty()) {
       for (auto& input : op->operands()) {
         ::pir::Value in_value = input.source();
-        if ((*value_2_var_name).count(in_value)) {
-          auto& var_name = (*value_2_var_name).at(in_value);
+        if (value_2_var_name.count(in_value)) {
+          auto& var_name = value_2_var_name.at(in_value);
           const paddle::framework::Variable* in_variable =
-              GetVariableByName(var_name, *variable_2_var_name);
+              GetVariableByName(var_name, variable_2_var_name);
           ss.str("");
           ss << in_value.impl();
           ret_value_str +=
 
@@ -136,8 +136,8 @@ const paddle::framework::Variable* GetVariableByName(
 
 void PrintValuesAndVariables(
     const pir::Block& block,
-    const std::unordered_map<pir::Value, std::string>* value_2_var_name,
-    const std::unordered_map<const paddle::framework::Variable*, std::string>*
+    const std::unordered_map<pir::Value, std::string>& value_2_var_name,
+    const std::unordered_map<const paddle::framework::Variable*, std::string>&
         variable_2_var_name);
 
 const std::vector<std::string> GetInstructionCallStack(