Compare commits

..

13 Commits
i263 ... i268

Author SHA1 Message Date
Dr-Noob
27f1872915 [v1.06][ARM] Add support for Amlogic A311D (#268) 2024-08-29 19:59:07 +01:00
Dr-Noob
9192ba3eb8 [v1.06][ARM] Add (another) cpufamily for M3 and set the ARM version, fixing peak performance wrong result (#230) 2024-08-29 08:13:05 +01:00
Dr-Noob
807a13d29e [v1.06] Fix manpage file extension (fixes #269) 2024-08-28 21:33:48 +01:00
Dr-Noob
15a803dae5 [v1.06][ARM] Check if HWCAP2_SVE2 is defined before using it (fixes #270) 2024-08-28 21:26:27 +01:00
Dr-Noob
0507355372 [v1.06][X86] Bugfix: set affinity in --accurate-pp
There are cases where measure_frequency is called after binding the
process to a specific core via bind_to_cpu (e.g., when iterating over
modules in hybrid architectures). Thus, in measure_frequency we must
set the affinity of the newly created threads, ensuring they are
binded to the right core.
2024-08-26 12:31:18 +01:00
Dr-Noob
9f66a137c5 [v1.06][ARM] Add support for NXP i.MX 8M Plus (#261) 2024-08-25 17:44:29 +01:00
Dr-Noob
324d0fbe94 [v1.06][PPC] Add support for Espresso (#231) 2024-08-25 16:50:58 +01:00
Dr-Noob
af8bb16302 [v1.06][ARM] Fix for commit 025e28c 2024-08-24 15:44:06 +01:00
Dr-Noob
40374121b8 [v1.06] Replace emalloc+memset with ecalloc when possible. Refactor some memory allocation code 2024-08-24 15:32:33 +01:00
Dr-Noob
025e28c516 [v1.06][ARM] Set Android properties as defines 2024-08-24 14:47:34 +01:00
Dr-Noob
7ad19d113c [v1.06] Remove soc_ prefix from field names in system_on_chip struct 2024-08-24 12:44:24 +01:00
Dr-Noob
13605ed0ce [v1.06][ARM] Remove BCM prefix from Broadcom vendor string 2024-08-24 12:34:57 +01:00
Dr-Noob
7689355a72 [v1.06][ARM] Add support for Apple SoCs in Asahi Linux (#263) 2024-08-23 08:37:13 +01:00
22 changed files with 192 additions and 117 deletions

View File

@@ -120,9 +120,9 @@ clean:
install: $(OUTPUT) install: $(OUTPUT)
install -Dm755 "cpufetch" "$(DESTDIR)$(PREFIX)/bin/cpufetch" install -Dm755 "cpufetch" "$(DESTDIR)$(PREFIX)/bin/cpufetch"
install -Dm644 "LICENSE" "$(DESTDIR)$(PREFIX)/share/licenses/cpufetch-git/LICENSE" install -Dm644 "LICENSE" "$(DESTDIR)$(PREFIX)/share/licenses/cpufetch-git/LICENSE"
install -Dm644 "cpufetch.1" "$(DESTDIR)$(PREFIX)/share/man/man1/cpufetch.1.gz" install -Dm644 "cpufetch.1" "$(DESTDIR)$(PREFIX)/share/man/man1/cpufetch.1"
uninstall: uninstall:
rm -f "$(DESTDIR)$(PREFIX)/bin/cpufetch" rm -f "$(DESTDIR)$(PREFIX)/bin/cpufetch"
rm -f "$(DESTDIR)$(PREFIX)/share/licenses/cpufetch-git/LICENSE" rm -f "$(DESTDIR)$(PREFIX)/share/licenses/cpufetch-git/LICENSE"
rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/cpufetch.1.gz" rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/cpufetch.1"

View File

@@ -176,7 +176,9 @@ struct features* get_features_info(void) {
printWarn("Unable to retrieve AT_HWCAP2 using getauxval"); printWarn("Unable to retrieve AT_HWCAP2 using getauxval");
} }
else { else {
#ifdef HWCAP2_SVE2
feat->SVE2 = hwcaps & HWCAP2_SVE2; feat->SVE2 = hwcaps & HWCAP2_SVE2;
#endif
} }
} }
#else #else
@@ -412,6 +414,7 @@ struct cpuInfo* get_cpu_info_mach(struct cpuInfo* cpu) {
cpu->peak_performance = get_peak_performance(cpu); cpu->peak_performance = get_peak_performance(cpu);
} }
else if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH || else if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH ||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_2 ||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO || cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO ||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_MAX) { cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_MAX) {
fill_cpu_info_everest_sawtooth(cpu, pcores, ecores); fill_cpu_info_everest_sawtooth(cpu, pcores, ecores);

View File

@@ -18,6 +18,11 @@
#define min(a,b) (((a)<(b))?(a):(b)) #define min(a,b) (((a)<(b))?(a):(b))
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define PROP_MTK_PLATFORM "ro.mediatek.platform"
#define PROP_SOC_MODEL "ro.soc.model"
#define PROP_PRODUCT_BOARD "ro.product.board"
#define PROP_BOARD_PLATFORM "ro.board.platform"
static char* soc_rpi_string[] = { static char* soc_rpi_string[] = {
"BCM2835", "BCM2835",
"BCM2836", "BCM2836",
@@ -28,8 +33,7 @@ static char* soc_rpi_string[] = {
char* toupperstr(char* str) { char* toupperstr(char* str) {
int len = strlen(str) + 1; int len = strlen(str) + 1;
char* ret = emalloc(sizeof(char) * len); char* ret = ecalloc(len, sizeof(char));
memset(ret, 0, sizeof(char) * len);
for(int i=0; i < len; i++) { for(int i=0; i < len; i++) {
ret[i] = toupper((unsigned char) str[i]); ret[i] = toupper((unsigned char) str[i]);
@@ -102,7 +106,7 @@ bool get_sunxisoc_from_sid(struct system_on_chip* soc, char* raw_name, uint32_t
int index = 0; int index = 0;
while(socFromSid[index].sid != 0x0) { while(socFromSid[index].sid != 0x0) {
if(socFromSid[index].sid == sid) { if(socFromSid[index].sid == sid) {
fill_soc(soc, socFromSid[index].soc.soc_name, socFromSid[index].soc.soc_model, socFromSid[index].soc.process); fill_soc(soc, socFromSid[index].soc.name, socFromSid[index].soc.model, socFromSid[index].soc.process);
return true; return true;
} }
index++; index++;
@@ -128,24 +132,24 @@ bool match_broadcom(char* soc_name, struct system_on_chip* soc) {
if((tmp = strstr(soc_name, "BCM")) == NULL) if((tmp = strstr(soc_name, "BCM")) == NULL)
return false; return false;
soc->soc_vendor = SOC_VENDOR_BROADCOM; soc->vendor = SOC_VENDOR_BROADCOM;
SOC_START SOC_START
SOC_EQ(tmp, "BCM2835", "2835", SOC_BCM_2835, soc, 65) SOC_EQ(tmp, "BCM2835", "BCM2835", SOC_BCM_2835, soc, 65)
SOC_EQ(tmp, "BCM2836", "2836", SOC_BCM_2836, soc, 40) SOC_EQ(tmp, "BCM2836", "BCM2836", SOC_BCM_2836, soc, 40)
SOC_EQ(tmp, "BCM2837", "2837", SOC_BCM_2837, soc, 40) SOC_EQ(tmp, "BCM2837", "BCM2837", SOC_BCM_2837, soc, 40)
SOC_EQ(tmp, "BCM2837B0", "2837B0", SOC_BCM_2837B0, soc, 40) SOC_EQ(tmp, "BCM2837B0", "BCM2837B0", SOC_BCM_2837B0, soc, 40)
SOC_EQ(tmp, "BCM21553", "21553", SOC_BCM_21553, soc, 65) SOC_EQ(tmp, "BCM21553", "BCM21553", SOC_BCM_21553, soc, 65)
SOC_EQ(tmp, "BCM21553-Thunderbird", "21553 Thunderbird", SOC_BCM_21553T, soc, 65) SOC_EQ(tmp, "BCM21553-Thunderbird", "BCM21553 Thunderbird", SOC_BCM_21553T, soc, 65)
SOC_EQ(tmp, "BCM21663", "21663", SOC_BCM_21663, soc, 40) SOC_EQ(tmp, "BCM21663", "BCM21663", SOC_BCM_21663, soc, 40)
SOC_EQ(tmp, "BCM21664", "21664", SOC_BCM_21664, soc, 40) SOC_EQ(tmp, "BCM21664", "BCM21664", SOC_BCM_21664, soc, 40)
SOC_EQ(tmp, "BCM28155", "28155", SOC_BCM_28155, soc, 40) SOC_EQ(tmp, "BCM28155", "BCM28155", SOC_BCM_28155, soc, 40)
SOC_EQ(tmp, "BCM23550", "23550", SOC_BCM_23550, soc, 40) SOC_EQ(tmp, "BCM23550", "BCM23550", SOC_BCM_23550, soc, 40)
SOC_EQ(tmp, "BCM28145", "28145", SOC_BCM_28145, soc, 40) SOC_EQ(tmp, "BCM28145", "BCM28145", SOC_BCM_28145, soc, 40)
SOC_EQ(tmp, "BCM2157", "2157", SOC_BCM_2157, soc, 65) SOC_EQ(tmp, "BCM2157", "BCM2157", SOC_BCM_2157, soc, 65)
SOC_EQ(tmp, "BCM21654", "21654", SOC_BCM_21654, soc, 40) SOC_EQ(tmp, "BCM21654", "BCM21654", SOC_BCM_21654, soc, 40)
SOC_EQ(tmp, "BCM2711", "2711", SOC_BCM_2711, soc, 28) SOC_EQ(tmp, "BCM2711", "BCM2711", SOC_BCM_2711, soc, 28)
SOC_EQ(tmp, "BCM2712", "2712", SOC_BCM_2712, soc, 16) SOC_EQ(tmp, "BCM2712", "BCM2712", SOC_BCM_2712, soc, 16)
SOC_END SOC_END
} }
@@ -156,7 +160,7 @@ bool match_google(char* soc_name, struct system_on_chip* soc) {
if((tmp = strstr(soc_name, "gs")) == NULL) if((tmp = strstr(soc_name, "gs")) == NULL)
return false; return false;
soc->soc_vendor = SOC_VENDOR_GOOGLE; soc->vendor = SOC_VENDOR_GOOGLE;
SOC_START SOC_START
SOC_EQ(tmp, "gs101", "Tensor", SOC_GOOGLE_TENSOR, soc, 5) SOC_EQ(tmp, "gs101", "Tensor", SOC_GOOGLE_TENSOR, soc, 5)
@@ -175,7 +179,7 @@ bool match_hisilicon(char* soc_name, struct system_on_chip* soc) {
else if((tmp = strstr(soc_name, "kirin")) != NULL); else if((tmp = strstr(soc_name, "kirin")) != NULL);
else return false; else return false;
soc->soc_vendor = SOC_VENDOR_KIRIN; soc->vendor = SOC_VENDOR_KIRIN;
SOC_START SOC_START
SOC_EQ(tmp, "hi3620GFC", "K3V2", SOC_HISILICON_3620, soc, 40) SOC_EQ(tmp, "hi3620GFC", "K3V2", SOC_HISILICON_3620, soc, 40)
@@ -217,7 +221,7 @@ bool match_exynos(char* soc_name, struct system_on_chip* soc) {
else if((tmp = strstr(soc_name, "exynos")) != NULL); else if((tmp = strstr(soc_name, "exynos")) != NULL);
else return false; else return false;
soc->soc_vendor = SOC_VENDOR_EXYNOS; soc->vendor = SOC_VENDOR_EXYNOS;
// Because exynos are recently using "exynosXXXX" instead // Because exynos are recently using "exynosXXXX" instead
// of "universalXXXX" as codenames, SOC_EXY_EQ will check for // of "universalXXXX" as codenames, SOC_EXY_EQ will check for
@@ -277,7 +281,7 @@ bool match_mediatek(char* soc_name, struct system_on_chip* soc) {
if((tmp = strstr(soc_name_upper, "MT")) == NULL) if((tmp = strstr(soc_name_upper, "MT")) == NULL)
return false; return false;
soc->soc_vendor = SOC_VENDOR_MEDIATEK; soc->vendor = SOC_VENDOR_MEDIATEK;
SOC_START SOC_START
// Dimensity // // Dimensity //
@@ -460,7 +464,7 @@ bool match_qualcomm(char* soc_name, struct system_on_chip* soc) {
else if((tmp = strstr(soc_name_upper, "QSD")) != NULL); else if((tmp = strstr(soc_name_upper, "QSD")) != NULL);
else return false; else return false;
soc->soc_vendor = SOC_VENDOR_SNAPDRAGON; soc->vendor = SOC_VENDOR_SNAPDRAGON;
SOC_START SOC_START
// Snapdragon S1 // // Snapdragon S1 //
@@ -613,7 +617,7 @@ bool match_allwinner(char* soc_name, struct system_on_chip* soc) {
if((tmp = strstr(soc_name, "sun")) == NULL) if((tmp = strstr(soc_name, "sun")) == NULL)
return false; return false;
soc->soc_vendor = SOC_VENDOR_ALLWINNER; soc->vendor = SOC_VENDOR_ALLWINNER;
SOC_START SOC_START
// SoCs we can detect just with with the name // SoCs we can detect just with with the name
@@ -737,7 +741,7 @@ void try_parse_soc_from_string(struct system_on_chip* soc, int soc_len, char* so
soc->raw_name = emalloc(sizeof(char) * (soc_len + 1)); soc->raw_name = emalloc(sizeof(char) * (soc_len + 1));
strncpy(soc->raw_name, soc_str, soc_len + 1); strncpy(soc->raw_name, soc_str, soc_len + 1);
soc->raw_name[soc_len] = '\0'; soc->raw_name[soc_len] = '\0';
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
parse_soc_from_string(soc); parse_soc_from_string(soc);
} }
@@ -745,34 +749,34 @@ struct system_on_chip* guess_soc_from_android(struct system_on_chip* soc) {
char tmp[100]; char tmp[100];
int property_len = 0; int property_len = 0;
property_len = android_property_get("ro.mediatek.platform", (char *) &tmp); property_len = android_property_get(PROP_MTK_PLATFORM, (char *) &tmp);
if(property_len > 0) { if(property_len > 0) {
try_parse_soc_from_string(soc, property_len, tmp); try_parse_soc_from_string(soc, property_len, tmp);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property ro.mediatek.platform: %s", tmp); if(soc->vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property %s: %s", PROP_MTK_PLATFORM, tmp);
else return soc; else return soc;
} }
// https://github.com/Dr-Noob/cpufetch/issues/253 // https://github.com/Dr-Noob/cpufetch/issues/253
// ro.soc.model might be more reliable than ro.product.board or // ro.soc.model might be more reliable than ro.product.board or
// ro.board.platform, so try with it first // ro.board.platform, so try with it first
property_len = android_property_get("ro.soc.model", (char *) &tmp); property_len = android_property_get(PROP_SOC_MODEL, (char *) &tmp);
if(property_len > 0) { if(property_len > 0) {
try_parse_soc_from_string(soc, property_len, tmp); try_parse_soc_from_string(soc, property_len, tmp);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property ro.soc.model: %s", tmp); if(soc->vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property %s: %s", PROP_SOC_MODEL, tmp);
else return soc; else return soc;
} }
property_len = android_property_get("ro.product.board", (char *) &tmp); property_len = android_property_get(PROP_PRODUCT_BOARD, (char *) &tmp);
if(property_len > 0) { if(property_len > 0) {
try_parse_soc_from_string(soc, property_len, tmp); try_parse_soc_from_string(soc, property_len, tmp);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property ro.product.board: %s", tmp); if(soc->vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property %s: %s", PROP_PRODUCT_BOARD, tmp);
else return soc; else return soc;
} }
property_len = android_property_get("ro.board.platform", (char *) &tmp); property_len = android_property_get(PROP_BOARD_PLATFORM, (char *) &tmp);
if(property_len > 0) { if(property_len > 0) {
try_parse_soc_from_string(soc, property_len, tmp); try_parse_soc_from_string(soc, property_len, tmp);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property ro.board.platform: %s", tmp); if(soc->vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property %s: %s", PROP_BOARD_PLATFORM, tmp);
else return soc; else return soc;
} }
@@ -838,7 +842,7 @@ bool get_rk_soc_from_efuse(struct system_on_chip* soc, char* efuse) {
int index = 0; int index = 0;
while(socFromRK[index].rk_soc != 0x0) { while(socFromRK[index].rk_soc != 0x0) {
if(socFromRK[index].rk_soc == rk_soc) { if(socFromRK[index].rk_soc == rk_soc) {
fill_soc(soc, socFromRK[index].soc.soc_name, socFromRK[index].soc.soc_model, socFromRK[index].soc.process); fill_soc(soc, socFromRK[index].soc.name, socFromRK[index].soc.model, socFromRK[index].soc.process);
return true; return true;
} }
index++; index++;
@@ -885,7 +889,7 @@ struct system_on_chip* guess_soc_from_uarch(struct system_on_chip* soc, struct c
int index = 0; int index = 0;
while(socFromUarch[index].u != UARCH_UNKNOWN) { while(socFromUarch[index].u != UARCH_UNKNOWN) {
if(socFromUarch[index].u == get_uarch(arch)) { if(socFromUarch[index].u == get_uarch(arch)) {
fill_soc(soc, socFromUarch[index].soc.soc_name, socFromUarch[index].soc.soc_model, socFromUarch[index].soc.process); fill_soc(soc, socFromUarch[index].soc.name, socFromUarch[index].soc.model, socFromUarch[index].soc.process);
return soc; return soc;
} }
index++; index++;
@@ -950,9 +954,10 @@ struct system_on_chip* guess_soc_from_devtree(struct system_on_chip* soc) {
return soc; return soc;
} }
DT_START
// The following are internal codenames of Asahi Linux // The following are internal codenames of Asahi Linux
// https://github.com/AsahiLinux/docs/wiki/Codenames // https://github.com/AsahiLinux/docs/wiki/Codenames
DT_START // https://github.com/Dr-Noob/cpufetch/issues/263
DT_EQ(dt, len, soc, "apple,t8103", "M1", SOC_APPLE_M1, 5) DT_EQ(dt, len, soc, "apple,t8103", "M1", SOC_APPLE_M1, 5)
DT_EQ(dt, len, soc, "apple,t6000", "M1 Pro", SOC_APPLE_M1_PRO, 5) DT_EQ(dt, len, soc, "apple,t6000", "M1 Pro", SOC_APPLE_M1_PRO, 5)
DT_EQ(dt, len, soc, "apple,t6001", "M1 Max", SOC_APPLE_M1_MAX, 5) DT_EQ(dt, len, soc, "apple,t6001", "M1 Max", SOC_APPLE_M1_MAX, 5)
@@ -965,6 +970,15 @@ struct system_on_chip* guess_soc_from_devtree(struct system_on_chip* soc) {
DT_EQ(dt, len, soc, "apple,t6030", "M3 Pro", SOC_APPLE_M3_PRO, 3) DT_EQ(dt, len, soc, "apple,t6030", "M3 Pro", SOC_APPLE_M3_PRO, 3)
DT_EQ(dt, len, soc, "apple,t6031", "M3 Max", SOC_APPLE_M3_MAX, 3) DT_EQ(dt, len, soc, "apple,t6031", "M3 Max", SOC_APPLE_M3_MAX, 3)
DT_EQ(dt, len, soc, "apple,t6034", "M3 Max", SOC_APPLE_M3_MAX, 3) DT_EQ(dt, len, soc, "apple,t6034", "M3 Max", SOC_APPLE_M3_MAX, 3)
// TODO: Add more NXP SoCs: https://elixir.bootlin.com/linux/v6.10.6/source/arch/arm64/boot/dts/freescale
// https://github.com/Dr-Noob/cpufetch/issues/261
// https://www.nxp.com/docs/en/fact-sheet/IMX8MPLUSFS.pdf
DT_EQ(dt, len, soc, "imx8mp-nitrogen8mp", "i.MX 8M Plus", SOC_NXP_IMX8MP, 14)
// TODO: Add more Amlogic SoCs: https://elixir.bootlin.com/linux/v6.10.6/source/arch/arm64/boot/dts/amlogic
// https://github.com/Dr-Noob/cpufetch/issues/268
// https://www.amlogic.com/#Products/393/index.html
// https://wikimovel.com/index.php/Amlogic_A311D
DT_EQ(dt, len, soc, "amlogic,a311d", "A311D", SOC_AMLOGIC_A311D, 12)
DT_END(dt, len) DT_END(dt, len)
} }
@@ -995,7 +1009,7 @@ struct system_on_chip* guess_soc_from_pci(struct system_on_chip* soc, struct cpu
if (socFromPCI[index].vendor_id == dev->vendor_id && if (socFromPCI[index].vendor_id == dev->vendor_id &&
socFromPCI[index].device_id == dev->device_id) { socFromPCI[index].device_id == dev->device_id) {
fill_soc(soc, socFromPCI[index].soc.soc_name, socFromPCI[index].soc.soc_model, socFromPCI[index].soc.process); fill_soc(soc, socFromPCI[index].soc.name, socFromPCI[index].soc.model, socFromPCI[index].soc.process);
return soc; return soc;
} }
} }
@@ -1079,12 +1093,12 @@ struct system_on_chip* guess_soc_apple(struct system_on_chip* soc) {
} }
else { else {
printBug("Found invalid physical cpu number: %d", physicalcpu); printBug("Found invalid physical cpu number: %d", physicalcpu);
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
} }
} }
else { else {
printBugCheckRelease("Found invalid cpu_subfamily: 0x%.8X", cpu_subfamily); printBugCheckRelease("Found invalid cpu_subfamily: 0x%.8X", cpu_subfamily);
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
} }
} }
else if(cpu_family == CPUFAMILY_ARM_AVALANCHE_BLIZZARD) { else if(cpu_family == CPUFAMILY_ARM_AVALANCHE_BLIZZARD) {
@@ -1106,19 +1120,21 @@ struct system_on_chip* guess_soc_apple(struct system_on_chip* soc) {
} }
else { else {
printBug("Found invalid physical cpu number: %d", physicalcpu); printBug("Found invalid physical cpu number: %d", physicalcpu);
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
} }
} }
else { else {
printBugCheckRelease("Found invalid cpu_subfamily: 0x%.8X", cpu_subfamily); printBugCheckRelease("Found invalid cpu_subfamily: 0x%.8X", cpu_subfamily);
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
} }
} }
else if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH || else if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH ||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_2 ||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO || cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO ||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_MAX) { cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_MAX) {
// Check M3 version // Check M3 version
if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH) { if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH ||
cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_2) {
fill_soc(soc, "M3", SOC_APPLE_M3, 3); fill_soc(soc, "M3", SOC_APPLE_M3, 3);
} }
else if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO) { else if(cpu_family == CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO) {
@@ -1129,12 +1145,12 @@ struct system_on_chip* guess_soc_apple(struct system_on_chip* soc) {
} }
else { else {
printBugCheckRelease("Found invalid cpu_family: 0x%.8X", cpu_family); printBugCheckRelease("Found invalid cpu_family: 0x%.8X", cpu_family);
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
} }
} }
else { else {
printBugCheckRelease("Found invalid cpu_family: 0x%.8X", cpu_family); printBugCheckRelease("Found invalid cpu_family: 0x%.8X", cpu_family);
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
} }
return soc; return soc;
} }
@@ -1143,15 +1159,15 @@ struct system_on_chip* guess_soc_apple(struct system_on_chip* soc) {
struct system_on_chip* get_soc(struct cpuInfo* cpu) { struct system_on_chip* get_soc(struct cpuInfo* cpu) {
struct system_on_chip* soc = emalloc(sizeof(struct system_on_chip)); struct system_on_chip* soc = emalloc(sizeof(struct system_on_chip));
soc->raw_name = NULL; soc->raw_name = NULL;
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
soc->soc_model = SOC_MODEL_UNKNOWN; soc->model = SOC_MODEL_UNKNOWN;
soc->process = UNKNOWN; soc->process = UNKNOWN;
#ifdef __linux__ #ifdef __linux__
bool isRPi = is_raspberry_pi(); bool isRPi = is_raspberry_pi();
if(isRPi) { if(isRPi) {
soc = guess_soc_raspbery_pi(soc); soc = guess_soc_raspbery_pi(soc);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
printErr("[RPi] SoC detection failed using revision code, falling back to cpuinfo detection"); printErr("[RPi] SoC detection failed using revision code, falling back to cpuinfo detection");
} }
else { else {
@@ -1160,7 +1176,7 @@ struct system_on_chip* get_soc(struct cpuInfo* cpu) {
} }
soc = guess_soc_from_cpuinfo(soc); soc = guess_soc_from_cpuinfo(soc);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
if(soc->raw_name != NULL) { if(soc->raw_name != NULL) {
printWarn("SoC detection failed using /proc/cpuinfo: Found '%s' string", soc->raw_name); printWarn("SoC detection failed using /proc/cpuinfo: Found '%s' string", soc->raw_name);
} }
@@ -1172,30 +1188,30 @@ struct system_on_chip* get_soc(struct cpuInfo* cpu) {
if(soc->raw_name == NULL) { if(soc->raw_name == NULL) {
printWarn("SoC detection failed using Android: No string found"); printWarn("SoC detection failed using Android: No string found");
} }
else if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { else if(soc->vendor == SOC_VENDOR_UNKNOWN) {
printWarn("SoC detection failed using Android: Found '%s' string", soc->raw_name); printWarn("SoC detection failed using Android: Found '%s' string", soc->raw_name);
} }
#endif // ifdef __ANDROID__ #endif // ifdef __ANDROID__
// If previous steps failed, try with the device tree // If previous steps failed, try with the device tree
if (soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if (soc->vendor == SOC_VENDOR_UNKNOWN) {
soc = guess_soc_from_devtree(soc); soc = guess_soc_from_devtree(soc);
} }
// If previous steps failed, try with nvmem // If previous steps failed, try with nvmem
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
soc = guess_soc_from_nvmem(soc); soc = guess_soc_from_nvmem(soc);
} }
// If previous steps failed, try infering it from the microarchitecture // If previous steps failed, try infering it from the microarchitecture
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
soc = guess_soc_from_uarch(soc, cpu); soc = guess_soc_from_uarch(soc, cpu);
} }
// If previous steps failed, try infering it from the pci device id // If previous steps failed, try infering it from the pci device id
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
soc = guess_soc_from_pci(soc, cpu); soc = guess_soc_from_pci(soc, cpu);
} }
} }
#elif defined __APPLE__ || __MACH__ #elif defined __APPLE__ || __MACH__
soc = guess_soc_apple(soc); soc = guess_soc_apple(soc);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
printWarn("SoC detection failed using cpu_subfamily"); printWarn("SoC detection failed using cpu_subfamily");
} }
else { else {
@@ -1203,7 +1219,7 @@ struct system_on_chip* get_soc(struct cpuInfo* cpu) {
} }
#endif // ifdef __linux__ #endif // ifdef __linux__
if(soc->soc_model == SOC_MODEL_UNKNOWN) { if(soc->model == SOC_MODEL_UNKNOWN) {
// raw_name might not be NULL, but if we were unable to find // raw_name might not be NULL, but if we were unable to find
// the exact SoC, just print "Unkwnown" // the exact SoC, just print "Unkwnown"
soc->raw_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN)+1)); soc->raw_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN)+1));

