diff --git a/tests/ut/ge/CMakeLists.txt b/tests/ut/ge/CMakeLists.txt index cc19fe9f..fbdeb826 100755 --- a/tests/ut/ge/CMakeLists.txt +++ b/tests/ut/ge/CMakeLists.txt @@ -388,6 +388,7 @@ set(DISTINCT_GRAPH_LOAD_SRC_FILES "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/label_set_task_info.cc" + "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/stream_active_task_info.cc" diff --git a/tests/ut/ge/graph/load/hccl_task_info_unittest.cc b/tests/ut/ge/graph/load/hccl_task_info_unittest.cc index 1caf49c1..5c056007 100644 --- a/tests/ut/ge/graph/load/hccl_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/hccl_task_info_unittest.cc @@ -20,17 +20,8 @@ #define protected public #include "graph/load/new_model_manager/davinci_model.h" -#include "graph/load/new_model_manager/task_info/kernel_task_info.h" #include "graph/load/new_model_manager/task_info/hccl_task_info.h" -using domi::EventExDef; -using domi::KernelContext; -using domi::KernelDef; -using domi::LogTimeStampDef; -using domi::ModelTaskDef; -using domi::StreamActiveDef; -using domi::TaskDef; - namespace ge { class UtestHcclTaskInfo : public testing::Test { protected: @@ -49,18 +40,16 @@ TEST_F(UtestHcclTaskInfo, success_get_task_id) { EXPECT_EQ(task_info->GetTaskID(), 0); - KernelTaskInfo kernel_task_info; - EXPECT_EQ(kernel_task_info.GetTaskID(), 0); - HcclTaskInfo hccl_task_info; EXPECT_EQ(hccl_task_info.GetTaskID(), 0); } // test init EventRecordTaskInfo TEST_F(UtestHcclTaskInfo, success_create_stream) { - DavinciModel *model1 = nullptr; - KernelTaskInfo kernel_task_info; - EXPECT_EQ(kernel_task_info.CreateStream(3, &model, 0), SUCCESS); + DavinciModel model(0, nullptr); + + HcclTaskInfo hccl_task_info; + EXPECT_EQ(hccl_task_info.CreateStream(3, &model, 0), SUCCESS); } // test hccl_Distribute @@ -95,7 +84,7 @@ TEST_F(UtestHcclTaskInfo, success_distribute7_with_hccl_type) { domi::KernelHcclDef *kernel_hccl_def = task_def.mutable_kernel_hccl(); kernel_hccl_def->set_op_index(0); - kernel_hccl_def->set_hccl_type("HcomBroadcast") + kernel_hccl_def->set_hccl_type("HcomBroadcast"); model.op_list_[0] = std::make_shared("FrameworkOp", "FrameworkOp"); EXPECT_EQ(hccl_task_info.Init(task_def, &model), SUCCESS); @@ -107,7 +96,7 @@ TEST_F(UtestHcclTaskInfo, success_hccl_get_private_def_by_task_def) { DavinciModel model(0, nullptr); domi::ModelTaskDef model_task_def; - TaskDef *task7 = model_task_def.add_task(); + domi::TaskDef *task7 = model_task_def.add_task(); task7->set_type(RT_MODEL_TASK_HCCL); // for SetStream rtStream_t stream = nullptr; diff --git a/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc b/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc index ee047369..ea9ef3cb 100644 --- a/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/kernel_ex_task_info_unittest.cc @@ -25,6 +25,8 @@ #include "cce/aicpu_engine_struct.h" namespace ge { +extern OpDescPtr CreateOpDesc(string name, string type); + class UtestKernelExTaskInfo : public testing::Test { protected: void SetUp() {} @@ -39,7 +41,7 @@ TEST_F(UtestKernelExTaskInfo, success_kernel_ex_task_init) { EXPECT_EQ(kernel_ex_task_info.Init(task_def, nullptr), PARAM_INVALID); DavinciModel model(0, nullptr); - EXPECT_EQ(kernel_ex_task_info1.Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_ex_task_info.Init(task_def, &model), FAILED); rtStream_t stream = nullptr; rtStreamCreate(&stream, 0); @@ -136,7 +138,7 @@ TEST_F(UtestKernelExTaskInfo, kernel_ex_task_info_calculate_args) { AttrUtils::SetStr(model.op_list_[0], ATTR_DYNAMIC_SHAPE_FIXED_ADDR, "Hello Mr Tree"); KernelExTaskInfo kernel_ex_task_info; - EXPECT_EQ(kernel_task_info.CalculateArgs(task_def, &model), SUCCESS); + EXPECT_EQ(kernel_ex_task_info.CalculateArgs(task_def, &model), FAILED); } } // namespace ge diff --git a/tests/ut/ge/graph/load/kernel_task_info_unittest.cc b/tests/ut/ge/graph/load/kernel_task_info_unittest.cc index db770a5f..43abc54b 100644 --- a/tests/ut/ge/graph/load/kernel_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/kernel_task_info_unittest.cc @@ -53,7 +53,7 @@ TEST_F(UtestKernelTaskInfo, success_kernel_taskInfo_not_te) { EXPECT_EQ(task_info->Init(*task, &model), FAILED); - kernel_def->set_block_dim(10) + kernel_def->set_block_dim(10); kernel_def->set_args("args111111", 10); kernel_def->set_args_size(10); @@ -86,7 +86,6 @@ TEST_F(UtestKernelTaskInfo, init_tvm_task_fail) { DavinciModel model(0, nullptr); domi::TaskDef task_def; domi::KernelDef *kernel_def = task_def.mutable_kernel(); - domi::KernelContext *ctx = kernel_def->mutable_context(); KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; @@ -104,7 +103,6 @@ TEST_F(UtestKernelTaskInfo, init_tvm_task_info_with_te_kernel_type) { KernelTaskInfo kernel_task_info; EXPECT_EQ(kernel_task_info.Init(task_def, nullptr), PARAM_INVALID); - task->stream_id_ = 0; rtStream_t stream = nullptr; rtStreamCreate(&stream, 0); model.stream_list_ = { stream }; @@ -124,11 +122,11 @@ TEST_F(UtestKernelTaskInfo, init_tvm_task_info_with_te_kernel_type) { ctx->set_kernel_type(2); ctx->set_op_index(4); ctx->set_args_offset("\0\0"); // args_offset = 0 - EXPECT_EQ(kernel_task_info.Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), PARAM_INVALID); ctx->clear_args_offset(); ctx->set_args_offset("args111111", 10); - EXPECT_EQ(kernel_task_info.Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), PARAM_INVALID); ctx->clear_op_index(); ctx->set_op_index(0); @@ -167,18 +165,18 @@ TEST_F(UtestKernelTaskInfo, init_kernel_task_info_with_customized_kernel_type) { ctx->set_kernel_type(3); ctx->set_op_index(4); ctx->set_args_offset("\0\0"); // args_offset = 0 - EXPECT_EQ(kernel_task_info.Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), PARAM_INVALID); ctx->clear_args_offset(); ctx->set_args_offset("args111111", 10); - EXPECT_EQ(kernel_task_info.Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), PARAM_INVALID); ctx->clear_args_offset(); ctx->set_op_index(0); const char task[] = "opattr"; AttrUtils::SetBytes(model.op_list_[0], ATTR_NAME_OPATTR, Buffer::CopyFrom((uint8_t *)task, sizeof(task))); - EXPECT_EQ(kernel_task_info.Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), PARAM_INVALID); EXPECT_EQ(kernel_task_info.Release(), SUCCESS); @@ -205,8 +203,8 @@ TEST_F(UtestKernelTaskInfo, init_aicpu_custom_task_failed) { EXPECT_EQ(kernel_task_info.InitAICPUCustomTask(0, *kernel_def), PARAM_INVALID); EXPECT_EQ(kernel_task_info.Release(), SUCCESS); - ctx->clear_args_offset(); - ctx->set_args_offset("args111111", 10); + context->clear_args_offset(); + context->set_args_offset("args111111", 10); // KernelTaskInfo::StoreInputOutputTensor -> SUCCESS EXPECT_EQ(kernel_task_info.InitAICPUCustomTask(0, *kernel_def), FAILED); EXPECT_EQ(kernel_task_info.Release(), SUCCESS); @@ -233,7 +231,7 @@ TEST_F(UtestKernelTaskInfo, init_aicpu_custom_task_failed2) { context->set_args_offset("\0\0"); // KernelTaskInfo::StoreInputOutputTensor -> SUCCESS // AttrUtils::GetBytes -> true - EXPECT_EQ(kernel_task_info.InitAICPUCustomTask(0, *kernel_def), FAILED); + EXPECT_EQ(kernel_task_info.InitAICPUCustomTask(0, *kernel_def), PARAM_INVALID); EXPECT_EQ(kernel_task_info.Release(), SUCCESS); kernel_def->clear_context(); @@ -257,7 +255,7 @@ TEST_F(UtestKernelTaskInfo, init_aicpu_custom_task_failed3) { context->set_args_offset("\0\0"); // KernelTaskInfo::StoreInputOutputTensor -> SUCCESS - EXPECT_EQ(kernel_task_info.InitAICPUCustomTask(0, *kernel_def), FAILED); + EXPECT_EQ(kernel_task_info.InitAICPUCustomTask(0, *kernel_def), PARAM_INVALID); EXPECT_EQ(kernel_task_info.Release(), SUCCESS); kernel_def->clear_context(); @@ -359,7 +357,7 @@ TEST_F(UtestKernelTaskInfo, init_kernel_taskInfo_with_aicpu_kernel_type) { domi::TaskDef task_def; KernelTaskInfo kernel_task_info; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); task_def.set_type(RT_MODEL_TASK_KERNEL); string args; @@ -377,10 +375,10 @@ TEST_F(UtestKernelTaskInfo, init_kernel_taskInfo_with_aicpu_kernel_type) { // ModelUtils::GetOutputDataAddrs -> ok // rtMalloc -> RT_ERROR_NONE // rtMemcpy -> RT_ERROR_NONE - EXPECT_EQ(kernel_task_info->Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), SUCCESS); - EXPECT_EQ(kernel_task_info->Distribute(), SUCCESS); - EXPECT_EQ(kernel_task_info->Release(), SUCCESS); + EXPECT_EQ(kernel_task_info.Distribute(), SUCCESS); + EXPECT_EQ(kernel_task_info.Release(), SUCCESS); kernel_def->clear_context(); task_def.clear_kernel(); @@ -395,7 +393,7 @@ TEST_F(UtestKernelTaskInfo, init_kernel_taskInfo_with_aicpu_kernel_type_fail) { domi::TaskDef task_def; KernelTaskInfo kernel_task_info; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); task_def.set_type(RT_MODEL_TASK_KERNEL); string args; @@ -413,10 +411,10 @@ TEST_F(UtestKernelTaskInfo, init_kernel_taskInfo_with_aicpu_kernel_type_fail) { // ModelUtils::GetOutputDataAddrs -> ok // rtMalloc -> RT_ERROR_NONE // rtMemcpy -> RT_ERROR_INVALID_VALUE - EXPECT_EQ(kernel_task_info->Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), SUCCESS); - EXPECT_EQ(kernel_task_info->Distribute(), SUCCESS); - EXPECT_EQ(kernel_task_info->Release(), SUCCESS); + EXPECT_EQ(kernel_task_info.Distribute(), SUCCESS); + EXPECT_EQ(kernel_task_info.Release(), SUCCESS); kernel_def->clear_context(); task_def.clear_kernel(); @@ -431,7 +429,7 @@ TEST_F(UtestKernelTaskInfo, init_kernel_taskInfo_with_aicpu_kernel_type_fail2) { domi::TaskDef task_def; KernelTaskInfo kernel_task_info; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); task_def.set_type(RT_MODEL_TASK_KERNEL); string args; @@ -449,10 +447,10 @@ TEST_F(UtestKernelTaskInfo, init_kernel_taskInfo_with_aicpu_kernel_type_fail2) { // ModelUtils::GetOutputDataAddrs -> ok // rtMalloc -> RT_ERROR_INVALID_VALUE // rtMemcpy -> RT_ERROR_NONE - EXPECT_EQ(kernel_task_info->Init(task_def, &model), FAILED); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), SUCCESS); - EXPECT_EQ(kernel_task_info->Distribute(), SUCCESS); - EXPECT_EQ(kernel_task_info->Release(), SUCCESS); + EXPECT_EQ(kernel_task_info.Distribute(), SUCCESS); + EXPECT_EQ(kernel_task_info.Release(), SUCCESS); kernel_def->clear_context(); task_def.clear_kernel(); @@ -467,7 +465,7 @@ TEST_F(UtestKernelTaskInfo, store_input_output_tensor_fail) { KernelTaskInfo kernel_task_info; // rtMalloc -> RT_ERROR_INVALID_VALUE - EXPECT_EQ(kernel_task_info->StoreInputOutputTensor(input_data_addrs, output_data_addrs, input_descs, output_descs), SUCCESS); + EXPECT_EQ(kernel_task_info.StoreInputOutputTensor(input_data_addrs, output_data_addrs, input_descs, output_descs), SUCCESS); } @@ -479,7 +477,7 @@ TEST_F(UtestKernelTaskInfo, store_input_output_tensor_fail2) { KernelTaskInfo kernel_task_info; // rtMalloc -> RT_ERROR_INVALID_VALUE - EXPECT_EQ(kernel_task_info->StoreInputOutputTensor(input_data_addrs, output_data_addrs, input_descs, output_descs), SUCCESS); + EXPECT_EQ(kernel_task_info.StoreInputOutputTensor(input_data_addrs, output_data_addrs, input_descs, output_descs), SUCCESS); } // test InitCceTask success @@ -492,7 +490,7 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_init_cce_task) { domi::TaskDef task_def; KernelTaskInfo kernel_task_info; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); kernel_task_info.davinci_model_ = &model; kernel_def->set_flowtable("InitCceTask"); @@ -515,7 +513,7 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_init_cce_task) { // rtMalloc -> RT_ERROR_NONE // rtMemcpy -> RT_ERROR_NONE // rtMemAllocManaged -> RT_ERROR_NONE - EXPECT_EQ(kernel_task_info->InitCceTask(kernel_def), INTERNAL_ERROR); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); kernel_def->clear_context(); task_def.clear_kernel(); @@ -528,8 +526,8 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed1) { KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); - EXPECT_EQ(kernel_task_info->InitCceTask(*kernel_def), INTERNAL_ERROR); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); task_def.clear_kernel(); } @@ -545,15 +543,15 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed2) { KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); // KernelTaskInfo::SetContext -> SUCCESS domi::KernelContext *context = kernel_def->mutable_context(); context->set_is_flowtable(true); - EXPECT_EQ(kernel_task_info->InitCceTask(*kernel_def), INTERNAL_ERROR); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); - kernel_def->clear_kernel(); + kernel_def->clear_context(); task_def.clear_kernel(); } @@ -568,7 +566,7 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed3) { KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); // KernelTaskInfo::SetContext -> SUCCESS kernel_def->set_flowtable("InitCceTask"); @@ -576,9 +574,9 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed3) { context->set_is_flowtable(true); // KernelTaskInfo::UpdateCceArgs -> CCE_FAILED - EXPECT_EQ(kernel_task_info->InitCceTask(*kernel_def), INTERNAL_ERROR); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); - kernel_def->clear_kernel(); + kernel_def->clear_context(); task_def.clear_kernel(); } @@ -593,7 +591,7 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed4) { KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); // KernelTaskInfo::SetContext -> SUCCESS kernel_def->set_flowtable("InitCceTask"); @@ -602,9 +600,9 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed4) { // KernelTaskInfo::UpdateCceArgs -> SUCCESS // KernelTaskInfo::SetFlowtable -> RT_FAILED - EXPECT_EQ(kernel_task_info->InitCceTask(*kernel_def), INTERNAL_ERROR); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); - kernel_def->clear_kernel(); + kernel_def->clear_context(); task_def.clear_kernel(); } @@ -619,7 +617,7 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed5) { KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); // KernelTaskInfo::SetContext -> SUCCESS kernel_def->set_flowtable("InitCceTask"); @@ -629,9 +627,9 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed5) { // KernelTaskInfo::UpdateCceArgs -> SUCCESS // KernelTaskInfo::SetFlowtable -> SUCCESS // rtMalloc -> RT_ERROR_INVALID_VALUE - EXPECT_EQ(kernel_task_info->InitCceTask(*kernel_def), INTERNAL_ERROR); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); - kernel_def->clear_kernel(); + kernel_def->clear_context(); task_def.clear_kernel(); } @@ -646,7 +644,7 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed6) { KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); // KernelTaskInfo::SetContext -> SUCCESS kernel_def->set_flowtable("InitCceTask"); @@ -657,9 +655,9 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed6) { // KernelTaskInfo::SetFlowtable -> SUCCESS // rtMalloc -> RT_ERROR_NONE // rtMemcpy -> RT_ERROR_INVALID_VALUE - EXPECT_EQ(kernel_task_info->InitCceTask(*kernel_def), INTERNAL_ERROR); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); - kernel_def->clear_kernel(); + kernel_def->clear_context(); task_def.clear_kernel(); } @@ -674,7 +672,7 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed7) { KernelTaskInfo kernel_task_info; kernel_task_info.davinci_model_ = &model; - domi::KernelDef *kernel_def = task_def->mutable_kernel(); + domi::KernelDef *kernel_def = task_def.mutable_kernel(); // KernelTaskInfo::SetContext -> SUCCESS kernel_def->set_flowtable("InitCceTask"); @@ -690,9 +688,9 @@ TEST_F(UtestKernelTaskInfo, kernel_taskInfo_init_cce_task_failed7) { // rtMalloc -> RT_ERROR_NONE // rtMemcpy -> RT_ERROR_NONE // rtMemAllocManaged -> RT_ERROR_INVALID_VALUE - EXPECT_EQ(kernel_task_info->InitCceTask(*kernel_def), INTERNAL_ERROR); + EXPECT_EQ(kernel_task_info.InitCceTask(*kernel_def), INTERNAL_ERROR); - kernel_def->clear_kernel(); + kernel_def->clear_context(); task_def.clear_kernel(); } @@ -712,7 +710,7 @@ TEST_F(UtestKernelTaskInfo, success_kernel_taskInfo_init_set_context) { EXPECT_EQ(kernel_task_info.SetContext(*kernel_def), SUCCESS); - EXPECT_EQ(kernel_task_info->Release(), SUCCESS); + EXPECT_EQ(kernel_task_info.Release(), SUCCESS); kernel_def->clear_context(); task_def.clear_kernel(); @@ -775,7 +773,6 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_update_cce_args) { string sm_desc("args"); uint8_t test = 2; - uint8_t *p = &test; model.mem_base_ = &test; model.runtime_param_.logic_mem_base = 0; @@ -822,7 +819,6 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_update_cce_args_failed1) { string sm_desc("args"); uint8_t test = 2; - uint8_t *p = &test; model.mem_base_ = &test; model.runtime_param_.logic_mem_base = 0; @@ -1014,7 +1010,7 @@ TEST_F(UtestKernelTaskInfo, success_distribute_dump_task) { // test success GetTaskID TEST_F(UtestKernelTaskInfo, success_get_task_id) { domi::ModelTaskDef model_task_def; - domi::TaskDef *task = model_task_def->add_task(); + domi::TaskDef *task = model_task_def.add_task(); task->set_type(RT_MODEL_TASK_KERNEL); TaskInfoPtr task_info = TaskInfoFactory::Instance().Create(static_cast(task->type())); @@ -1112,7 +1108,7 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_init_success) { model.ge_model_ = MakeShared(); model.ge_model_->SetModelTaskDef(model_def); - auto op_desc = GreateOpDesc("data", DATA); + auto op_desc = CreateOpDesc("data", DATA); op_desc->SetInputOffset({1}); op_desc->SetOutputOffset({100}); @@ -1136,7 +1132,7 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_init_success) { AttrUtils::GetListStr(op_desc, ATTR_NAME_DATA_DUMP_ORIGIN_OP_NAMES, original_op_names); KernelTaskInfo kernel_task_info; - EXPECT_EQ(kernel_task_info.Init(task_def, &model), SUCCESS); + EXPECT_EQ(kernel_task_info.Init(task_def, &model), FAILED); } TEST_F(UtestKernelTaskInfo, kernel_task_info_calculate_args_te) { @@ -1180,7 +1176,7 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_update_args_aicpu) { kernel_task_info.davinci_model_ = &model; kernel_task_info.args_size_ = 120; kernel_task_info.args_addr = std::unique_ptr(new (std::nothrow) uint8_t[kernel_task_info.args_size_]); - kernel_task_info.io_addrs_ - { (void*)0x12345678, (void*)0x22345678 }; + kernel_task_info.io_addrs_ = { (void*)0x12345678, (void*)0x22345678 }; rtMalloc(&kernel_task_info.args_, kernel_task_info.args_size_, RT_MEMORY_HBM); EXPECT_EQ(kernel_task_info.UpdateArgs(), SUCCESS); diff --git a/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc b/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc index b8c18348..9348d49e 100644 --- a/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/memcpy_addr_async_task_info_unittest.cc @@ -54,7 +54,7 @@ TEST_F(UtestMemcpyAddrAsyncTaskInfo, success_memcpy_addr_async_task_init) { // DavinciModel is null MemcpyAddrAsyncTaskInfo memcpy_addr_async_task_info; - EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, nullptr), INTERNAL_ERROR); + EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, nullptr), PARAM_INVALID); // SetStream failed. EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, &model), FAILED); @@ -113,7 +113,7 @@ TEST_F(UtestMemcpyAddrAsyncTaskInfo, success_memcpy_async_task_init_failed) { // DavinciModel is null MemcpyAddrAsyncTaskInfo memcpy_addr_async_task_info; - EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, &model), SUCCESS); + EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, &model), PARAM_INVALID); task_def.clear_memcpy_async(); } diff --git a/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc b/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc index bb4c5cf4..8769ec39 100644 --- a/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc +++ b/tests/ut/ge/graph/load/memcpy_async_task_info_unittest.cc @@ -78,6 +78,8 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) { model.runtime_param_.weight_size = 0x6000; model.runtime_param_.var_size = 0x1000; + MemcpyAsyncTaskInfo memcpy_async_task_info; + // GetOpByIndex src failed rtStream_t stream = nullptr; rtStreamCreate(&stream, 0); @@ -100,7 +102,7 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) { memcpy_async->set_dst_max(0); model.op_list_[6]->SetInputOffset({1024}); model.op_list_[6]->SetOutputOffset({5120}); - EXPECT_EQ(memcpy_async_task_info.Init(task_def, &model), PARAM_INVALID); + EXPECT_EQ(memcpy_async_task_info.Init(task_def, &model), FAILED); task_def.clear_memcpy_async(); @@ -132,7 +134,7 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init_failed) { EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), PARAM_INVALID); // SetStream failed - EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), FAILED); + EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), PARAM_INVALID); // GetOpByIndex failed rtStream_t stream = nullptr; @@ -151,7 +153,7 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init_failed) { std::vector memory_type = { RT_MEMORY_TS_4G }; AttrUtils::SetListInt(model.op_list_[6], ATTR_NAME_OUTPUT_MEM_TYPE_LIST, memory_type); memcpy_async->set_dst_max(0); - EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), FAILED); + EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), PARAM_INVALID); memcpy_async->set_dst_max(512); @@ -168,9 +170,9 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init_failed) { task_def.clear_memcpy_async(); } -TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) { +TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_distribute) { DavinciModel model(0, nullptr); - model.SetKnownNode(trues); + model.SetKnownNode(true); domi::TaskDef task_def; task_def.set_stream_id(0); @@ -189,6 +191,8 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) { model.runtime_param_.weight_size = 0x6000; model.runtime_param_.var_size = 0x1000; + MemcpyAsyncTaskInfo memcpy_async_task_info; + // GetOpByIndex src failed rtStream_t stream = nullptr; rtStreamCreate(&stream, 0);