Pre Merge pull request !2058 from zhupuxu/fix_bug_step_info_r1.5

ge/common/profiling/ge_profiling.cc

@@ -230,21 +230,15 @@ ge::Status ProfSetStepInfo(uint64_t index_id, uint16_t tag_id, rtStream_t stream
     REPORT_CALL_ERROR("E19999", "Get logic device id failed, ret 0x%X", rt_ret);
     return ge::FAILED;
   }
+  auto &profiling_manager = ge::ProfilingManager::Instance();
+  profiling_manager.SetCurIterNum(index_id);
   if (is_first_run && tag_id == kStepStart) {
-    GE_CHK_STATUS_RET_NOLOG(ge::ProfilingManager::Instance().ProfileStepInfo(index_id,
-                                                                             kModelId,
-                                                                             tag_id,
-                                                                             stream,
-                                                                             device_id));
+    GE_CHK_STATUS_RET_NOLOG(profiling_manager.ProfileStepInfo(index_id, kModelId, tag_id, stream, device_id));
     is_first_run = false;
     return ge::SUCCESS;
   }
   if (!is_first_run && tag_id == kStepEnd) {
-    GE_CHK_STATUS_RET_NOLOG(ge::ProfilingManager::Instance().ProfileStepInfo(index_id,
-                                                                             kModelId,
-                                                                             tag_id,
-                                                                             stream,
-                                                                             device_id));
+    GE_CHK_STATUS_RET_NOLOG(profiling_manager.ProfileStepInfo(index_id, kModelId, tag_id, stream, device_id));
     is_first_run = true;
     return ge::SUCCESS;
   }

ge/common/profiling/profiling_manager.cc

@@ -66,9 +66,12 @@ const std::string kIdx = "idx";
 
 namespace ge {
 ProfilingManager::ProfilingManager()
-    : is_load_profiling_(false), is_execute_profiling_(false), is_training_trace_(false), subscribe_count_(0) {
-  prof_cb_.msprofCtrlCallback = nullptr;
-  prof_cb_.msprofReporterCallback = nullptr;
+    : is_load_profiling_(false),
+      is_execute_profiling_(false),
+      is_training_trace_(false),
+      subscribe_count_(0),
+      prof_cb_({nullptr, nullptr}),
+      cur_iter_num_(INT64_MAX) {
 }
 
 ProfilingManager::~ProfilingManager() {}
@@ -604,6 +607,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfFi
   is_load_profiling_ = false;
   is_training_trace_ = false;
   is_execute_profiling_ = false;
+  cur_iter_num_ = INT64_MAX;
 
   // profiling plugin uninit
   PluginUnInit();

ge/common/profiling/profiling_manager.h

@@ -101,6 +101,8 @@ class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ProfilingManager {
   void GetOpInputOutputInfo(const OpDescPtr &op, TaskDescInfo &task_desc_info) const;
   void ReportData(const int32_t &device_id, const std::string &data, const std::string &tag_name);
   Status ProfileStepInfo(uint64_t index_id, uint64_t model_id, uint16_t tag_id, rtStream_t stream, int32_t device_id);
+  uint64_t GetCurIterNum() const { return cur_iter_num_; }
+  void SetCurIterNum(uint64_t cur_iter_num) { cur_iter_num_ = cur_iter_num; }
  private:
   Status InitFromOptions(const Options &options, MsprofGeOptions &prof_conf);
   Status ParseOptions(const std::string &options);
@@ -127,6 +129,7 @@ class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ProfilingManager {
   std::string fp_point_;
   std::string bp_point_;
   uint32_t reporter_max_len_ = 0;
+  uint64_t cur_iter_num_;
 };
 }  // namespace ge
 #endif  // GE_COMMON_PROFILING_PROFILING_MANAGER_H_

ge/single_op/single_op.cc

@@ -58,7 +58,7 @@ Status ProfilingTaskInfo(OpTask *op_task, const string &shape_type) {
          tmp_task_desc_info.op_name.c_str(), tmp_task_desc_info.model_name.c_str());
 
   tmp_task_desc_info.shape_type = shape_type;
-  tmp_task_desc_info.cur_iter_num = 0;
+  tmp_task_desc_info.cur_iter_num = ProfilingManager::Instance().GetCurIterNum();
   tmp_task_desc_info.task_type = op_task->GetTaskType();
 
   std::vector<TaskDescInfo> task_desc_info;

inc/framework/common/ge_types.h

@@ -260,7 +260,7 @@ struct TaskDescInfo {
   uint32_t task_id;
   uint32_t stream_id;
   std::string shape_type;
-  int64_t cur_iter_num;
+  uint64_t cur_iter_num;
   std::string task_type;
   std::vector<Format> input_format;
   std::vector<std::vector<int64_t>> input_shape;