diff --git a/ge/common/profiling/profiling_init.cc b/ge/common/profiling/profiling_init.cc index e0f1aa35..3e281bc3 100644 --- a/ge/common/profiling/profiling_init.cc +++ b/ge/common/profiling/profiling_init.cc @@ -66,7 +66,7 @@ ge::Status ProfilingInit::Init(const Options &options) { return SUCCESS; } -ge::Status ProfilingInit::ProfRegisterCtrlCallback() {; +ge::Status ProfilingInit::ProfRegisterCtrlCallback() { rtProfCtrlHandle callback = CommandHandle; rtError_t rt_ret = rtProfRegisterCtrlCallback(GE,callback); if (rt_ret != RT_ERROR_NONE) { diff --git a/tests/ut/ge/profiling/profiling_init_unittest.cc b/tests/ut/ge/profiling/profiling_init_unittest.cc index ccf90eda..02f91b5c 100644 --- a/tests/ut/ge/profiling/profiling_init_unittest.cc +++ b/tests/ut/ge/profiling/profiling_init_unittest.cc @@ -49,6 +49,29 @@ TEST_F(UtestGeProfilingInit, test_init) { auto &profiling_init = ge::ProfilingInit::Instance(); auto ret = profiling_init.Init(options); EXPECT_EQ(ret, ge::SUCCESS); + + options.profiling_mode = "0"; + ret = profiling_init.Init(options); + EXPECT_EQ(ret, ge::SUCCESS); + setenv("PROFILING_MODE", "false", true); + ret = profiling_init.Init(options); + EXPECT_EQ(ret, ge::SUCCESS); +} + +TEST_F(UtestGeProfilingInit, test_register_ctrl_callback) { + auto &profiling_init = ge::ProfilingInit::Instance(); + auto ret = profiling_init.ProfRegisterCtrlCallback(); + EXPECT_EQ(ret, ge::SUCCESS); +} + +TEST_F(UtestGeProfilingInit, test_parse_options) { + auto &profiling_init = ge::ProfilingInit::Instance(); + auto ret = profiling_init.ParseOptions(""); + EXPECT_EQ(ret, ge::PARAM_INVALID); + ret = profiling_init.ParseOptions("*"); + EXPECT_EQ(ret, ge::PARAM_INVALID); + ret = profiling_init.ParseOptions(R"(""training_trace":"on")"); + EXPECT_EQ(ret, ge::PARAM_INVALID); } TEST_F(UtestGeProfilingInit, test_stop) { @@ -61,6 +84,11 @@ TEST_F(UtestGeProfilingInit, test_shut) { profiling_init.ShutDownProfiling(); } +TEST_F(UtestGeProfilingInit, test_get_profiling_module) { + auto &profiling_init = ge::ProfilingInit::Instance(); + profiling_init.GetProfilingModule(); +} + TEST_F(UtestGeProfilingInit, test_set_deviceId) { uint32_t model_id = 0; uint32_t device_id = 0; diff --git a/tests/ut/ge/profiling/profiling_properties_unittest.cc b/tests/ut/ge/profiling/profiling_properties_unittest.cc index f97da098..b3178a52 100644 --- a/tests/ut/ge/profiling/profiling_properties_unittest.cc +++ b/tests/ut/ge/profiling/profiling_properties_unittest.cc @@ -39,6 +39,13 @@ class UtestGeProfilingProperties : public testing::Test { void TearDown() override {} }; +TEST_F(UtestGeProfilingProperties, test_load_profiling) { + auto &profiling_properties = ge::ProfilingProperties::Instance(); + profiling_properties.SetLoadProfiling(true); + auto is_load = profiling_properties.IsLoadProfiling(); + EXPECT_EQ(is_load, true); +} + TEST_F(UtestGeProfilingProperties, test_execute_profiling) { auto &profiling_properties = ge::ProfilingProperties::Instance(); profiling_properties.SetExecuteProfiling(true); @@ -55,8 +62,13 @@ TEST_F(UtestGeProfilingProperties, test_training_trace) { TEST_F(UtestGeProfilingProperties, test_fpbp_point) { auto &profiling_properties = ge::ProfilingProperties::Instance(); - std::string fp_point = "fp"; - std::string bp_point = "bp"; + std::string fp_point = ""; + std::string bp_point = ""; + profiling_properties.GetFpBpPoint(fp_point, bp_point); + EXPECT_EQ(fp_point, ""); + EXPECT_EQ(bp_point, ""); + fp_point = "fp"; + bp_point = "bp"; profiling_properties.SetFpBpPoint(fp_point, bp_point); profiling_properties.GetFpBpPoint(fp_point, bp_point); EXPECT_EQ(fp_point, "fp"); @@ -70,3 +82,23 @@ TEST_F(UtestGeProfilingProperties, test_profiling_on) { auto profiling_on = profiling_properties.ProfilingOn(); EXPECT_EQ(profiling_on, true); } + +TEST_F(UtestGeProfilingProperties, test_clear_properties) { + auto &profiling_properties = ge::ProfilingProperties::Instance(); + profiling_properties.SetFpBpPoint("fp", "bp"); + profiling_properties.SetLoadProfiling(true); + profiling_properties.SetExecuteProfiling(true); + profiling_properties.SetTrainingTrace(true); + profiling_properties.ClearProperties(); + auto is_execute = profiling_properties.IsExecuteProfiling(); + auto is_load = profiling_properties.IsLoadProfiling(); + auto is_train_trance = profiling_properties.ProfilingTrainingTraceOn(); + EXPECT_EQ(is_execute, false); + EXPECT_EQ(is_load, false); + EXPECT_EQ(is_train_trance, false); + std::string fp_point; + std::string bp_point; + profiling_properties.GetFpBpPoint(fp_point, bp_point); + EXPECT_EQ(fp_point, ""); + EXPECT_EQ(bp_point, ""); +}