已合并
【PR】: 删除short soc version的枚举值 #3175
jiang-mingming01创建于 6月26日
【PR】: 删除short soc version的枚举值 #3175
已合并
共 4 个文件变更+64-30
| @@ -41,11 +41,10 @@ typedef enum aclplatformDevInfo { | |||
| 41 | ACL_PLATFORM_L0_B_SIZE = 10, | 41 | ACL_PLATFORM_L0_B_SIZE = 10, |
| 42 | ACL_PLATFORM_L0_C_SIZE = 11, | 42 | ACL_PLATFORM_L0_C_SIZE = 11, |
| 43 | ACL_PLATFORM_L1_SIZE = 12, | 43 | ACL_PLATFORM_L1_SIZE = 12, |
| 44 | - ACL_PLATFORM_SHORT_SOC_VERSION = 13, | 44 | + ACL_PLATFORM_SOC_VERSION = 13, |
| 45 | - ACL_PLATFORM_SOC_VERSION = 14, | 45 | + ACL_PLATFORM_AIC_VERSION = 14, |
| 46 | - ACL_PLATFORM_AIC_VERSION = 15, | 46 | + ACL_PLATFORM_NPU_ARCH = 15, |
| 47 | - ACL_PLATFORM_NPU_ARCH = 16, | 47 | + ACL_PLATFORM_MEMORY_TYPE = 16, |
| 48 | - ACL_PLATFORM_MEMORY_TYPE = 17, | ||
| 49 | } aclplatformDevInfo; | 48 | } aclplatformDevInfo; |
| 50 | 49 | ||
| 51 | typedef enum aclplatformCoreType { | 50 | typedef enum aclplatformCoreType { |
| @@ -60,6 +59,22 @@ aclError aclplatformGetInstructionInfo(aclplatformCoreType type, | |||
| 60 | char *value, | 59 | char *value, |
| 61 | uint32_t maxLen); | 60 | uint32_t maxLen); |
| 62 | 61 | ||
| 62 | +typedef enum aclplatformNpuArch { | ||
| 63 | + DAV_1001 = 1001, | ||
| 64 | + DAV_2002 = 2002, | ||
| 65 | + DAV_2102 = 2102, | ||
| 66 | + DAV_2201 = 2201, | ||
| 67 | + DAV_3002 = 3002, | ||
| 68 | + DAV_3003 = 3003, | ||
| 69 | + DAV_3004 = 3004, | ||
| 70 | + DAV_3102 = 3102, | ||
| 71 | + DAV_3113 = 3113, | ||
| 72 | + DAV_3505 = 3505, | ||
| 73 | + DAV_3510 = 3510, | ||
| 74 | + DAV_5102 = 5102, | ||
| 75 | + DAV_RESV = 0xFFFF | ||
| 76 | +} aclplatformNpuArch; | ||
| 77 | + | ||
| 63 | // -------------------------------------------------------------------------- | 78 | // -------------------------------------------------------------------------- |
| 64 | // Mapping: aclplatformDevInfo enum value → (ini section, ini key) | 79 | // Mapping: aclplatformDevInfo enum value → (ini section, ini key) |
| 65 | // Indexed by enum value; order MUST match aclplatformDevInfo definition. | 80 | // Indexed by enum value; order MUST match aclplatformDevInfo definition. |
| @@ -73,7 +88,7 @@ aclError aclplatformGetInstructionInfo(aclplatformCoreType type, | |||
| 73 | // UB (5) → ACL_PLATFORM_AICORE_UB_SIZE (1) | 88 | // UB (5) → ACL_PLATFORM_AICORE_UB_SIZE (1) |
| 74 | // HBM (6) → ACL_PLATFORM_MEMORY_SIZE (5) | 89 | // HBM (6) → ACL_PLATFORM_MEMORY_SIZE (5) |
| 75 | // -------------------------------------------------------------------------- | 90 | // -------------------------------------------------------------------------- |
| 76 | -enum class aclplatformLocalMemType { | 91 | +typedef enum aclplatformLocalMemType { |
Y | |||
| 77 | L0_A = 0, | 92 | L0_A = 0, |
| 78 | L0_B = 1, | 93 | L0_B = 1, |
| 79 | L0_C = 2, | 94 | L0_C = 2, |
| @@ -81,7 +96,7 @@ enum class aclplatformLocalMemType { | |||
| 81 | L2 = 4, | 96 | L2 = 4, |
| 82 | UB = 5, | 97 | UB = 5, |
| 83 | HBM = 6 | 98 | HBM = 6 |
| 84 | -}; | 99 | +} aclplatformLocalMemType; |
| 85 | 100 | ||
| 86 | 101 | ||
| 87 | } | 102 | } |
| @@ -99,11 +99,10 @@ const std::vector<std::pair<std::string, std::string>> kDevInfoTable = { | |||
| 99 | /* 10: ACL_PLATFORM_L0_B_SIZE */ {"AICoreSpec", "l0_b_size"}, | 99 | /* 10: ACL_PLATFORM_L0_B_SIZE */ {"AICoreSpec", "l0_b_size"}, |
| 100 | /* 11: ACL_PLATFORM_L0_C_SIZE */ {"AICoreSpec", "l0_c_size"}, | 100 | /* 11: ACL_PLATFORM_L0_C_SIZE */ {"AICoreSpec", "l0_c_size"}, |
| 101 | /* 12: ACL_PLATFORM_L1_SIZE */ {"AICoreSpec", "l1_size"}, | 101 | /* 12: ACL_PLATFORM_L1_SIZE */ {"AICoreSpec", "l1_size"}, |
| 102 | - /* 13: ACL_PLATFORM_SHORT_SOC_VERSION */ {"version", "Short_SoC_version"}, | 102 | + /* 13: ACL_PLATFORM_SOC_VERSION */ {"version", "SoC_version"}, |
| 103 | - /* 14: ACL_PLATFORM_SOC_VERSION */ {"version", "SoC_version"}, | 103 | + /* 14: ACL_PLATFORM_AIC_VERSION */ {"version", "AIC_version"}, |
| 104 | - /* 15: ACL_PLATFORM_AIC_VERSION */ {"version", "AIC_version"}, | 104 | + /* 15: ACL_PLATFORM_NPU_ARCH */ {"version", "NpuArch"}, |
| 105 | - /* 16: ACL_PLATFORM_NPU_ARCH */ {"version", "NpuArch"}, | 105 | + /* 16: ACL_PLATFORM_MEMORY_TYPE */ {"SoCInfo", "memory_type"}, |
| 106 | - /* 17: ACL_PLATFORM_MEMORY_TYPE */ {"SoCInfo", "memory_type"}, | ||
| 107 | }; | 106 | }; |
| 108 | } // namespace | 107 | } // namespace |
| 109 | 108 | ||
| @@ -169,14 +169,6 @@ TEST_F(PlatformManagerAclUTest, acl_platform_GetDeviceInfo_L1_SIZE) | |||
| 169 | EXPECT_STREQ(buf, "524288"); | 169 | EXPECT_STREQ(buf, "524288"); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | -TEST_F(PlatformManagerAclUTest, acl_platform_GetDeviceInfo_SHORT_SOC_VERSION) | ||
| 173 | -{ | ||
| 174 | - char buf[64] = {0}; | ||
| 175 | - aclError ret = aclplatformGetDeviceInfo(ACL_PLATFORM_SHORT_SOC_VERSION, buf, sizeof(buf)); | ||
| 176 | - EXPECT_EQ(ret, ACL_SUCCESS); | ||
| 177 | - EXPECT_STREQ(buf, "Ascend910B"); | ||
| 178 | -} | ||
| 179 | - | ||
| 180 | TEST_F(PlatformManagerAclUTest, acl_platform_GetDeviceInfo_SOC_VERSION) | 172 | TEST_F(PlatformManagerAclUTest, acl_platform_GetDeviceInfo_SOC_VERSION) |
| 181 | { | 173 | { |
| 182 | char buf[64] = {0}; | 174 | char buf[64] = {0}; |
这个已经开出去了，直接修改会不会有兼容性问题？