View File

@@ -382,6 +382,10 @@ enum {
SOC_TEGRA_X1, SOC_TEGRA_X1,
// ALTRA // ALTRA
SOC_AMPERE_ALTRA, SOC_AMPERE_ALTRA,
// NXP
SOC_NXP_IMX8MP,
// AMLOGIC
SOC_AMLOGIC_A311D,
// UNKNOWN // UNKNOWN
SOC_MODEL_UNKNOWN SOC_MODEL_UNKNOWN
}; };
@@ -399,6 +403,8 @@ inline static VENDOR get_soc_vendor_from_soc(SOC soc) {
else if(soc >= SOC_GOOGLE_TENSOR && soc <= SOC_GOOGLE_TENSOR_G3) return SOC_VENDOR_GOOGLE; else if(soc >= SOC_GOOGLE_TENSOR && soc <= SOC_GOOGLE_TENSOR_G3) return SOC_VENDOR_GOOGLE;
else if(soc >= SOC_TEGRA_X1 && soc <= SOC_TEGRA_X1) return SOC_VENDOR_NVIDIA; else if(soc >= SOC_TEGRA_X1 && soc <= SOC_TEGRA_X1) return SOC_VENDOR_NVIDIA;
else if(soc >= SOC_AMPERE_ALTRA && soc <= SOC_AMPERE_ALTRA) return SOC_VENDOR_AMPERE; else if(soc >= SOC_AMPERE_ALTRA && soc <= SOC_AMPERE_ALTRA) return SOC_VENDOR_AMPERE;
else if(soc >= SOC_NXP_IMX8MP && soc <= SOC_NXP_IMX8MP) return SOC_VENDOR_NXP;
else if(soc >= SOC_AMLOGIC_A311D && soc <= SOC_AMLOGIC_A311D) return SOC_VENDOR_AMLOGIC;
return SOC_VENDOR_UNKNOWN; return SOC_VENDOR_UNKNOWN;
} }

View File

@@ -33,6 +33,7 @@ enum {
ISA_ARMv8_3_A, ISA_ARMv8_3_A,
ISA_ARMv8_4_A, ISA_ARMv8_4_A,
ISA_ARMv8_5_A, ISA_ARMv8_5_A,
ISA_ARMv8_6_A,
ISA_ARMv9_A ISA_ARMv9_A
}; };
@@ -93,8 +94,10 @@ static const ISA isas_uarch[] = {
[UARCH_EXYNOS_M5] = ISA_ARMv8_2_A, [UARCH_EXYNOS_M5] = ISA_ARMv8_2_A,
[UARCH_ICESTORM] = ISA_ARMv8_5_A, // https://github.com/llvm/llvm-project/blob/main/llvm/include/llvm/Support/AArch64TargetParser.def [UARCH_ICESTORM] = ISA_ARMv8_5_A, // https://github.com/llvm/llvm-project/blob/main/llvm/include/llvm/Support/AArch64TargetParser.def
[UARCH_FIRESTORM] = ISA_ARMv8_5_A, [UARCH_FIRESTORM] = ISA_ARMv8_5_A,
[UARCH_BLIZZARD] = ISA_ARMv8_5_A, // Not confirmed [UARCH_BLIZZARD] = ISA_ARMv8_6_A, // https://github.com/llvm/llvm-project/blob/main/llvm/unittests/TargetParser/TargetParserTest.cpp
[UARCH_AVALANCHE] = ISA_ARMv8_5_A, [UARCH_AVALANCHE] = ISA_ARMv8_6_A, // https://github.com/llvm/llvm-project/blob/main/llvm/unittests/TargetParser/TargetParserTest.cpp
[UARCH_SAWTOOTH] = ISA_ARMv8_6_A, // https://github.com/llvm/llvm-project/blob/main/llvm/unittests/TargetParser/TargetParserTest.cpp
[UARCH_EVEREST] = ISA_ARMv8_6_A, // https://github.com/llvm/llvm-project/blob/main/llvm/unittests/TargetParser/TargetParserTest.cpp
[UARCH_PJ4] = ISA_ARMv7_A, [UARCH_PJ4] = ISA_ARMv7_A,
[UARCH_XIAOMI] = ISA_ARMv8_A, [UARCH_XIAOMI] = ISA_ARMv8_A,
}; };
@@ -112,6 +115,7 @@ static char* isas_string[] = {
[ISA_ARMv8_3_A] = "ARMv8.3", [ISA_ARMv8_3_A] = "ARMv8.3",
[ISA_ARMv8_4_A] = "ARMv8.4", [ISA_ARMv8_4_A] = "ARMv8.4",
[ISA_ARMv8_5_A] = "ARMv8.5", [ISA_ARMv8_5_A] = "ARMv8.5",
[ISA_ARMv8_6_A] = "ARMv8.6",
[ISA_ARMv9_A] = "ARMv9" [ISA_ARMv9_A] = "ARMv9"
}; };
@@ -271,6 +275,7 @@ bool is_ARMv8_or_newer(struct cpuInfo* cpu) {
cpu->arch->isa == ISA_ARMv8_3_A || cpu->arch->isa == ISA_ARMv8_3_A ||
cpu->arch->isa == ISA_ARMv8_4_A || cpu->arch->isa == ISA_ARMv8_4_A ||
cpu->arch->isa == ISA_ARMv8_5_A || cpu->arch->isa == ISA_ARMv8_5_A ||
cpu->arch->isa == ISA_ARMv8_6_A ||
cpu->arch->isa == ISA_ARMv9_A; cpu->arch->isa == ISA_ARMv9_A;
} }

