mirror of
https://github.com/Dr-Noob/cpufetch.git
synced 2026-03-25 07:50:40 +01:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae6c7f75ad | ||
|
|
f84160f97e | ||
|
|
e7ec4d492e | ||
|
|
dfa2b773d1 | ||
|
|
59efbf4e08 | ||
|
|
29768e841d | ||
|
|
cc16bc56ef | ||
|
|
1504c5d0ef | ||
|
|
08919916dc | ||
|
|
4a8a7567f0 | ||
|
|
c01f60fa6c |
@@ -237,7 +237,7 @@ struct cpuInfo* get_cpu_info_linux(struct cpuInfo* cpu) {
|
||||
cpu->num_cpus = sockets;
|
||||
cpu->hv = emalloc(sizeof(struct hypervisor));
|
||||
cpu->hv->present = false;
|
||||
cpu->soc = get_soc();
|
||||
cpu->soc = get_soc(cpu);
|
||||
cpu->peak_performance = get_peak_performance(cpu);
|
||||
|
||||
return cpu;
|
||||
@@ -374,19 +374,19 @@ struct cpuInfo* get_cpu_info_mach(struct cpuInfo* cpu) {
|
||||
// the CPU is an Apple SoC
|
||||
if(cpu_family == CPUFAMILY_ARM_FIRESTORM_ICESTORM) {
|
||||
fill_cpu_info_firestorm_icestorm(cpu, pcores, ecores);
|
||||
cpu->soc = get_soc();
|
||||
cpu->soc = get_soc(cpu);
|
||||
cpu->peak_performance = get_peak_performance(cpu);
|
||||
}
|
||||
else if(cpu_family == CPUFAMILY_ARM_AVALANCHE_BLIZZARD) {
|
||||
fill_cpu_info_avalanche_blizzard(cpu, pcores, ecores);
|
||||
cpu->soc = get_soc();
|
||||
cpu->soc = get_soc(cpu);
|
||||
cpu->peak_performance = get_peak_performance(cpu);
|
||||
}
|
||||
else if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH ||
|
||||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO ||
|
||||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_MAX) {
|
||||
fill_cpu_info_everest_sawtooth(cpu, pcores, ecores);
|
||||
cpu->soc = get_soc();
|
||||
cpu->soc = get_soc(cpu);
|
||||
cpu->peak_performance = get_peak_performance(cpu);
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#include "soc.h"
|
||||
#include "socs.h"
|
||||
#include "udev.h"
|
||||
#include "uarch.h"
|
||||
#include "../common/global.h"
|
||||
|
||||
#if defined(__APPLE__) || defined(__MACH__)
|
||||
@@ -801,6 +802,38 @@ struct system_on_chip* guess_soc_from_nvmem(struct system_on_chip* soc) {
|
||||
return soc;
|
||||
}
|
||||
|
||||
struct system_on_chip* guess_soc_from_uarch(struct system_on_chip* soc, struct cpuInfo* cpu) {
|
||||
// Currently we only support CPUs with only one uarch (in other words, one socket)
|
||||
struct uarch* arch = cpu->arch;
|
||||
if (arch == NULL) {
|
||||
printWarn("guess_soc_from_uarch: uarch is NULL");
|
||||
return soc;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
MICROARCH u;
|
||||
struct system_on_chip soc;
|
||||
} uarchToSoC;
|
||||
|
||||
uarchToSoC socFromUarch[] = {
|
||||
{UARCH_TAISHAN_V110, {SOC_KUNPENG_920, SOC_VENDOR_KUNPENG, 7, "920", NULL} },
|
||||
{UARCH_TAISHAN_V200, {SOC_KUNPENG_930, SOC_VENDOR_KUNPENG, 7, "930", NULL} }, // manufacturing process is not well-known
|
||||
{UARCH_UNKNOWN, {UNKNOWN, SOC_VENDOR_UNKNOWN, -1, "", NULL} }
|
||||
};
|
||||
|
||||
int index = 0;
|
||||
while(socFromUarch[index].u != UARCH_UNKNOWN) {
|
||||
if(socFromUarch[index].u == get_uarch(arch)) {
|
||||
fill_soc(soc, socFromUarch[index].soc.soc_name, socFromUarch[index].soc.soc_model, socFromUarch[index].soc.process);
|
||||
return soc;
|
||||
}
|
||||
index++;
|
||||
}
|
||||
|
||||
printWarn("guess_soc_from_uarch: No uarch matched the list");
|
||||
return soc;
|
||||
}
|
||||
|
||||
int hex2int(char c) {
|
||||
if (c >= '0' && c <= '9')
|
||||
return c - '0';
|
||||
@@ -935,7 +968,7 @@ struct system_on_chip* guess_soc_apple(struct system_on_chip* soc) {
|
||||
}
|
||||
#endif
|
||||
|
||||
struct system_on_chip* get_soc(void) {
|
||||
struct system_on_chip* get_soc(struct cpuInfo* cpu) {
|
||||
struct system_on_chip* soc = emalloc(sizeof(struct system_on_chip));
|
||||
soc->raw_name = NULL;
|
||||
soc->soc_vendor = SOC_VENDOR_UNKNOWN;
|
||||
@@ -975,6 +1008,10 @@ struct system_on_chip* get_soc(void) {
|
||||
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
|
||||
soc = guess_soc_from_nvmem(soc);
|
||||
}
|
||||
// If everything else failed, try infering it from the microarchitecture
|
||||
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
|
||||
soc = guess_soc_from_uarch(soc, cpu);
|
||||
}
|
||||
}
|
||||
#elif defined __APPLE__ || __MACH__
|
||||
soc = guess_soc_apple(soc);
|
||||
|
||||
@@ -5,6 +5,6 @@
|
||||
#include "../common/soc.h"
|
||||
#include <stdint.h>
|
||||
|
||||
struct system_on_chip* get_soc(void);
|
||||
struct system_on_chip* get_soc(struct cpuInfo* cpu);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -29,6 +29,9 @@ enum {
|
||||
SOC_HISILICON_3670,
|
||||
SOC_HISILICON_3680,
|
||||
SOC_HISILICON_3690,
|
||||
// Kunpeng //
|
||||
SOC_KUNPENG_920,
|
||||
SOC_KUNPENG_930,
|
||||
// Exynos //
|
||||
SOC_EXYNOS_3475,
|
||||
SOC_EXYNOS_4210,
|
||||
@@ -367,6 +370,7 @@ enum {
|
||||
inline static VENDOR get_soc_vendor_from_soc(SOC soc) {
|
||||
if(soc >= SOC_BCM_2835 && soc <= SOC_BCM_2712) return SOC_VENDOR_BROADCOM;
|
||||
else if(soc >= SOC_HISILICON_3620 && soc <= SOC_HISILICON_3690) return SOC_VENDOR_KIRIN;
|
||||
else if(soc >= SOC_KUNPENG_920 && soc <= SOC_KUNPENG_930) return SOC_VENDOR_KUNPENG;
|
||||
else if(soc >= SOC_EXYNOS_3475 && soc <= SOC_EXYNOS_880) return SOC_VENDOR_EXYNOS;
|
||||
else if(soc >= SOC_MTK_MT6893 && soc <= SOC_MTK_MT8783) return SOC_VENDOR_MEDIATEK;
|
||||
else if(soc >= SOC_SNAPD_QSD8650 && soc <= SOC_SNAPD_SM8450) return SOC_VENDOR_SNAPDRAGON;
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
// Data not available
|
||||
#define NA -1
|
||||
|
||||
typedef uint32_t MICROARCH;
|
||||
typedef uint32_t ISA;
|
||||
|
||||
struct uarch {
|
||||
@@ -37,89 +36,6 @@ enum {
|
||||
ISA_ARMv9_A
|
||||
};
|
||||
|
||||
enum {
|
||||
UARCH_UNKNOWN,
|
||||
// ARM
|
||||
UARCH_ARM7,
|
||||
UARCH_ARM9,
|
||||
UARCH_ARM1136,
|
||||
UARCH_ARM1156,
|
||||
UARCH_ARM1176,
|
||||
UARCH_ARM11MPCORE,
|
||||
UARCH_CORTEX_A5,
|
||||
UARCH_CORTEX_A7,
|
||||
UARCH_CORTEX_A8,
|
||||
UARCH_CORTEX_A9,
|
||||
UARCH_CORTEX_A12,
|
||||
UARCH_CORTEX_A15,
|
||||
UARCH_CORTEX_A17,
|
||||
UARCH_CORTEX_A32,
|
||||
UARCH_CORTEX_A35,
|
||||
UARCH_CORTEX_A53,
|
||||
UARCH_CORTEX_A55r0, // ARM Cortex-A55 revision 0 (restricted dual-issue capabilities compared to revision 1+).
|
||||
UARCH_CORTEX_A55,
|
||||
UARCH_CORTEX_A57,
|
||||
UARCH_CORTEX_A65,
|
||||
UARCH_CORTEX_A72,
|
||||
UARCH_CORTEX_A73,
|
||||
UARCH_CORTEX_A75,
|
||||
UARCH_CORTEX_A76,
|
||||
UARCH_CORTEX_A77,
|
||||
UARCH_CORTEX_A78,
|
||||
UARCH_CORTEX_A510,
|
||||
UARCH_CORTEX_A710,
|
||||
UARCH_CORTEX_A715,
|
||||
UARCH_CORTEX_X1,
|
||||
UARCH_CORTEX_X2,
|
||||
UARCH_CORTEX_X3,
|
||||
UARCH_NEOVERSE_N1,
|
||||
UARCH_NEOVERSE_E1,
|
||||
UARCH_NEOVERSE_V1,
|
||||
UARCH_SCORPION,
|
||||
UARCH_KRAIT,
|
||||
UARCH_KYRO,
|
||||
UARCH_FALKOR,
|
||||
UARCH_SAPHIRA,
|
||||
UARCH_DENVER,
|
||||
UARCH_DENVER2,
|
||||
UARCH_CARMEL,
|
||||
// SAMSUNG
|
||||
UARCH_EXYNOS_M1, // Samsung Exynos M1 (Exynos 8890 big cores)
|
||||
UARCH_EXYNOS_M2, // Samsung Exynos M2 (Exynos 8895 big cores)
|
||||
UARCH_EXYNOS_M3, // Samsung Exynos M3 (Exynos 9810 big cores)
|
||||
UARCH_EXYNOS_M4, // Samsung Exynos M4 (Exynos 9820 big cores)
|
||||
UARCH_EXYNOS_M5, // Samsung Exynos M5 (Exynos 9830 big cores)
|
||||
// APPLE
|
||||
UARCH_SWIFT, // Apple A6 and A6X processors.
|
||||
UARCH_CYCLONE, // Apple A7 processor.
|
||||
UARCH_TYPHOON, // Apple A8 and A8X processor
|
||||
UARCH_TWISTER, // Apple A9 and A9X processor.
|
||||
UARCH_HURRICANE, // Apple A10 and A10X processor.
|
||||
UARCH_MONSOON, // Apple A11 processor (big cores).
|
||||
UARCH_MISTRAL, // Apple A11 processor (little cores).
|
||||
UARCH_VORTEX, // Apple A12 processor (big cores).
|
||||
UARCH_TEMPEST, // Apple A12 processor (big cores).
|
||||
UARCH_LIGHTNING, // Apple A13 processor (big cores).
|
||||
UARCH_THUNDER, // Apple A13 processor (little cores).
|
||||
UARCH_ICESTORM, // Apple M1 processor (little cores).
|
||||
UARCH_FIRESTORM, // Apple M1 processor (big cores).
|
||||
UARCH_BLIZZARD, // Apple M2 processor (little cores).
|
||||
UARCH_AVALANCHE, // Apple M2 processor (big cores).
|
||||
UARCH_SAWTOOTH, // Apple M3 processor (little cores).
|
||||
UARCH_EVEREST, // Apple M3 processor (big cores).
|
||||
// CAVIUM
|
||||
UARCH_THUNDERX, // Cavium ThunderX
|
||||
UARCH_THUNDERX2, // Cavium ThunderX2 (originally Broadcom Vulkan).
|
||||
// MARVELL
|
||||
UARCH_PJ4,
|
||||
UARCH_BRAHMA_B15,
|
||||
UARCH_BRAHMA_B53,
|
||||
UARCH_XGENE, // Applied Micro X-Gene.
|
||||
UARCH_TAISHAN_V110, // HiSilicon TaiShan v110 (Huawei Kunpeng 920 series processors).
|
||||
// PHYTIUM
|
||||
UARCH_XIAOMI, // Not to be confused with Xiaomi Inc
|
||||
};
|
||||
|
||||
static const ISA isas_uarch[] = {
|
||||
[UARCH_ARM1136] = ISA_ARMv6,
|
||||
[UARCH_ARM1156] = ISA_ARMv6_T2,
|
||||
@@ -159,6 +75,7 @@ static const ISA isas_uarch[] = {
|
||||
[UARCH_THUNDERX] = ISA_ARMv8_A,
|
||||
[UARCH_THUNDERX2] = ISA_ARMv8_1_A,
|
||||
[UARCH_TAISHAN_V110] = ISA_ARMv8_2_A,
|
||||
[UARCH_TAISHAN_V200] = ISA_ARMv8_2_A, // Not confirmed
|
||||
[UARCH_DENVER] = ISA_ARMv8_A,
|
||||
[UARCH_DENVER2] = ISA_ARMv8_A,
|
||||
[UARCH_CARMEL] = ISA_ARMv8_A,
|
||||
@@ -284,7 +201,8 @@ struct uarch* get_uarch_from_midr(uint32_t midr, struct cpuInfo* cpu) {
|
||||
CHECK_UARCH(arch, cpu, 'C', 0x0A3, NA, NA, "ThunderX 81XX", UARCH_THUNDERX, CPU_VENDOR_CAVIUM)
|
||||
CHECK_UARCH(arch, cpu, 'C', 0x0AF, NA, NA, "ThunderX2 99XX", UARCH_THUNDERX2, CPU_VENDOR_CAVIUM)
|
||||
|
||||
CHECK_UARCH(arch, cpu, 'H', 0xD01, NA, NA, "TaiShan v110", UARCH_TAISHAN_V110, CPU_VENDOR_HUAWUEI) // Kunpeng 920 series
|
||||
CHECK_UARCH(arch, cpu, 'H', 0xD01, NA, NA, "TaiShan v110", UARCH_TAISHAN_V110, CPU_VENDOR_HUAWEI) // Kunpeng 920 series
|
||||
CHECK_UARCH(arch, cpu, 'H', 0xD02, NA, NA, "TaiShan v200", UARCH_TAISHAN_V200, CPU_VENDOR_HUAWEI) // Kunpeng 930 series (found in openeuler: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XQCV7NX2UKRIUWUFKRF4PO3QENCOUFR3)
|
||||
CHECK_UARCH(arch, cpu, 'H', 0xD40, NA, NA, "Cortex-A76", UARCH_CORTEX_A76, CPU_VENDOR_ARM) // Kirin 980 Big/Medium cores -> Cortex-A76
|
||||
|
||||
CHECK_UARCH(arch, cpu, 'N', 0x000, NA, NA, "Denver", UARCH_DENVER, CPU_VENDOR_NVIDIA)
|
||||
@@ -406,6 +324,8 @@ int get_number_of_vpus(struct cpuInfo* cpu) {
|
||||
return 3;
|
||||
case UARCH_ICESTORM: // [https://dougallj.github.io/applecpu/icestorm-simd.html]
|
||||
case UARCH_BLIZZARD: // [https://en.wikipedia.org/wiki/Comparison_of_ARM_processors]
|
||||
case UARCH_TAISHAN_V110:// [https://www-file.huawei.com/-/media/corp2020/pdf/publications/huawei-research/2022/huawei-research-issue1-en.pdf]: "128-bit x 2 for single precision"
|
||||
case UARCH_TAISHAN_V200:// Not confirmed, asssuming same as v110
|
||||
case UARCH_CORTEX_A57: // [https://www.anandtech.com/show/8718/the-samsung-galaxy-note-4-exynos-review/5]
|
||||
case UARCH_CORTEX_A72: // [https://www.anandtech.com/show/10347/arm-cortex-a73-artemis-unveiled/2]
|
||||
case UARCH_CORTEX_A73: // [https://www.anandtech.com/show/10347/arm-cortex-a73-artemis-unveiled/2]
|
||||
@@ -437,6 +357,10 @@ char* get_str_uarch(struct cpuInfo* cpu) {
|
||||
return cpu->arch->uarch_str;
|
||||
}
|
||||
|
||||
MICROARCH get_uarch(struct uarch* arch) {
|
||||
return arch->uarch;
|
||||
}
|
||||
|
||||
void free_uarch_struct(struct uarch* arch) {
|
||||
free(arch->uarch_str);
|
||||
free(arch);
|
||||
|
||||
@@ -5,11 +5,98 @@
|
||||
|
||||
#include "midr.h"
|
||||
|
||||
enum {
|
||||
UARCH_UNKNOWN,
|
||||
// ARM
|
||||
UARCH_ARM7,
|
||||
UARCH_ARM9,
|
||||
UARCH_ARM1136,
|
||||
UARCH_ARM1156,
|
||||
UARCH_ARM1176,
|
||||
UARCH_ARM11MPCORE,
|
||||
UARCH_CORTEX_A5,
|
||||
UARCH_CORTEX_A7,
|
||||
UARCH_CORTEX_A8,
|
||||
UARCH_CORTEX_A9,
|
||||
UARCH_CORTEX_A12,
|
||||
UARCH_CORTEX_A15,
|
||||
UARCH_CORTEX_A17,
|
||||
UARCH_CORTEX_A32,
|
||||
UARCH_CORTEX_A35,
|
||||
UARCH_CORTEX_A53,
|
||||
UARCH_CORTEX_A55r0, // ARM Cortex-A55 revision 0 (restricted dual-issue capabilities compared to revision 1+).
|
||||
UARCH_CORTEX_A55,
|
||||
UARCH_CORTEX_A57,
|
||||
UARCH_CORTEX_A65,
|
||||
UARCH_CORTEX_A72,
|
||||
UARCH_CORTEX_A73,
|
||||
UARCH_CORTEX_A75,
|
||||
UARCH_CORTEX_A76,
|
||||
UARCH_CORTEX_A77,
|
||||
UARCH_CORTEX_A78,
|
||||
UARCH_CORTEX_A510,
|
||||
UARCH_CORTEX_A710,
|
||||
UARCH_CORTEX_A715,
|
||||
UARCH_CORTEX_X1,
|
||||
UARCH_CORTEX_X2,
|
||||
UARCH_CORTEX_X3,
|
||||
UARCH_NEOVERSE_N1,
|
||||
UARCH_NEOVERSE_E1,
|
||||
UARCH_NEOVERSE_V1,
|
||||
UARCH_SCORPION,
|
||||
UARCH_KRAIT,
|
||||
UARCH_KYRO,
|
||||
UARCH_FALKOR,
|
||||
UARCH_SAPHIRA,
|
||||
UARCH_DENVER,
|
||||
UARCH_DENVER2,
|
||||
UARCH_CARMEL,
|
||||
// SAMSUNG
|
||||
UARCH_EXYNOS_M1, // Samsung Exynos M1 (Exynos 8890 big cores)
|
||||
UARCH_EXYNOS_M2, // Samsung Exynos M2 (Exynos 8895 big cores)
|
||||
UARCH_EXYNOS_M3, // Samsung Exynos M3 (Exynos 9810 big cores)
|
||||
UARCH_EXYNOS_M4, // Samsung Exynos M4 (Exynos 9820 big cores)
|
||||
UARCH_EXYNOS_M5, // Samsung Exynos M5 (Exynos 9830 big cores)
|
||||
// APPLE
|
||||
UARCH_SWIFT, // Apple A6 and A6X processors.
|
||||
UARCH_CYCLONE, // Apple A7 processor.
|
||||
UARCH_TYPHOON, // Apple A8 and A8X processor
|
||||
UARCH_TWISTER, // Apple A9 and A9X processor.
|
||||
UARCH_HURRICANE, // Apple A10 and A10X processor.
|
||||
UARCH_MONSOON, // Apple A11 processor (big cores).
|
||||
UARCH_MISTRAL, // Apple A11 processor (little cores).
|
||||
UARCH_VORTEX, // Apple A12 processor (big cores).
|
||||
UARCH_TEMPEST, // Apple A12 processor (big cores).
|
||||
UARCH_LIGHTNING, // Apple A13 processor (big cores).
|
||||
UARCH_THUNDER, // Apple A13 processor (little cores).
|
||||
UARCH_ICESTORM, // Apple M1 processor (little cores).
|
||||
UARCH_FIRESTORM, // Apple M1 processor (big cores).
|
||||
UARCH_BLIZZARD, // Apple M2 processor (little cores).
|
||||
UARCH_AVALANCHE, // Apple M2 processor (big cores).
|
||||
UARCH_SAWTOOTH, // Apple M3 processor (little cores).
|
||||
UARCH_EVEREST, // Apple M3 processor (big cores).
|
||||
// CAVIUM
|
||||
UARCH_THUNDERX, // Cavium ThunderX
|
||||
UARCH_THUNDERX2, // Cavium ThunderX2 (originally Broadcom Vulkan).
|
||||
// MARVELL
|
||||
UARCH_PJ4,
|
||||
UARCH_BRAHMA_B15,
|
||||
UARCH_BRAHMA_B53,
|
||||
UARCH_XGENE, // Applied Micro X-Gene.
|
||||
UARCH_TAISHAN_V110, // HiSilicon TaiShan v110
|
||||
UARCH_TAISHAN_V200, // HiSilicon TaiShan v200
|
||||
// PHYTIUM
|
||||
UARCH_XIAOMI, // Not to be confused with Xiaomi Inc
|
||||
};
|
||||
|
||||
typedef uint32_t MICROARCH;
|
||||
|
||||
struct uarch* get_uarch_from_midr(uint32_t midr, struct cpuInfo* cpu);
|
||||
int get_number_of_vpus(struct cpuInfo* cpu);
|
||||
int get_vpus_width(struct cpuInfo* cpu);
|
||||
bool has_fma_support(struct cpuInfo* cpu);
|
||||
char* get_str_uarch(struct cpuInfo* cpu);
|
||||
void free_uarch_struct(struct uarch* arch);
|
||||
MICROARCH get_uarch(struct uarch* arch);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -145,6 +145,25 @@ $C2 Exynos \
|
||||
$C2 \
|
||||
$C2 "
|
||||
|
||||
#define ASCII_KUNPENG \
|
||||
"$C2 . \
|
||||
$C2 .. \
|
||||
$C2 .## \
|
||||
$C1 .$CR $C2.###. \
|
||||
$C1 ..$CR $C2#####. \
|
||||
$C1 .#.$CR $C2.#######. \
|
||||
$C1 .####.$CR $C2.#######. \
|
||||
$C1 ..######*$CR $C2.#######. . \
|
||||
$C1 .#########*$CR $C2.#######* . \
|
||||
$C1 ######*$CR $C2.#######. .#. \
|
||||
$C1*#######*$CR $C2.#######. *##. \
|
||||
$C1 ##*$CR $C2.#######. ####### \
|
||||
$C2 ###.$CR $C1#####$C2 *### \
|
||||
$C1 *########## \
|
||||
$C1 *######## \
|
||||
$C1 #####. \
|
||||
$C1 *###. "
|
||||
|
||||
#define ASCII_KIRIN \
|
||||
"$C1 ####### \
|
||||
$C1 ##### #################### \
|
||||
@@ -485,6 +504,7 @@ asciiL logo_snapd = { ASCII_SNAPD, 39, 16, false, {C_FG_RED, C_FG_WH
|
||||
asciiL logo_mtk = { ASCII_MTK, 59, 5, false, {C_FG_BLUE, C_FG_YELLOW}, {C_FG_BLUE, C_FG_YELLOW} };
|
||||
asciiL logo_exynos = { ASCII_EXYNOS, 22, 13, true, {C_BG_BLUE, C_FG_WHITE}, {C_FG_BLUE, C_FG_WHITE} };
|
||||
asciiL logo_kirin = { ASCII_KIRIN, 53, 12, false, {C_FG_RED}, {C_FG_WHITE, C_FG_RED} };
|
||||
asciiL logo_kunpeng = { ASCII_KUNPENG, 48, 17, false, {C_FG_RED, C_FG_WHITE}, {C_FG_WHITE, C_FG_RED} };
|
||||
asciiL logo_broadcom = { ASCII_BROADCOM, 44, 19, false, {C_FG_WHITE, C_FG_RED}, {C_FG_WHITE, C_FG_RED} };
|
||||
asciiL logo_arm = { ASCII_ARM, 42, 5, false, {C_FG_CYAN}, {C_FG_WHITE, C_FG_CYAN} };
|
||||
asciiL logo_ibm = { ASCII_IBM, 42, 9, false, {C_FG_CYAN, C_FG_WHITE}, {C_FG_CYAN, C_FG_WHITE} };
|
||||
|
||||
@@ -16,7 +16,7 @@ enum {
|
||||
CPU_VENDOR_NVIDIA,
|
||||
CPU_VENDOR_APM,
|
||||
CPU_VENDOR_QUALCOMM,
|
||||
CPU_VENDOR_HUAWUEI,
|
||||
CPU_VENDOR_HUAWEI,
|
||||
CPU_VENDOR_SAMSUNG,
|
||||
CPU_VENDOR_MARVELL,
|
||||
CPU_VENDOR_PHYTIUM,
|
||||
@@ -32,6 +32,7 @@ enum {
|
||||
enum {
|
||||
HV_VENDOR_KVM,
|
||||
HV_VENDOR_QEMU,
|
||||
HV_VENDOR_VBOX,
|
||||
HV_VENDOR_HYPERV,
|
||||
HV_VENDOR_VMWARE,
|
||||
HV_VENDOR_XEN,
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef ARCH_X86
|
||||
static const char* ARCH_STR = "x86_64 build";
|
||||
static const char* ARCH_STR = "x86 / x86_64 build";
|
||||
#include "../x86/cpuid.h"
|
||||
#elif ARCH_PPC
|
||||
static const char* ARCH_STR = "PowerPC build";
|
||||
|
||||
@@ -336,6 +336,13 @@ struct ascii_logo* choose_ascii_art_aux(struct ascii_logo* logo_long, struct asc
|
||||
}
|
||||
}
|
||||
|
||||
// https://no-color.org/
|
||||
bool is_color_enabled(void) {
|
||||
const char *var_name = "NO_COLOR";
|
||||
char *no_color = getenv(var_name);
|
||||
return no_color == NULL || no_color[0] == '\0';
|
||||
}
|
||||
|
||||
void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* term, int lf) {
|
||||
// 1. Choose logo
|
||||
#ifdef ARCH_X86
|
||||
@@ -364,6 +371,8 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter
|
||||
art->art = &logo_exynos;
|
||||
else if(art->vendor == SOC_VENDOR_KIRIN)
|
||||
art->art = &logo_kirin;
|
||||
else if(art->vendor == SOC_VENDOR_KUNPENG)
|
||||
art->art = &logo_kunpeng;
|
||||
else if(art->vendor == SOC_VENDOR_BROADCOM)
|
||||
art->art = &logo_broadcom;
|
||||
else if(art->vendor == SOC_VENDOR_APPLE)
|
||||
@@ -392,6 +401,9 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter
|
||||
|
||||
// 2. Choose colors
|
||||
struct ascii_logo* logo = art->art;
|
||||
bool color = is_color_enabled();
|
||||
if (!color)
|
||||
art->style = STYLE_LEGACY;
|
||||
|
||||
switch(art->style) {
|
||||
case STYLE_LEGACY:
|
||||
|
||||
@@ -15,6 +15,7 @@ static char* soc_trademark_string[] = {
|
||||
[SOC_VENDOR_MEDIATEK] = "MediaTek ",
|
||||
[SOC_VENDOR_EXYNOS] = "Exynos ",
|
||||
[SOC_VENDOR_KIRIN] = "Kirin ",
|
||||
[SOC_VENDOR_KUNPENG] = "Kunpeng ",
|
||||
[SOC_VENDOR_BROADCOM] = "Broadcom BCM",
|
||||
[SOC_VENDOR_APPLE] = "Apple ",
|
||||
[SOC_VENDOR_ROCKCHIP] = "Rockchip ",
|
||||
|
||||
@@ -19,6 +19,7 @@ enum {
|
||||
SOC_VENDOR_MEDIATEK,
|
||||
SOC_VENDOR_EXYNOS,
|
||||
SOC_VENDOR_KIRIN,
|
||||
SOC_VENDOR_KUNPENG,
|
||||
SOC_VENDOR_BROADCOM,
|
||||
SOC_VENDOR_APPLE,
|
||||
SOC_VENDOR_ROCKCHIP,
|
||||
@@ -39,7 +40,7 @@ struct system_on_chip {
|
||||
char* raw_name;
|
||||
};
|
||||
|
||||
struct system_on_chip* get_soc(void);
|
||||
struct system_on_chip* get_soc(struct cpuInfo* cpu);
|
||||
char* get_soc_name(struct system_on_chip* soc);
|
||||
VENDOR get_soc_vendor(struct system_on_chip* soc);
|
||||
bool match_soc(struct system_on_chip* soc, char* raw_name, char* expected_name, char* soc_name, SOC soc_model, int32_t process);
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
static char *hv_vendors_name[] = {
|
||||
[HV_VENDOR_KVM] = "KVM",
|
||||
[HV_VENDOR_QEMU] = "QEMU",
|
||||
[HV_VENDOR_VBOX] = "VirtualBox",
|
||||
[HV_VENDOR_HYPERV] = "Microsoft Hyper-V",
|
||||
[HV_VENDOR_VMWARE] = "VMware",
|
||||
[HV_VENDOR_XEN] = "Xen",
|
||||
@@ -80,9 +81,13 @@ struct topology* get_topology_info(struct cache* cach) {
|
||||
if(!fill_package_ids_from_sys(package_ids, topo->total_cores)) {
|
||||
printWarn("fill_package_ids_from_sys failed, output may be incomplete/invalid");
|
||||
for(int i=0; i < topo->total_cores; i++) package_ids[i] = 0;
|
||||
// fill_package_ids_from_sys failed, use a
|
||||
// more sophisticated wat to find the number of sockets
|
||||
// fill_package_ids_from_sys failed, use udev to try
|
||||
// to find the number of sockets
|
||||
topo->sockets = get_num_sockets_package_cpus(topo);
|
||||
if (topo->sockets == UNKNOWN_DATA) {
|
||||
printWarn("get_num_sockets_package_cpus failed: assuming 1 socket");
|
||||
topo->sockets = 1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// fill_package_ids_from_sys succeeded, use the
|
||||
|
||||
@@ -25,6 +25,7 @@ enum {
|
||||
UARCH_PPC603,
|
||||
UARCH_PPC440,
|
||||
UARCH_PPC470,
|
||||
UARCH_ESPRESSO, // Not exactly an uarch, but the codename of Wii U
|
||||
UARCH_PPC970,
|
||||
UARCH_PPC970FX,
|
||||
UARCH_PPC970MP,
|
||||
@@ -75,6 +76,7 @@ void fill_uarch(struct uarch* arch, MICROARCH u) {
|
||||
FILL_UARCH(arch->uarch, UARCH_PPC603, "PowerPC 603", UNK) // varies
|
||||
FILL_UARCH(arch->uarch, UARCH_PPC440, "PowerPC 440", UNK)
|
||||
FILL_UARCH(arch->uarch, UARCH_PPC470, "PowerPC 470", 45) // strange...
|
||||
FILL_UARCH(arch->uarch, UARCH_ESPRESSO, "Espresso", 45) // https://en.wikipedia.org/wiki/PowerPC_7xx#Espresso, https://en.wikipedia.org/wiki/Espresso_(processor)
|
||||
FILL_UARCH(arch->uarch, UARCH_PPC970, "PowerPC 970", 130)
|
||||
FILL_UARCH(arch->uarch, UARCH_PPC970FX, "PowerPC 970FX", 90)
|
||||
FILL_UARCH(arch->uarch, UARCH_PPC970MP, "PowerPC 970MP", 90)
|
||||
@@ -234,6 +236,7 @@ struct uarch* get_uarch_from_pvr(uint32_t pvr) {
|
||||
CHECK_UARCH(arch, pvr, 0xffff0000, 0x7ff50000, UARCH_PPC470)
|
||||
CHECK_UARCH(arch, pvr, 0xffff0000, 0x00050000, UARCH_PPC470)
|
||||
CHECK_UARCH(arch, pvr, 0xffff0000, 0x11a50000, UARCH_PPC470)
|
||||
CHECK_UARCH(arch, pvr, 0xffffffff, 0x70010201, UARCH_ESPRESSO)
|
||||
UARCH_END
|
||||
|
||||
return arch;
|
||||
@@ -280,9 +283,6 @@ char* get_str_process(struct cpuInfo* cpu) {
|
||||
if(process == UNK) {
|
||||
snprintf(str, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN);
|
||||
}
|
||||
else if(process > 100) {
|
||||
sprintf(str, "%.2fum", (double)process/100);
|
||||
}
|
||||
else if(process > 0){
|
||||
sprintf(str, "%dnm", process);
|
||||
}
|
||||
|
||||
@@ -163,7 +163,7 @@ struct cpuInfo* get_cpu_info(void) {
|
||||
cpu->ext = get_extensions_from_str(ext_str);
|
||||
if(cpu->ext->str != NULL && cpu->ext->mask == 0) return NULL;
|
||||
cpu->arch = get_uarch_from_cpuinfo_str(cpuinfo_str, cpu);
|
||||
cpu->soc = get_soc();
|
||||
cpu->soc = get_soc(cpu);
|
||||
cpu->freq = get_frequency_info(0);
|
||||
cpu->peak_performance = get_peak_performance(cpu);
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ struct system_on_chip* guess_soc_from_devtree(struct system_on_chip* soc) {
|
||||
return soc;
|
||||
}
|
||||
|
||||
struct system_on_chip* get_soc(void) {
|
||||
struct system_on_chip* get_soc(struct cpuInfo* cpu) {
|
||||
struct system_on_chip* soc = emalloc(sizeof(struct system_on_chip));
|
||||
soc->raw_name = NULL;
|
||||
soc->soc_vendor = SOC_VENDOR_UNKNOWN;
|
||||
|
||||
@@ -5,6 +5,6 @@
|
||||
#include "../common/cpu.h"
|
||||
#include <stdint.h>
|
||||
|
||||
struct system_on_chip* get_soc(void);
|
||||
struct system_on_chip* get_soc(struct cpuInfo* cpu);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
static const char *hv_vendors_string[] = {
|
||||
[HV_VENDOR_KVM] = "KVMKVMKVM",
|
||||
[HV_VENDOR_QEMU] = "TCGTCGTCGTCG",
|
||||
[HV_VENDOR_VBOX] = "VBoxVBoxVBox",
|
||||
[HV_VENDOR_HYPERV] = "Microsoft Hv",
|
||||
[HV_VENDOR_VMWARE] = "VMwareVMware",
|
||||
[HV_VENDOR_XEN] = "XenVMMXenVMM",
|
||||
@@ -38,6 +39,7 @@ static const char *hv_vendors_string[] = {
|
||||
static char *hv_vendors_name[] = {
|
||||
[HV_VENDOR_KVM] = "KVM",
|
||||
[HV_VENDOR_QEMU] = "QEMU",
|
||||
[HV_VENDOR_VBOX] = "VirtualBox",
|
||||
[HV_VENDOR_HYPERV] = "Microsoft Hyper-V",
|
||||
[HV_VENDOR_VMWARE] = "VMware",
|
||||
[HV_VENDOR_XEN] = "Xen",
|
||||
@@ -486,9 +488,8 @@ struct cpuInfo* get_cpu_info(void) {
|
||||
cpu->cpu_name = get_str_cpu_name_internal();
|
||||
}
|
||||
else {
|
||||
cpu->cpu_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN) + 1));
|
||||
strcpy(cpu->cpu_name, STRING_UNKNOWN);
|
||||
printWarn("Can't read cpu name from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x80000004, cpu->maxExtendedLevels);
|
||||
cpu->cpu_name = NULL;
|
||||
printWarn("Can't read CPU name from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x80000004, cpu->maxExtendedLevels);
|
||||
}
|
||||
|
||||
cpu->topology_extensions = false;
|
||||
@@ -538,12 +539,17 @@ struct cpuInfo* get_cpu_info(void) {
|
||||
ptr->first_core_id = first_core;
|
||||
ptr->feat = get_features_info(ptr);
|
||||
|
||||
// If any field of the struct is NULL,
|
||||
// return inmideately, as further functions
|
||||
// require valid fields (cach, topo, etc)
|
||||
ptr->arch = get_cpu_uarch(ptr);
|
||||
ptr->freq = get_frequency_info(ptr);
|
||||
|
||||
if (cpu->cpu_name == NULL && ptr == cpu) {
|
||||
// If we couldnt read CPU name from cpuid, infer it now
|
||||
cpu->cpu_name = infer_cpu_name_from_uarch(cpu->arch);
|
||||
}
|
||||
|
||||
// If any field of the struct is NULL,
|
||||
// return early, as next functions
|
||||
// require non NULL fields in cach and topo
|
||||
ptr->cach = get_cache_info(ptr);
|
||||
if(ptr->cach == NULL) return cpu;
|
||||
|
||||
|
||||
@@ -48,7 +48,9 @@ enum {
|
||||
UARCH_UNKNOWN,
|
||||
// INTEL //
|
||||
UARCH_P5,
|
||||
UARCH_P6,
|
||||
UARCH_P5_MMX,
|
||||
UARCH_P6_PENTIUM_II,
|
||||
UARCH_P6_PENTIUM_III,
|
||||
UARCH_DOTHAN,
|
||||
UARCH_YONAH,
|
||||
UARCH_MEROM,
|
||||
@@ -144,31 +146,31 @@ struct uarch* get_uarch_from_cpuid_intel(uint32_t ef, uint32_t f, uint32_t em, u
|
||||
// EM: Extended Model //
|
||||
// M: Model //
|
||||
// S: Stepping //
|
||||
// ----------------------------------------------------------------------------- //
|
||||
// ------------------------------------------------------------------------------- //
|
||||
// EF F EM M S //
|
||||
UARCH_START
|
||||
CHECK_UARCH(arch, 0, 5, 0, 0, NA, "P5", UARCH_P5, 800)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 1, NA, "P5", UARCH_P5, 800)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 2, NA, "P5", UARCH_P5, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 3, NA, "P5", UARCH_P5, 600)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 4, NA, "P5 MMX", UARCH_P5, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 7, NA, "P5 MMX", UARCH_P5, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 8, NA, "P5 MMX", UARCH_P5, 250)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 4, NA, "P5 (MMX)", UARCH_P5_MMX, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 7, NA, "P5 (MMX)", UARCH_P5_MMX, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 8, NA, "P5 (MMX)", UARCH_P5_MMX, 250)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 9, 0, "Lakemont", UARCH_LAKEMONT, 32)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 9, NA, "P5 MMX", UARCH_P5, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 9, NA, "P5 (MMX)", UARCH_P5_MMX, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 10, 0, "Lakemont", UARCH_LAKEMONT, 32)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 0, NA, "P6 Pentium II", UARCH_P6, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 1, NA, "P6 Pentium II", UARCH_P6, UNK) // process depends on core
|
||||
CHECK_UARCH(arch, 0, 6, 0, 2, NA, "P6 Pentium II", UARCH_P6, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 3, NA, "P6 Pentium II", UARCH_P6, 350)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 4, NA, "P6 Pentium II", UARCH_P6, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 5, NA, "P6 Pentium II", UARCH_P6, 250)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 6, NA, "P6 Pentium II", UARCH_P6, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 7, NA, "P6 Pentium III", UARCH_P6, 250)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 8, NA, "P6 Pentium III", UARCH_P6, 180)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 9, NA, "P6 Pentium M", UARCH_P6, 130)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 10, NA, "P6 Pentium III", UARCH_P6, 180)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 11, NA, "P6 Pentium III", UARCH_P6, 130)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 0, NA, "P6 (Pentium II)", UARCH_P6_PENTIUM_II, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 1, NA, "P6 (Pentium II)", UARCH_P6_PENTIUM_II, UNK) // process depends on core
|
||||
CHECK_UARCH(arch, 0, 6, 0, 2, NA, "P6 (Pentium II)", UARCH_P6_PENTIUM_II, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 3, NA, "P6 (Klamath)", UARCH_P6_PENTIUM_II, 350) // http://instlatx64.atw.hu.
|
||||
CHECK_UARCH(arch, 0, 6, 0, 4, NA, "P6 (Pentium II)", UARCH_P6_PENTIUM_II, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 5, NA, "P6 (Deschutes)", UARCH_P6_PENTIUM_II, 250) // http://instlatx64.atw.hu.
|
||||
CHECK_UARCH(arch, 0, 6, 0, 6, NA, "P6 (Dixon)", UARCH_P6_PENTIUM_II, UNK) // http://instlatx64.atw.hu.
|
||||
CHECK_UARCH(arch, 0, 6, 0, 7, NA, "P6 (Katmai)", UARCH_P6_PENTIUM_III, 250) // Core names from: https://en.wikichip.org/wiki/intel/cpuid. NOTE: Xeon core names are different! https://www.techpowerup.com/cpu-specs/?generation=Intel+Pentium+III+Xeon
|
||||
CHECK_UARCH(arch, 0, 6, 0, 8, NA, "P6 (Coppermine)", UARCH_P6_PENTIUM_III, 180) // Also: https://en.wikipedia.org/wiki/Pentium_III
|
||||
CHECK_UARCH(arch, 0, 6, 0, 9, NA, "P6 (Pentium M)", UARCH_P6_PENTIUM_III, 130)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 10, NA, "P6 (Coppermine T)", UARCH_P6_PENTIUM_III, 180)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 11, NA, "P6 (Tualatin)", UARCH_P6_PENTIUM_III, 130)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 13, NA, "Dothan", UARCH_DOTHAN, UNK) // process depends on core
|
||||
CHECK_UARCH(arch, 0, 6, 0, 14, NA, "Yonah", UARCH_YONAH, 65)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 15, NA, "Merom", UARCH_MEROM, 65)
|
||||
@@ -380,6 +382,7 @@ struct uarch* get_uarch_from_cpuid_amd(uint32_t ef, uint32_t f, uint32_t em, uin
|
||||
CHECK_UARCH(arch, 10, 15, 5, 0, NA, "Zen 3", UARCH_ZEN3, 7) // instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 6, 1, 2, "Zen 4", UARCH_ZEN4, 5) // instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 7, 4, 1, "Zen 4", UARCH_ZEN4, 4) // instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 7, 5, 2, "Zen 4", UARCH_ZEN4, 4) // instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 7, 8, 0, "Zen 4", UARCH_ZEN4, 4) // instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 8, NA, NA, "Zen 4", UARCH_ZEN4, 5) // instlatx64 (AMD MI300C)
|
||||
CHECK_UARCH(arch, 10, 15, 9, NA, NA, "Zen 4", UARCH_ZEN4, 5) // instlatx64 (AMD MI300A)
|
||||
@@ -391,11 +394,16 @@ struct uarch* get_uarch_from_cpuid_amd(uint32_t ef, uint32_t f, uint32_t em, uin
|
||||
|
||||
struct uarch* get_uarch_from_cpuid(struct cpuInfo* cpu, uint32_t dump, uint32_t ef, uint32_t f, uint32_t em, uint32_t m, int s) {
|
||||
if(cpu->cpu_vendor == CPU_VENDOR_INTEL) {
|
||||
struct uarch* arch = emalloc(sizeof(struct uarch));
|
||||
if(dump == 0x000806E9) {
|
||||
if (cpu->cpu_name == NULL) {
|
||||
printErr("Unable to find uarch without CPU name");
|
||||
fill_uarch(arch, STRING_UNKNOWN, UARCH_UNKNOWN, UNK);
|
||||
return arch;
|
||||
}
|
||||
|
||||
// It is not possible to determine uarch only from CPUID dump (can be Kaby Lake or Amber Lake)
|
||||
// See issue https://github.com/Dr-Noob/cpufetch/issues/122
|
||||
struct uarch* arch = emalloc(sizeof(struct uarch));
|
||||
|
||||
if(strstr(cpu->cpu_name, "Y") != NULL) {
|
||||
fill_uarch(arch, "Amber Lake", UARCH_AMBER_LAKE, 14);
|
||||
}
|
||||
@@ -406,10 +414,14 @@ struct uarch* get_uarch_from_cpuid(struct cpuInfo* cpu, uint32_t dump, uint32_t
|
||||
return arch;
|
||||
}
|
||||
else if (dump == 0x000806EA) {
|
||||
if (cpu->cpu_name == NULL) {
|
||||
printErr("Unable to find uarch without CPU name");
|
||||
fill_uarch(arch, STRING_UNKNOWN, UARCH_UNKNOWN, UNK);
|
||||
return arch;
|
||||
}
|
||||
|
||||
// It is not possible to determine uarch only from CPUID dump (can be Kaby Lake R or Coffee Lake U)
|
||||
// See issue https://github.com/Dr-Noob/cpufetch/issues/149
|
||||
struct uarch* arch = emalloc(sizeof(struct uarch));
|
||||
|
||||
if(strstr(cpu->cpu_name, "i5-8250U") != NULL ||
|
||||
strstr(cpu->cpu_name, "i5-8350U") != NULL ||
|
||||
strstr(cpu->cpu_name, "i7-8550U") != NULL ||
|
||||
@@ -428,6 +440,41 @@ struct uarch* get_uarch_from_cpuid(struct cpuInfo* cpu, uint32_t dump, uint32_t
|
||||
return get_uarch_from_cpuid_amd(ef, f, em, m, s);
|
||||
}
|
||||
|
||||
// If we cannot get the CPU name from CPUID, try to infer it from uarch
|
||||
char* infer_cpu_name_from_uarch(struct uarch* arch) {
|
||||
char* cpu_name = NULL;
|
||||
if (arch == NULL) {
|
||||
printErr("infer_cpu_name_from_uarch: Unable to find CPU name");
|
||||
cpu_name = ecalloc(strlen(STRING_UNKNOWN) + 1, sizeof(char));
|
||||
strcpy(cpu_name, STRING_UNKNOWN);
|
||||
return cpu_name;
|
||||
}
|
||||
|
||||
char *str = NULL;
|
||||
|
||||
if (arch->uarch == UARCH_P5)
|
||||
str = "Intel Pentium";
|
||||
else if (arch->uarch == UARCH_P5_MMX)
|
||||
str = "Intel Pentium MMX";
|
||||
else if (arch->uarch == UARCH_P6_PENTIUM_II)
|
||||
str = "Intel Pentium II";
|
||||
else if (arch->uarch == UARCH_P6_PENTIUM_III)
|
||||
str = "Intel Pentium III";
|
||||
else
|
||||
printErr("Unable to find name from uarch: %d", arch->uarch);
|
||||
|
||||
if (str == NULL) {
|
||||
cpu_name = ecalloc(strlen(STRING_UNKNOWN) + 1, sizeof(char));
|
||||
strcpy(cpu_name, STRING_UNKNOWN);
|
||||
}
|
||||
else {
|
||||
cpu_name = ecalloc(strlen(str) + 1, sizeof(char));
|
||||
strcpy(cpu_name, str);
|
||||
}
|
||||
|
||||
return cpu_name;
|
||||
}
|
||||
|
||||
bool vpus_are_AVX512(struct cpuInfo* cpu) {
|
||||
return cpu->arch->uarch != UARCH_ICE_LAKE &&
|
||||
cpu->arch->uarch != UARCH_TIGER_LAKE &&
|
||||
@@ -498,9 +545,6 @@ char* get_str_process(struct cpuInfo* cpu) {
|
||||
if(process == UNK) {
|
||||
snprintf(str, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN);
|
||||
}
|
||||
else if(process > 100) {
|
||||
sprintf(str, "%.2fum", (double)process/100);
|
||||
}
|
||||
else if(process > 0){
|
||||
sprintf(str, "%dnm", process);
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
struct uarch;
|
||||
|
||||
struct uarch* get_uarch_from_cpuid(struct cpuInfo* cpu, uint32_t dump, uint32_t ef, uint32_t f, uint32_t em, uint32_t m, int s);
|
||||
char* infer_cpu_name_from_uarch(struct uarch* arch);
|
||||
bool vpus_are_AVX512(struct cpuInfo* cpu);
|
||||
bool is_knights_landing(struct cpuInfo* cpu);
|
||||
int get_number_of_vpus(struct cpuInfo* cpu);
|
||||
|
||||
Reference in New Issue
Block a user