From f10f5859037a8352a4575844ee5b4b836775c732 Mon Sep 17 00:00:00 2001 From: stsdc <6031763+stsdc@users.noreply.github.com> Date: Fri, 23 Jan 2026 16:51:37 +0100 Subject: [PATCH 1/2] Parse ARM cpu names --- src/Resources/ARMPartDecoder.vala | 310 ++++++++++++++++++++++++++++++ src/Resources/CPU.vala | 40 +++- src/meson.build | 1 + 3 files changed, 343 insertions(+), 8 deletions(-) create mode 100644 src/Resources/ARMPartDecoder.vala diff --git a/src/Resources/ARMPartDecoder.vala b/src/Resources/ARMPartDecoder.vala new file mode 100644 index 000000000..b9be514a0 --- /dev/null +++ b/src/Resources/ARMPartDecoder.vala @@ -0,0 +1,310 @@ +/* +* Copyright (c) 2026 elementary LLC. (https://elementary.io) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License as published by the Free Software Foundation; either +* version 3 of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301 USA +*/ + +public class Monitor.ARMPartDecoder { + // Vala port of https://github.com/util-linux/util-linux/blob/2da5c904e18fdcffd2b252d641e6f76374c7b406/sys-utils/lscpu-arm.c + struct ARMPart { + int id; + string name; + } + + struct ARMImplementer { + int id; + ARMPart[] parts; + string name; + } + + const ARMPart ARM_PARTS[] = { + { 0x810, "ARM810" }, + { 0x920, "ARM920" }, + { 0x922, "ARM922" }, + { 0x926, "ARM926" }, + { 0x940, "ARM940" }, + { 0x946, "ARM946" }, + { 0x966, "ARM966" }, + { 0xa20, "ARM1020" }, + { 0xa22, "ARM1022" }, + { 0xa26, "ARM1026" }, + { 0xb02, "ARM11 MPCore" }, + { 0xb36, "ARM1136" }, + { 0xb56, "ARM1156" }, + { 0xb76, "ARM1176" }, + { 0xc05, "Cortex-A5" }, + { 0xc07, "Cortex-A7" }, + { 0xc08, "Cortex-A8" }, + { 0xc09, "Cortex-A9" }, + { 0xc0d, "Cortex-A17" }, /* Originally A12 */ + { 0xc0f, "Cortex-A15" }, + { 0xc0e, "Cortex-A17" }, + { 0xc14, "Cortex-R4" }, + { 0xc15, "Cortex-R5" }, + { 0xc17, "Cortex-R7" }, + { 0xc18, "Cortex-R8" }, + { 0xc20, "Cortex-M0" }, + { 0xc21, "Cortex-M1" }, + { 0xc23, "Cortex-M3" }, + { 0xc24, "Cortex-M4" }, + { 0xc27, "Cortex-M7" }, + { 0xc60, "Cortex-M0+" }, + { 0xd01, "Cortex-A32" }, + { 0xd02, "Cortex-A34" }, + { 0xd03, "Cortex-A53" }, + { 0xd04, "Cortex-A35" }, + { 0xd05, "Cortex-A55" }, + { 0xd06, "Cortex-A65" }, + { 0xd07, "Cortex-A57" }, + { 0xd08, "Cortex-A72" }, + { 0xd09, "Cortex-A73" }, + { 0xd0a, "Cortex-A75" }, + { 0xd0b, "Cortex-A76" }, + { 0xd0c, "Neoverse-N1" }, + { 0xd0d, "Cortex-A77" }, + { 0xd0e, "Cortex-A76AE" }, + { 0xd13, "Cortex-R52" }, + { 0xd15, "Cortex-R82" }, + { 0xd16, "Cortex-R52+" }, + { 0xd20, "Cortex-M23" }, + { 0xd21, "Cortex-M33" }, + { 0xd22, "Cortex-M55" }, + { 0xd23, "Cortex-M85" }, + { 0xd40, "Neoverse-V1" }, + { 0xd41, "Cortex-A78" }, + { 0xd42, "Cortex-A78AE" }, + { 0xd43, "Cortex-A65AE" }, + { 0xd44, "Cortex-X1" }, + { 0xd46, "Cortex-A510" }, + { 0xd47, "Cortex-A710" }, + { 0xd48, "Cortex-X2" }, + { 0xd49, "Neoverse-N2" }, + { 0xd4a, "Neoverse-E1" }, + { 0xd4b, "Cortex-A78C" }, + { 0xd4c, "Cortex-X1C" }, + { 0xd4d, "Cortex-A715" }, + { 0xd4e, "Cortex-X3" }, + { 0xd4f, "Neoverse-V2" }, + { 0xd80, "Cortex-A520" }, + { 0xd81, "Cortex-A720" }, + { 0xd82, "Cortex-X4" }, + }; + + const ARMPart BROADCOM_PARTS[] = { + { 0x0f, "Brahma-B15" }, + { 0x100, "Brahma-B53" }, + { 0x516, "ThunderX2" }, + }; + + const ARMPart DEC_PARTS[] = { + { 0xa10, "SA110" }, + { 0xa11, "SA1100" }, + }; + + const ARMPart CAVIUM_PARTS[] = { + { 0x0a0, "ThunderX" }, + { 0x0a1, "ThunderX-88XX" }, + { 0x0a2, "ThunderX-81XX" }, + { 0x0a3, "ThunderX-83XX" }, + { 0x0af, "ThunderX2-99xx" }, + { 0x0b0, "OcteonTX2" }, + { 0x0b1, "OcteonTX2-98XX" }, + { 0x0b2, "OcteonTX2-96XX" }, + { 0x0b3, "OcteonTX2-95XX" }, + { 0x0b4, "OcteonTX2-95XXN" }, + { 0x0b5, "OcteonTX2-95XXMM" }, + { 0x0b6, "OcteonTX2-95XXO" }, + { 0x0b8, "ThunderX3-T110" }, + }; + + const ARMPart APM_PARTS[] = { + { 0x000, "X-Gene" }, + }; + + const ARMPart QUALCOMM_PARTS[] = { + { 0x00f, "Scorpion" }, + { 0x02d, "Scorpion" }, + { 0x04d, "Krait" }, + { 0x06f, "Krait" }, + { 0x201, "Kryo" }, + { 0x205, "Kryo" }, + { 0x211, "Kryo" }, + { 0x800, "Falkor-V1/Kryo" }, + { 0x801, "Kryo-V2" }, + { 0x802, "Kryo-3XX-Gold" }, + { 0x803, "Kryo-3XX-Silver" }, + { 0x804, "Kryo-4XX-Gold" }, + { 0x805, "Kryo-4XX-Silver" }, + { 0xc00, "Falkor" }, + { 0xc01, "Saphira" }, + }; + + const ARMPart SAMSUNG_PARTS[] = { + { 0x001, "exynos-m1" }, + { 0x002, "exynos-m3" }, + { 0x003, "exynos-m4" }, + { 0x004, "exynos-m5" }, + }; + + const ARMPart NVIDIA_PARTS[] = { + { 0x000, "Denver" }, + { 0x003, "Denver 2" }, + { 0x004, "Carmel" }, + }; + + const ARMPart MARVELL_PARTS[] = { + { 0x131, "Feroceon-88FR131" }, + { 0x581, "PJ4/PJ4b" }, + { 0x584, "PJ4B-MP" }, + }; + + const ARMPart APPLE_PARTS[] = { + { 0x000, "Swift" }, + { 0x001, "Cyclone" }, + { 0x002, "Typhoon" }, + { 0x003, "Typhoon/Capri" }, + { 0x004, "Twister" }, + { 0x005, "Twister/Elba/Malta" }, + { 0x006, "Hurricane" }, + { 0x007, "Hurricane/Myst" }, + { 0x008, "Monsoon" }, + { 0x009, "Mistral" }, + { 0x00b, "Vortex" }, + { 0x00c, "Tempest" }, + { 0x00f, "Tempest-M9" }, + { 0x010, "Vortex/Aruba" }, + { 0x011, "Tempest/Aruba" }, + { 0x012, "Lightning" }, + { 0x013, "Thunder" }, + { 0x020, "Icestorm-A14" }, + { 0x021, "Firestorm-A14" }, + { 0x022, "Icestorm-M1" }, + { 0x023, "Firestorm-M1" }, + { 0x024, "Icestorm-M1-Pro" }, + { 0x025, "Firestorm-M1-Pro" }, + { 0x026, "Thunder-M10" }, + { 0x028, "Icestorm-M1-Max" }, + { 0x029, "Firestorm-M1-Max" }, + { 0x030, "Blizzard-A15" }, + { 0x031, "Avalanche-A15" }, + { 0x032, "Blizzard-M2" }, + { 0x033, "Avalanche-M2" }, + { 0x034, "Blizzard-M2-Pro" }, + { 0x035, "Avalanche-M2-Pro" }, + { 0x036, "Sawtooth-A16" }, + { 0x037, "Everest-A16" }, + { 0x038, "Blizzard-M2-Max" }, + { 0x039, "Avalanche-M2-Max" }, + }; + + const ARMPart FARADAY_PARTS[] = { + { 0x526, "FA526" }, + { 0x626, "FA626" }, + }; + + const ARMPart INTEL_PARTS[] = { + { 0x200, "i80200" }, + { 0x210, "PXA250A" }, + { 0x212, "PXA210A" }, + { 0x242, "i80321-400" }, + { 0x243, "i80321-600" }, + { 0x290, "PXA250B/PXA26x" }, + { 0x292, "PXA210B" }, + { 0x2c2, "i80321-400-B0" }, + { 0x2c3, "i80321-600-B0" }, + { 0x2d0, "PXA250C/PXA255/PXA26x" }, + { 0x2d2, "PXA210C" }, + { 0x411, "PXA27x" }, + { 0x41c, "IPX425-533" }, + { 0x41d, "IPX425-400" }, + { 0x41f, "IPX425-266" }, + { 0x682, "PXA32x" }, + { 0x683, "PXA930/PXA935" }, + { 0x688, "PXA30x" }, + { 0x689, "PXA31x" }, + { 0xb11, "SA1110" }, + { 0xc12, "IPX1200" }, + }; + + const ARMPart FUJITSU_PARTS[] = { + { 0x001, "A64FX" }, + }; + + const ARMPart HISILICON_PARTS[] = { + { 0xd01, "Kunpeng-920" }, /* aka tsv110 */ + { 0xd40, "Cortex-A76" }, /* HiSilicon uses this ID though advertises A76 */ + }; + + const ARMPart AMPERE_PARTS[] = { + { 0xac3, "Ampere-1" }, + { 0xac4, "Ampere-1a" }, + }; + + const ARMPart PHYTIUM_PARTS[] = { + { 0x303, "FTC310" }, + { 0x660, "FTC660" }, + { 0x661, "FTC661" }, + { 0x662, "FTC662" }, + { 0x663, "FTC663" }, + { 0x664, "FTC664" }, + { 0x862, "FTC862" }, + }; + + const ARMImplementer ARM_IMPLEMENTERS[] = { + { 0x41, ARM_PARTS, "ARM" }, + { 0x42, BROADCOM_PARTS, "Broadcom" }, + { 0x43, CAVIUM_PARTS, "Cavium" }, + { 0x44, DEC_PARTS, "DEC" }, + { 0x46, FUJITSU_PARTS, "FUJITSU" }, + { 0x48, HISILICON_PARTS, "HiSilicon" }, + { 0x4e, NVIDIA_PARTS, "NVIDIA" }, + { 0x50, APM_PARTS, "APM" }, + { 0x51, QUALCOMM_PARTS, "Qualcomm" }, + { 0x53, SAMSUNG_PARTS, "Samsung" }, + { 0x56, MARVELL_PARTS, "Marvell" }, + { 0x61, APPLE_PARTS, "Apple" }, + { 0x66, FARADAY_PARTS, "Faraday" }, + { 0x69, INTEL_PARTS, "Intel" }, + { 0x70, PHYTIUM_PARTS, "Phytium" }, + { 0xc0, AMPERE_PARTS, "Ampere" }, + }; + + public static string? decode_arm_model (uint? cpu_implementer, uint? cpu_part) { + + string? result = null; + + if (cpu_implementer == null || cpu_part == null) { + return result; + } + + if (cpu_implementer == 0 || cpu_part == 0) { + return result; + } + + foreach (var implementer in ARM_IMPLEMENTERS) { + if (cpu_implementer == implementer.id) { + result = implementer.name + " "; + foreach (var part in implementer.parts) { + if (cpu_part == part.id) { + result += part.name; + } + } + } + } + + return result; + } +} \ No newline at end of file diff --git a/src/Resources/CPU.vala b/src/Resources/CPU.vala index 4e411052a..578ceb63f 100644 --- a/src/Resources/CPU.vala +++ b/src/Resources/CPU.vala @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io) + * SPDX-FileCopyrightText: 2026 elementary, Inc. (https://elementary.io) */ public class Monitor.CPU : Object { @@ -8,6 +8,13 @@ public class Monitor.CPU : Object { private float last_total; private float load; + // ARM specific fields + public uint ? implementer; + public uint ? architecture; + public uint ? variant; + public uint ? part; + public uint ? revision; + public string ? model_name; public string ? model; public string ? family; @@ -68,9 +75,11 @@ public class Monitor.CPU : Object { last_used = 0; last_total = 0; + parse_cpuinfo (); + model_name = get_cpu_info (); - parse_cpuinfo (); + debug ("CPU name: %s", model_name); debug ("Number of cores: %d", (int) get_num_processors ()); for (int i = 0; i < (int) get_num_processors (); i++) { @@ -192,14 +201,21 @@ public class Monitor.CPU : Object { family = values["cpu family"]; microcode = values["microcode"]; cache_size = values["cache size"]; - parse_flags (values["flags"], features, DBDIR + "/cpu_features.csv"); - bogomips = values["bogomips"]; - parse_flags (values["bugs"], bugs, DBDIR + "/cpu_bugs.csv"); + parse_flags (values["flags"] ?? values["Features"], features, DBDIR + "/cpu_features.csv"); + bogomips = values["bogomips"] ?? values["BogoMIPS"]; + parse_flags (values["bugs"] ?? "", bugs, DBDIR + "/cpu_bugs.csv"); address_sizes = values["address sizes"]; - // values.foreach ((key, value) => { - // debug("%s: %s\n", key, value); - // }); + // long.parse supports 0x format hex strings + implementer = (int)long.parse (values["CPU implementer"]); + architecture = (int)long.parse (values["CPU architecture"]); + variant = (int)long.parse (values["CPU variant"]); + part = (int)long.parse (values["CPU part"]); + revision = (int)long.parse (values["CPU revision"]); + + values.foreach ((key, value) => { + debug("%s: %s\n", key, value); + }); } private void parse_flags (string _flags, Gee.HashMap flags, string path) { @@ -264,6 +280,14 @@ public class Monitor.CPU : Object { } } + if (model == null) { + debug ("Try ARM decoding for CPU %d", i); + model = ARMPartDecoder.decode_arm_model (implementer, part); + if (model == null) { + continue; + } + } + string ? core_count = values.lookup ("cpu cores"); if (core_count != null) { counts.@set (model, int.parse (core_count)); diff --git a/src/meson.build b/src/meson.build index 41ff3c6cb..b6464f8d7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -52,6 +52,7 @@ source_app_files = [ 'Resources/CPU.vala', 'Resources/CPUCache.vala', 'Resources/Core.vala', + 'Resources/ARMPartDecoder.vala', 'Resources/Memory.vala', 'Resources/Swap.vala', 'Resources/Network.vala', From cf3aaa16bf8af2ee7472c03e48dbab304bcbf75f Mon Sep 17 00:00:00 2001 From: stsdc <6031763+stsdc@users.noreply.github.com> Date: Fri, 23 Jan 2026 17:51:43 +0100 Subject: [PATCH 2/2] Fix linting; comment out debug --- src/Resources/ARMPartDecoder.vala | 2 +- src/Resources/CPU.vala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Resources/ARMPartDecoder.vala b/src/Resources/ARMPartDecoder.vala index b9be514a0..87fa299bb 100644 --- a/src/Resources/ARMPartDecoder.vala +++ b/src/Resources/ARMPartDecoder.vala @@ -307,4 +307,4 @@ public class Monitor.ARMPartDecoder { return result; } -} \ No newline at end of file +} diff --git a/src/Resources/CPU.vala b/src/Resources/CPU.vala index 578ceb63f..7b3aae88d 100644 --- a/src/Resources/CPU.vala +++ b/src/Resources/CPU.vala @@ -213,9 +213,9 @@ public class Monitor.CPU : Object { part = (int)long.parse (values["CPU part"]); revision = (int)long.parse (values["CPU revision"]); - values.foreach ((key, value) => { - debug("%s: %s\n", key, value); - }); + // values.foreach ((key, value) => { + // debug("%s: %s\n", key, value); + // }); } private void parse_flags (string _flags, Gee.HashMap flags, string path) {