1f:{"diffs":[{"old_path":"src/algorithm/pub_inc/coll_alg_param.h","new_path":"src/algorithm/pub_inc/coll_alg_param.h","old_blob_id":"72974b7425c97e315c6df74623f4438e401c1721","new_blob_id":"8d0cff8a2205ab8c0fcf42d2418f60a77efe5017","file_path":"src/algorithm/pub_inc/coll_alg_param.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -156,6 +156,7 @@ struct OpParam {\n RankId dstRank = 0;\n RankId srcRank = 0;\n bool aicpuUnfoldMode = false;\n+ uint8_t aicpuCacheEnable = 0;\n bool isCapture = false;\n HcclTraceInfo* opBaseAtraceInfo = nullptr;\n union {\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/hccl_communicator_host.cc","new_path":"src/framework/communicator/impl/hccl_communicator_host.cc","old_blob_id":"e0ea7eaaf4e9ebcc7674d374f5a89c2c81f8244d","new_blob_id":"85bf8a792e01daf29ca444f73443fa121e4e2868","file_path":"src/framework/communicator/impl/hccl_communicator_host.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2d","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":35,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/device/framework/aicpu_communicator.cc","new_path":"src/framework/device/framework/aicpu_communicator.cc","old_blob_id":"7169ec8c3349d9c5cc046c5069c73116b7a02083","new_blob_id":"36122e2cfbdbba507fc4613e0465bc72da5e5694","file_path":"src/framework/device/framework/aicpu_communicator.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2e","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":2,"removed_lines":2,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/device/framework/aicpu_hccl_process.cc","new_path":"src/framework/device/framework/aicpu_hccl_process.cc","old_blob_id":"b41d726b6e545ab1ca3867a8bdf0e55a7ea4dba4","new_blob_id":"dd14853a30e4bce6a0b7a246c70e13c882988f34","file_path":"src/framework/device/framework/aicpu_hccl_process.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -391,6 +391,8 @@ HcclResult AicpuHcclProcess::AicpuRunRpcServerV2(\n tilingData->syncMode, tilingData->root, tilingData->dstRank, tilingData->srcRank,\n tilingData->opType, tilingData->index, tilingData->length);\n \n+ HCCL_DEBUG(\"[AicpuHcclProcess][AicpuRunRpcServerV2]Entry AicpuRunRpcServerV2, aicpuCacheEnable[%u]\", tilingData->aicpuCacheEnable);\n+\n CHK_RET(hcclCommAicpu->RecordHostOrder(commParam, tag, tilingData->orderLaunchMode));\n \n hccl::OpParam opParam;\n@@ -411,6 +413,7 @@ HcclResult AicpuHcclProcess::AicpuRunRpcServerV2(\n opParam.isZeroCopy = tilingData->isZeroCopy;\n opParam.index = tilingData->index;\n opParam.isCapture = tilingData->isCapture;\n+ opParam.aicpuCacheEnable = tilingData->aicpuCacheEnable;\n hcclCommAicpu->PrepareOpRetryHandler(tilingData->inplaceSupportRetry,\n tilingData->retryEnable, tilingData->inPlaceSupportRetryStatus,\n tilingData->isInplacePreSync, tilingData->isPostSync);\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/platform/common/externalinput.cc","new_path":"src/platform/common/externalinput.cc","old_blob_id":"e317a74c74edd2772dbca18530b3a80c3bcddc0f","new_blob_id":"1c3945b5a0b0d54a43d08e7cb4ab346078e818be","file_path":"src/platform/common/externalinput.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2f","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":58,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/platform/common/externalinput.h","new_path":"src/platform/common/externalinput.h","old_blob_id":"ee6faab7bad514c1ca35e42e9ef06c846865b01b","new_blob_id":"8c6c96a639ccb99d4e0d1cc19ea7c0a1124e16ae","file_path":"src/platform/common/externalinput.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -111,6 +111,7 @@ struct ExternalInput {\n bool enableEntryLog;\n bool interHccsDisable;\n bool aicpuUnfold;\n+ uint8_t aicpuCacheEnable;\n bool aivMode;\n bool remoteIsHdc = false;\n bool hcclRetryConfig[HCCL_RETRY_ENABLE_LEVEL_NUM];\n@@ -174,6 +175,7 @@ struct ExternalInput {\n enablePipline = false;\n enableEntryLog = false;\n interHccsDisable = false;\n+ aicpuCacheEnable = 1; // 默认开启aicpu cache (只有当aicpuUnfold为true时才生效)\n opCounterEnable = true;\n logicSuperPodId = \"\";\n rdmaFastPost = false;\n@@ -239,6 +241,8 @@ HcclResult ParseEntryLogEnable();\n \n HcclResult ParseOpExpansion();\n \n+HcclResult ParseAicpuCacheEnable();\n+\n HcclResult ResetInitState();\n \n HcclResult ParseInterLinkType();\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":4,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/platform/common/unfold_cache/op_unfold_cache.cc","new_path":"src/platform/common/unfold_cache/op_unfold_cache.cc","old_blob_id":"778edc9e348effd2cb997e56f9bab0f7913f33a7","new_blob_id":"4bde6194eb72895f0712ef6b7d3e171056d89961","file_path":"src/platform/common/unfold_cache/op_unfold_cache.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -18,7 +18,13 @@\n \n namespace hccl {\n \n- bool OpUnfoldCache::NeedCache(const HcclCMDType opType, const std::unordered_map& isUsedRdmaMap, const bool isDeviceMode) {\n+ bool OpUnfoldCache::NeedCache(const uint8_t aicpuCacheEnable, const HcclCMDType opType, const std::unordered_map& isUsedRdmaMap, const bool isDeviceMode) {\n+ // 校验环境变量\n+ if (aicpuCacheEnable == 0) {\n+ HCCL_INFO(\"[OpUnfoldCache][NeedCache] disable aicpu cache for aicpuCacheEnable[%u]\", aicpuCacheEnable);\n+ return false;\n+ }\n+\n // 屏蔽MC2算子\n if (isDeviceMode) {\n HCCL_INFO(\"[OpUnfoldCache][NeedCache] MC2 op is not supported for operator unfolding cache\");\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":7,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/platform/common/unfold_cache/op_unfold_cache.h","new_path":"src/platform/common/unfold_cache/op_unfold_cache.h","old_blob_id":"4ec2895cc7125f1e577658411e5145d6a100afde","new_blob_id":"2d4da8202abb0cc7f40a428bb5002d1ca43a8345","file_path":"src/platform/common/unfold_cache/op_unfold_cache.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -26,7 +26,7 @@ namespace hccl {\n class OpUnfoldCache {\n public:\n // 根据算子类型判断是否需要cache\n- static bool NeedCache(const HcclCMDType opType, const std::unordered_map& isUsedRdmaMap, const bool isDeviceMode);\n+ static bool NeedCache(const uint8_t aicpuCacheEnable, const HcclCMDType opType, const std::unordered_map& isUsedRdmaMap, const bool isDeviceMode);\n \n explicit OpUnfoldCache();\n ~OpUnfoldCache();\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/pub_inc/aicpu_operator_pub.h","new_path":"src/pub_inc/aicpu_operator_pub.h","old_blob_id":"b13fec4907f7d918ba8e45973e23529551d8b14a","new_blob_id":"fbc0402f0e46e1403cd2c7e6379deab4e04c9eae","file_path":"src/pub_inc/aicpu_operator_pub.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -701,6 +701,7 @@ struct OpTilingData {\n u64 version = 0;\n s32 userStreamId;\n u32 ahcConfInfo[TOP_HIERARCHICAL_CONF_SIZE] = {0};\n+ uint8_t aicpuCacheEnable = 0; // 是否开启aicpu cache\n \n /******************可变长度数据区，如需新增字段请在这之前增加*******************/\n u64 length; // 可变长度数据区长度\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/pub_inc/externalinput_pub.h","new_path":"src/pub_inc/externalinput_pub.h","old_blob_id":"ead43d9d36d7025ace15e399a4c8232f8753f17e","new_blob_id":"9581fe5ea9bb253a2d4f80651e3e742e21bf2073","file_path":"src/pub_inc/externalinput_pub.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -126,6 +126,8 @@ const MasterInfo& GetExternalInputMasterInfo();\n \n const bool& GetExternalInputHcclAicpuUnfold();\n \n+const uint8_t& GetExternalInputAicpuCacheEnable();\n+\n const bool& GetExternalInputHcclAivMode();\n \n const u32 GetExternalInputQpsPerConnection();\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":2,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"test/ut/framework/communicator/hccl_api_base_test.cc","new_path":"test/ut/framework/communicator/hccl_api_base_test.cc","old_blob_id":"0927559cc2ee2c6006bc4c35f0ebe95ef4fc55c8","new_blob_id":"2e46a615cd7497aad7e0438f2b37aa2d792a0ed3","file_path":"test/ut/framework/communicator/hccl_api_base_test.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -9,6 +9,7 @@\n */\n \n #include \"hccl_api_base_test.h\"\n+#include \"sub_inc/mmpa_typedef_linux.h\"\n \n #ifdef __cplusplus\n extern \"C\" {\n@@ -24,6 +25,34 @@ rtError_t rtStreamClear(rtStream_t stm, rtClearStep_t step)\n return 0;\n }\n \n+INT32 mmGetEnv(const CHAR *name, CHAR *value, UINT32 len)\n+{\n+ INT32 ret;\n+ UINT32 envLen = 0;\n+ if ((name == NULL) || (value == NULL) || (len == MMPA_ZERO)) {\n+ return EN_INVALID_PARAM;\n+ }\n+ const CHAR *envPtr = getenv(name);\n+ if (envPtr == NULL) {\n+ return EN_ERROR;\n+ }\n+\n+ UINT32 lenOfRet = (UINT32)strlen(envPtr);\n+ if (lenOfRet < (UINT32)(MMPA_MEM_MAX_LEN - 1)) {\n+ envLen = lenOfRet + 1U;\n+ }\n+\n+ if ((envLen != MMPA_ZERO) && (len < envLen)) {\n+ return EN_INVALID_PARAM;\n+ } else {\n+ ret = memcpy_s(value, len, envPtr, envLen); //lint !e613\n+ if (ret != EN_OK) {\n+ return EN_ERROR;\n+ }\n+ }\n+ return EN_OK;\n+}\n+\n #ifdef __cplusplus\n }\n #endif // __cplusplus\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":29,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"test/ut/framework/op_base_api/hccl_api_base_test.cc","new_path":"test/ut/framework/op_base_api/hccl_api_base_test.cc","old_blob_id":"f8c356d5b60c8a6525fe5de45ceb1cbe31be8d26","new_blob_id":"fda42fc82d92022734fc71b8622f086937556573","file_path":"test/ut/framework/op_base_api/hccl_api_base_test.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -9,6 +9,7 @@\n */\n \n #include \"hccl_api_base_test.h\"\n+#include \"sub_inc/mmpa_typedef_linux.h\"\n \n #ifdef __cplusplus\n extern \"C\" {\n@@ -24,6 +25,34 @@ rtError_t rtStreamClear(rtStream_t stm, rtClearStep_t step)\n return 0;\n }\n \n+INT32 mmGetEnv(const CHAR *name, CHAR *value, UINT32 len)\n+{\n+ INT32 ret;\n+ UINT32 envLen = 0;\n+ if ((name == NULL) || (value == NULL) || (len == MMPA_ZERO)) {\n+ return EN_INVALID_PARAM;\n+ }\n+ const CHAR *envPtr = getenv(name);\n+ if (envPtr == NULL) {\n+ return EN_ERROR;\n+ }\n+\n+ UINT32 lenOfRet = (UINT32)strlen(envPtr);\n+ if (lenOfRet < (UINT32)(MMPA_MEM_MAX_LEN - 1)) {\n+ envLen = lenOfRet + 1U;\n+ }\n+\n+ if ((envLen != MMPA_ZERO) && (len < envLen)) {\n+ return EN_INVALID_PARAM;\n+ } else {\n+ ret = memcpy_s(value, len, envPtr, envLen); //lint !e613\n+ if (ret != EN_OK) {\n+ return EN_ERROR;\n+ }\n+ }\n+ return EN_OK;\n+}\n+\n #ifdef __cplusplus\n }\n #endif // __cplusplus\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":29,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"test/ut/platform/resource/dispatcher/ut_aicpu_dispatcher_utest.cc","new_path":"test/ut/platform/resource/dispatcher/ut_aicpu_dispatcher_utest.cc","old_blob_id":"3469d109d933d6895d1ca94fa970e3a273617b8e","new_blob_id":"b211143c568223df64182964bf22fc95a9789209","file_path":"test/ut/platform/resource/dispatcher/ut_aicpu_dispatcher_utest.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$30","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":29,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"test/ut/platform/resource/notify/ut_aicpu_notify_utest.cc","new_path":"test/ut/platform/resource/notify/ut_aicpu_notify_utest.cc","old_blob_id":"3857ef5e1886cd9d898453bc28454bdd065b9413","new_blob_id":"9e638711566cfa9af932229fc62f9b35a4ad74c6","file_path":"test/ut/platform/resource/notify/ut_aicpu_notify_utest.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -32,6 +32,7 @@\n #include \"sal.h\"\n \n #include \"adapter_rts.h\"\n+#include \"sub_inc/mmpa_typedef_linux.h\"\n \n #undef private\n #undef protected\n@@ -53,6 +54,34 @@ rtError_t rtStreamClear(rtStream_t stm, rtClearStep_t step)\n return 0;\n }\n \n+INT32 mmGetEnv(const CHAR *name, CHAR *value, UINT32 len)\n+{\n+ INT32 ret;\n+ UINT32 envLen = 0;\n+ if ((name == NULL) || (value == NULL) || (len == MMPA_ZERO)) {\n+ return EN_INVALID_PARAM;\n+ }\n+ const CHAR *envPtr = getenv(name);\n+ if (envPtr == NULL) {\n+ return EN_ERROR;\n+ }\n+\n+ UINT32 lenOfRet = (UINT32)strlen(envPtr);\n+ if (lenOfRet < (UINT32)(MMPA_MEM_MAX_LEN - 1)) {\n+ envLen = lenOfRet + 1U;\n+ }\n+\n+ if ((envLen != MMPA_ZERO) && (len < envLen)) {\n+ return EN_INVALID_PARAM;\n+ } else {\n+ ret = memcpy_s(value, len, envPtr, envLen); //lint !e613\n+ if (ret != EN_OK) {\n+ return EN_ERROR;\n+ }\n+ }\n+ return EN_OK;\n+}\n+\n #ifdef __cplusplus\n }\n #endif // __cplusplus\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":29,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"test/ut/platform/resource/transport/ut_aicpu_transport_device_p2p_utest.cc","new_path":"test/ut/platform/resource/transport/ut_aicpu_transport_device_p2p_utest.cc","old_blob_id":"1c660f6646ae6461645c96f815d892dd21633f61","new_blob_id":"c1c67050524e75233817c53f6618f9753ee4823a","file_path":"test/ut/platform/resource/transport/ut_aicpu_transport_device_p2p_utest.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$31","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":29,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null}],"diff_refs":{"base_sha":"6d20c88c48641ca34662774d60db3977b239fcd8","head_sha":"560f0007894b0e5f63548e89621ee187e66c98ca","start_sha":"6d20c88c48641ca34662774d60db3977b239fcd8"},"added_lines":259,"removed_lines":4,"change_file_count":15,"change_line_count":263,"too_large":false,"total":15}

hcomm

hcomm