已合并
[refactor]dump kernel args when use debug_dump #34375
rich创建于 4月25日
[refactor]dump kernel args when use debug_dump #34375
已合并
共 5 个文件变更+9-8
| @@ -1646,10 +1646,11 @@ ACL_FUNC_VISIBILITY aclError aclmdlRICaptureTaskUpdateEnd(aclrtStream stream); | |||
| 1646 | * @brief dump the json content of the model | 1646 | * @brief dump the json content of the model |
| 1647 | * @param modelRI [IN] model runtime instance | 1647 | * @param modelRI [IN] model runtime instance |
| 1648 | * @param path [IN] json file path | 1648 | * @param path [IN] json file path |
| 1649 | + * @param flags [IN] control whether to dump Kernel Args | ||
| 1649 | * @retval ACL_SUCCESS The function is successfully executed. | 1650 | * @retval ACL_SUCCESS The function is successfully executed. |
| 1650 | * @retval OtherValues Failure | 1651 | * @retval OtherValues Failure |
| 1651 | */ | 1652 | */ |
| 1652 | -ACL_FUNC_VISIBILITY aclError aclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path); | 1653 | +ACL_FUNC_VISIBILITY aclError aclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path, uint32_t flags); |
| 1653 | 1654 | ||
| 1654 | /** | 1655 | /** |
| 1655 | * @ingroup AscendCL | 1656 | * @ingroup AscendCL |
| @@ -106,7 +106,7 @@ aclError aclrtCreateEventWithFlag(aclrtEvent *event, uint32_t flag) {return 0;} | |||
| 106 | aclError aclrtCreateEventExWithFlag(aclrtEvent *event, uint32_t flag) {return 0;} | 106 | aclError aclrtCreateEventExWithFlag(aclrtEvent *event, uint32_t flag) {return 0;} |
| 107 | aclError aclrtResetEvent(aclrtEvent event, aclrtStream stream){return 0;} | 107 | aclError aclrtResetEvent(aclrtEvent event, aclrtStream stream){return 0;} |
| 108 | aclError aclrtStreamQuery(aclrtStream stream, aclrtStreamStatus *status) {return 0;}; | 108 | aclError aclrtStreamQuery(aclrtStream stream, aclrtStreamStatus *status) {return 0;}; |
| 109 | -aclError aclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path) {return 0;}; | 109 | +aclError aclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path, uint32_t flags) {return 0;}; |
| 110 | aclError aclrtGetErrorVerbose(int32_t deviceId, aclrtErrorInfo *errorInfo) {return 0;}; | 110 | aclError aclrtGetErrorVerbose(int32_t deviceId, aclrtErrorInfo *errorInfo) {return 0;}; |
| 111 | aclError aclrtRepairError(int32_t deviceId, const aclrtErrorInfo *errorInfo) {return 0;} | 111 | aclError aclrtRepairError(int32_t deviceId, const aclrtErrorInfo *errorInfo) {return 0;} |
| 112 | } | 112 | } |
| @@ -298,7 +298,7 @@ void NPUGraph::debug_dump(const std::string& debug_path) | |||
| 298 | { | 298 | { |
| 299 | if (has_graph_exec_) { | 299 | if (has_graph_exec_) { |
| 300 | TORCH_WARN("calling NPUGraph::debug_dump() for model id ", model_ri_); | 300 | TORCH_WARN("calling NPUGraph::debug_dump() for model id ", model_ri_); |
| 301 | - NPU_CHECK_ERROR(c10_npu::acl::AclmdlRIDebugJsonPrint(model_ri_, debug_path.c_str())); | 301 | + NPU_CHECK_ERROR(c10_npu::acl::AclmdlRIDebugJsonPrint(model_ri_, debug_path.c_str(), 1)); |
| 302 | } else { | 302 | } else { |
| 303 | TORCH_WARN("Called NPUGraph::debug_dump without a preceding successful capture."); | 303 | TORCH_WARN("Called NPUGraph::debug_dump without a preceding successful capture."); |
| 304 | } | 304 | } |
| @@ -1176,17 +1176,17 @@ aclError AclmdlRICaptureTaskUpdateEnd(aclrtStream stream) | |||
| 1176 | return func(stream); | 1176 | return func(stream); |
| 1177 | } | 1177 | } |
| 1178 | 1178 | ||
| 1179 | -aclError AclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path) | 1179 | +aclError AclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path, uint32_t flags) |
| 1180 | { | 1180 | { |
| 1181 | - ACL_CALL_LOG("aclmdlRIDebugJsonPrint", "modelRI=" << modelRI << ", path=" << (path ? path : "nullptr")); | 1181 | + ACL_CALL_LOG("aclmdlRIDebugJsonPrint", "modelRI=" << modelRI << ", path=" << (path ? path : "nullptr") << ", flags=" << flags); |
| 1182 | - typedef aclError (*AclmdlRIDebugJsonPrint)(aclmdlRI, const char*); | 1182 | + typedef aclError (*AclmdlRIDebugJsonPrint)(aclmdlRI, const char*, uint32_t flags); |
| 1183 | static AclmdlRIDebugJsonPrint func = nullptr; | 1183 | static AclmdlRIDebugJsonPrint func = nullptr; |
| 1184 | if (func == nullptr) { | 1184 | if (func == nullptr) { |
| 1185 | func = (AclmdlRIDebugJsonPrint) GET_FUNC(aclmdlRIDebugJsonPrint); | 1185 | func = (AclmdlRIDebugJsonPrint) GET_FUNC(aclmdlRIDebugJsonPrint); |
| 1186 | } | 1186 | } |
| 1187 | 1187 | ||
| 1188 | TORCH_CHECK(func, "Failed to find function aclmdlRIDebugJsonPrint", PTA_ERROR(ErrCode::NOT_FOUND)); | 1188 | TORCH_CHECK(func, "Failed to find function aclmdlRIDebugJsonPrint", PTA_ERROR(ErrCode::NOT_FOUND)); |
| 1189 | - return func(modelRI, path); | 1189 | + return func(modelRI, path, flags); |
| 1190 | } | 1190 | } |
| 1191 | 1191 | ||
| 1192 | aclError AclrtHostRegister(void *ptr, uint64_t size, aclrtHostRegisterType type, void **devPtr) | 1192 | aclError AclrtHostRegister(void *ptr, uint64_t size, aclrtHostRegisterType type, void **devPtr) |
| @@ -252,7 +252,7 @@ aclError AclmdlRICaptureTaskUpdateBegin(aclrtStream stream, aclrtTaskGrp handle) | |||
| 252 | 252 | ||
| 253 | aclError AclmdlRICaptureTaskUpdateEnd(aclrtStream stream); | 253 | aclError AclmdlRICaptureTaskUpdateEnd(aclrtStream stream); |
| 254 | 254 | ||
| 255 | -aclError AclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path); | 255 | +aclError AclmdlRIDebugJsonPrint(aclmdlRI modelRI, const char* path, uint32_t flags); |
| 256 | 256 | ||
| 257 | aclError AclmdlRICaptureThreadExchangeMode(aclmdlRICaptureMode* mode); | 257 | aclError AclmdlRICaptureThreadExchangeMode(aclmdlRICaptureMode* mode); |
| 258 | 258 | ||