From 3aa149299ecc5443a6dab82d350887cf859af8c3 Mon Sep 17 00:00:00 2001 From: zhupuxu Date: Fri, 9 Jul 2021 17:49:27 +0800 Subject: [PATCH] test cm Signed-off-by: zhupuxu --- ge/common/profiling/ge_profiling.cc | 1 - ge/common/profiling/profiling_manager.cc | 5 +++-- ge/common/profiling/profiling_manager.h | 5 ++--- ge/single_op/single_op.cc | 2 +- tests/ut/ge/profiling/ge_profiling_manager_unittest.cc | 17 ----------------- tests/ut/ge/session/inner_session_unittest.cc | 14 ++++++++++++++ 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/ge/common/profiling/ge_profiling.cc b/ge/common/profiling/ge_profiling.cc index fcd01a12..f20fa37c 100644 --- a/ge/common/profiling/ge_profiling.cc +++ b/ge/common/profiling/ge_profiling.cc @@ -268,7 +268,6 @@ ge::Status ProfSetStepInfo(uint64_t index_id, uint16_t tag_id, rtStream_t stream return ge::FAILED; } auto &profiling_manager = ge::ProfilingManager::Instance(); - profiling_manager.SetStepInfoIndex(index_id); if (is_first_run && tag_id == kStepStart) { GE_CHK_STATUS_RET_NOLOG(profiling_manager.ProfileStepInfo(index_id, kModelId, tag_id, stream, device_id)); is_first_run = false; diff --git a/ge/common/profiling/profiling_manager.cc b/ge/common/profiling/profiling_manager.cc index 0464491d..2d3ab37a 100644 --- a/ge/common/profiling/profiling_manager.cc +++ b/ge/common/profiling/profiling_manager.cc @@ -71,7 +71,7 @@ ProfilingManager::ProfilingManager() is_training_trace_(false), subscribe_count_(0), prof_cb_({nullptr, nullptr}), - index_id_(UINT64_MAX), + cur_iter_num_(UINT64_MAX), subscribe_info_({false, 0, 0}) { } @@ -327,6 +327,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::Profilin FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfileStepInfo( uint64_t index_id, uint64_t model_id, uint16_t tag_id, rtStream_t stream, int32_t device_id) { #ifdef DAVINCI_SUPPORT_PROFILING + cur_iter_num_ = index_id; if (!is_load_profiling_ && subscribe_count_ == 0) { GELOGD("Profiling is not turned on, no need to profile step info."); return SUCCESS; @@ -608,7 +609,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfFi is_load_profiling_ = false; is_training_trace_ = false; is_execute_profiling_ = false; - index_id_ = UINT64_MAX; + cur_iter_num_ = UINT64_MAX; // profiling plugin uninit PluginUnInit(); diff --git a/ge/common/profiling/profiling_manager.h b/ge/common/profiling/profiling_manager.h index e5137562..c8cc415a 100755 --- a/ge/common/profiling/profiling_manager.h +++ b/ge/common/profiling/profiling_manager.h @@ -107,8 +107,7 @@ 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); - void SetStepInfoIndex(uint64_t index_id) { index_id_ = index_id; } - uint64_t GetStepInfoIndex() const { return index_id_; } + uint64_t GetCurIterNum() const { return cur_iter_num_; } void SetGraphIdToDeviceMap(uint32_t graph_id, uint32_t device_id) { device_id_map_[graph_id] = device_id; } Status GetDeviceIdFromGraph(uint32_t graph_id, uint32_t &device_id); void SetSubscribeInfo(uint64_t prof_switch, uint32_t model_id, bool is_subscribe); @@ -143,7 +142,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 index_id_; + uint64_t cur_iter_num_; std::map device_id_map_; // key: graph_id, value: device_id std::map model_id_map_; // key: graph_id, value: model_id ProfSubscribeInfo subscribe_info_; diff --git a/ge/single_op/single_op.cc b/ge/single_op/single_op.cc index a82c30ba..eddf6478 100755 --- a/ge/single_op/single_op.cc +++ b/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 = ProfilingManager::Instance().GetStepInfoIndex(); + tmp_task_desc_info.cur_iter_num = ProfilingManager::Instance().GetCurIterNum(); tmp_task_desc_info.task_type = op_task->GetTaskType(); std::vector task_desc_info; diff --git a/tests/ut/ge/profiling/ge_profiling_manager_unittest.cc b/tests/ut/ge/profiling/ge_profiling_manager_unittest.cc index 35879df8..dd41f23b 100644 --- a/tests/ut/ge/profiling/ge_profiling_manager_unittest.cc +++ b/tests/ut/ge/profiling/ge_profiling_manager_unittest.cc @@ -156,23 +156,6 @@ TEST_F(UtestGeProfilinganager, set_step_info_failed) { EXPECT_EQ(ret, ge::FAILED); } -TEST_F(UtestGeProfilinganager, get_device_from_graph) { - GraphId graph_id = 1; - uint32_t device_id = 0; - GraphManager graph_manager; - GraphNodePtr graph_node = MakeShared(graph_id); - graph_manager.AddGraphNode(graph_id, graph_node); - graph_manager.SetAddGraphCondition(graph_id, 2); - Graph graph("test_graph"); - CreateGraph(graph); - std::map options; - OmgContext context; - Status ret = graph_manager.AddGraph(graph_id, graph, options, context); - EXPECT_EQ(ret, ge::SUCCESS); - ret = ProfGetDeviceFormGraphId(graph_id, device_id); - EXPECT_EQ(ret, ge::SUCCESS); -} - TEST_F(UtestGeProfilinganager, handle_subscribe_info) { ProfCommandHandleType prof_type = kProfCommandhandleModelSubscribe; ProfCommandHandleData prof_data; diff --git a/tests/ut/ge/session/inner_session_unittest.cc b/tests/ut/ge/session/inner_session_unittest.cc index 80cc2834..d8531d77 100644 --- a/tests/ut/ge/session/inner_session_unittest.cc +++ b/tests/ut/ge/session/inner_session_unittest.cc @@ -16,6 +16,8 @@ #include +#include "framework/common/profiling/ge_profiling.h" + #define private public #define protected public #include "session/inner_session.h" @@ -58,4 +60,16 @@ TEST_F(UtestInnerSession, check_op_precision_mode) { auto ret = inner_session.Initialize(); EXPECT_NE(ret, ge::SUCCESS); } + +TEST_F(Utest_Inner_session, get_device_from_graph) { + std::map options = {}; + uint64_t session_id = 1; + InnerSession inner_session(session_id, options); + GraphId graph_id = 1; + uint32_t device_id = 0; + Graph graph("test_graph"); + Status ret = inner_session.AddGraph(graph_id, graph); + ret = ProfGetDeviceFormGraphId(graph_id, device_id); + EXPECT_EQ(ret, ge::SUCCESS); +} } // namespace ge