Merged
adapt default alg selector #7119
jjc1600307376Add on 23 days ago
adapt default alg selector #7119
Merged
Merged fromjjc1600307376/asc-devkitto_selectintocann/asc-devkitmaster
Total: 6 files changed+115-185
| @@ -165,8 +165,10 @@ HcclResult CheckCcuKfcFlow(const void* mc2Tiling, const void* ccTilingList[], ui | |||
| 165 | HCCL_ERROR("Invalid CCU KFC tiling version %u, expected %u.", initTiling->version, INIT_TILING_CCU_NEW_VERSION); | 165 | HCCL_ERROR("Invalid CCU KFC tiling version %u, expected %u.", initTiling->version, INIT_TILING_CCU_NEW_VERSION); |
| 166 | return HCCL_E_NOT_SUPPORT; | 166 | return HCCL_E_NOT_SUPPORT; |
| 167 | } | 167 | } |
| 168 | - if (tilingNum == 0U || tilingNum > MAX_CC_TILING_NUM || tilingNum != initTiling->mc2HcommCnt) { | 168 | + if (tilingNum != 1U || tilingNum != initTiling->mc2HcommCnt) { |
| 169 | - HCCL_ERROR("Invalid CCU KFC tiling number %u, init tiling number %u.", tilingNum, initTiling->mc2HcommCnt); | 169 | + HCCL_ERROR( |
| 170 | + "CCU KFC currently supports only one cc tiling, but got tilingNum %u, init tiling number %u.", tilingNum, | ||
| 171 | + initTiling->mc2HcommCnt); | ||
| 170 | return HCCL_E_NOT_SUPPORT; | 172 | return HCCL_E_NOT_SUPPORT; |
| 171 | } | 173 | } |
| 172 | uint32_t expectedOpType = static_cast<uint32_t>(HcclCMDType::HCCL_CMD_INVALID); | 174 | uint32_t expectedOpType = static_cast<uint32_t>(HcclCMDType::HCCL_CMD_INVALID); |
| @@ -569,7 +569,7 @@ HcclResult DispatchAllocByCommEngine( | |||
| 569 | "[HcclAllocComResourceByTiling]Failed to resolve a supported CCU version; refusing V1 fallback."); | 569 | "[HcclAllocComResourceByTiling]Failed to resolve a supported CCU version; refusing V1 fallback."); |
| 570 | return HCCL_E_NOT_SUPPORT; | 570 | return HCCL_E_NOT_SUPPORT; |
| 571 | } | 571 | } |
| 572 | - if (!CheckCcuAlgorithmsRegistered(ccTilingList, tilingNum)) { | 572 | + if (checkOnly && !CheckCcuAlgorithmsRegistered(ccTilingList, tilingNum)) { |
| 573 | HCCL_INFO("[HcclAllocComResourceByTiling]Current ccu algorithm is not supported in mc2_client."); | 573 | HCCL_INFO("[HcclAllocComResourceByTiling]Current ccu algorithm is not supported in mc2_client."); |
| 574 | return HCCL_E_ALG_NOT_SUPPORTED; | 574 | return HCCL_E_ALG_NOT_SUPPORTED; |
| 575 | } | 575 | } |
| @@ -18,7 +18,6 @@ | |||
| 18 | #include "include/adv_api/hccl/hccl_common.h" | 18 | #include "include/adv_api/hccl/hccl_common.h" |
| 19 | #include "securec.h" | 19 | #include "securec.h" |
| 20 | #include "../../detail/host_log.h" | 20 | #include "../../detail/host_log.h" |
| 21 | -#include "../../detail/hccl/cc/src/ops/op_common/external_alg/external_alg_parser.h" | ||
| 22 | #include "include/adv_api/hccl/internal/hccl_msg.h" | 21 | #include "include/adv_api/hccl/internal/hccl_msg.h" |
| 23 | #include "include/adv_api/hccl/internal/hccl_tiling_msg.h" | 22 | #include "include/adv_api/hccl/internal/hccl_tiling_msg.h" |
| 24 | #include "tiling/platform/platform_ascendc.h" | 23 | #include "tiling/platform/platform_ascendc.h" |
| @@ -55,21 +54,15 @@ uint8_t ResolveDevType(const std::string& socVersion) | |||
| 55 | } | 54 | } |
| 56 | return UINT8_MAX; | 55 | return UINT8_MAX; |
| 57 | } | 56 | } |
| 58 | -bool IsCcuAlgorithmRegistered(const std::string& algConfig, uint8_t commEngine) | 57 | + |
| 58 | +bool IsCcuNewFrameworkEnabled(uint8_t commEngine, uint8_t devType) | ||
| 59 | { | 59 | { |
| 60 | - if (commEngine != 5U && commEngine != 6U) { | 60 | + constexpr uint8_t COMM_ENGINE_CCU_MS = 5U; |
| 61 | + constexpr uint8_t COMM_ENGINE_CCU_SCHED = 6U; | ||
| 62 | + if (commEngine != COMM_ENGINE_CCU_MS && commEngine != COMM_ENGINE_CCU_SCHED) { | ||
| 61 | return false; | 63 | return false; |
| 62 | } | 64 | } |
| 63 | - if (algConfig.find('[') == std::string::npos) { | 65 | + return devType == DEV_TYPE_A5 || devType == DEV_TYPE_A6; |
| 64 | - return false; | ||
| 65 | - } | ||
| 66 | - mc2_ops_hccl::ExternalAlgSpec spec; | ||
| 67 | - std::string errMsg; | ||
| 68 | - if (!mc2_ops_hccl::ParseExternalAlg(algConfig, spec, errMsg)) { | ||
| 69 | - TILING_LOG_WARNING("external algConfig[%s] parse failed, reason[%s].", algConfig.c_str(), errMsg.c_str()); | ||
| 70 | - return false; | ||
| 71 | - } | ||
| 72 | - return true; | ||
| 73 | } | 66 | } |
| 74 | 67 | ||
| 75 | void PrintMc2InitTiling(const Mc2InitTilingInner& tiling) | 68 | void PrintMc2InitTiling(const Mc2InitTilingInner& tiling) |
| @@ -120,8 +113,8 @@ uint32_t SetDevType(Mc2InitTilingInner* tilingInner) | |||
| 120 | auto getSocVerFunc = HcclSymbolLoader::GetInstance().Load<int32_t (*)(char*, uint32_t)>( | 113 | auto getSocVerFunc = HcclSymbolLoader::GetInstance().Load<int32_t (*)(char*, uint32_t)>( |
| 121 | "libruntime.so", "rtGetSocVersion", pathName); | 114 | "libruntime.so", "rtGetSocVersion", pathName); |
| 122 | ASCENDC_HOST_ASSERT(getSocVerFunc != nullptr, return EXIT_FAILURE, "Failed to get soc version."); | 115 | ASCENDC_HOST_ASSERT(getSocVerFunc != nullptr, return EXIT_FAILURE, "Failed to get soc version."); |
| 123 | - char socVersion[50]; | 116 | + char socVersion[50] = {0}; |
| 124 | - getSocVerFunc(socVersion, sizeof(socVersion)); | 117 | + (void)getSocVerFunc(socVersion, sizeof(socVersion)); |
| 125 | std::string devType = std::string(socVersion); | 118 | std::string devType = std::string(socVersion); |
| 126 | tilingInner->devType = ResolveDevType(socVersion); | 119 | tilingInner->devType = ResolveDevType(socVersion); |
| 127 | return EXIT_SUCCESS; | 120 | return EXIT_SUCCESS; |
| @@ -188,10 +181,10 @@ uint32_t Mc2CcTilingConfig::GetTiling(::Mc2InitTiling& tiling) | |||
| 188 | for (uint32_t i = 0; i < MAX_CC_TILING_NUM; i++) { | 181 | for (uint32_t i = 0; i < MAX_CC_TILING_NUM; i++) { |
| 189 | tilingInner->offset[i] = 0; | 182 | tilingInner->offset[i] = 0; |
| 190 | } | 183 | } |
| 191 | - if (IsCcuAlgorithmRegistered(impl_.algConfig_, impl_.commEngine_)) { | 184 | + ASCENDC_HOST_ASSERT(SetDevType(tilingInner) == EXIT_SUCCESS, return EXIT_FAILURE, "SetDevType failed."); |
| 185 | + if (IsCcuNewFrameworkEnabled(impl_.commEngine_, tilingInner->devType)) { | ||
| 192 | tilingInner->version = INIT_TILING_CCU_NEW_VERSION; | 186 | tilingInner->version = INIT_TILING_CCU_NEW_VERSION; |
| 193 | } | 187 | } |
| 194 | - ASCENDC_HOST_ASSERT(SetDevType(tilingInner) == EXIT_SUCCESS, return EXIT_FAILURE, "SetDevType failed."); | ||
| 195 | 188 | ||
| 196 | TILING_LOG_DEBUG("Mc2InitTiling addr %#lx", impl_.initTilingAddr_); | 189 | TILING_LOG_DEBUG("Mc2InitTiling addr %#lx", impl_.initTilingAddr_); |
| 197 | PrintMc2InitTiling(*tilingInner); | 190 | PrintMc2InitTiling(*tilingInner); |
| @@ -7,7 +7,6 @@ | |||
| 7 | * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. | 7 | * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. |
| 8 | * See LICENSE in the root of the software repository for the full text of the License. | 8 | * See LICENSE in the root of the software repository for the full text of the License. |
| 9 | */ | 9 | */ |
| 10 | -#include <cstdio> | ||
| 11 | #include <set> | 10 | #include <set> |
| 12 | #include <string> | 11 | #include <string> |
| 13 | #include <utility> | 12 | #include <utility> |
| @@ -21,17 +20,6 @@ | |||
| 21 | 20 | ||
| 22 | using namespace mc2_ops_hccl; | 21 | using namespace mc2_ops_hccl; |
| 23 | 22 | ||
| 24 | -namespace { | ||
| 25 | -Mc2CcTilingInner MakeTiling(const char* algConfig, uint32_t opType = 6U /*ALLGATHER*/) | ||
| 26 | -{ | ||
| 27 | - Mc2CcTilingInner tiling{}; | ||
| 28 | - tiling.opType = opType; | ||
| 29 | - tiling.commEngine = static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED); | ||
| 30 | - (void)snprintf(tiling.algConfig, sizeof(tiling.algConfig), "%s", algConfig); | ||
| 31 | - return tiling; | ||
| 32 | -} | ||
| 33 | -} // namespace | ||
| 34 | - | ||
| 35 | // CCU 候选 ⊆ algorithmMap(三名单一致性:sidecar 注册表 / tiling 白名单 / algorithmMap) | 23 | // CCU 候选 ⊆ algorithmMap(三名单一致性:sidecar 注册表 / tiling 白名单 / algorithmMap) |
| 36 | TEST(ExtAlgFull, CcuCandidatesAreInAlgorithmMap) | 24 | TEST(ExtAlgFull, CcuCandidatesAreInAlgorithmMap) |
| 37 | { | 25 | { |
| @@ -70,56 +58,9 @@ TEST(ExtAlgForced, FourStateClassification) | |||
| 70 | EXPECT_FALSE(spec.orderStrong); | 58 | EXPECT_FALSE(spec.orderStrong); |
| 71 | } | 59 | } |
| 72 | 60 | ||
| 73 | -// hccl_mc2.cc 内部自由函数,专属目标已编入该翻译单元,符号可见 | ||
| 74 | -bool CheckCcuAlgorithmsRegistered(const void* ccTilingList[], uint32_t tilingNum); | ||
| 75 | - | ||
| 76 | -// CheckCcuAlgorithmsRegistered 新契约(f3b8b6463 起):外部名解析通过即放行,不再校验 CCU 候选注册; | ||
| 77 | -// 仅 null tiling、NONE/LEGACY kind、解析错误被拒 | ||
| 78 | -TEST(ExtAlgGateB, ExternalNameGate) | ||
| 79 | -{ | ||
| 80 | - // sole[mesh] AG 有 CCU 候选 CcuSchedAllGatherSoleMesh(algorithmMap + V2 注册表均在)→ 过 | ||
| 81 | - Mc2CcTilingInner agSoleMesh = MakeTiling("sole[mesh]", 6U); | ||
| 82 | - const void* goodList[] = {&agSoleMesh}; | ||
| 83 | - EXPECT_TRUE(CheckCcuAlgorithmsRegistered(goodList, 1U)); | ||
| 84 | - | ||
| 85 | - // AG pipeline[mesh,nhr] 解析通过即放行(新契约不再校验 CCU 候选注册,候选选择交由后续 selector) | ||
| 86 | - Mc2CcTilingInner agPipeline = MakeTiling("pipeline[mesh,nhr]", 6U); | ||
| 87 | - const void* badList[] = {&agPipeline}; | ||
| 88 | - EXPECT_TRUE(CheckCcuAlgorithmsRegistered(badList, 1U)); | ||
| 89 | - | ||
| 90 | - // 语法错 → 拒 | ||
| 91 | - Mc2CcTilingInner badSyntax = MakeTiling("sole[ring]", 6U); | ||
| 92 | - const void* badSyntaxList[] = {&badSyntax}; | ||
| 93 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(badSyntaxList, 1U)); | ||
| 94 | - | ||
| 95 | - // null tiling 守卫 | ||
| 96 | - const void* nullList[] = {nullptr}; | ||
| 97 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(nullList, 1U)); | ||
| 98 | - | ||
| 99 | - // 裸名不再作为强制算法:无论是否已注册一律归 NONE → gate 拒后由 | ||
| 100 | - // TryForcedAlgAndPrepareEngine 回退默认 selector 兜底;空名/legacy 现状语义不变 | ||
| 101 | - Mc2CcTilingInner bare = MakeTiling("CcuSchedAllGatherSoleMesh", 6U); | ||
| 102 | - const void* bareList[] = {&bare}; | ||
| 103 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(bareList, 1U)); | ||
| 104 | - Mc2CcTilingInner bareUnknown = MakeTiling("CcuNoSuchAlgorithm", 6U); | ||
| 105 | - const void* bareUnknownList[] = {&bareUnknown}; | ||
| 106 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(bareUnknownList, 1U)); | ||
| 107 | - Mc2CcTilingInner empty = MakeTiling("", 6U); | ||
| 108 | - const void* emptyList[] = {&empty}; | ||
| 109 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(emptyList, 1U)); | ||
| 110 | - Mc2CcTilingInner legacy = MakeTiling("allgather=level0:fullmesh", 6U); | ||
| 111 | - const void* legacyList[] = {&legacy}; | ||
| 112 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(legacyList, 1U)); | ||
| 113 | -} | ||
| 114 | - | ||
| 115 | // 失败路径三要素:报错必须含 algConfig 原文/候选或定名/原因(语法错与候选为空/规则全灭分叉)。 | 61 | // 失败路径三要素:报错必须含 algConfig 原文/候选或定名/原因(语法错与候选为空/规则全灭分叉)。 |
| 116 | TEST(ExtAlgFailure, ErrorMessagesCarryThreeElements) | 62 | TEST(ExtAlgFailure, ErrorMessagesCarryThreeElements) |
| 117 | { | 63 | { |
| 118 | - // RS sole[mesh.chunk] 解析通过即放行(新契约不再校验 CCU 候选注册,AICPU-only 外部名同样过 gate) | ||
| 119 | - Mc2CcTilingInner rsMeshChunk = MakeTiling("sole[mesh.chunk]", 7U); // RS: AICPU-only 候选 | ||
| 120 | - const void* goodList[] = {&rsMeshChunk}; | ||
| 121 | - EXPECT_TRUE(CheckCcuAlgorithmsRegistered(goodList, 1U)); | ||
| 122 | - | ||
| 123 | // 解析层 errMsg 三要素:解析失败消息含原文 | 64 | // 解析层 errMsg 三要素:解析失败消息含原文 |
| 124 | ExternalAlgSpec spec; | 65 | ExternalAlgSpec spec; |
| 125 | std::string errMsg; | 66 | std::string errMsg; |
| @@ -68,8 +68,6 @@ REGISTER_ALG_META( | |||
| 68 | FLAG_NONE, 0); | 68 | FLAG_NONE, 0); |
| 69 | } // namespace mc2_ops_hccl | 69 | } // namespace mc2_ops_hccl |
| 70 | 70 | ||
| 71 | -// hccl_mc2.cc 的 CheckCcuAlgorithmsRegistered(非 static 自由函数,须在全局作用域声明) | ||
| 72 | -bool CheckCcuAlgorithmsRegistered(const void* ccTilingList[], uint32_t tilingNum); | ||
| 73 | HcclResult CheckMc2CcDeviceType(const char* apiName); | 71 | HcclResult CheckMc2CcDeviceType(const char* apiName); |
| 74 | 72 | ||
| 75 | namespace { | 73 | namespace { |
| @@ -485,6 +483,7 @@ TEST_F(CcuMc2TestSuite, CcuSelectAlg_ReduceScatterRejectsProd) | |||
| 485 | EXPECT_EQ(RunCcuSelectAlg(comm_, stream_, topoTag, ccTilingList, 1, resCtx), HCCL_E_NOT_SUPPORT); | 483 | EXPECT_EQ(RunCcuSelectAlg(comm_, stream_, topoTag, ccTilingList, 1, resCtx), HCCL_E_NOT_SUPPORT); |
| 486 | } | 484 | } |
| 487 | 485 | ||
| 486 | +// tilingNum > 1 由 tilingNum != 1 校验直接拒绝(原混合算子拒绝语义收敛于此) | ||
| 488 | TEST_F(CcuMc2TestSuite, CheckCcuKfcFlow_RejectsMixedOps) | 487 | TEST_F(CcuMc2TestSuite, CheckCcuKfcFlow_RejectsMixedOps) |
| 489 | { | 488 | { |
| 490 | Mc2InitTilingInner initTiling{}; | 489 | Mc2InitTilingInner initTiling{}; |
| @@ -504,29 +503,13 @@ TEST_F(CcuMc2TestSuite, CheckCcuKfcFlow_AcceptsReduceScatter) | |||
| 504 | { | 503 | { |
| 505 | Mc2InitTilingInner initTiling{}; | 504 | Mc2InitTilingInner initTiling{}; |
| 506 | initTiling.version = INIT_TILING_CCU_NEW_VERSION; | 505 | initTiling.version = INIT_TILING_CCU_NEW_VERSION; |
| 507 | - initTiling.mc2HcommCnt = 2U; | 506 | + initTiling.mc2HcommCnt = 1U; |
| 508 | - Mc2CcTilingInner reduceScatter0{}; | 507 | + Mc2CcTilingInner reduceScatter{}; |
| 509 | - reduceScatter0.opType = static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER); | ||
| 510 | - reduceScatter0.commEngine = static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED); | ||
| 511 | - Mc2CcTilingInner reduceScatter1 = reduceScatter0; | ||
| 512 | - const void* ccTilingList[] = {&reduceScatter0, &reduceScatter1}; | ||
| 513 | - | ||
| 514 | - EXPECT_EQ(CheckCcuKfcFlow(&initTiling, ccTilingList, 2U, g_stubRankSize), HCCL_SUCCESS); | ||
| 515 | -} | ||
| 516 | - | ||
| 517 | -TEST_F(CcuMc2TestSuite, CheckCcuKfcFlow_RejectsAllGatherReduceScatterMix) | ||
| 518 | -{ | ||
| 519 | - Mc2InitTilingInner initTiling{}; | ||
| 520 | - initTiling.version = INIT_TILING_CCU_NEW_VERSION; | ||
| 521 | - initTiling.mc2HcommCnt = 2U; | ||
| 522 | - Mc2CcTilingInner allGather{}; | ||
| 523 | - allGather.opType = static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER); | ||
| 524 | - allGather.commEngine = static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED); | ||
| 525 | - Mc2CcTilingInner reduceScatter = allGather; | ||
| 526 | reduceScatter.opType = static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER); | 508 | reduceScatter.opType = static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER); |
| 527 | - const void* ccTilingList[] = {&allGather, &reduceScatter}; | 509 | + reduceScatter.commEngine = static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED); |
| 510 | + const void* ccTilingList[] = {&reduceScatter}; | ||
| 528 | 511 | ||
| 529 | - EXPECT_EQ(CheckCcuKfcFlow(&initTiling, ccTilingList, 2U, g_stubRankSize), HCCL_E_NOT_SUPPORT); | 512 | + EXPECT_EQ(CheckCcuKfcFlow(&initTiling, ccTilingList, 1U, g_stubRankSize), HCCL_SUCCESS); |
| 530 | } | 513 | } |
| 531 | 514 | ||
| 532 | TEST_F(CcuMc2TestSuite, CheckCcuKfcFlow_RejectsPeerOnlyOutsideTp2) | 515 | TEST_F(CcuMc2TestSuite, CheckCcuKfcFlow_RejectsPeerOnlyOutsideTp2) |
| @@ -645,7 +628,7 @@ TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_CcuPath) | |||
| 645 | { | 628 | { |
| 646 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER)}; | 629 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER)}; |
| 647 | Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); | 630 | Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); |
| 648 | - // 新契约:CCU 路径只认外部名(裸名归为 NONE,闸门直接拒绝) | 631 | + // 外部名走强制算法定名链路,命中 CcuSchedAllGatherSoleMesh |
| 649 | strcpy(tiling.ccTiling[0].algConfig, "sole[mesh]"); | 632 | strcpy(tiling.ccTiling[0].algConfig, "sole[mesh]"); |
| 650 | void* opResCtx = nullptr; | 633 | void* opResCtx = nullptr; |
| 651 | HcclResult ret = HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx); | 634 | HcclResult ret = HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx); |
| @@ -662,24 +645,45 @@ TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_CcuPath) | |||
| 662 | EXPECT_EQ(ctx->algorithmType[0], static_cast<uint32_t>(AlgorithmType::CcuSchedAllGatherSoleMesh)); | 645 | EXPECT_EQ(ctx->algorithmType[0], static_cast<uint32_t>(AlgorithmType::CcuSchedAllGatherSoleMesh)); |
| 663 | } | 646 | } |
| 664 | 647 | ||
| 665 | -TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_CcuAlgorithmNotRegistered) | 648 | +// 注册表未注册不再触发 1042 回退链路:定名后由 algorithmMap 命中校验兜底, |
| 649 | +// 未命中按 HCCL_E_NOT_SUPPORT 直接失败,opbase 侧映射为 FAILED 报错。 | ||
| 650 | +TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_AlgNameNotInMapFails) | ||
| 666 | { | 651 | { |
| 667 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER)}; | 652 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER)}; |
| 668 | Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); | 653 | Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); |
| 669 | - mc2_ops_hccl::g_stubCcuAlgorithmRegistered = false; | 654 | + // 老语法(含'=')归为 LEGACY 回退默认 selector;裸名是强制算法不走 selector, |
| 655 | + // 故先改写 algConfig 使 selector 定名路径生效。 | ||
| 656 | + strcpy(tiling.ccTiling[0].algConfig, "AllReduce=level0:doublering"); | ||
| 657 | + // selector 定名结果未注册:algorithmMap 无此名,FillCcuAlgTypeAndName 返回 HCCL_E_NOT_SUPPORT | ||
| 658 | + mc2_ops_hccl::g_stubSelectorAlgName = "NotExistAlg"; | ||
| 670 | 659 | ||
| 671 | void* opResCtx = nullptr; | 660 | void* opResCtx = nullptr; |
| 672 | HcclResult ret = HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx); | 661 | HcclResult ret = HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx); |
| 673 | 662 | ||
| 674 | - EXPECT_EQ(ret, HCCL_E_ALG_NOT_SUPPORTED); | 663 | + EXPECT_EQ(ret, HCCL_E_NOT_SUPPORT); |
| 675 | EXPECT_EQ(opResCtx, nullptr); | 664 | EXPECT_EQ(opResCtx, nullptr); |
| 676 | } | 665 | } |
| 677 | 666 | ||
| 667 | +// 真实申请路径不经过 CheckCcuAlgorithmsRegistered 闸门:裸名交由 selector 定名 | ||
| 668 | +TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_BareNameUsesSelector) | ||
| 669 | +{ | ||
| 670 | + uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER)}; | ||
| 671 | + // BuildMc2Tiling 对 CCU_SCHED + ALLGATHER 默认填入裸名 CcuSchedAllGatherSoleMesh | ||
| 672 | + Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); | ||
| 673 | + | ||
| 674 | + void* opResCtx = nullptr; | ||
| 675 | + EXPECT_EQ(HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx), HCCL_SUCCESS); | ||
| 676 | + ASSERT_NE(opResCtx, nullptr); | ||
| 677 | + EXPECT_EQ( | ||
| 678 | + static_cast<OpResCtx*>(opResCtx)->algorithmType[0], | ||
| 679 | + static_cast<uint32_t>(AlgorithmType::CcuSchedAllGatherSoleMesh)); | ||
| 680 | +} | ||
| 681 | + | ||
| 678 | TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_ReduceScatterCcuPath) | 682 | TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_ReduceScatterCcuPath) |
| 679 | { | 683 | { |
| 680 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER)}; | 684 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER)}; |
| 681 | Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); | 685 | Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); |
| 682 | - // 新契约:CCU 路径只认外部名(裸名归为 NONE,闸门直接拒绝) | 686 | + // 外部名走强制算法定名链路,命中 CcuReduceScatterMeshMem2Mem1D |
| 683 | strcpy(tiling.ccTiling[0].algConfig, "sole[mesh]"); | 687 | strcpy(tiling.ccTiling[0].algConfig, "sole[mesh]"); |
| 684 | void* opResCtx = nullptr; | 688 | void* opResCtx = nullptr; |
| 685 | HcclResult ret = HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx); | 689 | HcclResult ret = HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx); |
| @@ -868,38 +872,9 @@ TEST_F(CcuMc2TestSuite, TryForcedAlgExternalTopoFailFallsBackToSelector) | |||
| 868 | EXPECT_EQ(opParam.engine, CommEngine::COMM_ENGINE_CCU); | 872 | EXPECT_EQ(opParam.engine, CommEngine::COMM_ENGINE_CCU); |
| 869 | } | 873 | } |
| 870 | 874 | ||
| 871 | -// CCU 闸门:外部名放行;裸名仅在已注册时放行(未注册回退默认 selector 兜底); | 875 | +// CCU 闸门(本 PR 后语义):只放行外部名(含 '[' 且可解析); |
| 872 | -// 缺省/老语法一律拒绝。 | 876 | +// 裸名/缺省/老语法一律归为 NONE,由 selector 回退默认算法(原白名单闸门已删除)。 |
| 873 | -TEST_F(CcuMc2TestSuite, CcuAlgorithmGateAcceptsOnlyExternalAlgConfig) | ||
| 874 | -{ | ||
| 875 | - Mc2CcTilingInner tiling{}; | ||
| 876 | - tiling.opType = static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLREDUCE); | ||
| 877 | - tiling.commEngine = static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED); | ||
| 878 | - const void* ccTilingList[] = {&tiling}; | ||
| 879 | 877 | ||
| 880 | - // 缺省与老语法拒绝 | ||
| 881 | - strcpy(tiling.algConfig, "default"); | ||
| 882 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(ccTilingList, 1U)); | ||
| 883 | - strcpy(tiling.algConfig, "AllReduce=level0:doublering"); | ||
| 884 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(ccTilingList, 1U)); | ||
| 885 | - | ||
| 886 | - // 裸名(无论是否已注册)归 NONE → 拒绝并回退默认 selector | ||
| 887 | - strcpy(tiling.algConfig, "CcuSchedAllReduceSoleMesh"); | ||
| 888 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(ccTilingList, 1U)); | ||
| 889 | - strcpy(tiling.algConfig, "CcuNoSuchAlgorithm"); | ||
| 890 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(ccTilingList, 1U)); | ||
| 891 | - | ||
| 892 | - // 合法外部名放行 | ||
| 893 | - strcpy(tiling.algConfig, "sole[mesh]"); | ||
| 894 | - EXPECT_TRUE(CheckCcuAlgorithmsRegistered(ccTilingList, 1U)); | ||
| 895 | - | ||
| 896 | - // 外部名词法错误 → 拒绝 | ||
| 897 | - strcpy(tiling.algConfig, "sole[ring]"); | ||
| 898 | - EXPECT_FALSE(CheckCcuAlgorithmsRegistered(ccTilingList, 1U)); | ||
| 899 | -} | ||
| 900 | - | ||
| 901 | -// EXTERNAL 资源失败回退(与裸名同路):定名成功 → 资源失败(按名桩限定)→ | ||
| 902 | -// 回退默认 selector 重选 → 二次资源申请成功 → GetOpParam 整体 SUCCESS | ||
| 903 | TEST_F(CcuMc2TestSuite, GetOpParam_ExternalNameResourceFallbackToSelector) | 878 | TEST_F(CcuMc2TestSuite, GetOpParam_ExternalNameResourceFallbackToSelector) |
| 904 | { | 879 | { |
| 905 | Mc2CcTilingInner tiling{}; | 880 | Mc2CcTilingInner tiling{}; |
| @@ -977,7 +952,8 @@ TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_MixedOpsRejected) | |||
| 977 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLREDUCE)}; | 952 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLREDUCE)}; |
| 978 | Mc2TilingTestData tiling = BuildMc2Tiling(2, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); | 953 | Mc2TilingTestData tiling = BuildMc2Tiling(2, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); |
| 979 | void* opResCtx = nullptr; | 954 | void* opResCtx = nullptr; |
| 980 | - EXPECT_EQ(HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx), HCCL_E_ALG_NOT_SUPPORTED); | 955 | + // CheckCcuKfcFlow 限定 tilingNum == 1,多算子场景直接 HCCL_E_NOT_SUPPORT |
| 956 | + EXPECT_EQ(HcclAllocComResourceByTiling(comm_, stream_, &tiling, &opResCtx), HCCL_E_NOT_SUPPORT); | ||
| 981 | } | 957 | } |
| 982 | 958 | ||
| 983 | TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_NullComm) | 959 | TEST_F(CcuMc2TestSuite, HcclAllocComResourceByTiling_NullComm) |
| @@ -1289,24 +1265,15 @@ TEST_F(CcuMc2TestSuite, CheckOpResSufficient_SingleRankBypass) | |||
| 1289 | EXPECT_EQ(ret, HCCL_SUCCESS); | 1265 | EXPECT_EQ(ret, HCCL_SUCCESS); |
| 1290 | } | 1266 | } |
| 1291 | 1267 | ||
| 1292 | -TEST_F(CcuMc2TestSuite, CheckOpResSufficient_AlgNotRegistered) | ||
| 1293 | -{ | ||
| 1294 | - uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER)}; | ||
| 1295 | - Mc2TilingTestData tiling = BuildMc2Tiling(1, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); | ||
| 1296 | - mc2_ops_hccl::g_stubCcuAlgorithmRegistered = false; | ||
| 1297 | - | ||
| 1298 | - HcclResult ret = CheckOpResSufficient(comm_, stream_, &tiling); | ||
| 1299 | - | ||
| 1300 | - EXPECT_EQ(ret, HCCL_E_ALG_NOT_SUPPORTED); | ||
| 1301 | -} | ||
| 1302 | - | ||
| 1303 | TEST_F(CcuMc2TestSuite, CheckOpResSufficient_MixedOpsRejected) | 1268 | TEST_F(CcuMc2TestSuite, CheckOpResSufficient_MixedOpsRejected) |
| 1304 | { | 1269 | { |
| 1305 | uint32_t opTypes[] = { | 1270 | uint32_t opTypes[] = { |
| 1306 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLREDUCE)}; | 1271 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLREDUCE)}; |
| 1307 | Mc2TilingTestData tiling = BuildMc2Tiling(2, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); | 1272 | Mc2TilingTestData tiling = BuildMc2Tiling(2, static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), opTypes, nullptr); |
| 1308 | 1273 | ||
| 1309 | - // 多算子场景先被CheckCcuAlgorithmsRegistered拒绝(tilingNum>1),不进入逐算子校验 | 1274 | + // checkOnly 路径仍在 CheckCcuAlgorithmsRegistered 中被 tilingNum > 1 拒绝(回退码 1042), |
| 1275 | + // 不会进入 CheckCcuKfcFlow;真实申请路径才由 CheckCcuKfcFlow 的 tilingNum != 1 拒绝 | ||
| 1276 | + // (见 HcclAllocComResourceByTiling_MixedOpsRejected)。 | ||
| 1310 | EXPECT_EQ(CheckOpResSufficient(comm_, stream_, &tiling), HCCL_E_ALG_NOT_SUPPORTED); | 1277 | EXPECT_EQ(CheckOpResSufficient(comm_, stream_, &tiling), HCCL_E_ALG_NOT_SUPPORTED); |
| 1311 | } | 1278 | } |
| 1312 | 1279 | ||
| @@ -1351,7 +1318,7 @@ TEST_F(CcuMc2TestSuite, CheckOpResSufficient_MixedEnginesRejected) | |||
| 1351 | TEST_F(CcuMc2TestSuite, CheckOpResSufficient_ReduceScatterRejectsUnsupportedCombos) | 1318 | TEST_F(CcuMc2TestSuite, CheckOpResSufficient_ReduceScatterRejectsUnsupportedCombos) |
| 1352 | { | 1319 | { |
| 1353 | // 端到端:CCU_SCHED + REDUCE_SCATTER 时,64位数据类型与PROD归约在默认selector被拒绝。 | 1320 | // 端到端:CCU_SCHED + REDUCE_SCATTER 时,64位数据类型与PROD归约在默认selector被拒绝。 |
| 1354 | - // 新契约下闸门只放行外部名,故将algConfig置为sole[mesh](定名CcuSchedReduceScatterSoleMesh); | 1321 | + // algConfig置为sole[mesh](定名CcuSchedReduceScatterSoleMesh); |
| 1355 | // 通过g_stubCcuAlgExecNull令强制算法校验失败→回退到默认selector, | 1322 | // 通过g_stubCcuAlgExecNull令强制算法校验失败→回退到默认selector, |
| 1356 | // 桩ExecuteSelector复刻真实selector的64位/PROD拒绝规则。 | 1323 | // 桩ExecuteSelector复刻真实selector的64位/PROD拒绝规则。 |
| 1357 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER)}; | 1324 | uint32_t opTypes[] = {static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER)}; |
| @@ -1513,14 +1480,14 @@ TEST_F(CcuMc2TestSuite, CheckOpResSufficientByArgs_AicpuBypass) | |||
| 1513 | EXPECT_EQ(Mc2FreeCcArgs(ccArgs), HCCL_SUCCESS); | 1480 | EXPECT_EQ(Mc2FreeCcArgs(ccArgs), HCCL_SUCCESS); |
| 1514 | } | 1481 | } |
| 1515 | 1482 | ||
| 1516 | -// 新契约:CCU 闸门不再校验"算法是否已注册",只认外部名;裸名/缺省一律 ALG_NOT_SUPPORTED | 1483 | +// ccArgs 校验接口内部固定走 checkOnly,闸门仍生效:裸名/缺省/legacy 名一律 ALG_NOT_SUPPORTED |
| 1517 | TEST_F(CcuMc2TestSuite, CheckOpResSufficientByArgs_RejectsNonExternalAlgConfig) | 1484 | TEST_F(CcuMc2TestSuite, CheckOpResSufficientByArgs_RejectsNonExternalAlgConfig) |
| 1518 | { | 1485 | { |
| 1519 | SetCommEngineEnv(static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED)); | 1486 | SetCommEngineEnv(static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED)); |
| 1520 | void* ccArgs = CreateMc2CcArgs(static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), "CcuSchedAllGatherSoleMesh"); | 1487 | void* ccArgs = CreateMc2CcArgs(static_cast<uint8_t>(OpExecuteConfig::CCU_SCHED), "CcuSchedAllGatherSoleMesh"); |
| 1521 | ASSERT_NE(ccArgs, nullptr); | 1488 | ASSERT_NE(ccArgs, nullptr); |
| 1522 | 1489 | ||
| 1523 | - // 裸名(无论是否已注册)不再作为强制算法 → 向上报不支持 | 1490 | + // 裸名(无论是否已注册)不作为强制算法 → 校验接口报不支持 |
| 1524 | EXPECT_EQ( | 1491 | EXPECT_EQ( |
| 1525 | CheckOpResSufficient(comm_, static_cast<uint8_t>(HcclCMDType::HCCL_CMD_ALLGATHER), ccArgs), | 1492 | CheckOpResSufficient(comm_, static_cast<uint8_t>(HcclCMDType::HCCL_CMD_ALLGATHER), ccArgs), |
| 1526 | HCCL_E_ALG_NOT_SUPPORTED); | 1493 | HCCL_E_ALG_NOT_SUPPORTED); |
| @@ -175,6 +175,9 @@ TEST_F(TestHcclTiling, Mc2CcTilingConfig_multiTiling) | |||
| 175 | 175 | ||
| 176 | class TestHcclTilingCcuKfc : public TestHcclTiling { | 176 | class TestHcclTilingCcuKfc : public TestHcclTiling { |
| 177 | protected: | 177 | protected: |
| 178 | + // 期望值按 SetDevType 解析出的真实 devType 分支:A5/A6 主机上新契约生效(101), | ||
| 179 | + // 其他机型(如 910B/无 NPU 环境)保持 100,消除断言对执行机芯片的依赖。 | ||
| 180 | + // expectedVersion 语义为"新契约生效时的期望值",devType 非法时翻转为 INIT_TILING_VERSION。 | ||
| 178 | void ExpectInitTilingVersion( | 181 | void ExpectInitTilingVersion( |
| 179 | uint32_t opType, const std::string& algConfig, uint8_t commEngine, uint32_t expectedVersion) | 182 | uint32_t opType, const std::string& algConfig, uint8_t commEngine, uint32_t expectedVersion) |
| 180 | { | 183 | { |
| @@ -183,27 +186,33 @@ protected: | |||
| 183 | 186 | ||
| 184 | ASSERT_EQ(tilingConfig.GetTiling(initTiling), EXIT_SUCCESS); | 187 | ASSERT_EQ(tilingConfig.GetTiling(initTiling), EXIT_SUCCESS); |
| 185 | const auto* tilingInner = reinterpret_cast<const Mc2InitTilingInner*>(&initTiling); | 188 | const auto* tilingInner = reinterpret_cast<const Mc2InitTilingInner*>(&initTiling); |
| 186 | - EXPECT_EQ(tilingInner->version, expectedVersion); | 189 | + const bool isA5OrA6 = (tilingInner->devType == 6U) || (tilingInner->devType == 8U); |
| 190 | + const uint32_t adaptedVersion = isA5OrA6 ? expectedVersion : INIT_TILING_VERSION; | ||
| 191 | + EXPECT_EQ(tilingInner->version, adaptedVersion); | ||
| 187 | } | 192 | } |
| 188 | }; | 193 | }; |
| 189 | 194 | ||
| 190 | -TEST_F(TestHcclTilingCcuKfc, AllToAllVCcuSchedBareNameKeepsDefaultVersion) | 195 | +// 新契约:裸名(不含'[')与外部名一视同仁,CCU 新版本仅由 commEngine(5/6)+ 设备型号(A5/A6)决定; |
| 196 | +// 裸名进入新流程后由 mc2 侧 selector 定名并回退默认算法,不再报 1042。 | ||
| 197 | +TEST_F(TestHcclTilingCcuKfc, AllToAllVCcuSchedBareNameUsesCcuNewVersion) | ||
| 191 | { | 198 | { |
| 192 | ExpectInitTilingVersion( | 199 | ExpectInitTilingVersion( |
| 193 | - static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLTOALLV), "CcuSchedAllToAllVSoleMesh", 6U, INIT_TILING_VERSION); | 200 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLTOALLV), "CcuSchedAllToAllVSoleMesh", 6U, |
| 201 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 194 | } | 202 | } |
| 195 | 203 | ||
| 196 | -TEST_F(TestHcclTilingCcuKfc, AllToAllCcuSchedBareNameKeepsDefaultVersion) | 204 | +TEST_F(TestHcclTilingCcuKfc, AllToAllCcuSchedBareNameUsesCcuNewVersion) |
| 197 | { | 205 | { |
| 198 | ExpectInitTilingVersion( | 206 | ExpectInitTilingVersion( |
| 199 | - static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLTOALL), "CcuSchedAllToAllSoleMesh", 6U, INIT_TILING_VERSION); | 207 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLTOALL), "CcuSchedAllToAllSoleMesh", 6U, |
| 208 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 200 | } | 209 | } |
| 201 | 210 | ||
| 202 | -TEST_F(TestHcclTilingCcuKfc, AllToAllMultiJettyCcuSchedBareNameKeepsDefaultVersion) | 211 | +TEST_F(TestHcclTilingCcuKfc, AllToAllMultiJettyCcuSchedBareNameUsesCcuNewVersion) |
| 203 | { | 212 | { |
| 204 | ExpectInitTilingVersion( | 213 | ExpectInitTilingVersion( |
| 205 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLTOALL), "CcuSchedAllToAllMesh1DMultiJetty", 6U, | 214 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLTOALL), "CcuSchedAllToAllMesh1DMultiJetty", 6U, |
| 206 | - INIT_TILING_VERSION); | 215 | + INIT_TILING_CCU_NEW_VERSION); |
| 207 | } | 216 | } |
| 208 | 217 | ||
| 209 | TEST_F(TestHcclTilingCcuKfc, UnsupportedCommEngineUsesDefaultVersion) | 218 | TEST_F(TestHcclTilingCcuKfc, UnsupportedCommEngineUsesDefaultVersion) |
| @@ -212,63 +221,81 @@ TEST_F(TestHcclTilingCcuKfc, UnsupportedCommEngineUsesDefaultVersion) | |||
| 212 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 4U, INIT_TILING_VERSION); | 221 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 4U, INIT_TILING_VERSION); |
| 213 | } | 222 | } |
| 214 | 223 | ||
| 215 | -TEST_F(TestHcclTilingCcuKfc, UnregisteredAlgorithmUsesDefaultVersion) | 224 | +TEST_F(TestHcclTilingCcuKfc, UnregisteredAlgorithmAlsoUsesCcuNewVersion) |
| 216 | { | 225 | { |
| 217 | ExpectInitTilingVersion( | 226 | ExpectInitTilingVersion( |
| 218 | - static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuUnregisteredAlgorithm", 6U, INIT_TILING_VERSION); | 227 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuUnregisteredAlgorithm", 6U, |
| 228 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 219 | } | 229 | } |
| 220 | 230 | ||
| 221 | -TEST_F(TestHcclTilingCcuKfc, AllGatherCcuMsBareNameKeepsDefaultVersion) | 231 | +TEST_F(TestHcclTilingCcuKfc, AllGatherCcuMsBareNameUsesCcuNewVersion) |
| 222 | { | 232 | { |
| 223 | ExpectInitTilingVersion( | 233 | ExpectInitTilingVersion( |
| 224 | - static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 5U, INIT_TILING_VERSION); | 234 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 5U, |
| 235 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 225 | } | 236 | } |
| 226 | 237 | ||
| 227 | -TEST_F(TestHcclTilingCcuKfc, AllGatherCcuSchedBareNameKeepsDefaultVersion) | 238 | +TEST_F(TestHcclTilingCcuKfc, AllGatherCcuSchedBareNameUsesCcuNewVersion) |
| 228 | { | 239 | { |
| 229 | ExpectInitTilingVersion( | 240 | ExpectInitTilingVersion( |
| 230 | - static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 6U, INIT_TILING_VERSION); | 241 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 6U, |
| 242 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 231 | } | 243 | } |
| 232 | 244 | ||
| 233 | -TEST_F(TestHcclTilingCcuKfc, KfcAllGatherCcuSchedBareNameKeepsDefaultVersion) | 245 | +TEST_F(TestHcclTilingCcuKfc, KfcAllGatherCcuSchedBareNameUsesCcuNewVersion) |
| 234 | { | 246 | { |
| 235 | ExpectInitTilingVersion( | 247 | ExpectInitTilingVersion( |
| 236 | - static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 6U, INIT_TILING_VERSION); | 248 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "CcuSchedAllGatherSoleMesh", 6U, |
| 249 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 237 | } | 250 | } |
| 238 | 251 | ||
| 239 | -TEST_F(TestHcclTilingCcuKfc, ReduceScatterCcuMsBareNameKeepsDefaultVersion) | 252 | +TEST_F(TestHcclTilingCcuKfc, ReduceScatterCcuMsBareNameUsesCcuNewVersion) |
| 240 | { | 253 | { |
| 241 | ExpectInitTilingVersion( | 254 | ExpectInitTilingVersion( |
| 242 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleMesh", 5U, | 255 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleMesh", 5U, |
| 243 | - INIT_TILING_VERSION); | 256 | + INIT_TILING_CCU_NEW_VERSION); |
| 244 | } | 257 | } |
| 245 | 258 | ||
| 246 | -TEST_F(TestHcclTilingCcuKfc, ReduceScatterCcuSchedBareNameKeepsDefaultVersion) | 259 | +TEST_F(TestHcclTilingCcuKfc, ReduceScatterCcuSchedBareNameUsesCcuNewVersion) |
| 247 | { | 260 | { |
| 248 | ExpectInitTilingVersion( | 261 | ExpectInitTilingVersion( |
| 249 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleMesh", 6U, | 262 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleMesh", 6U, |
| 250 | - INIT_TILING_VERSION); | 263 | + INIT_TILING_CCU_NEW_VERSION); |
| 251 | } | 264 | } |
| 252 | 265 | ||
| 253 | -TEST_F(TestHcclTilingCcuKfc, ReduceScatterConcurMeshNHRMultiLinkCcuSchedBareNameKeepsDefaultVersion) | 266 | +TEST_F(TestHcclTilingCcuKfc, HalfAlltoAllVCcuMsUsesCcuNewVersion) |
| 267 | +{ | ||
| 268 | + ExpectInitTilingVersion( | ||
| 269 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_HALF_ALLTOALLV), "CcuHalfAll2AllVMesh1D", 5U, | ||
| 270 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 271 | +} | ||
| 272 | + | ||
| 273 | +TEST_F(TestHcclTilingCcuKfc, HalfAlltoAllVCcuSchedUsesCcuNewVersion) | ||
| 274 | +{ | ||
| 275 | + ExpectInitTilingVersion( | ||
| 276 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_HALF_ALLTOALLV), "CcuHalfAll2AllVMesh1D", 6U, | ||
| 277 | + INIT_TILING_CCU_NEW_VERSION); | ||
| 278 | +} | ||
| 279 | + | ||
| 280 | +TEST_F(TestHcclTilingCcuKfc, ReduceScatterConcurMeshNHRMultiLinkCcuSchedBareNameUsesCcuNewVersion) | ||
| 254 | { | 281 | { |
| 255 | ExpectInitTilingVersion( | 282 | ExpectInitTilingVersion( |
| 256 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterConcurMeshNHRMultiLink", 6U, | 283 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterConcurMeshNHRMultiLink", 6U, |
| 257 | - INIT_TILING_VERSION); | 284 | + INIT_TILING_CCU_NEW_VERSION); |
| 258 | } | 285 | } |
| 259 | 286 | ||
| 260 | -TEST_F(TestHcclTilingCcuKfc, ReduceScatterPeerOnlyCcuSchedBareNameKeepsDefaultVersion) | 287 | +TEST_F(TestHcclTilingCcuKfc, ReduceScatterPeerOnlyCcuSchedBareNameUsesCcuNewVersion) |
| 261 | { | 288 | { |
| 262 | ExpectInitTilingVersion( | 289 | ExpectInitTilingVersion( |
| 263 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleMeshPeerOnly", 6U, | 290 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleMeshPeerOnly", 6U, |
| 264 | - INIT_TILING_VERSION); | 291 | + INIT_TILING_CCU_NEW_VERSION); |
| 265 | } | 292 | } |
| 266 | 293 | ||
| 267 | -TEST_F(TestHcclTilingCcuKfc, ReduceScatterSoleNhrMultiLinkCcuSchedBareNameKeepsDefaultVersion) | 294 | +TEST_F(TestHcclTilingCcuKfc, ReduceScatterSoleNhrMultiLinkCcuSchedBareNameUsesCcuNewVersion) |
| 268 | { | 295 | { |
| 269 | ExpectInitTilingVersion( | 296 | ExpectInitTilingVersion( |
| 270 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleNHRMultiLink", 6U, | 297 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "CcuSchedReduceScatterSoleNHRMultiLink", 6U, |
| 271 | - INIT_TILING_VERSION); | 298 | + INIT_TILING_CCU_NEW_VERSION); |
| 272 | } | 299 | } |
| 273 | 300 | ||
| 274 | // 外部名 + CCU 引擎 → CCU 新版本 | 301 | // 外部名 + CCU 引擎 → CCU 新版本 |
| @@ -292,20 +319,20 @@ TEST_F(TestHcclTilingCcuKfc, ExternalAlgNameCcuMsUsesCcuNewVersion) | |||
| 292 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "sole[mesh]", 5U, INIT_TILING_CCU_NEW_VERSION); | 319 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_REDUCE_SCATTER), "sole[mesh]", 5U, INIT_TILING_CCU_NEW_VERSION); |
| 293 | } | 320 | } |
| 294 | 321 | ||
| 295 | -// 外部名 + CCU 引擎即设 101:tiling 侧不预判有无 CCU 候选,精确判断在 | 322 | +// 外部名 + CCU 引擎即设 101:tiling 侧不预判有无 CCU 候选,候选是否可用由 mc2 侧 |
| 296 | -// mc2 侧 CheckCcuAlgorithmsRegistered(报错含原文与原因)。此用例钉住 AICPU-only 外部名同样设 101。 | 323 | +// selector 定名与 algorithmMap 命中校验决定。此用例钉住 AICPU-only 外部名同样设 101。 |
| 297 | TEST_F(TestHcclTilingCcuKfc, ExternalAlgNameAicpuOnlyAlsoUsesCcuNewVersion) | 324 | TEST_F(TestHcclTilingCcuKfc, ExternalAlgNameAicpuOnlyAlsoUsesCcuNewVersion) |
| 298 | { | 325 | { |
| 299 | ExpectInitTilingVersion( | 326 | ExpectInitTilingVersion( |
| 300 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "pipeline[mesh,nhr]", 6U, INIT_TILING_CCU_NEW_VERSION); | 327 | static_cast<uint32_t>(HcclCMDType::HCCL_CMD_ALLGATHER), "pipeline[mesh,nhr]", 6U, INIT_TILING_CCU_NEW_VERSION); |
| 301 | } | 328 | } |
| 302 | 329 | ||
| 303 | -// 语法错的外部名 + CCU 引擎:不设 101——version 影响 CCU 链后续流程,坏输入不带新版本标记; | 330 | +// 语法错的外部名 + CCU 引擎:同样设 101——新契约下 version 仅由 commEngine+devType 决定, |
| 304 | -// 词法错误明细由 mc2 侧 CheckCcuAlgorithmsRegistered 报出。 | 331 | +// algConfig 内容(含语法错)不影响 version,词法错误明细由 mc2 侧 selector 报出。 |
| 305 | -TEST_F(TestHcclTilingCcuKfc, ExternalAlgNameBadSyntaxKeepsCcuOldVersion) | 332 | +TEST_F(TestHcclTilingCcuKfc, ExternalAlgNameBadSyntaxAlsoUsesCcuNewVersion) |
| 306 | { | 333 | { |
| 307 | ExpectInitTilingVersion( | 334 | ExpectInitTilingVersion( |
| 308 | - static_cast<uint32_t>(HcclCMDType::HCCL_CMD_BROADCAST), "sole[ring", 6U, INIT_TILING_VERSION); | 335 | + static_cast<uint32_t>(HcclCMDType::HCCL_CMD_BROADCAST), "sole[ring", 6U, INIT_TILING_CCU_NEW_VERSION); |
| 309 | } | 336 | } |
| 310 | 337 | ||
| 311 | // ============================================================================ | 338 | // ============================================================================ |
🟡 Medium Priority
变更行(tests/api/adv_api/tiling/test_hccl_tiling.cpp:194-196 等十余处)把裸名用例的期望版本从 INIT_TILING_VERSION(100) 翻转为 INIT_TILING_CCU_NEW_VERSION(101)。
证据链:
IsCcuNewFrameworkEnabled(impl_.commEngine_, tilingInner->devType)为真时才写 101,而该函数(hccl_tiling.cpp:59-66)要求devType == DEV_TYPE_A5(6) || == DEV_TYPE_A6(8)。tilingInner->devType由SetDevType()(hccl_tiling.cpp:106-122)通过HcclSymbolLoader::Load("libruntime.so","rtGetSocVersion", ${ASCEND_HOME_PATH}/lib64/)取真实 soc 字符串后经ResolveDevType解析得到。ExpectInitTilingVersion(test_hccl_tiling.cpp:178-188)与TestHcclTilingCcuKfc都没有对 soc 版本做任何打桩(TestHcclSymbolLoader反而显式断言用的是真实 libruntime.so),因此期望值取决于跑测试的机器芯片。失败模式:在 Ascend910B(ResolveDevType→DEV_TYPE_A2=1)等非 A5/A6 主机上,version 保持 100,本 PR 翻转的十余条断言(另外还有未改动的 ExternalAlgNameCcuCandidateUsesCcuNewVersion 等 3 条)全部 EXPECT_EQ 失败;若 rtGetSocVersion 失败,
SetDevType里char socVersion[50]未初始化且返回值被忽略(hccl_tiling.cpp:117-118),版本判定将变成不确定值,用例表现为 flaky。改动前这些断言只依赖 algConfig 字符串,与设备无关,因此这是本次改动新引入的环境依赖。建议:在 TestHcclTilingCcuKfc 中为 SetDevType 提供确定的 soc 版本(桩 libruntime.so 返回 Ascend950 / 测试钩子设置 devType),再断言 101;或在断言处按解析出的 devType 分支期望值。