[IR] Refine BuildScope in phi_kernel_util (#55423)

* add code

* fix bug

* refine code

* refine code

* fix bug

Author: zhangbo9674

paddle/fluid/framework/new_executor/new_ir_interpreter.cc

@@ -185,16 +185,20 @@ FetchList NewIRInterpreter::Run(const std::vector<std::string>& feed_names,
 
   if (!is_build_) {
     LOG_FIRST_N(INFO, 1) << "New Executor is Running.";
-    ::ir::BuildScope(
-        *ir_program_->block(), scope_, local_scope_, &value_2_var_name_map_);
+    ::ir::BuildScope(*ir_program_->block(),
+                     InnerScope(),
+                     &value_2_var_name_,
+                     &variable_2_var_name_,
+                     &var_name_2_id_,
+                     &variable_list_);
 
     std::vector<paddle::framework::OpFuncNode> op_func_nodes;
     interpreter::BuildOpFuncList(place_,
                                  ir_program_->block(),
                                  &op_func_nodes,
                                  scope_,
                                  local_scope_,
-                                 value_2_var_name_map_,
+                                 value_2_var_name_,
                                  execution_config_);
     // SetFeedVarsInplaceSkip(feed_names);
     // convert vec func_list to graph
@@ -237,8 +241,12 @@ FetchList NewIRInterpreter::BetaRun(const std::vector<std::string>& feed_names,
   SetDeviceId(place_);
   if (!is_build_) {
     LOG_FIRST_N(INFO, 1) << "New Executor is BetaRunning.";
-    ::ir::BuildScope(
-        *ir_program_->block(), scope_, local_scope_, &value_2_var_name_map_);
+    ::ir::BuildScope(*ir_program_->block(),
+                     InnerScope(),
+                     &value_2_var_name_,
+                     &variable_2_var_name_,
+                     &var_name_2_id_,
+                     &variable_list_);
     BuildInstruction();
     for (size_t instr_id = 0; instr_id < vec_instruction_base_.size();
          ++instr_id) {
@@ -1526,13 +1534,8 @@ void NewIRInterpreter::BuildInstruction() {
        ++it) {
     VLOG(0) << "Build Instruction for op: " << op_idx;
     if ((*it)->dialect()->name() == "pd_kernel") {
-      vec_instruction_base_.emplace_back(
-          std::make_unique<PhiKernelInstruction>(op_idx++,
-                                                 place_,
-                                                 (*it),
-                                                 scope_,
-                                                 local_scope_,
-                                                 value_2_var_name_map_));
+      vec_instruction_base_.emplace_back(std::make_unique<PhiKernelInstruction>(
+          op_idx++, place_, (*it), scope_, local_scope_, value_2_var_name_));
     } else {
       PADDLE_THROW(platform::errors::Unimplemented(
           "Now only support pd_kernel dialect."));

paddle/fluid/framework/new_executor/new_ir_interpreter.h

@@ -192,7 +192,11 @@ class NewIRInterpreter : public InterpreterBaseImpl {
 
   std::vector<std::unique_ptr<InstructionBase>> vec_instruction_base_;
 
-  std::unordered_map<::ir::Value, std::string> value_2_var_name_map_;
+  std::unordered_map<::ir::Value, std::string> value_2_var_name_;
+  std::unordered_map<const paddle::framework::Variable*, std::string>
+      variable_2_var_name_;
+  std::map<std::string, int> var_name_2_id_;
+  std::vector<Variable*> variable_list_;
 };
 
 }  // namespace framework

paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_adaptor.h

@@ -55,8 +55,18 @@ class PhiKernelAdaptor {
 
   void run_kernel_prog(ir::Program* program) {
     auto block = program->block();
-    std::unordered_map<ir::Value, std::string> name_map;
-    BuildScope(*block, scope_, nullptr, &name_map);
+    std::unordered_map<ir::Value, std::string> value_2_var_name;
+    std::unordered_map<const paddle::framework::Variable*, std::string>
+        variable_2_var_name;
+    std::map<std::string, int> var_name_2_id;
+    std::vector<paddle::framework::Variable*> variable_list;
+
+    BuildScope(*block,
+               scope_,
+               &value_2_var_name,
+               &variable_2_var_name,
+               &var_name_2_id,
+               &variable_list);
     ir::IrContext* ctx = ir::IrContext::Instance();
 
     ctx->GetOrRegisterDialect<paddle::dialect::PaddleDialect>();
@@ -88,7 +98,8 @@ class PhiKernelAdaptor {
           phi::MetaTensor,
           paddle::small_vector<phi::MetaTensor, phi::kInputSmallVectorSize>,
           paddle::small_vector<phi::MetaTensor, phi::kInputSmallVectorSize>,
-          false>((*it), name_map, scope_, nullptr, op_yaml_info_parser, &ctx);
+          false>(
+          (*it), value_2_var_name, scope_, nullptr, op_yaml_info_parser, &ctx);
 
       infer_meta_impl->infer_meta_(&ctx);
 
@@ -108,12 +119,16 @@ class PhiKernelAdaptor {
                           phi::TensorBase*,
                           paddle::small_vector<const phi::TensorBase*>,
                           paddle::small_vector<phi::TensorBase*>,
-                          true>(
-          (*it), name_map, scope_, nullptr, op_yaml_info_parser, &kernel_ctx);
+                          true>((*it),
+                                value_2_var_name,
+                                scope_,
+                                nullptr,
+                                op_yaml_info_parser,
+                                &kernel_ctx);
       kernel_fn(&kernel_ctx);
 
       auto out_value = (*it)->result(0);
-      out_name = name_map[out_value];
+      out_name = value_2_var_name[out_value];
     }
   }