Add ARM Lumex-C2-Ultra uarch detection, cache decode, and core scores (#463) Add cpuinfo_uarch_lumex_c2_ultra (0x00300604) for ARM implementer 0x41 CPU part 0xD96 (Arm C2-Ultra), format it as "Lumex-C2-Ultra" in cpu-info (keeping the lumex_ prefix for consistency with cpuinfo_uarch_lumex_c1_*), and score the Lumex C1 and C2 tiers in midr_score_core() so prime and mid-tier clusters stay grouped even with non-monotonic cluster frequencies or offline cores. References (public): - Arm C2-Ultra Core Technical Reference Manual (109736): https://developer.arm.com/documentation/109736/latest - Arm C2-Ultra product page: https://developer.arm.com/Processors/C2-Ultra - Upstream LLVM Host.cpp mapping 0x41 / 0xD96 to c2-ultra: https://github.com/llvm/llvm-project/commit/b4badb65df4ea15fc6ecabd8f9366a96df11dcb5 Also add cpuinfo_arm_decode_cache() support for cpuinfo_uarch_lumex_c2_ultra using the public Arm C2-Ultra TRM 109736 cache defaults (64 KB 4-way L1I, 128 KB 4-way L1D, 2 MB 8-way private L2 minimum configuration, 64-byte lines) with unit test coverage in test/arm-cache.cc, and add the exynos-9975 mode to test/mock/arm-linux-topology.cc using synthetic non-monotonic frequencies to cover the midr_score_core() ordering.
diff --git a/CMakeLists.txt b/CMakeLists.txt index c1f64ca..0fc210d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -761,7 +761,7 @@ ADD_EXECUTABLE(arm-linux-topology-test test/mock/arm-linux-topology.cc) CPUINFO_TARGET_ENABLE_CXX11(arm-linux-topology-test) TARGET_LINK_LIBRARIES(arm-linux-topology-test PRIVATE cpuinfo_mock gtest) - FOREACH(topology pixel-8 pixel-9 pixel-10 galaxy-s23 missing-midr frequency-groups unknown-parts mixed-caches) + FOREACH(topology pixel-8 pixel-9 pixel-10 galaxy-s23 exynos-9975 missing-midr frequency-groups unknown-parts mixed-caches) ADD_TEST(NAME arm-linux-topology-${topology}-test COMMAND arm-linux-topology-test ${topology}) ENDFOREACH()
diff --git a/include/cpuinfo.h b/include/cpuinfo.h index a441208..3545772 100644 --- a/include/cpuinfo.h +++ b/include/cpuinfo.h
@@ -562,6 +562,12 @@ cpuinfo_uarch_lumex_c1_pro = 0x00300602, /** ARM Lumex-C1-Nano. */ cpuinfo_uarch_lumex_c1_nano = 0x00300603, + /** + * ARM C2-Ultra (MIDR part 0xD96; Arm C2-Ultra Core TRM 109736, LLVM + * Host.cpp). Named with the lumex_ prefix for consistency with + * cpuinfo_uarch_lumex_c1_*. + */ + cpuinfo_uarch_lumex_c2_ultra = 0x00300604, /** Qualcomm Scorpion. */ cpuinfo_uarch_scorpion = 0x00400100,
diff --git a/src/arm/cache.c b/src/arm/cache.c index 61df632..52f5e41 100644 --- a/src/arm/cache.c +++ b/src/arm/cache.c
@@ -1378,6 +1378,32 @@ }; break; } + case cpuinfo_uarch_lumex_c2_ultra: { + /* + * Arm C2-Ultra Core Technical Reference Manual + * (https://developer.arm.com/documentation/109736/latest): + * - L1 instruction cache: 64 KB, 4-way set associative, 64-byte line. + * - L1 data cache: 128 KB, 4-way set associative, 64-byte line. + * - Private unified L2 cache: configurable 2 MB (8-way) or 3 MB + * (12-way), 64-byte line. Default to the 2 MB minimum configuration. + */ + *l1i = (struct cpuinfo_cache){ + .size = 64 * 1024, + .associativity = 4, + .line_size = 64, + }; + *l1d = (struct cpuinfo_cache){ + .size = 128 * 1024, + .associativity = 4, + .line_size = 64, + }; + *l2 = (struct cpuinfo_cache){ + .size = 2 * 1024 * 1024, + .associativity = 8, + .line_size = 64, + }; + break; + } #if CPUINFO_ARCH_ARM && !defined(__ARM_ARCH_8A__) case cpuinfo_uarch_scorpion: /*
diff --git a/src/arm/midr.h b/src/arm/midr.h index cf7cf41..af0f3e1 100644 --- a/src/arm/midr.h +++ b/src/arm/midr.h
@@ -181,6 +181,8 @@ case UINT32_C(0x4100D440): /* Cortex-X1 */ case UINT32_C(0x4100D480): /* Cortex-X2 */ case UINT32_C(0x4100D4E0): /* Cortex-X3 */ + case UINT32_C(0x4100D8C0): /* Lumex-C1-Ultra */ + case UINT32_C(0x4100D960): /* Lumex-C2-Ultra */ /* These cores are in big role w.r.t * Cortex-A75/-A76/-A77/-A78/-A710/-A715 */ @@ -195,6 +197,7 @@ case UINT32_C(0x4100D4B0): /* Cortex-A78C */ case UINT32_C(0x4100D470): /* Cortex-A710 */ case UINT32_C(0x4100D4D0): /* Cortex-A715 */ + case UINT32_C(0x4100D900): /* Lumex-C1-Premium */ case UINT32_C(0x4800D400): /* Cortex-A76 (HiSilicon) */ case UINT32_C(0x4E000030): /* Denver 2 */ case UINT32_C(0x51002050): /* Kryo Gold */ @@ -212,6 +215,7 @@ /* These cores are always in big role */ return 5; case UINT32_C(0x4100D070): /* Cortex-A57 */ + case UINT32_C(0x4100D8B0): /* Lumex-C1-Pro */ /* Cortex-A57 can be in LITTLE role w.r.t. Denver 2, or * in big role w.r.t. Cortex-A53 */ return 4; @@ -223,6 +227,7 @@ case UINT32_C(0x4100D460): /* Cortex-A510 */ #if CPUINFO_ARCH_ARM64 case UINT32_C(0x4100D800): /* Cortex-A520 */ + case UINT32_C(0x4100D8A0): /* Lumex-C1-Nano */ #endif /* CPUINFO_ARCH_ARM64 */ /* Cortex-A53 is usually in LITTLE role, but can be in * big role w.r.t. Cortex-A35 */
diff --git a/src/arm/uarch.c b/src/arm/uarch.c index 1990240..8f359fb 100644 --- a/src/arm/uarch.c +++ b/src/arm/uarch.c
@@ -150,21 +150,24 @@ case 0xD87: /* Cortex-A725 */ *uarch = cpuinfo_uarch_cortex_a725; break; - case 0xD8A: + case 0xD8A: /* Lumex-C1-Nano */ *uarch = cpuinfo_uarch_lumex_c1_nano; break; - case 0xD8B: + case 0xD8B: /* Lumex-C1-Pro */ *uarch = cpuinfo_uarch_lumex_c1_pro; break; - case 0xD8C: + case 0xD8C: /* Lumex-C1-Ultra */ *uarch = cpuinfo_uarch_lumex_c1_ultra; break; case 0xD8F: /* Cortex-A320 */ *uarch = cpuinfo_uarch_cortex_a320; break; - case 0xD90: + case 0xD90: /* Lumex-C1-Premium */ *uarch = cpuinfo_uarch_lumex_c1_premium; break; + case 0xD96: /* Arm C2-Ultra (TRM 109736, LLVM Host.cpp) */ + *uarch = cpuinfo_uarch_lumex_c2_ultra; + break; default: switch (midr_get_part(midr) >> 8) { #if CPUINFO_ARCH_ARM
diff --git a/test/arm-cache.cc b/test/arm-cache.cc index 0373b58..0d61147 100644 --- a/test/arm-cache.cc +++ b/test/arm-cache.cc
@@ -2339,3 +2339,32 @@ EXPECT_EQ(0, l3.size); } } + +TEST(ARM, lumex_c2_ultra) { + const struct cpuinfo_arm_chipset chipset = { + .vendor = cpuinfo_arm_chipset_vendor_unknown, + .series = cpuinfo_arm_chipset_series_unknown, + }; + + struct cpuinfo_cache l1i = {0}; + struct cpuinfo_cache l1d = {0}; + struct cpuinfo_cache l2 = {0}; + struct cpuinfo_cache l3 = {0}; + + cpuinfo_arm_decode_cache( + cpuinfo_uarch_lumex_c2_ultra, 1, UINT32_C(0x410FD961), &chipset, 0, 8, &l1i, &l1d, &l2, &l3); + + EXPECT_EQ(64 * 1024, l1i.size); + EXPECT_EQ(4, l1i.associativity); + EXPECT_EQ(256, l1i.sets); + EXPECT_EQ(64, l1i.line_size); + EXPECT_EQ(128 * 1024, l1d.size); + EXPECT_EQ(4, l1d.associativity); + EXPECT_EQ(512, l1d.sets); + EXPECT_EQ(64, l1d.line_size); + EXPECT_EQ(2 * 1024 * 1024, l2.size); + EXPECT_EQ(8, l2.associativity); + EXPECT_EQ(4096, l2.sets); + EXPECT_EQ(64, l2.line_size); + EXPECT_EQ(0, l3.size); +}
diff --git a/test/mock/arm-linux-topology.cc b/test/mock/arm-linux-topology.cc index 0ee94b2..9fd3f64 100644 --- a/test/mock/arm-linux-topology.cc +++ b/test/mock/arm-linux-topology.cc
@@ -184,6 +184,25 @@ expected_linux_ids = {7, 3, 4, 5, 6, 0, 1, 2}; expected_cluster_sizes = {1, 2, 2, 3}; expected_uarchs = 4; + } else if (mode == "exynos-9975") { + // Synthetic non-monotonic frequencies verify midr_score_core() keeps + // both Lumex-C2-Ultra clusters grouped ahead of Lumex-C1-Pro clusters + // even when one C2-Ultra core has a lower max frequency than a C1-Pro + // cluster. + input = { + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 2000000, 0}, + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 2000000, 0}, + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 2000000, 0}, + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 2000000, 0}, + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 3000000, 1}, + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 3000000, 1}, + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 3000000, 1}, + {0xD8B, cpuinfo_uarch_lumex_c1_pro, 3000000, 1}, + {0xD96, cpuinfo_uarch_lumex_c2_ultra, 2500000, 2}, + {0xD96, cpuinfo_uarch_lumex_c2_ultra, 3500000, 3}}; + expected_linux_ids = {9, 8, 4, 5, 6, 7, 0, 1, 2, 3}; + expected_cluster_sizes = {1, 1, 4, 4}; + expected_uarchs = 2; } else if (mode == "frequency-groups") { input = { {0xD05, cpuinfo_uarch_cortex_a55r0, 1000000, 0},
diff --git a/tools/cpu-info.c b/tools/cpu-info.c index cd45446..d697ef3 100644 --- a/tools/cpu-info.c +++ b/tools/cpu-info.c
@@ -257,6 +257,8 @@ return "Lumex-C1-Pro"; case cpuinfo_uarch_lumex_c1_nano: return "Lumex-C1-Nano"; + case cpuinfo_uarch_lumex_c2_ultra: + return "Lumex-C2-Ultra"; case cpuinfo_uarch_neoverse_n1: return "Neoverse N1"; case cpuinfo_uarch_neoverse_e1: