Pull Request已成功合入, 合并人@CANN-robot
(感谢 Leewis 的贡献)变更摘要
该 PR 主要为文档与注释修正及若干 bug 修复。其一,修正了 include/ccu/ccu_primitives.hpp 文件末尾 #endif 注释与实际头文件名不一致的问题(由 CCU_API_HPP 更正为 CCU_PRIMITIVES_HPP)。其二,修复了 ZeroCopyAddressMgr::GetLocalIpc2RemoteAddr 中的错误检查逻辑:原代码误用 rangeIt == addrRange.end() 作为判错条件,而实际取用的映射查询结果是 mapIt,现改为正确检查 mapIt == addrMapping.end(),并同步更新了错误日志内容。其三,修复了 IAicpuTsThread 的 SdmaCopy 与 SdmaReduce 接口中 4GB 边界判断的缺陷,将 sizeByte > 0x100000000ULL 改为 sizeByte >= 0x100000000ULL,使恰好等于 4GB(0x100000000)的数据量也会被正确拦截并返回 HCCL_E_PARA。
主要改动
- 修正头文件结束注释:在
include/ccu/ccu_primitives.hpp中将#endif后的注释由CCU_API_HPP更正为CCU_PRIMITIVES_HPP,使注释与头文件守卫一致。 - 修复
GetLocalIpc2RemoteAddr判错条件:在src/legacy/ascend910/framework/communicator/impl/zero_copy/zero_copy_address_mgr.cc中,将错误分支的条件由误用的rangeIt == addrRange.end()改为正确的mapIt == addrMapping.end(),并更新错误日志为提示baseAddr未被映射,避免因条件误判导致未映射地址仍被继续使用。 - 收紧
SdmaCopy的 4GB 边界校验:在src/legacy/ascend950/interface/aicpu_ts_thread_interface.cc中将SdmaCopy的大小判断由sizeByte > 0x100000000ULL改为sizeByte >= 0x100000000ULL,使等于 4GB 的任务也会被判为超限并返回HCCL_E_PARA。 - 收紧
SdmaReduce的 4GB 边界校验:同样在aicpu_ts_thread_interface.cc中,将SdmaReduce的大小判断由sizeByte > 0x100000000ULL改为sizeByte >= 0x100000000ULL,与SdmaCopy保持一致,符合"SDMA 单个任务最大支持 4GB"的约束语义。


Thanks for your pull-request.
The full list of commands accepted by me can be found at here.
You can get sig-info at here.
You can self-configure the PR merge rules for this repository. For more details, please refer to Here.
For more, you also can visit HICANN.
PR Approval Progress
✅ Congratulations! All modules have met the lgtm and approve requirements.
Module Approval Details
| module | lgtm status | approve status |
|---|---|---|
| docs | ✅ 颜业峰, 张兴平 (2/2) | ✅ 颜业峰 (1/1) |
| include | ✅ 颜业峰, 张兴平 (2/2) | ✅ 颜业峰 (1/1) |
| repo-cann/hcomm | ✅ 丁炜秦, 颜业峰, 张兴平 (3/2) | ✅ 丁炜秦, 颜业峰 (2/1) |
| src/legacy/ascend910/framework | ✅ 丁炜秦, 颜业峰, 张兴平 (3/2) | ✅ 丁炜秦, 颜业峰 (2/1) |
💡 Tip:
- Committer can comment
/approveor/lgtm- Commenting
/approveimplies both code review (lgtm) and intent to merge (approve)
CLA Signature Pass
Leewis, thanks for your pull request. All authors of the commits have signed the CLA. 👍


描述
修改多个代码问题:
变更类型
请选择本次引入的变更类型:
关联的Issue
#565
#634
#530
#749
测试
已完成的测试用例和场景:
1.
2.
补充的UT用例:
文档更新
合入检查