@@ -417,31 +417,44 @@ int32_t HcommReadReduceOnThread(ThreadHandle thread, ChannelHandle channel, void return HCCL_SUCCESS; } -int32_t HcommWriteNbi(ChannelHandle channel, void *dst, const void *src, uint64_t len) +int32_t HcommWriteNbiOnThread(ThreadHandle thread, ChannelHandle channel, void *dst, const void *src, uint64_t len) { - HCCL_INFO("[%s] START. channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", - __func__, channel, dst, src, len); + HCCL_INFO("[%s] START. thread[0x%llx], channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", + __func__, thread, channel, dst, src, len); + (void)thread; CHK_PTR_NULL(src); CHK_PTR_NULL(dst); - auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); - CHK_PTR_NULL(hostCpuRoceChannelPtr); - - HcclResult ret = hostCpuRoceChannelPtr->Write(dst, src, len); + HcclResult ret = HCCL_SUCCESS; + DevType devType; + CHK_RET(hrtGetDeviceType(devType)); + if (devType == DevType::DEV_TYPE_950) { + auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); + CHK_PTR_NULL(hostCpuRoceChannelPtr); + ret = hostCpuRoceChannelPtr->Write(dst, src, len); + } else { + ret = HCCL_E_NOT_SUPPORT; + } CHK_PRT_RET(ret != HCCL_SUCCESS, - HCCL_ERROR("[%s] FAIL. channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", - __func__, channel, dst, src, len), ret); + HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", + __func__, thread, channel, dst, src, len), ret); HCCL_INFO("[%s] SUCCESS.", __func__); return HCCL_SUCCESS; } -int32_t HcommWriteWithNotifyNbi(ChannelHandle channel, void *dst, const void *src, +int32_t HcommWriteNbi(ChannelHandle channel, void *dst, const void *src, uint64_t len) +{ + return HcommWriteNbiOnThread(0, channel, dst, src, len); +} + +int32_t HcommWriteWithNotifyNbiOnThread(ThreadHandle thread, ChannelHandle channel, void *dst, const void *src, uint64_t len, uint32_t remoteNotifyIdx) { - HCCL_INFO("[%s] START. channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu], remoteNotifyIdx[%u].", - __func__, channel, dst, src, len, remoteNotifyIdx); + HCCL_INFO("[%s] START. thread[0x%llx], channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu], remoteNotifyIdx[%u].", + __func__, thread, channel, dst, src, len, remoteNotifyIdx); + (void)thread; CHK_PTR_NULL(src); CHK_PTR_NULL(dst); @@ -456,53 +469,53 @@ int32_t HcommWriteWithNotifyNbi(ChannelHandle channel, void *dst, const void *sr ret = HCCL_E_NOT_SUPPORT; } CHK_PRT_RET(ret != HCCL_SUCCESS, - HCCL_ERROR("[%s] FAIL. channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu], remoteNotifyIdx[%u].", - __func__, channel, dst, src, len, remoteNotifyIdx), ret); + HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu], remoteNotifyIdx[%u].", + __func__, thread, channel, dst, src, len, remoteNotifyIdx), ret); + HCCL_INFO("[%s] SUCCESS.", __func__); + return HCCL_SUCCESS; +} + +int32_t HcommWriteWithNotifyNbi(ChannelHandle channel, void *dst, const void *src, + uint64_t len, uint32_t remoteNotifyIdx) +{ + return HcommWriteWithNotifyNbiOnThread(0, channel, dst, src, len, remoteNotifyIdx); +} + +int32_t HcommReadNbiOnThread(ThreadHandle thread, ChannelHandle channel, void *dst, const void *src, uint64_t len) +{ + HCCL_INFO("[%s] START. thread[0x%llx], channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", + __func__, thread, channel, dst, src, len); + + (void)thread; + CHK_PTR_NULL(src); + CHK_PTR_NULL(dst); + + HcclResult ret = HCCL_SUCCESS; + DevType devType; + CHK_RET(hrtGetDeviceType(devType)); + if (devType == DevType::DEV_TYPE_950) { + auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); + CHK_PTR_NULL(hostCpuRoceChannelPtr); + ret = hostCpuRoceChannelPtr->Read(dst, src, len); + } else { + ret = HCCL_E_NOT_SUPPORT; + } + CHK_PRT_RET(ret != HCCL_SUCCESS, + HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", + __func__, thread, channel, dst, src, len), ret); HCCL_INFO("[%s] SUCCESS.", __func__); return HCCL_SUCCESS; } int32_t HcommReadNbi(ChannelHandle channel, void *dst, const void *src, uint64_t len) { - HCCL_INFO("[%s] START. channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", - __func__, channel, dst, src, len); - - CHK_PTR_NULL(src); - CHK_PTR_NULL(dst); - - auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); - CHK_PTR_NULL(hostCpuRoceChannelPtr); - - HcclResult ret = hostCpuRoceChannelPtr->Read(dst, src, len); - CHK_PRT_RET(ret != HCCL_SUCCESS, - HCCL_ERROR("[%s] FAIL. channel[0x%llx], dst[0x%llx], src[0x%llx], len[%llu].", - __func__, channel, dst, src, len), ret); - HCCL_INFO("[%s] SUCCESS.", __func__); - return HCCL_SUCCESS; + return HcommReadNbiOnThread(0, channel, dst, src, len); } int32_t HcommChannelNotifyRecordOnThread(ThreadHandle thread, ChannelHandle channel, uint32_t remoteNotifyIdx) { HCCL_INFO("[%s] START. thread[0x%llx], channel[0x%llx], remoteNotifyIdx[%u].", __func__, thread, channel, remoteNotifyIdx); - AddThread(thread); - - Thread *threadPtr = reinterpret_cast(thread); - CHK_PTR_NULL(threadPtr); - - Stream *stream = GetStream(thread); - CHK_PTR_NULL(stream); - - HcclResult ret = HcclRemoteNotifyRecord(stream, reinterpret_cast(channel), remoteNotifyIdx); - CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx], remoteNotifyIdx[%u].", __func__, thread, channel, remoteNotifyIdx), ret); - HCCL_INFO("[%s] SUCCESS.", __func__); - return ret; -} - -int32_t HcommChannelNotifyRecord(ChannelHandle channel, uint32_t remoteNotifyIdx) -{ - HCCL_INFO("[%s] START. channel[0x%llx], remoteNotifyIdx[%u].", __func__, channel, remoteNotifyIdx); - HcclResult ret = HCCL_SUCCESS; DevType devType; CHK_RET(hrtGetDeviceType(devType)); @@ -510,36 +523,36 @@ int32_t HcommChannelNotifyRecord(ChannelHandle channel, uint32_t remoteNotifyIdx auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); CHK_PTR_NULL(hostCpuRoceChannelPtr); ret = hostCpuRoceChannelPtr->NotifyRecord(remoteNotifyIdx); - } else { - ret = HCCL_E_NOT_SUPPORT; + } else { // Non-950 devices use thread-based notify. + AddThread(thread); + + Thread *threadPtr = reinterpret_cast(thread); + CHK_PTR_NULL(threadPtr); + + Stream *stream = GetStream(thread); + CHK_PTR_NULL(stream); + + ret = HcclRemoteNotifyRecord(stream, reinterpret_cast(channel), remoteNotifyIdx); } - CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. channel[0x%llx], remoteNotifyIdx[%u].", __func__, channel, remoteNotifyIdx), ret); + CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx], remoteNotifyIdx[%u].", __func__, thread, channel, remoteNotifyIdx), ret); HCCL_INFO("[%s] SUCCESS.", __func__); return HCCL_SUCCESS; } +int32_t HcommChannelNotifyRecord(ChannelHandle channel, uint32_t remoteNotifyIdx) +{ + DevType devType; + CHK_RET(hrtGetDeviceType(devType)); + if (devType != DevType::DEV_TYPE_950) { + return HCCL_E_NOT_SUPPORT; + } + return HcommChannelNotifyRecordOnThread(0, channel, remoteNotifyIdx); +} + int32_t HcommChannelNotifyWaitOnThread(ThreadHandle thread, ChannelHandle channel, uint32_t localNotifyIdx, uint32_t timeout) { HCCL_INFO("[%s] START. thread[0x%llx], channel[0x%llx], localNotifyIdx[%u], timeout[%u].", __func__, thread, channel, localNotifyIdx, timeout); - AddThread(thread); - - Thread *threadPtr = reinterpret_cast(thread); - CHK_PTR_NULL(threadPtr); - - Stream *stream = GetStream(thread); - CHK_PTR_NULL(stream); - - HcclResult ret = HcclRemoteNotifyWait(stream, reinterpret_cast(channel), localNotifyIdx, timeout); - CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx], localNotifyIdx[%u], timeout[%u].", __func__, thread, channel, localNotifyIdx, timeout), ret); - HCCL_INFO("[%s] SUCCESS.", __func__); - return HCCL_SUCCESS; -} - -int32_t HcommChannelNotifyWait(ChannelHandle channel, uint32_t localNotifyIdx, uint32_t timeout) -{ - HCCL_INFO("[%s] START. channel[0x%llx], localNotifyIdx[%u], timeout[%u].", __func__, channel, localNotifyIdx, timeout); - HcclResult ret = HCCL_SUCCESS; DevType devType; CHK_RET(hrtGetDeviceType(devType)); @@ -547,14 +560,32 @@ int32_t HcommChannelNotifyWait(ChannelHandle channel, uint32_t localNotifyIdx, u auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); CHK_PTR_NULL(hostCpuRoceChannelPtr); ret = hostCpuRoceChannelPtr->NotifyWait(localNotifyIdx, timeout); - } else { - ret = HCCL_E_NOT_SUPPORT; + } else { // Non-950 devices use thread-based notify. + AddThread(thread); + + Thread *threadPtr = reinterpret_cast(thread); + CHK_PTR_NULL(threadPtr); + + Stream *stream = GetStream(thread); + CHK_PTR_NULL(stream); + + ret = HcclRemoteNotifyWait(stream, reinterpret_cast(channel), localNotifyIdx, timeout); } - CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. channel[0x%llx], localNotifyIdx[%u], timeout[%u].", __func__, channel, localNotifyIdx, timeout), ret); + CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx], localNotifyIdx[%u], timeout[%u].", __func__, thread, channel, localNotifyIdx, timeout), ret); HCCL_INFO("[%s] SUCCESS.", __func__); return HCCL_SUCCESS; } +int32_t HcommChannelNotifyWait(ChannelHandle channel, uint32_t localNotifyIdx, uint32_t timeout) +{ + DevType devType; + CHK_RET(hrtGetDeviceType(devType)); + if (devType != DevType::DEV_TYPE_950) { + return HCCL_E_NOT_SUPPORT; + } + return HcommChannelNotifyWaitOnThread(0, channel, localNotifyIdx, timeout); +} + HcclResult CommFence(ThreadHandle thread, ChannelHandle channel) // 控制前后的任务保序 { HCCL_DEBUG("[CommFence] thread[0x%llx], channel[0x%llx].", thread, channel); @@ -607,26 +638,45 @@ int32_t HcommReleaseComm(const char* commId) return HCCL_SUCCESS; } +int32_t HcommFenceOnThread(ThreadHandle thread) +{ + HCCL_INFO("[%s] START. thread[0x%llx].", __func__, thread); + (void)thread; + HcclResult ret = HcommFlushV2(); + CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. thread[0x%llx].", __func__, thread), ret); + HCCL_INFO("[%s] SUCCESS.", __func__); + return HCCL_SUCCESS; +} + int32_t HcommFlush() { - HCCL_INFO("[%s] START.", __func__); - HcclResult ret = HcommFlushV2(); - CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL.", __func__), ret); + return HcommFenceOnThread(0); +} + +int32_t HcommChannelFenceOnThread(ThreadHandle thread, ChannelHandle channel) +{ + HCCL_INFO("[%s] START. thread[0x%llx], channel[0x%llx].", __func__, thread, channel); + + (void)thread; + + HcclResult ret = HCCL_SUCCESS; + DevType devType; + CHK_RET(hrtGetDeviceType(devType)); + if (devType == DevType::DEV_TYPE_950) { + auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); + CHK_PTR_NULL(hostCpuRoceChannelPtr); + ret = hostCpuRoceChannelPtr->ChannelFence(); + } else { + ret = HCCL_E_NOT_SUPPORT; + } + CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. thread[0x%llx], channel[0x%llx].", __func__, thread, channel), ret); HCCL_INFO("[%s] SUCCESS.", __func__); return HCCL_SUCCESS; } int32_t HcommChannelFence(ChannelHandle channel) { - HCCL_INFO("[%s] START. channel[0x%llx].", __func__, channel); - - auto *const hostCpuRoceChannelPtr = reinterpret_cast(channel); - CHK_PTR_NULL(hostCpuRoceChannelPtr); - - HcclResult ret = hostCpuRoceChannelPtr->ChannelFence(); - CHK_PRT_RET(ret != HCCL_SUCCESS, HCCL_ERROR("[%s] FAIL. channel[0x%llx].", __func__, channel), ret); - HCCL_INFO("[%s] SUCCESS.", __func__); - return HCCL_SUCCESS; + return HcommChannelFenceOnThread(0, channel); } HcclResult HcclDfxRegOpInfo(HcclComm comm, void* hcclDfxOpInfo)

hcomm

hcomm