View File

@@ -225,8 +225,7 @@ bool parse_color(char* optarg_str, struct color*** cs) {
char* build_short_options(void) { char* build_short_options(void) {
const char *c = args_chr; const char *c = args_chr;
int len = sizeof(args_chr) / sizeof(args_chr[0]); int len = sizeof(args_chr) / sizeof(args_chr[0]);
char* str = (char *) emalloc(sizeof(char) * (len*2 + 1)); char* str = (char *) ecalloc(len*2 + 1, sizeof(char));
memset(str, 0, sizeof(char) * (len*2 + 1));
#ifdef ARCH_X86 #ifdef ARCH_X86
sprintf(str, "%c:%c:%c%c%c%c%c%c%c%c%c%c%c%c", sprintf(str, "%c:%c:%c%c%c%c%c%c%c%c%c%c%c%c",

View File

@@ -413,6 +413,26 @@ $C1 ## ### ### \
$C1 \ $C1 \
$C1 " $C1 "
#define ASCII_NXP \
"$C1##### # $C2####### ####### $C3########## \
$C1####### ## $C2####### ####### $C3############### \
$C1########## #### $C2###### ###### $C3### ###### \
$C1############ ##### $C2############ $C3##### ##### \
$C1##### ####### ##### $C2########## $C3################### \
$C1##### ######### $C2############## $C3############### \
$C1##### ###### $C2###### ###### $C3#### \
$C1##### ## $C2###### ###### $C3## "
#define ASCII_AMLOGIC \
"$C1 .#####. ### ### \
$C1 ######## ### \
$C1 ####..### ########## ### ### ##### ### ### \
$C1 .## #. ### ## ## ## ### ## ## ## ## ### ## \
$C1 #### #.# ### ## ## ## ### ## ## ## ## ### ## \
$C1#########.### ## ## ## ## ### ###### ## ### \
$C1 ### \
$C1 ### "
// --------------------- LONG LOGOS ------------------------- // // --------------------- LONG LOGOS ------------------------- //
#define ASCII_AMD_L \ #define ASCII_AMD_L \
"$C1 \ "$C1 \
@@ -589,6 +609,8 @@ asciiL logo_starfive = { ASCII_STARFIVE, 33, 17, false, {C_FG_WHITE},
asciiL logo_sipeed = { ASCII_SIPEED, 41, 16, true, {C_BG_RED, C_BG_WHITE}, {C_FG_RED, C_FG_WHITE} }; asciiL logo_sipeed = { ASCII_SIPEED, 41, 16, true, {C_BG_RED, C_BG_WHITE}, {C_FG_RED, C_FG_WHITE} };
asciiL logo_nvidia = { ASCII_NVIDIA, 45, 19, false, {C_FG_GREEN, C_FG_WHITE}, {C_FG_WHITE, C_FG_GREEN} }; asciiL logo_nvidia = { ASCII_NVIDIA, 45, 19, false, {C_FG_GREEN, C_FG_WHITE}, {C_FG_WHITE, C_FG_GREEN} };
asciiL logo_ampere = { ASCII_AMPERE, 50, 17, false, {C_FG_RED}, {C_FG_WHITE, C_FG_RED} }; asciiL logo_ampere = { ASCII_AMPERE, 50, 17, false, {C_FG_RED}, {C_FG_WHITE, C_FG_RED} };
asciiL logo_nxp = { ASCII_NXP, 55, 8, false, {C_FG_YELLOW, C_FG_CYAN, C_FG_GREEN}, {C_FG_CYAN, C_FG_WHITE} };
asciiL logo_amlogic = { ASCII_AMLOGIC, 58, 8, false, {C_FG_BLUE}, {C_FG_BLUE, C_FG_B_WHITE} };
// Long variants | ----------------------------------------------------------------------------------------------------------------| // Long variants | ----------------------------------------------------------------------------------------------------------------|
asciiL logo_amd_l = { ASCII_AMD_L, 62, 19, true, {C_BG_WHITE, C_BG_GREEN}, {C_FG_WHITE, C_FG_GREEN} }; asciiL logo_amd_l = { ASCII_AMD_L, 62, 19, true, {C_BG_WHITE, C_BG_GREEN}, {C_FG_WHITE, C_FG_GREEN} };

View File

@@ -66,7 +66,7 @@ struct pci_devices * get_pci_paths(void) {
if ((stbuf.st_mode & S_IFMT) == S_IFDIR) { if ((stbuf.st_mode & S_IFMT) == S_IFDIR) {
int strLen = min(MAX_LENGTH_PCI_DIR_NAME, strlen(dp->d_name)) + 1; int strLen = min(MAX_LENGTH_PCI_DIR_NAME, strlen(dp->d_name)) + 1;
pci->devices[i] = emalloc(sizeof(struct pci_device)); pci->devices[i] = emalloc(sizeof(struct pci_device));
pci->devices[i]->path = ecalloc(sizeof(char), strLen); pci->devices[i]->path = ecalloc(strLen, sizeof(char));
strncpy(pci->devices[i]->path, dp->d_name, strLen); strncpy(pci->devices[i]->path, dp->d_name, strLen);
i++; i++;
} }

View File

@@ -391,6 +391,10 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter
art->art = &logo_rockchip; art->art = &logo_rockchip;
else if(art->vendor == SOC_VENDOR_AMPERE) else if(art->vendor == SOC_VENDOR_AMPERE)
art->art = &logo_ampere; art->art = &logo_ampere;
else if(art->vendor == SOC_VENDOR_NXP)
art->art = &logo_nxp;
else if(art->vendor == SOC_VENDOR_AMLOGIC)
art->art = &logo_amlogic;
else if(art->vendor == SOC_VENDOR_NVIDIA) else if(art->vendor == SOC_VENDOR_NVIDIA)
art->art = choose_ascii_art_aux(&logo_nvidia_l, &logo_nvidia, term, lf); art->art = choose_ascii_art_aux(&logo_nvidia_l, &logo_nvidia, term, lf);
else { else {

View File

@@ -16,12 +16,14 @@ static char* soc_trademark_string[] = {
[SOC_VENDOR_EXYNOS] = "Exynos ", [SOC_VENDOR_EXYNOS] = "Exynos ",
[SOC_VENDOR_KIRIN] = "Kirin ", [SOC_VENDOR_KIRIN] = "Kirin ",
[SOC_VENDOR_KUNPENG] = "Kunpeng ", [SOC_VENDOR_KUNPENG] = "Kunpeng ",
[SOC_VENDOR_BROADCOM] = "Broadcom BCM", [SOC_VENDOR_BROADCOM] = "Broadcom ",
[SOC_VENDOR_APPLE] = "Apple ", [SOC_VENDOR_APPLE] = "Apple ",
[SOC_VENDOR_ROCKCHIP] = "Rockchip ", [SOC_VENDOR_ROCKCHIP] = "Rockchip ",
[SOC_VENDOR_GOOGLE] = "Google ", [SOC_VENDOR_GOOGLE] = "Google ",
[SOC_VENDOR_NVIDIA] = "NVIDIA ", [SOC_VENDOR_NVIDIA] = "NVIDIA ",
[SOC_VENDOR_AMPERE] = "Ampere ", [SOC_VENDOR_AMPERE] = "Ampere ",
[SOC_VENDOR_NXP] = "NXP ",
[SOC_VENDOR_AMLOGIC] = "Amlogic ",
// RISC-V // RISC-V
[SOC_VENDOR_SIFIVE] = "SiFive ", [SOC_VENDOR_SIFIVE] = "SiFive ",
[SOC_VENDOR_STARFIVE] = "StarFive ", [SOC_VENDOR_STARFIVE] = "StarFive ",
@@ -31,7 +33,7 @@ static char* soc_trademark_string[] = {
}; };
VENDOR get_soc_vendor(struct system_on_chip* soc) { VENDOR get_soc_vendor(struct system_on_chip* soc) {
return soc->soc_vendor; return soc->vendor;
} }
char* get_str_process(struct system_on_chip* soc) { char* get_str_process(struct system_on_chip* soc) {
@@ -42,39 +44,37 @@ char* get_str_process(struct system_on_chip* soc) {
snprintf(str, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN); snprintf(str, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN);
} }
else { else {
str = emalloc(sizeof(char) * 5); int max_process_len = 5 + 1;
memset(str, 0, sizeof(char) * 5); str = ecalloc(max_process_len, sizeof(char));
snprintf(str, 5, "%dnm", soc->process); snprintf(str, max_process_len, "%dnm", soc->process);
} }
return str; return str;
} }
char* get_soc_name(struct system_on_chip* soc) { char* get_soc_name(struct system_on_chip* soc) {
if(soc->soc_model == SOC_MODEL_UNKNOWN) if(soc->model == SOC_MODEL_UNKNOWN)
return soc->raw_name; return soc->raw_name;
return soc->soc_name; return soc->name;
} }
void fill_soc(struct system_on_chip* soc, char* soc_name, SOC soc_model, int32_t process) { void fill_soc(struct system_on_chip* soc, char* soc_name, SOC soc_model, int32_t process) {
soc->soc_model = soc_model; soc->model = soc_model;
soc->soc_vendor = get_soc_vendor_from_soc(soc_model); soc->vendor = get_soc_vendor_from_soc(soc_model);
soc->process = process; soc->process = process;
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
printBug("fill_soc: soc->soc_vendor == SOC_VENDOR_UNKOWN"); printBug("fill_soc: soc->vendor == SOC_VENDOR_UNKOWN");
// If we fall here there is a bug in socs.h // If we fall here there is a bug in socs.h
// Reset everything to avoid segfault // Reset everything to avoid segfault
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
soc->soc_model = SOC_MODEL_UNKNOWN; soc->model = SOC_MODEL_UNKNOWN;
soc->process = UNKNOWN; soc->process = UNKNOWN;
soc->raw_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN)+1)); soc->raw_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN)+1));
snprintf(soc->raw_name, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN); snprintf(soc->raw_name, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN);
} }
else { else {
soc->process = process; int len = strlen(soc_name) + strlen(soc_trademark_string[soc->vendor]) + 1;
int len = strlen(soc_name) + strlen(soc_trademark_string[soc->soc_vendor]) + 1; soc->name = emalloc(sizeof(char) * len);
soc->soc_name = emalloc(sizeof(char) * len); sprintf(soc->name, "%s%s", soc_trademark_string[soc->vendor], soc_name);
memset(soc->soc_name, 0, sizeof(char) * len);
sprintf(soc->soc_name, "%s%s", soc_trademark_string[soc->soc_vendor], soc_name);
} }
} }

