From: @chen-hua-baker Reviewed-by: @zhangxiaokun9,@wqtshg Signed-off-by: @wqtshgtags/v1.3.0
| @@ -1066,10 +1066,6 @@ Status KernelTaskInfo::InitAicpuTask(uint32_t op_index, const domi::KernelDef &k | |||||
| } | } | ||||
| InitDumpArgs(sizeof(aicpu::AicpuParamHead)); | InitDumpArgs(sizeof(aicpu::AicpuParamHead)); | ||||
| if (kernel_type_ == ccKernelType::CUST_AI_CPU) { | |||||
| dump_flag_ |= RT_KERNEL_CUSTOM_AICPU; | |||||
| } | |||||
| davinci_model_->SetZeroCopyAddr(op_desc, io_addrs, args_addr.get(), args_, args_size_, sizeof(aicpu::AicpuParamHead)); | davinci_model_->SetZeroCopyAddr(op_desc, io_addrs, args_addr.get(), args_, args_size_, sizeof(aicpu::AicpuParamHead)); | ||||
| return SUCCESS; | return SUCCESS; | ||||
| @@ -1095,6 +1091,9 @@ void KernelTaskInfo::InitDumpArgs(uint32_t offset) { | |||||
| GELOGD("Op debug is open in kernel task info"); | GELOGD("Op debug is open in kernel task info"); | ||||
| dump_args_ = static_cast<char *>(args_) + offset; | dump_args_ = static_cast<char *>(args_) + offset; | ||||
| } | } | ||||
| if (kernel_type_ == ccKernelType::CUST_AI_CPU) { | |||||
| dump_flag_ |= RT_KERNEL_CUSTOM_AICPU; | |||||
| } | |||||
| } | } | ||||
| Status KernelTaskInfo::InitAicpuTaskExtInfo(const std::string &ext_info) { | Status KernelTaskInfo::InitAicpuTaskExtInfo(const std::string &ext_info) { | ||||
| @@ -1184,6 +1184,22 @@ TEST_F(UtestKernelTaskInfo, kernel_task_info_calculate_args_aicpu) { | |||||
| EXPECT_EQ(kernel_task_info.CalculateArgs(task_def, &model), SUCCESS); | EXPECT_EQ(kernel_task_info.CalculateArgs(task_def, &model), SUCCESS); | ||||
| } | } | ||||
| TEST_F(UtestKernelTaskInfo, kernel_task_info_calculate_args_custom_aicpu) { | |||||
| DavinciModel model(0, nullptr); | |||||
| domi::TaskDef task_def; | |||||
| domi::KernelDef *kernel_def = task_def.mutable_kernel(); | |||||
| domi::KernelContext *ctx = kernel_def->mutable_context(); | |||||
| ctx->set_kernel_type(7); | |||||
| KernelTaskInfo kernel_task_info; | |||||
| kernel_task_info.davinci_model_ = &model; | |||||
| kernel_task_info.kernel_type_ = ccKernelType::CUST_AI_CPU; | |||||
| kernel_task_info.op_desc_ = std::make_shared<OpDesc>("concat", "TensorArrayWrite"); | |||||
| kernel_task_info.InitDumpArgs(0); | |||||
| EXPECT_EQ(kernel_task_info.CalculateArgs(task_def, &model), SUCCESS); | |||||
| } | |||||
| TEST_F(UtestKernelTaskInfo, kernel_task_info_update_args_te) { | TEST_F(UtestKernelTaskInfo, kernel_task_info_update_args_te) { | ||||
| DavinciModel model(0, nullptr); | DavinciModel model(0, nullptr); | ||||