Star0
3
代码
代码
Issues
Pull Requests1
Actions
项目讨论
Wiki
分析
Star0
3
已开启
【PR】: 简要描述 #14
jiaxingru创建于 6月8日
【PR】: 简要描述 #14
已开启
jiaxingru创建于 6月8日
从m0_60337577/runtime_aclgraph_cond_opaclgraph_cond_op_0531_2_jxr2合入到dragon_q/runtimeaclgraph_cond_op_0531_2
共 5 个文件变更+10-8
Msrc/runtime/core/inc/model/capture_model.hpp+1-1
@@ -404,7 +404,7 @@ private:
404 bool isSubCaptureModel_{false};404 bool isSubCaptureModel_{false};
405 uint64_t resourceGroupId_{0U}; // 资源组ID，同一父子关系网共享405 uint64_t resourceGroupId_{0U}; // 资源组ID，同一父子关系网共享
406 rtCondHandle_t condHandle_{nullptr}; // 模型归属的condHandle406 rtCondHandle_t condHandle_{nullptr}; // 模型归属的condHandle
407- uint32_t rootExeStreamId_{UINT32_MAX};407+ uint16_t rootExeStreamId_{UINT16_MAX};
408 uint32_t loadCompleteNotifyid_{0UL}; // 用于子模型task error等异常场景408 uint32_t loadCompleteNotifyid_{0UL}; // 用于子模型task error等异常场景
409};409};
410}410}
Msrc/runtime/core/inc/sqe/v200_base/place_holder_sqe.h+1-1
@@ -79,7 +79,7 @@ struct DavidStarsModelMaintaince {
79 uint16_t endgraphNotifyId;79 uint16_t endgraphNotifyId;
80 uint32_t executorFlag;80 uint32_t executorFlag;
81 uint64_t streamExecTimesAddr;81 uint64_t streamExecTimesAddr;
82- uint32_t opSqId;82+ uint32_t opSqId;
83 uint32_t sqId;83 uint32_t sqId;
84 uint16_t rootExeStreamId;84 uint16_t rootExeStreamId;
85 uint16_t reserved0;85 uint16_t reserved0;
Msrc/runtime/core/inc/stars/stars.hpp+4-2
@@ -160,6 +160,8 @@ struct RtStarsModelMaintaince {
160 uint16_t endgraph_notify_id;160 uint16_t endgraph_notify_id;
161 uint32_t executor_flag;161 uint32_t executor_flag;
162 uint64_t streamExecTimesAddr;162 uint64_t streamExecTimesAddr;
163+ uint32_t reserved0; // reserved for David alignment
164+ uint32_t reserved1; // reserved for David alignment
163 uint16_t root_exe_stream_id;165 uint16_t root_exe_stream_id;
164 uint16_t reserved0;166 uint16_t reserved0;
165 uint32_t reserved[5];167 uint32_t reserved[5];
@@ -171,7 +173,7 @@ struct RtStarsMaintaince {
171 uint16_t target_id;173 uint16_t target_id;
172 uint8_t reserved[44];174 uint8_t reserved[44];
173};175};
174-struct RtMdlTaskUpdate {176+struct RtMdlTaskUpdate {
175 uint64_t descBufOffset; // rtFftsPlusTaskInfo_t-->descBuf177 uint64_t descBufOffset; // rtFftsPlusTaskInfo_t-->descBuf
176 uint64_t tilingKeyOffset;178 uint64_t tilingKeyOffset;
177 uint64_t blockDimOffset;179 uint64_t blockDimOffset;
@@ -275,7 +277,7 @@ struct RtStarsPhSqe {
275 RtStreamOverflowSwitch stream_overflow_switch_info;277 RtStreamOverflowSwitch stream_overflow_switch_info;
276 RtGetDevMsg get_dev_msg_info;278 RtGetDevMsg get_dev_msg_info;
277 RtStreamSetTag stream_set_tag_info;279 RtStreamSetTag stream_set_tag_info;
278- RtDebugStatus debugStatusInfo;280+ RtDebugStatus debugStatusInfo;
279 RtFlipTaskTag flip_task_info;281 RtFlipTaskTag flip_task_info;
280 RtUpdateAddrTaskTag updateAddrInfo;282 RtUpdateAddrTaskTag updateAddrInfo;
281 RtAicpuInfoLoad ai_cpu_load_info;283 RtAicpuInfoLoad ai_cpu_load_info;
Msrc/runtime/core/src/task/inc/model_maintaince_task.h+1-1
@@ -22,7 +22,7 @@ void ToCommandBodyForModelMaintainceTask(TaskInfo * const taskInfo, rtCommand_t
22void DoCompleteSuccessForModelMaintainceTask(TaskInfo * const taskInfo, const uint32_t devId);22void DoCompleteSuccessForModelMaintainceTask(TaskInfo * const taskInfo, const uint32_t devId);
23void PrintErrorInfoForModelMaintainceTask(TaskInfo * const taskInfo, const uint32_t devId);23void PrintErrorInfoForModelMaintainceTask(TaskInfo * const taskInfo, const uint32_t devId);
24uint32_t GetEndGraphNotifyId(Model *mdl);24uint32_t GetEndGraphNotifyId(Model *mdl);
25-uint32_t GetRootExeStreamId(const Model * const mdl);25+uint16_t GetRootExeStreamId(const Model * const mdl);
26uint32_t GetCaptureModelExecutorType(ModelMaintainceTaskInfo *maintainceTaskInfo);26uint32_t GetCaptureModelExecutorType(ModelMaintainceTaskInfo *maintainceTaskInfo);
27} // namespace runtime27} // namespace runtime
28} // namespace cce28} // namespace cce
Msrc/runtime/core/src/task/task_info/model/model_maintaince_task.cc+3-3
@@ -21,17 +21,17 @@ namespace cce {
21namespace runtime {21namespace runtime {
22 22 
23#if F_DESC("ModelMaintainceTask")23#if F_DESC("ModelMaintainceTask")
24-uint32_t GetRootExeStreamId(const Model * const mdl)24+uint16_t GetRootExeStreamId(const Model * const mdl)
25{25{
26 if ((mdl == nullptr) || (mdl->GetModelType() != RT_MODEL_CAPTURE_MODEL)) {26 if ((mdl == nullptr) || (mdl->GetModelType() != RT_MODEL_CAPTURE_MODEL)) {
27- return UINT32_MAX;27+ return UINT16_MAX;
28 }28 }
29 29 
30 auto *captureModel = dynamic_cast<const CaptureModel *>(mdl);30 auto *captureModel = dynamic_cast<const CaptureModel *>(mdl);
31 if (captureModel == nullptr) {31 if (captureModel == nullptr) {
32 RT_LOG(RT_LOG_ERROR, "dynamic_cast to CaptureModel failed, model_type=%d, model_id=%u.",32 RT_LOG(RT_LOG_ERROR, "dynamic_cast to CaptureModel failed, model_type=%d, model_id=%u.",
33 mdl->GetModelType(), mdl->Id_());33 mdl->GetModelType(), mdl->Id_());
34- return UINT32_MAX;34+ return UINT16_MAX;
35 }35 }
36 36 
37 return captureModel->GetRootExeStreamId();37 return captureModel->GetRootExeStreamId();