View File

@@ -26,6 +26,8 @@ enum {
SOC_VENDOR_GOOGLE, SOC_VENDOR_GOOGLE,
SOC_VENDOR_NVIDIA, SOC_VENDOR_NVIDIA,
SOC_VENDOR_AMPERE, SOC_VENDOR_AMPERE,
SOC_VENDOR_NXP,
SOC_VENDOR_AMLOGIC,
// RISC-V // RISC-V
SOC_VENDOR_SIFIVE, SOC_VENDOR_SIFIVE,
SOC_VENDOR_STARFIVE, SOC_VENDOR_STARFIVE,
@@ -35,10 +37,10 @@ enum {
}; };
struct system_on_chip { struct system_on_chip {
SOC soc_model; SOC model;
VENDOR soc_vendor; VENDOR vendor;
int32_t process; int32_t process;
char* soc_name; char* name;
char* raw_name; char* raw_name;
}; };

View File

@@ -21,9 +21,12 @@
#define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D #define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
#endif #endif
// M3 / A16 / A17 // M3 / A16 / A17
// https://ratfactor.com/zig/stdlib-browseable2/c/darwin.zig.html // M3: https://ratfactor.com/zig/stdlib-browseable2/c/darwin.zig.html
// https://github.com/Dr-Noob/cpufetch/issues/210 // M3_2: https://github.com/Dr-Noob/cpufetch/issues/230
// PRO: https://github.com/Dr-Noob/cpufetch/issues/225
// MAX: https://github.com/Dr-Noob/cpufetch/issues/210
#define CPUFAMILY_ARM_EVEREST_SAWTOOTH 0x8765EDEA #define CPUFAMILY_ARM_EVEREST_SAWTOOTH 0x8765EDEA
#define CPUFAMILY_ARM_EVEREST_SAWTOOTH_2 0xFA33415E
#define CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO 0x5F4DEA93 #define CPUFAMILY_ARM_EVEREST_SAWTOOTH_PRO 0x5F4DEA93
#define CPUFAMILY_ARM_EVEREST_SAWTOOTH_MAX 0x72015832 #define CPUFAMILY_ARM_EVEREST_SAWTOOTH_MAX 0x72015832

View File

@@ -146,8 +146,7 @@ char* get_field_from_cpuinfo(char* CPUINFO_FIELD) {
char* tmp2 = strstr(tmp1, "\n"); char* tmp2 = strstr(tmp1, "\n");
int strlen = (1 + (tmp2-tmp1)); int strlen = (1 + (tmp2-tmp1));
char* hardware = emalloc(sizeof(char) * strlen); char* hardware = ecalloc(strlen, sizeof(char));
memset(hardware, 0, sizeof(char) * strlen);
strncpy(hardware, tmp1, tmp2-tmp1); strncpy(hardware, tmp1, tmp2-tmp1);
return hardware; return hardware;

View File

@@ -81,9 +81,13 @@ struct topology* get_topology_info(struct cache* cach) {
if(!fill_package_ids_from_sys(package_ids, topo->total_cores)) { if(!fill_package_ids_from_sys(package_ids, topo->total_cores)) {
printWarn("fill_package_ids_from_sys failed, output may be incomplete/invalid"); 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; for(int i=0; i < topo->total_cores; i++) package_ids[i] = 0;
// fill_package_ids_from_sys failed, use a // fill_package_ids_from_sys failed, use udev to try
// more sophisticated wat to find the number of sockets // to find the number of sockets
topo->sockets = get_num_sockets_package_cpus(topo); 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 { else {
// fill_package_ids_from_sys succeeded, use the // fill_package_ids_from_sys succeeded, use the

View File

@@ -25,6 +25,7 @@ enum {
UARCH_PPC603, UARCH_PPC603,
UARCH_PPC440, UARCH_PPC440,
UARCH_PPC470, UARCH_PPC470,
UARCH_ESPRESSO, // Not exactly an uarch, but the codename of Wii U
UARCH_PPC970, UARCH_PPC970,
UARCH_PPC970FX, UARCH_PPC970FX,
UARCH_PPC970MP, 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_PPC603, "PowerPC 603", UNK) // varies
FILL_UARCH(arch->uarch, UARCH_PPC440, "PowerPC 440", UNK) FILL_UARCH(arch->uarch, UARCH_PPC440, "PowerPC 440", UNK)
FILL_UARCH(arch->uarch, UARCH_PPC470, "PowerPC 470", 45) // strange... 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), https://github.com/Dr-Noob/cpufetch/issues/231
FILL_UARCH(arch->uarch, UARCH_PPC970, "PowerPC 970", 130) FILL_UARCH(arch->uarch, UARCH_PPC970, "PowerPC 970", 130)
FILL_UARCH(arch->uarch, UARCH_PPC970FX, "PowerPC 970FX", 90) FILL_UARCH(arch->uarch, UARCH_PPC970FX, "PowerPC 970FX", 90)
FILL_UARCH(arch->uarch, UARCH_PPC970MP, "PowerPC 970MP", 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, 0x7ff50000, UARCH_PPC470)
CHECK_UARCH(arch, pvr, 0xffff0000, 0x00050000, UARCH_PPC470) CHECK_UARCH(arch, pvr, 0xffff0000, 0x00050000, UARCH_PPC470)
CHECK_UARCH(arch, pvr, 0xffff0000, 0x11a50000, UARCH_PPC470) CHECK_UARCH(arch, pvr, 0xffff0000, 0x11a50000, UARCH_PPC470)
CHECK_UARCH(arch, pvr, 0xffffffff, 0x70010201, UARCH_ESPRESSO)
UARCH_END UARCH_END
return arch; return arch;

View File

@@ -13,7 +13,7 @@ bool fill_array_from_sys(int *core_ids, int total_cores, char* SYS_PATH) {
char* buf; char* buf;
char* end; char* end;
char path[128]; char path[128];
memset(path, 0, 128); memset(name, 0, sizeof(char) * 128);
for(int i=0; i < total_cores; i++) { for(int i=0; i < total_cores; i++) {
sprintf(path, "%s%s/cpu%d/%s", _PATH_SYS_SYSTEM, _PATH_SYS_CPU, i, SYS_PATH); sprintf(path, "%s%s/cpu%d/%s", _PATH_SYS_SYSTEM, _PATH_SYS_CPU, i, SYS_PATH);

View File

@@ -100,9 +100,8 @@ struct extensions* get_extensions_from_str(char* str) {
return ext; return ext;
} }
int len = sizeof(char) * (strlen(str)+1); int len = strlen(str);
ext->str = emalloc(sizeof(char) * len); ext->str = ecalloc(len+1, sizeof(char));
memset(ext->str, 0, len);
strncpy(ext->str, str, sizeof(char) * len); strncpy(ext->str, str, sizeof(char) * len);
// Code inspired in Linux kernel (riscv_fill_hwcap): // Code inspired in Linux kernel (riscv_fill_hwcap):

View File

@@ -12,7 +12,7 @@ bool match_sifive(char* soc_name, struct system_on_chip* soc) {
/*if((tmp = strstr(soc_name, "???")) == NULL) /*if((tmp = strstr(soc_name, "???")) == NULL)
return false;*/ return false;*/
//soc->soc_vendor = ??? //soc->vendor = ???
SOC_START SOC_START
SOC_EQ(tmp, "fu740", "Freedom U740", SOC_SIFIVE_U740, soc, 40) SOC_EQ(tmp, "fu740", "Freedom U740", SOC_SIFIVE_U740, soc, 40)
@@ -68,12 +68,12 @@ struct system_on_chip* guess_soc_from_devtree(struct system_on_chip* soc) {
struct system_on_chip* get_soc(struct cpuInfo* cpu) { struct system_on_chip* get_soc(struct cpuInfo* cpu) {
struct system_on_chip* soc = emalloc(sizeof(struct system_on_chip)); struct system_on_chip* soc = emalloc(sizeof(struct system_on_chip));
soc->raw_name = NULL; soc->raw_name = NULL;
soc->soc_vendor = SOC_VENDOR_UNKNOWN; soc->vendor = SOC_VENDOR_UNKNOWN;
soc->soc_model = SOC_MODEL_UNKNOWN; soc->model = SOC_MODEL_UNKNOWN;
soc->process = UNKNOWN; soc->process = UNKNOWN;
soc = guess_soc_from_devtree(soc); soc = guess_soc_from_devtree(soc);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->vendor == SOC_VENDOR_UNKNOWN) {
if(soc->raw_name != NULL) { if(soc->raw_name != NULL) {
printWarn("SoC detection failed using device tree: Found '%s' string", soc->raw_name); printWarn("SoC detection failed using device tree: Found '%s' string", soc->raw_name);
} }
@@ -82,7 +82,7 @@ struct system_on_chip* get_soc(struct cpuInfo* cpu) {
} }
} }
if(soc->soc_model == SOC_MODEL_UNKNOWN) { if(soc->model == SOC_MODEL_UNKNOWN) {
// raw_name might not be NULL, but if we were unable to find // raw_name might not be NULL, but if we were unable to find
// the exact SoC, just print "Unkwnown" // the exact SoC, just print "Unkwnown"
soc->raw_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN)+1)); soc->raw_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN)+1));

View File

@@ -40,8 +40,7 @@ char* get_field_from_devtree(int DEVTREE_FIELD) {
tmp1++; tmp1++;
int strlen = filelen-(tmp1-buf); int strlen = filelen-(tmp1-buf);
char* hardware = emalloc(sizeof(char) * strlen); char* hardware = ecalloc(strlen, sizeof(char));
memset(hardware, 0, sizeof(char) * strlen);
strncpy(hardware, tmp1, strlen-1); strncpy(hardware, tmp1, strlen-1);
return hardware; return hardware;
@@ -70,9 +69,8 @@ char* parse_cpuinfo_field(char* field_str) {
} }
int ret_strlen = (end-tmp); int ret_strlen = (end-tmp);
char* ret = emalloc(sizeof(char) * (ret_strlen+1)); char* ret = ecalloc(ret_strlen+1, sizeof(char));
memset(ret, 0, sizeof(char) * (ret_strlen+1)); strncpy(ret, tmp, sizeof(char) * ret_strlen);
strncpy(ret, tmp, ret_strlen);
return ret; return ret;
} }

View File

@@ -234,15 +234,11 @@ uint32_t max_apic_id_size(uint32_t** cache_id_apic, struct topology* topo) {
bool build_topo_from_apic(uint32_t* apic_pkg, uint32_t* apic_smt, uint32_t** cache_id_apic, struct topology* topo) { bool build_topo_from_apic(uint32_t* apic_pkg, uint32_t* apic_smt, uint32_t** cache_id_apic, struct topology* topo) {
uint32_t size = max_apic_id_size(cache_id_apic, topo); uint32_t size = max_apic_id_size(cache_id_apic, topo);
uint32_t* sockets = emalloc(sizeof(uint32_t) * size); uint32_t* sockets = ecalloc(size, sizeof(uint32_t));
uint32_t* smt = emalloc(sizeof(uint32_t) * size); uint32_t* smt = ecalloc(size, sizeof(uint32_t));
uint32_t* apic_id = emalloc(sizeof(uint32_t) * size); uint32_t* apic_id = ecalloc(size, sizeof(uint32_t));
uint32_t num_caches = 0; uint32_t num_caches = 0;
memset(sockets, 0, sizeof(uint32_t) * size);
memset(smt, 0, sizeof(uint32_t) * size);
memset(apic_id, 0, sizeof(uint32_t) * size);
// System topology // System topology
for(int i=0; i < topo->total_cores_module; i++) { for(int i=0; i < topo->total_cores_module; i++) {
sockets[apic_pkg[i]] = 1; sockets[apic_pkg[i]] = 1;

View File

@@ -91,8 +91,7 @@ char* get_str_cpu_name_internal(void) {
uint32_t edx = 0; uint32_t edx = 0;
uint32_t c = 0; uint32_t c = 0;
char * name = emalloc(sizeof(char) * CPU_NAME_MAX_LENGTH); char * name = ecalloc(CPU_NAME_MAX_LENGTH, sizeof(char));
memset(name, 0, CPU_NAME_MAX_LENGTH);
for(int i=0; i < 3; i++) { for(int i=0; i < 3; i++) {
eax = 0x80000002 + i; eax = 0x80000002 + i;
@@ -281,7 +280,7 @@ struct hypervisor* get_hp_info(bool hv_present) {
} }
else { else {
char name[13]; char name[13];
memset(name, 0, 13); memset(name, 0, sizeof(char) * 13);
get_name_cpuid(name, ebx, ecx, edx); get_name_cpuid(name, ebx, ecx, edx);
bool found = false; bool found = false;
@@ -471,7 +470,7 @@ struct cpuInfo* get_cpu_info(void) {
//Fill vendor //Fill vendor
char name[13]; char name[13];
memset(name,0,13); memset(name, 0, sizeof(char) * 13);
get_name_cpuid(name, ebx, edx, ecx); get_name_cpuid(name, ebx, edx, ecx);
if(strcmp(CPU_VENDOR_INTEL_STRING,name) == 0) if(strcmp(CPU_VENDOR_INTEL_STRING,name) == 0)

View File

@@ -116,8 +116,25 @@ int64_t measure_frequency(struct cpuInfo* cpu) {
} }
pthread_t* compute_th = malloc(sizeof(pthread_t) * cpu->topo->total_cores); pthread_t* compute_th = malloc(sizeof(pthread_t) * cpu->topo->total_cores);
cpu_set_t cpus;
pthread_attr_t attr;
if ((ret = pthread_attr_init(&attr)) != 0) {
printErr("pthread_attr_init: %s", strerror(ret));
return -1;
}
for(int i=0; i < cpu->topo->total_cores; i++) { for(int i=0; i < cpu->topo->total_cores; i++) {
ret = pthread_create(&compute_th[i], NULL, compute_function, NULL); // We might have called bind_to_cpu previously, binding the threads
// to a specific core, so now we must make sure we run the new thread
// on the correct core.
CPU_ZERO(&cpus);
CPU_SET(i, &cpus);
if ((ret = pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &cpus)) != 0) {
printErr("pthread_attr_setaffinity_np: %s", strerror(ret));
return -1;
}
ret = pthread_create(&compute_th[i], &attr, compute_function, NULL);
if(ret != 0) { if(ret != 0) {
fprintf(stderr, "Error creating thread\n"); fprintf(stderr, "Error creating thread\n");