[v1.05] Clean up previous commit

Makefile

@@ -7,33 +7,23 @@ PREFIX ?= /usr
 
 SRC_COMMON=src/common/
 
-COMMON_SRC = $(SRC_COMMON)main.c $(SRC_COMMON)cpu.c $(SRC_COMMON)udev.c $(SRC_COMMON)printer.c $(SRC_COMMON)args.c $(SRC_COMMON)global.c
+COMMON_SRC = $(SRC_COMMON)main.c $(SRC_COMMON)cpu.c $(SRC_COMMON)udev.c $(SRC_COMMON)printer.c $(SRC_COMMON)args.c $(SRC_COMMON)global.c $(SRC_COMMON)freq.c
-COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_COMMON)printer.h $(SRC_COMMON)args.h $(SRC_COMMON)global.h
+COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_COMMON)printer.h $(SRC_COMMON)args.h $(SRC_COMMON)global.h $(SRC_COMMON)freq.h
 
 ifneq ($(OS),Windows_NT)
 	GIT_VERSION := "$(shell git describe --abbrev=4 --dirty --always --tags)"
 	arch := $(shell uname -m)
-	os := $(shell uname -s)
-
-	ifeq ($(os), Linux)
-		COMMON_SRC += $(SRC_COMMON)freq.c
-		COMMON_HDR += $(SRC_COMMON)freq.h
-	endif
-
 	ifeq ($(arch), $(filter $(arch), x86_64 amd64 i386 i486 i586 i686))
 		SRC_DIR=src/x86/
 		SOURCE += $(COMMON_SRC) $(SRC_DIR)cpuid.c $(SRC_DIR)apic.c $(SRC_DIR)cpuid_asm.c $(SRC_DIR)uarch.c
 		HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h $(SRC_DIR)freq/freq.h
 
+                os := $(shell uname -s)
                 ifeq ($(os), Linux)
 			SOURCE += $(SRC_DIR)freq/freq.c freq_nov.o freq_avx.o freq_avx512.o
 			HEADERS += $(SRC_DIR)freq/freq.h
 			CFLAGS += -pthread
                 endif
-		ifeq ($(os), FreeBSD)
-			SOURCE += $(SRC_COMMON)sysctl.c
-			HEADERS += $(SRC_COMMON)sysctl.h
-		endif
 		CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
 	else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
 		SRC_DIR=src/ppc/
@@ -42,19 +32,14 @@ ifneq ($(OS),Windows_NT)
 		CFLAGS += -DARCH_PPC -std=gnu99 -fstack-protector-all -Wno-language-extension-token
 	else ifeq ($(arch), $(filter $(arch), arm aarch64_be aarch64 arm64 armv8b armv8l armv7l armv6l))
 		SRC_DIR=src/arm/
-		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_COMMON)pci.c $(SRC_DIR)udev.c sve.o
+		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
-		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_COMMON)pci.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
+		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
 		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
 
-		# Check if the compiler supports -march=armv8-a+sve. We will use it (if supported) to compile SVE detection code later
+		os := $(shell uname -s)
-		is_sve_flag_supported := $(shell $(CC) -march=armv8-a+sve -c $(SRC_DIR)sve.c -o sve_test.o 2> /dev/null && echo 'yes'; rm -f sve_test.o)
-		ifeq ($(is_sve_flag_supported), yes)
-			SVE_FLAGS += -march=armv8-a+sve
-		endif
-
 		ifeq ($(os), Darwin)
-			SOURCE += $(SRC_COMMON)sysctl.c
+			SOURCE += $(SRC_DIR)sysctl.c
-			HEADERS += $(SRC_COMMON)sysctl.h
+			HEADERS += $(SRC_DIR)sysctl.h
 		endif
         else ifeq ($(arch), $(filter $(arch), riscv64 riscv32))
                 SRC_DIR=src/riscv/
@@ -101,9 +86,6 @@ freq_avx.o: Makefile $(SRC_DIR)freq/freq_avx.c $(SRC_DIR)freq/freq_avx.h $(SRC_D
 freq_avx512.o: Makefile $(SRC_DIR)freq/freq_avx512.c $(SRC_DIR)freq/freq_avx512.h $(SRC_DIR)freq/freq.h
 	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
 
-sve.o: Makefile $(SRC_DIR)sve.c $(SRC_DIR)sve.h
-	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SVE_FLAGS) -c $(SRC_DIR)sve.c -o $@
-
 $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
 ifeq ($(GIT_VERSION),"")
 	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)

README.md

@@ -45,7 +45,6 @@ cpufetch is a command-line tool written in C that displays the CPU information i
   - [3.1 x86_64](#31-x86_64)
   - [3.2 ARM](#32-arm)
   - [3.3 PowerPC](#33-powerpc)
-  - [3.4 RISC-V](#34-risc-v)
 - [4. Colors](#4-colors)
   - [4.1 Specifying a name](#41-specifying-a-name)
   - [4.2 Specifying the colors in RGB format](#42-specifying-the-colors-in-rgb-format)
@@ -121,11 +120,6 @@ make
 <p align="center"><img width=90% src="pictures/ibm.png"></p>
 <p align="center">Talos II</p>
 
-## 3.4 RISC-V
-
-<p align="center"><img width=80% src="pictures/starfive.png"></p>
-<p align="center">StarFive VisionFive 2</p>
-
 ## 4. Colors
 By default, `cpufetch` will print the CPU logo with the system colorscheme. However, you can set a custom color scheme in two different ways:
 
@@ -181,7 +175,6 @@ Thanks to the fellow contributors and interested people in the project. Special
 - [mdoksa76](https://github.com/mdoksa76) and [exkc](https://github.com/exkc): Excellent ideas and feedback for supporting Allwinner SoCs.
 - [Sakura286](https://github.com/Sakura286), [exkc](https://github.com/exkc) and [Patola](https://github.com/Patola): Helped with RISC-V port with ssh access, ideas, testing, etc.
 - [ThomasKaiser](https://github.com/ThomasKaiser): Very valuable feedback on improving ARM SoC detection (Apple, Allwinner, Rockchip).
-- [zerkerX](https://github.com/zerkerX): Helped with feedback for supporting old (e.g., Pentium III) Intel CPUs.
 
 ## 8. cpufetch for GPUs (gpufetch)
 See [gpufetch](https://github.com/Dr-Noob/gpufetch) project!

src/arm/midr.c

@@ -8,18 +8,16 @@
 #ifdef __linux__
   #include <sys/auxv.h>
   #include <asm/hwcap.h>
-  #include "../common/freq.h"
 #elif defined __APPLE__ || __MACH__
-  #include "../common/sysctl.h"
+  #include "sysctl.h"
 #endif
 
 #include "../common/global.h"
 #include "../common/soc.h"
-#include "../common/args.h"
+#include "../common/freq.h"
 #include "udev.h"
 #include "midr.h"
 #include "uarch.h"
-#include "sve.h"
 
 bool cores_are_equal(int c1pos, int c2pos, uint32_t* midr_array, int32_t* freq_array) {
   return midr_array[c1pos] == midr_array[c2pos] && freq_array[c1pos] == freq_array[c2pos];
@@ -42,15 +40,12 @@ struct cache* get_cache_info(struct cpuInfo* cpu) {
 struct frequency* get_frequency_info(uint32_t core) {
   struct frequency* freq = emalloc(sizeof(struct frequency));
 
-  freq->measured = false;
   freq->base = UNKNOWN_DATA;
   freq->max = get_max_freq_from_file(core);
   #ifdef __linux__
-    if (freq->max == UNKNOWN_DATA || measure_max_frequency_flag()) {
+    if (freq->max == UNKNOWN_DATA) {
-      if (freq->max == UNKNOWN_DATA)
       printWarn("Unable to find max frequency from udev, measuring CPU frequency");
       freq->max = measure_max_frequency(core);
-      freq->measured = true;
     }
   #endif
 
@@ -169,15 +164,6 @@ struct features* get_features_info(void) {
     feat->SHA1 = hwcaps & HWCAP_SHA1;
     feat->SHA2 = hwcaps & HWCAP_SHA2;
     feat->NEON = hwcaps & HWCAP_ASIMD;
-    feat->SVE = hwcaps & HWCAP_SVE;
-
-    hwcaps = getauxval(AT_HWCAP2);
-    if (errno == ENOENT) {
-      printWarn("Unable to retrieve AT_HWCAP2 using getauxval");
-    }
-    else {
-      feat->SVE2 = hwcaps & HWCAP2_SVE2;
-    }
   }
 #else
   else {
@@ -193,8 +179,6 @@ struct features* get_features_info(void) {
     feat->CRC32 = hwcaps & HWCAP2_CRC32;
     feat->SHA1 = hwcaps & HWCAP2_SHA1;
     feat->SHA2 = hwcaps & HWCAP2_SHA2;
-    feat->SVE = false;
-    feat->SVE2 = false;
   }
 #endif // ifdef __aarch64__
 #elif defined __APPLE__ || __MACH__
@@ -204,14 +188,8 @@ struct features* get_features_info(void) {
   feat->SHA1 = true;
   feat->SHA2 = true;
   feat->NEON = true;
-  feat->SVE = false;
-  feat->SVE2 = false;
 #endif  // ifdef __linux__
 
-  if (feat->SVE || feat->SVE2) {
-    feat->cntb = sve_cntb();
-  }
-
   return feat;
 }
 
@@ -448,7 +426,7 @@ char* get_str_topology(struct cpuInfo* cpu, struct topology* topo, bool dual_soc
 
 char* get_str_features(struct cpuInfo* cpu) {
   struct features* feat = cpu->feat;
-  uint32_t max_len = strlen("NEON,SHA1,SHA2,AES,CRC32,SVE,SVE2,") + 1;
+  uint32_t max_len = strlen("NEON,SHA1,SHA2,AES,CRC32,") + 1;
   uint32_t len = 0;
   char* string = ecalloc(max_len, sizeof(char));
 
@@ -456,14 +434,6 @@ char* get_str_features(struct cpuInfo* cpu) {
     strcat(string, "NEON,");
     len += 5;
   }
-  if(feat->SVE) {
-    strcat(string, "SVE,");
-    len += 4;
-  }
-  if(feat->SVE2) {
-    strcat(string, "SVE2,");
-    len += 5;
-  }
   if(feat->SHA1) {
     strcat(string, "SHA1,");
     len += 5;
@@ -513,10 +483,6 @@ void print_debug(struct cpuInfo* cpu) {
     }
   }
 
-  if (cpu->feat->SVE || cpu->feat->SVE2) {
-    printf("- cntb: %d\n", (int) cpu->feat->cntb);
-  }
-
   #if defined(__APPLE__) || defined(__MACH__)
     printf("hw.cpufamily: 0x%.8X\n", get_sys_info_by_name("hw.cpufamily"));
     printf("hw.cpusubfamily: 0x%.8X\n", get_sys_info_by_name("hw.cpusubfamily"));

src/arm/soc.c

@@ -8,10 +8,9 @@
 #include "udev.h"
 #include "uarch.h"
 #include "../common/global.h"
-#include "../common/pci.h"
 
 #if defined(__APPLE__) || defined(__MACH__)
-  #include "../common/sysctl.h"
+  #include "sysctl.h"
 #endif
 
 #define NA -1
@@ -167,13 +166,11 @@ bool match_google(char* soc_name, struct system_on_chip* soc) {
 
 // https://www.techinsights.com/
 // https://datasheetspdf.com/pdf-file/1316605/HiSilicon/Hi3660/1
-// https://github.com/Dr-Noob/cpufetch/issues/259
 bool match_hisilicon(char* soc_name, struct system_on_chip* soc) {
   char* tmp;
 
-  if((tmp = strstr(soc_name, "hi")) != NULL);
+  if((tmp = strstr(soc_name, "hi")) == NULL)
-  else if((tmp = strstr(soc_name, "kirin")) != NULL);
+    return false;
-  else return false;
 
   soc->soc_vendor = SOC_VENDOR_KIRIN;
 
@@ -206,7 +203,6 @@ bool match_hisilicon(char* soc_name, struct system_on_chip* soc) {
   SOC_EQ(tmp, "hi3680",     "980",   SOC_HISILICON_3680, soc,  7)
   //SOC_EQ(tmp, "?",        "985",   SOC_KIRIN, soc,  7)
   SOC_EQ(tmp, "hi3690",     "990",   SOC_HISILICON_3690, soc,  7)
-  SOC_EQ(tmp, "kirin9000s", "9000s", SOC_HISILICON_9000S,soc,  7)
   SOC_END
 }
 
@@ -424,9 +420,6 @@ bool match_mediatek(char* soc_name, struct system_on_chip* soc) {
 }
 
 /*
- * Good sources:
- * https://www.geektopia.es/es/products/company/qualcomm/socs/
- *
  * APQ: Application Processor Qualcomm
  * MSM: Mobile Station Modem
  * In a APQXXXX or MSMXXXX, the second digit represents:
@@ -584,25 +577,6 @@ bool match_qualcomm(char* soc_name, struct system_on_chip* soc) {
   SOC_EQ(tmp, "SM8250-AB",      "865+",      SOC_SNAPD_SM8250_AB,      soc,  7)
   SOC_EQ(tmp, "SM8350",         "888",       SOC_SNAPD_SM8350,         soc,  5)
   SOC_EQ(tmp, "SM8350-AC",      "888+",      SOC_SNAPD_SM8350,         soc,  5)
-  // Snapdragon Gen 4 //
-  SOC_EQ(tmp, "SM4375",         "4 Gen 1",   SOC_SNAPD_SM4375,         soc,  6)
-  SOC_EQ(tmp, "SM4450",         "4 Gen 2",   SOC_SNAPD_SM4450,         soc,  4)
-  SOC_EQ(tmp, "SM4635",         "4s Gen 2",  SOC_SNAPD_SM4635,         soc,  4)
-  // Snapdragon Gen 6 //
-  SOC_EQ(tmp, "SM6375-AC",      "6s Gen 3",  SOC_SNAPD_SM6375_AC,      soc,  6)
-  SOC_EQ(tmp, "SM6450",         "6 Gen 1",   SOC_SNAPD_SM6450,         soc,  4)
-  // Snapdragon Gen 7 //
-  SOC_EQ(tmp, "SM7435-AB",      "7s Gen 2",  SOC_SNAPD_SM7435_AB,      soc,  4)
-  SOC_EQ(tmp, "SM7450",         "7 Gen 1",   SOC_SNAPD_SM7450,         soc,  4)
-  SOC_EQ(tmp, "SM7475",         "7+ Gen 2",  SOC_SNAPD_SM7475,         soc,  4)
-  SOC_EQ(tmp, "SM7550-AB",      "7 Gen 3",   SOC_SNAPD_SM7550_AB,      soc,  4)
-  SOC_EQ(tmp, "SM7675-AB",      "7+ Gen 3",  SOC_SNAPD_SM7675_AB,      soc,  4)
-  // Snapdragon Gen 8 //
-  SOC_EQ(tmp, "SM8450",         "8 Gen 1",   SOC_SNAPD_SM8450,         soc,  4)
-  SOC_EQ(tmp, "SM8475",         "8+ Gen 1",  SOC_SNAPD_SM8475,         soc,  4)
-  SOC_EQ(tmp, "SM8550-AB",      "8 Gen 2",   SOC_SNAPD_SM8550_AB,      soc,  4)
-  SOC_EQ(tmp, "SM8635",         "8s Gen 3",  SOC_SNAPD_SM8635,         soc,  4)
-  SOC_EQ(tmp, "SM8650-AB",      "8 Gen 3",   SOC_SNAPD_SM8650_AB,      soc,  4)
   SOC_END
 }
 
@@ -649,37 +623,12 @@ bool match_special(char* soc_name, struct system_on_chip* soc) {
     return true;
   }
 
-  // New Snapdragon SoCs codenames
+  // Snapdragon 8 Gen 1 reported as "taro"
-  // https://github.com/sm8450-mainline/fdt?tab=readme-ov-file#chipsets
-  // https://github.com/Dr-Noob/cpufetch/issues/253
-  if (strcmp(soc_name, "cape") == 0) {
-    fill_soc(soc, "8+ Gen 1", SOC_SNAPD_SM8475, 4);
-    return true;
-  }
-
   if(strcmp(soc_name, "taro") == 0) {
     fill_soc(soc, "8 Gen 1", SOC_SNAPD_SM8450, 4);
     return true;
   }
 
-  if(strcmp(soc_name, "ukee") == 0) {
-    fill_soc(soc, "7+ Gen 2", SOC_SNAPD_SM7475, 4);
-    return true;
-  }
-
-  if(strcmp(soc_name, "diwali") == 0) {
-    fill_soc(soc, "7 Gen 1", SOC_SNAPD_SM7450, 4);
-    return true;
-  }
-
-  // parrot can be either SM7435 or SM6450, we need more data
-  // to distingish between those two
-
-  if(strcmp(soc_name, "ravelin") == 0) {
-    fill_soc(soc, "4 Gen 2", SOC_SNAPD_SM4450, 4);
-    return true;
-  }
-
   // Google Pixel 6
   // https://github.com/Dr-Noob/cpufetch/issues/134
   if(strcmp(soc_name, "oriole") == 0) {
@@ -752,16 +701,6 @@ struct system_on_chip* guess_soc_from_android(struct system_on_chip* soc) {
     else return soc;
   }
 
-  // https://github.com/Dr-Noob/cpufetch/issues/253
-  // ro.soc.model might be more reliable than ro.product.board or
-  // ro.board.platform, so try with it first
-  property_len = android_property_get("ro.soc.model", (char *) &tmp);
-  if(property_len > 0) {
-    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);
-    else return soc;
-  }
-
   property_len = android_property_get("ro.product.board", (char *) &tmp);
   if(property_len > 0) {
     try_parse_soc_from_string(soc, property_len, tmp);
@@ -895,121 +834,6 @@ struct system_on_chip* guess_soc_from_uarch(struct system_on_chip* soc, struct c
   return soc;
 }
 
-// Return the dt string without the NULL characters.
-char* get_dt_str(char* dt, int filelen) {
-  char* dt_without_null = (char *) malloc(sizeof(char) * filelen);
-  memcpy(dt_without_null, dt, filelen);
-
-  for (int i=0; i < filelen-1; i++) {
-    if (dt_without_null[i] == '\0')
-      dt_without_null[i] = ',';
-  }
-  return dt_without_null;
-}
-
-bool match_dt(struct system_on_chip* soc, char* dt, int filelen, char* expected_name, char* soc_name, SOC soc_model, int32_t process) {
-  // The /proc/device-tree/compatible file (passed by dt) uses NULL
-  // to separate the strings, so we need to make an special case here
-  // and iterate over the NULL characters, thus iterating over each
-  // individual compatible strings.
-
-  if (strstr(dt, expected_name) != NULL) {
-    fill_soc(soc, soc_name, soc_model, process);
-    return true;
-  }
-
-  char *compatible = dt;
-  char *end_of_dt = dt + filelen;
-
-  while ((compatible = strchr(compatible, '\0')) != end_of_dt) {
-    compatible++;
-    if (strstr(compatible, expected_name) != NULL) {
-      fill_soc(soc, soc_name, soc_model, process);
-      return true;
-    }
-  }
-
-  return false;
-}
-
-#define DT_START if (false) {}
-#define DT_EQ(dt, filelen, soc, expected_name, soc_name, soc_model, process) \
-   else if (match_dt(soc, dt, filelen, expected_name, soc_name, soc_model, process)) return soc;
-#define DT_END(dt, filelen) else { printWarn("guess_soc_from_devtree: No match found for '%s'", get_dt_str(dt, filelen)); return soc; }
-
-// TODO: Move this to doc
-// The number of fields seems non-standard, so for now it seems wiser
-// to just get the entire string with all fields and just look for the
-// substring.
-// TODO: Implement this by going trough NULL-separated fields rather than
-// using strstr.
-struct system_on_chip* guess_soc_from_devtree(struct system_on_chip* soc) {
-  int len;
-  char* dt = get_devtree_compatible(&len);
-  if (dt == NULL) {
-    return soc;
-  }
-
-  DT_START
-  // The following are internal codenames of Asahi Linux
-  // https://github.com/AsahiLinux/docs/wiki/Codenames
-  // 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,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,t6002", "M1 Ultra", SOC_APPLE_M1_ULTRA, 5)
-  DT_EQ(dt, len, soc, "apple,t8112", "M2",       SOC_APPLE_M2,       5)
-  DT_EQ(dt, len, soc, "apple,t6020", "M2 Pro",   SOC_APPLE_M2_PRO,   5)
-  DT_EQ(dt, len, soc, "apple,t6021", "M2 Max",   SOC_APPLE_M2_MAX,   5)
-  DT_EQ(dt, len, soc, "apple,t6022", "M2 Ultra", SOC_APPLE_M2_ULTRA, 5)
-  DT_EQ(dt, len, soc, "apple,t8122", "M3",       SOC_APPLE_M3,       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,t6034", "M3 Max",   SOC_APPLE_M3_MAX,   3)
-  // 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)
-  DT_END(dt, len)
-}
-
-struct system_on_chip* guess_soc_from_pci(struct system_on_chip* soc, struct cpuInfo* cpu) {
-  struct pci_devices * pci = get_pci_devices();
-  if (pci == NULL) {
-    printWarn("guess_soc_from_pci: Unable to find suitable PCI devices");
-    return soc;
-  }
-
-  typedef struct {
-    uint16_t vendor_id;
-    uint16_t device_id;
-    struct system_on_chip soc;
-  } pciToSoC;
-
-  pciToSoC socFromPCI[] = {
-    {PCI_VENDOR_NVIDIA, PCI_DEVICE_TEGRA_X1, {SOC_TEGRA_X1,     SOC_VENDOR_NVIDIA,  20, "Tegra X1", NULL} },
-    // {PCI_VENDOR_NVIDIA, PCI_DEVICE_GH_200,{SOC_GH_200,       SOC_VENDOR_NVIDIA,   ?, "Grace Hopper", NULL} },
-    {PCI_VENDOR_AMPERE, PCI_DEVICE_ALTRA,    {SOC_AMPERE_ALTRA, SOC_VENDOR_AMPERE,   7, "Altra",    NULL} }, // https://www.anandtech.com/show/15575/amperes-altra-80-core-n1-soc-for-hyperscalers-against-rome-and-xeon
-    {0x0000,            0x0000,              {UNKNOWN,          SOC_VENDOR_UNKNOWN, -1,      "",    NULL} }
-  };
-
-  int index = 0;
-  while (socFromPCI[index].vendor_id != 0x0) {
-    for (int i=0; i < pci->num_devices; i++) {
-      struct pci_device * dev = pci->devices[i];
-
-      if (socFromPCI[index].vendor_id == dev->vendor_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);
-        return soc;
-      }
-    }
-    index++;
-  }
-
-  printWarn("guess_soc_from_pci: No PCI device matched the list");
-  return soc;
-}
-
 int hex2int(char c) {
   if (c >= '0' && c <= '9')
     return c - '0';
@@ -1180,22 +1004,14 @@ struct system_on_chip* get_soc(struct cpuInfo* cpu) {
       printWarn("SoC detection failed using Android: Found '%s' string", soc->raw_name);
     }
 #endif // ifdef __ANDROID__
-    // If previous steps failed, try with the device tree
+    // If cpufinfo/Android (if available) detection fails, try with nvmem
-    if (soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
-      soc = guess_soc_from_devtree(soc);
-    }
-    // If previous steps failed, try with nvmem
     if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
       soc = guess_soc_from_nvmem(soc);
     }
-    // If previous steps failed, try infering it from the microarchitecture
+    // If everything else failed, try infering it from the microarchitecture
     if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
       soc = guess_soc_from_uarch(soc, cpu);
     }
-    // If previous steps failed, try infering it from the pci device id
-    if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
-      soc = guess_soc_from_pci(soc, cpu);
-    }
   }
 #elif defined __APPLE__ || __MACH__
   soc = guess_soc_apple(soc);

src/arm/socs.h

@@ -29,7 +29,6 @@ enum {
   SOC_HISILICON_3670,
   SOC_HISILICON_3680,
   SOC_HISILICON_3690,
-  SOC_HISILICON_9000S,
   // Kunpeng //
   SOC_KUNPENG_920,
   SOC_KUNPENG_930,
@@ -271,16 +270,11 @@ enum {
   SOC_SNAPD_SDM660,
   SOC_SNAPD_SM6115,
   SOC_SNAPD_SM6125,
-  SOC_SNAPD_SM6375_AC,
-  SOC_SNAPD_SM6450,
   SOC_SNAPD_SDM670,
   SOC_SNAPD_SM6150,
   SOC_SNAPD_SM6350,
   SOC_SNAPD_SDM710,
   SOC_SNAPD_SDM712,
-  SOC_SNAPD_SM4375,
-  SOC_SNAPD_SM4450,
-  SOC_SNAPD_SM4635,
   SOC_SNAPD_SM7125,
   SOC_SNAPD_SM7150_AA,
   SOC_SNAPD_SM7150_AB,
@@ -289,11 +283,6 @@ enum {
   SOC_SNAPD_SM7250_AA,
   SOC_SNAPD_SM7250_AB,
   SOC_SNAPD_SM7250_AC,
-  SOC_SNAPD_SM7435_AB,
-  SOC_SNAPD_SM7450,
-  SOC_SNAPD_SM7475,
-  SOC_SNAPD_SM7550_AB,
-  SOC_SNAPD_SM7675_AB,
   SOC_SNAPD_MSM8974AA,
   SOC_SNAPD_MSM8974AB,
   SOC_SNAPD_MSM8974AC,
@@ -314,10 +303,6 @@ enum {
   SOC_SNAPD_SM8250_AB,
   SOC_SNAPD_SM8350,
   SOC_SNAPD_SM8450,
-  SOC_SNAPD_SM8475,
-  SOC_SNAPD_SM8550_AB,
-  SOC_SNAPD_SM8635,
-  SOC_SNAPD_SM8650_AB,
   // APPLE
   SOC_APPLE_M1,
   SOC_APPLE_M1_PRO,
@@ -378,30 +363,21 @@ enum {
   SOC_GOOGLE_TENSOR,
   SOC_GOOGLE_TENSOR_G2,
   SOC_GOOGLE_TENSOR_G3,
-  // NVIDIA,
-  SOC_TEGRA_X1,
-  // ALTRA
-  SOC_AMPERE_ALTRA,
-  // NXP
-  SOC_NXP_IMX8MP,
   // UNKNOWN
   SOC_MODEL_UNKNOWN
 };
 
 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_9000S) return SOC_VENDOR_KIRIN;
+  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_SM8650_AB) return SOC_VENDOR_SNAPDRAGON;
+  else if(soc >= SOC_SNAPD_QSD8650 && soc <= SOC_SNAPD_SM8450) return SOC_VENDOR_SNAPDRAGON;
   else if(soc >= SOC_APPLE_M1 && soc <= SOC_APPLE_M3_MAX) return SOC_VENDOR_APPLE;
   else if(soc >= SOC_ALLWINNER_A10 && soc <= SOC_ALLWINNER_R328) return SOC_VENDOR_ALLWINNER;
   else if(soc >= SOC_ROCKCHIP_3288 && soc <= SOC_ROCKCHIP_3588) return SOC_VENDOR_ROCKCHIP;
   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_AMPERE_ALTRA && soc <= SOC_AMPERE_ALTRA) return SOC_VENDOR_AMPERE;
-  else if(soc >= SOC_NXP_IMX8MP && soc <= SOC_NXP_IMX8MP) return SOC_VENDOR_NXP;
   return SOC_VENDOR_UNKNOWN;
 }
 

src/arm/sve.c

@@ -1,15 +0,0 @@
-#include <stdint.h>
-#include "../common/global.h"
-
-// https://learn.arm.com/learning-paths/servers-and-cloud-computing/sve/sve_basics/#:~:text=Using%20a%20text%20editor%20of%20your%20choice%2C%20copy,svcntb%28%29%29%3B%20%7D%20This%20program%20prints%20the%20vector%20length
-uint64_t sve_cntb(void) {
-  #ifdef __ARM_FEATURE_SVE
-    uint64_t x0 = 0;
-    __asm volatile("cntb %0"
-         : "=r"(x0));
-    return x0;
-  #else
-    printWarn("sve_cntb: Hardware supports SVE, but it was not enabled by the compiler");
-    return 0;
-  #endif
-}

src/arm/sve.h

@@ -1,6 +0,0 @@
-#ifndef __SVE_DETECTION__
-#define __SVE_DETECTION__
-
-uint64_t sve_cntb(void);
-
-#endif

src/arm/sysctl.c

@@ -4,8 +4,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "global.h"
+#include "../common/global.h"
-#include "cpu.h"
+#include "../common/cpu.h"
 
 uint32_t get_sys_info_by_name(char* name) {
   size_t size = 0;

src/arm/sysctl.h

@@ -40,14 +40,6 @@
   #define CPUSUBFAMILY_ARM_HC_HD 5
 #endif
 
-// For alternative way to get CPU frequency on macOS and *BSD
-#ifdef __APPLE__
-  #define CPUFREQUENCY_SYSCTL "hw.cpufrequency_max"
-#else
-  // For FreeBSD, not sure about other *BSD
-  #define CPUFREQUENCY_SYSCTL "dev.cpu.0.freq"
-#endif
-
 uint32_t get_sys_info_by_name(char* name);
 
 #endif

src/arm/uarch.c

@@ -75,7 +75,6 @@ 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_V120] = ISA_ARMv8_2_A, // Not confirmed
   [UARCH_TAISHAN_V200] = ISA_ARMv8_2_A, // Not confirmed
   [UARCH_DENVER]       = ISA_ARMv8_A,
   [UARCH_DENVER2]      = ISA_ARMv8_A,
@@ -203,10 +202,8 @@ struct uarch* get_uarch_from_midr(uint32_t midr, struct cpuInfo* cpu) {
   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_HUAWEI) // Kunpeng 920 series
-  CHECK_UARCH(arch, cpu, 'H', 0xD02,  2,  2, "TaiShan v120",          UARCH_TAISHAN_V120, CPU_VENDOR_HUAWEI) // Kiring 9000S Big cores (https://github.com/Dr-Noob/cpufetch/issues/259)
   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, 'H', 0xD42, NA, NA, "TaiShan v120",          UARCH_TAISHAN_V120, CPU_VENDOR_HUAWEI) // Kiring 9000S Small Cores (https://github.com/Dr-Noob/cpufetch/issues/259)
 
   CHECK_UARCH(arch, cpu, 'N', 0x000, NA, NA, "Denver",                UARCH_DENVER,       CPU_VENDOR_NVIDIA)
   CHECK_UARCH(arch, cpu, 'N', 0x003, NA, NA, "Denver2",               UARCH_DENVER2,      CPU_VENDOR_NVIDIA)
@@ -248,8 +245,6 @@ struct uarch* get_uarch_from_midr(uint32_t midr, struct cpuInfo* cpu) {
 
   CHECK_UARCH(arch, cpu, 'a', 0x022, NA, NA, "Icestorm",              UARCH_ICESTORM,     CPU_VENDOR_APPLE)
   CHECK_UARCH(arch, cpu, 'a', 0x023, NA, NA, "Firestorm",             UARCH_FIRESTORM,    CPU_VENDOR_APPLE)
-  CHECK_UARCH(arch, cpu, 'a', 0x024, NA, NA, "Icestorm",              UARCH_ICESTORM,     CPU_VENDOR_APPLE)     // https://github.com/Dr-Noob/cpufetch/issues/263
-  CHECK_UARCH(arch, cpu, 'a', 0x025, NA, NA, "Firestorm",             UARCH_FIRESTORM,    CPU_VENDOR_APPLE)     // https://github.com/Dr-Noob/cpufetch/issues/263
   CHECK_UARCH(arch, cpu, 'a', 0x030, NA, NA, "Blizzard",              UARCH_BLIZZARD,     CPU_VENDOR_APPLE)
   CHECK_UARCH(arch, cpu, 'a', 0x031, NA, NA, "Avalanche",             UARCH_AVALANCHE,    CPU_VENDOR_APPLE)
   CHECK_UARCH(arch, cpu, 'a', 0x048, NA, NA, "Sawtooth",              UARCH_SAWTOOTH,     CPU_VENDOR_APPLE)
@@ -296,10 +291,7 @@ int get_vpus_width(struct cpuInfo* cpu) {
     case UARCH_NEOVERSE_V1:
       return 256;
     default:
-      if (cpu->feat->SVE && cpu->feat->cntb > 0) {
+      if(cpu->feat->NEON) {
-        return cpu->feat->cntb * 8;
-      }
-      else if (cpu->feat->NEON) {
         if(is_ARMv8_or_newer(cpu)) {
           return 128;
         }
@@ -332,9 +324,6 @@ 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_V120:// Not confirmed, asssuming same as v110
-    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]

src/arm/uarch.h

@@ -83,9 +83,7 @@ enum {
   UARCH_BRAHMA_B15,
   UARCH_BRAHMA_B53,
   UARCH_XGENE,        // Applied Micro X-Gene.
-  // HUAWEI
   UARCH_TAISHAN_V110, // HiSilicon TaiShan v110
-  UARCH_TAISHAN_V120, // HiSilicon TaiShan v120
   UARCH_TAISHAN_V200, // HiSilicon TaiShan v200
   // PHYTIUM
   UARCH_XIAOMI,       // Not to be confused with Xiaomi Inc

src/common/args.c

@@ -28,7 +28,6 @@ struct args_struct {
   bool help_flag;
   bool raw_flag;
   bool accurate_pp;
-  bool measure_max_frequency_flag;
   bool full_cpu_name_flag;
   bool logo_long;
   bool logo_short;
@@ -51,7 +50,6 @@ const char args_chr[] = {
   /* [ARG_LOGO_INTEL_NEW] = */ 3,
   /* [ARG_LOGO_INTEL_OLD] = */ 4,
   /* [ARG_ACCURATE_PP]    = */ 5,
-  /* [ARG_MEASURE_MAX_FREQ] = */ 6,
   /* [ARG_DEBUG]          = */ 'd',
   /* [ARG_VERBOSE]        = */ 'v',
   /* [ARG_VERSION]        = */ 'V',
@@ -68,7 +66,6 @@ const char *args_str[] = {
   /* [ARG_LOGO_INTEL_NEW] = */ "logo-intel-new",
   /* [ARG_LOGO_INTEL_OLD] = */ "logo-intel-old",
   /* [ARG_ACCURATE_PP]    = */ "accurate-pp",
-  /* [ARG_MEASURE_MAX_FREQ] = */ "measure-max-freq",
   /* [ARG_DEBUG]          = */ "debug",
   /* [ARG_VERBOSE]        = */ "verbose",
   /* [ARG_VERSION]        = */ "version",
@@ -104,10 +101,6 @@ bool accurate_pp(void) {
   return args.accurate_pp;
 }
 
-bool measure_max_frequency_flag(void) {
-  return args.measure_max_frequency_flag;
-}
-
 bool show_full_cpu_name(void) {
   return args.full_cpu_name_flag;
 }
@@ -229,20 +222,12 @@ char* build_short_options(void) {
   memset(str, 0, sizeof(char) * (len*2 + 1));
 
 #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[ARG_STYLE], c[ARG_COLOR], c[ARG_HELP],
   c[ARG_RAW], c[ARG_FULLCPUNAME],
   c[ARG_LOGO_SHORT], c[ARG_LOGO_LONG],
   c[ARG_LOGO_INTEL_NEW], c[ARG_LOGO_INTEL_OLD],
-  c[ARG_ACCURATE_PP], c[ARG_MEASURE_MAX_FREQ],
+  c[ARG_ACCURATE_PP], c[ARG_DEBUG], c[ARG_VERBOSE],
-  c[ARG_DEBUG], c[ARG_VERBOSE],
-  c[ARG_VERSION]);
-#elif ARCH_ARM
-  sprintf(str, "%c:%c:%c%c%c%c%c%c%c",
-  c[ARG_STYLE], c[ARG_COLOR], c[ARG_HELP],
-  c[ARG_LOGO_SHORT], c[ARG_LOGO_LONG],
-  c[ARG_MEASURE_MAX_FREQ],
-  c[ARG_DEBUG], c[ARG_VERBOSE],
   c[ARG_VERSION]);
 #else
   sprintf(str, "%c:%c:%c%c%c%c%c%c",
@@ -285,11 +270,8 @@ bool parse_args(int argc, char* argv[]) {
     {args_str[ARG_LOGO_INTEL_NEW], no_argument,       0, args_chr[ARG_LOGO_INTEL_NEW] },
     {args_str[ARG_LOGO_INTEL_OLD], no_argument,       0, args_chr[ARG_LOGO_INTEL_OLD] },
     {args_str[ARG_ACCURATE_PP],    no_argument,       0, args_chr[ARG_ACCURATE_PP]    },
-    {args_str[ARG_MEASURE_MAX_FREQ], no_argument,       0, args_chr[ARG_MEASURE_MAX_FREQ] },
     {args_str[ARG_FULLCPUNAME],    no_argument,       0, args_chr[ARG_FULLCPUNAME]    },
     {args_str[ARG_RAW],            no_argument,       0, args_chr[ARG_RAW]            },
-#elif ARCH_ARM
-    {args_str[ARG_MEASURE_MAX_FREQ], no_argument,       0, args_chr[ARG_MEASURE_MAX_FREQ] },
 #endif
     {args_str[ARG_LOGO_SHORT],     no_argument,       0, args_chr[ARG_LOGO_SHORT]     },
     {args_str[ARG_LOGO_LONG],      no_argument,       0, args_chr[ARG_LOGO_LONG]      },
@@ -331,9 +313,6 @@ bool parse_args(int argc, char* argv[]) {
     else if(opt == args_chr[ARG_ACCURATE_PP]) {
        args.accurate_pp = true;
     }
-    else if(opt == args_chr[ARG_MEASURE_MAX_FREQ]) {
-       args.measure_max_frequency_flag = true;
-    }
     else if(opt == args_chr[ARG_FULLCPUNAME]) {
        args.full_cpu_name_flag = true;
     }

src/common/args.h

@@ -29,7 +29,6 @@ enum {
   ARG_LOGO_INTEL_NEW,
   ARG_LOGO_INTEL_OLD,
   ARG_ACCURATE_PP,
-  ARG_MEASURE_MAX_FREQ,
   ARG_DEBUG,
   ARG_VERBOSE,
   ARG_VERSION
@@ -44,7 +43,6 @@ int max_arg_str_length(void);
 bool parse_args(int argc, char* argv[]);
 bool show_help(void);
 bool accurate_pp(void);
-bool measure_max_frequency_flag(void);
 bool show_full_cpu_name(void);
 bool show_logo_long(void);
 bool show_logo_short(void);

src/common/ascii.h

@@ -105,19 +105,6 @@ $C1  MMM  :MMM      NMM  dMMK   dMMX            MMN   \
 $C1  MMM  :MMM      NMM  dMMMoo  OMM0....:Nx.   MMN   \
 $C1  MMM  :WWW      XWW   lONMM   'xXMMMMNOc    MMN   "
 
-#define ASCII_HYGON \
-"$C1                                                   \
-$C1                                                   \
-$C1                                                   \
-$C1 ##    ##  ##    ##  ######     ######    ##    #  \
-$C1 ##....##   ##  ##  ##        ##      ##  ####  #  \
-$C1 ########     ##    ##    ##. ##      ##  #  ####  \
-$C1 ##    ##     ##    *######.    ######    #    ##  \
-$C1                                                   \
-$C1                                                   \
-$C1                                                   \
-$C1                                                   "
-
 #define ASCII_SNAPD \
 "              $C1@@$C2########               \
            $C1@@@@@$C2###########            \
@@ -373,56 +360,6 @@ $C1##########@@@@@@@@@@@@@@@@############## \
 $C1######################################## \
 $C1  ####################################   "
 
-#define ASCII_NVIDIA \
-"$C1               'cccccccccccccccccccccccccc   \
-$C1               ;oooooooooooooooooooooooool   \
-$C1           .:::.     .oooooooooooooooooool   \
-$C1      .:cll;   ,c:::.     cooooooooooooool   \
-$C1   ,clo'      ;.   oolc:     ooooooooooool   \
-$C1.cloo    ;cclo .      .olc.    coooooooool   \
-$C1oooo   :lo,    ;ll;    looc    :oooooooool   \
-$C1 oooc   ool.   ;oooc;clol    :looooooooool   \
-$C1  :ooc   ,ol;  ;oooooo.   .cloo;     loool   \
-$C1    ool;   .olc.       ,:lool        .lool   \
-$C1      ool:.    ,::::ccloo.        :clooool   \
-$C1         oolc::.            ':cclooooooool   \
-$C1               ;oooooooooooooooooooooooool   \
-$C1                                             \
-$C1                                             \
-$C2######.  ##   ##  ##  ######   ##    ###     \
-$C2##   ##  ##   ##  ##  ##   ##  ##   #: :#    \
-$C2##   ##   ## ##   ##  ##   ##  ##  #######   \
-$C2##   ##    ###    ##  ######   ## ##     ##  "
-
-#define ASCII_AMPERE \
-"$C1                                                  \
-$C1                                                  \
-$C1                             ##                   \
-$C1                            ####                  \
-$C1                           ### ##                 \
-$C1                          ###   ###               \
-$C1                         ###     ###              \
-$C1                        ###        ###            \
-$C1                       ##           ###           \
-$C1                 #######   ###       ###          \
-$C1            ######  ##        ######   ###        \
-$C1        ####      ###              ########       \
-$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##               "
-
 // --------------------- LONG LOGOS ------------------------- //
 #define ASCII_AMD_L \
 "$C1                                                              \
@@ -555,23 +492,6 @@ $C1        ###########. ############                 \
 $C1            ################                      \
 $C1                 #######                          "
 
-#define ASCII_NVIDIA_L \
-"$C1                  MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM  \
-$C1                  MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM  \
-$C1                .::   'MMMMMMMMMMMMMMMMMMMMMMMMM  \
-$C1           ccllooo;:;.       ;MMMMMMMMMMMMMMMMMM  \
-$C1       cloc       :ooollcc:     :MMMMMMMMMMMMMMM  \
-$C1    cloc      :ccl;      lolc,     ;MMMMMMMMMMMM  \
-$C1.cloo:    :clo    ;c:      .ool;     MMMMMMMMMMM  \
-$C1  ooo:    ooo     :ool,  .cloo.    ;lMMMMMMMMMMM  \
-$C1   ooo:    ooc    :ooooccooo.    :MMMM  lMMMMMMM  \
-$C1     ooc.   ool:  :oooooo'    ,cloo.        MMMM  \
-$C1      ool:.    olc:       .:cloo.          :MMMM  \
-$C1         olc,     ;:::cccloo.          :MMMMMMMM  \
-$C1            olcc::;              ,:ccloMMMMMMMMM  \
-$C1                  :......oMMMMMMMMMMMMMMMMMMMMMM  \
-$C1                  :lllMMMMMMMMMMMMMMMMMMMMMMMMMM  "
-
 typedef struct ascii_logo asciiL;
 
 //                        +-----------------------------------------------------------------------------------------------------------------+
@@ -580,7 +500,6 @@ typedef struct ascii_logo asciiL;
 asciiL logo_amd         = { ASCII_AMD,         39, 15, false, {C_FG_WHITE, C_FG_GREEN},                       {C_FG_WHITE,   C_FG_GREEN}   };
 asciiL logo_intel       = { ASCII_INTEL,       48, 14, false, {C_FG_CYAN},                                    {C_FG_CYAN,    C_FG_WHITE}   };
 asciiL logo_intel_new   = { ASCII_INTEL_NEW,   51,  9, false, {C_FG_CYAN},                                    {C_FG_CYAN,    C_FG_WHITE}   };
-asciiL logo_hygon       = { ASCII_HYGON,       51, 11, false, {C_FG_RED},                                     {C_FG_RED,     C_FG_WHITE}   };
 asciiL logo_snapd       = { ASCII_SNAPD,       39, 16, false, {C_FG_RED, C_FG_WHITE},                         {C_FG_RED,     C_FG_WHITE}   };
 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}   };
@@ -597,9 +516,6 @@ asciiL logo_riscv       = { ASCII_RISCV,       63, 18, false, {C_FG_CYAN, C_FG_Y
 asciiL logo_sifive      = { ASCII_SIFIVE,      48, 19, true,  {C_BG_WHITE, C_BG_BLACK},                       {C_FG_WHITE,   C_FG_BLUE}    };
 asciiL logo_starfive    = { ASCII_STARFIVE,    33, 17, false, {C_FG_WHITE},                                   {C_FG_WHITE,   C_FG_BLUE}    };
 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_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}   };
 
 // Long variants          | ----------------------------------------------------------------------------------------------------------------|
 asciiL logo_amd_l       = { ASCII_AMD_L,       62, 19, true,  {C_BG_WHITE, C_BG_GREEN},                       {C_FG_WHITE, C_FG_GREEN}     };
@@ -609,7 +525,6 @@ asciiL logo_arm_l       = { ASCII_ARM_L,       60,  8, true,  {C_BG_CYAN},
 asciiL logo_ibm_l       = { ASCII_IBM_L,       62, 13, true,  {C_BG_CYAN, C_FG_WHITE},                        {C_FG_CYAN,  C_FG_WHITE}     };
 asciiL logo_starfive_l  = { ASCII_STARFIVE_L,  50, 22, false, {C_FG_WHITE},                                   {C_FG_WHITE, C_FG_BLUE}      };
 asciiL logo_sifive_l    = { ASCII_SIFIVE_L,    53, 21, true,  {C_BG_WHITE, C_BG_BLACK},                       {C_FG_WHITE, C_FG_CYAN}      };
-asciiL logo_nvidia_l    = { ASCII_NVIDIA_L,    50, 15, false, {C_FG_GREEN, C_FG_WHITE},                       {C_FG_WHITE, C_FG_GREEN}     };
 asciiL logo_unknown     = { NULL,               0,  0, false, {COLOR_NONE},                                   {COLOR_NONE, COLOR_NONE}     };
 
 #endif

src/common/cpu.c

@@ -145,25 +145,17 @@ char* get_str_l3(struct cache* cach) {
 
 char* get_str_freq(struct frequency* freq) {
   //Max 3 digits and 3 for '(M/G)Hz' plus 1 for '\0'
-  uint32_t size = (1+5+1+3+1);
+  uint32_t size = (5+1+3+1);
   assert(strlen(STRING_UNKNOWN)+1 <= size);
-  char* string = ecalloc(size, sizeof(char));
+  char* string = emalloc(sizeof(char)*size);
+  memset(string, 0, sizeof(char)*size);
 
-  if(freq->max == UNKNOWN_DATA || freq->max < 0) {
+  if(freq->max == UNKNOWN_DATA || freq->max < 0)
     snprintf(string,strlen(STRING_UNKNOWN)+1,STRING_UNKNOWN);
-  }
+  else if(freq->max >= 1000)
-  else if(freq->max >= 1000) {
-    if (freq->measured)
-      snprintf(string,size,"~%.3f "STRING_GIGAHERZ,(float)(freq->max)/1000);
-    else
     snprintf(string,size,"%.3f "STRING_GIGAHERZ,(float)(freq->max)/1000);
-  }
-  else {
-    if (freq->measured)
-      snprintf(string,size,"~%d "STRING_MEGAHERZ,freq->max);
   else
     snprintf(string,size,"%d "STRING_MEGAHERZ,freq->max);
-  }
 
   return string;
 }

src/common/cpu.h

@@ -8,7 +8,6 @@ enum {
 // ARCH_X86
   CPU_VENDOR_INTEL,
   CPU_VENDOR_AMD,
-  CPU_VENDOR_HYGON,
 // ARCH_ARM
   CPU_VENDOR_ARM,
   CPU_VENDOR_APPLE,
@@ -33,7 +32,6 @@ enum {
 enum {
   HV_VENDOR_KVM,
   HV_VENDOR_QEMU,
-  HV_VENDOR_VBOX,
   HV_VENDOR_HYPERV,
   HV_VENDOR_VMWARE,
   HV_VENDOR_XEN,
@@ -58,8 +56,6 @@ typedef int32_t VENDOR;
 struct frequency {
   int32_t base;
   int32_t max;
-  // Indicates if max frequency was measured
-  bool measured;
 };
 
 struct hypervisor {
@@ -124,9 +120,6 @@ struct features {
   bool SHA1;
   bool SHA2;
   bool CRC32;
-  bool SVE;
-  bool SVE2;
-  uint64_t cntb;
 #endif  
 };
 

src/common/freq.c

@@ -13,7 +13,6 @@
 #include <linux/perf_event.h>
 
 #include "global.h"
-#include "cpu.h"
 
 static long
 perf_event_open(struct perf_event_attr *hw_event, pid_t pid,
@@ -70,15 +69,28 @@ void nop_function(uint64_t iters) {
   }
 }
 
-// Run the nop_function with the number of iterations specified and
+// Differences between x86 measure_frequency this measure_max_frequency:
-// measure both the time and number of cycles
+// - measure_frequency employs all cores simultaneously wherease 
-int measure_freq_iters(uint64_t iters, uint32_t core, double* freq) {
+//   measure_max_frequency only employs 1.
+// - measure_frequency runs the computation and checks /proc/cpuinfo whereas
+//   measure_max_frequency does not rely on /proc/cpuinfo and simply
+//   counts cpu cycles to measure frequency.
+// - measure_frequency uses actual computation while measuring the frequency
+//   whereas measure_max_frequency uses nop instructions. This makes the former
+//   x86 dependant whereas the latter is architecture independant.
+int64_t measure_max_frequency(uint32_t core) {
+  if (!bind_to_cpu(core)) {
+    printErr("Failed binding the process to CPU %d", core);
+    return -1;
+  }
+
   clockid_t clock = CLOCK_PROCESS_CPUTIME_ID;
-  struct timespec start, end;
+
   struct perf_event_attr pe;
-  uint64_t cycles;
+  uint64_t instructions;
   int fd;
   int pid = 0;
+
   memset(&pe, 0, sizeof(struct perf_event_attr));
   pe.type = PERF_TYPE_HARDWARE;
   pe.size = sizeof(struct perf_event_attr);
@@ -91,12 +103,18 @@ int measure_freq_iters(uint64_t iters, uint32_t core, double* freq) {
   if (fd == -1) {
     perror("perf_event_open");
     if (errno == EPERM || errno == EACCES) {
-      printErr("You may not have permission to collect stats.\n"\
+      printf("You may not have permission to collect stats.\n");
-      "Consider tweaking /proc/sys/kernel/perf_event_paranoid or running as root");
+      printf("Consider tweaking /proc/sys/kernel/perf_event_paranoid or running as root.\n");
     }
     return -1;
   }
 
+  const char* frequency_banner = "cpufetch is measuring the max frequency...";
+  printf("%s", frequency_banner);
+  fflush(stdout);
+
+  uint64_t iters = 10000000;
+  struct timespec start, end;
   if (clock_gettime(clock, &start) == -1) {
     perror("clock_gettime");
     return -1;
@@ -112,15 +130,7 @@ int measure_freq_iters(uint64_t iters, uint32_t core, double* freq) {
 
   nop_function(iters);
 
-  ssize_t ret = read(fd, &cycles, sizeof(uint64_t));
+  read(fd, &instructions, sizeof(uint64_t));
-  if (ret == -1) {
-    perror("read");
-    return -1;
-  }
-  if (ret != sizeof(uint64_t)) {
-    printErr("Read returned %d, expected %d", ret, sizeof(uint64_t));
-    return -1;
-  }
   if(ioctl(fd, PERF_EVENT_IOC_DISABLE, 0) == -1) {
     perror("ioctl");
     return -1;
@@ -132,59 +142,8 @@ int measure_freq_iters(uint64_t iters, uint32_t core, double* freq) {
 
   uint64_t nsecs = (end.tv_sec*1e9 + end.tv_nsec) - (start.tv_sec*1e9 + start.tv_nsec);
   uint64_t usecs = nsecs/1000;  
-  *freq = cycles/((double)usecs);
+  double frequency = instructions/((double)usecs);
-  return 0;
-}
 
-// Return a good number of iterations to run the nop_function in
-// order to get a precise measurement of the frequency without taking
-// too much time.
-uint64_t get_num_iters_from_freq(double frequency) {
-  // Truncate to reduce variability
-  uint64_t freq_trunc = ((uint64_t) frequency / 100) * 100;
-  uint64_t osp_per_iter = 4 * 1000;
-
-  return freq_trunc * 1e7 * 1/osp_per_iter;
-}
-
-// Differences between x86 measure_frequency and this measure_max_frequency:
-// - measure_frequency employs all cores simultaneously whereas
-//   measure_max_frequency only employs 1.
-// - measure_frequency runs the computation and checks /proc/cpuinfo whereas
-//   measure_max_frequency does not rely on /proc/cpuinfo and simply
-//   counts cpu cycles to measure frequency.
-// - measure_frequency uses actual computation while measuring the frequency
-//   whereas measure_max_frequency uses nop instructions. This makes the former
-//   x86 dependant whereas the latter is architecture independant.
-int64_t measure_max_frequency(uint32_t core) {
-  if (!bind_to_cpu(core)) {
-    printErr("Failed binding the process to CPU %d", core);
-    return UNKNOWN_DATA;
-  }
-
-  // First, get very rough estimation of clock cycle to
-  // compute a reasonable value for the iterations
-  double estimation_freq, frequency;
-  uint64_t iters = 100000;
-  if (measure_freq_iters(iters, core, &estimation_freq) == -1)
-    return UNKNOWN_DATA;
-
-  if (estimation_freq <= 0.0) {
-    printErr("First frequency measurement yielded an invalid value: %f", estimation_freq);
-    return UNKNOWN_DATA;
-  }
-  iters = get_num_iters_from_freq(estimation_freq);
-  printWarn("Running frequency measurement with %ld iterations on core %d...", iters, core);
-
-  // Now perform actual measurement
-  const char* frequency_banner = "cpufetch is measuring the max frequency...";
-  printf("%s", frequency_banner);
-  fflush(stdout);
-
-  if (measure_freq_iters(iters, core, &frequency) == -1)
-    return UNKNOWN_DATA;
-  
-  // Clean screen once measurement is finished
   printf("\r%*c\r", (int) strlen(frequency_banner), ' ');
   
   // Discard last digit in the frequency, which should help providing

src/common/global.c

@@ -62,7 +62,7 @@
 #endif
 
 #ifndef GIT_FULL_VERSION
-  static const char* VERSION = "1.06";
+  static const char* VERSION = "1.05";
 #endif
 
 enum {

src/common/main.c

@@ -30,17 +30,11 @@ void print_help(char *argv[]) {
 #ifdef ARCH_X86
 #ifdef __linux__
   printf("      --%s %*s Compute the peak performance accurately (measure the CPU frequency instead of using the maximum)\n", t[ARG_ACCURATE_PP], (int) (max_len-strlen(t[ARG_ACCURATE_PP])), "");
-  printf("      --%s %*s Measure the max CPU frequency instead of reading it\n", t[ARG_MEASURE_MAX_FREQ], (int) (max_len-strlen(t[ARG_MEASURE_MAX_FREQ])), "");
+#endif
-#endif // __linux__
   printf("      --%s %*s Show the old Intel logo\n", t[ARG_LOGO_INTEL_OLD], (int) (max_len-strlen(t[ARG_LOGO_INTEL_OLD])), "");
   printf("      --%s %*s Show the new Intel logo\n", t[ARG_LOGO_INTEL_NEW], (int) (max_len-strlen(t[ARG_LOGO_INTEL_NEW])), "");
   printf("  -%c, --%s %*s Show the full CPU name (do not abbreviate it)\n", c[ARG_FULLCPUNAME], t[ARG_FULLCPUNAME], (int) (max_len-strlen(t[ARG_FULLCPUNAME])), "");
   printf("  -%c, --%s %*s Print raw cpuid data (debug purposes)\n", c[ARG_RAW], t[ARG_RAW], (int) (max_len-strlen(t[ARG_RAW])), "");
-#endif // ARCH_X86
-#ifdef ARCH_ARM
-#ifdef __linux__
-  printf("      --%s %*s Measure the max CPU frequency instead of reading it\n", t[ARG_MEASURE_MAX_FREQ], (int) (max_len-strlen(t[ARG_MEASURE_MAX_FREQ])), "");
-#endif
 #endif
   printf("  -%c, --%s %*s Print this help and exit\n", c[ARG_HELP], t[ARG_HELP], (int) (max_len-strlen(t[ARG_HELP])), "");
   printf("  -%c, --%s %*s Print cpufetch version and exit\n", c[ARG_VERSION], t[ARG_VERSION], (int) (max_len-strlen(t[ARG_VERSION])), "");
@@ -51,7 +45,7 @@ void print_help(char *argv[]) {
   printf("  * \"amd\":       Use AMD color scheme \n");
   printf("  * \"ibm\",       Use IBM color scheme \n");
   printf("  * \"arm\":       Use ARM color scheme \n");
-  printf("  * \"rockchip\":  Use Rockchip color scheme \n");
+  printf("  * \"rockchip\":  Use ARM color scheme \n");
   printf("  * \"sifive\":    Use SiFive color scheme \n");
   printf("  * custom:      If the argument of --color does not match any of the previous strings, a custom scheme can be specified.\n");
   printf("                 5 colors must be given in RGB with the format: R,G,B:R,G,B:...\n");
@@ -86,11 +80,6 @@ void print_help(char *argv[]) {
   printf("    --accurate-pp option, which will measure the AVX frequency and show a more precise estimation\n");
   printf("    (this option is only available in x86 architectures).\n");
   printf("    To precisely measure peak performance, see: https://github.com/Dr-Noob/peakperf\n");
-  printf("\n");
-  printf("    Both --accurate-pp and --measure-max-freq measure the actual frequency of the CPU. However,\n");
-  printf("    they differ slightly. The former measures the max frequency while running vectorized SSE/AVX\n");
-  printf("    instructions and it is thus x86 only, whereas the latter simply measures the max clock cycle\n");
-  printf("    and is architecture independent.\n");
 }
 
 int main(int argc, char* argv[]) {

src/common/pci.c

@@ -1,133 +0,0 @@
-#define _GNU_SOURCE
-
-#include <sys/stat.h>
-#include <dirent.h>
-
-#include "udev.h"
-#include "global.h"
-#include "pci.h"
-
-#ifndef PATH_MAX
-  #define PATH_MAX 1024
-#endif
-
-#define PCI_PATH "/sys/bus/pci/devices/"
-#define MAX_LENGTH_PCI_DIR_NAME 1024
-
-// Return a list of PCI devices containing only
-// the sysfs path
-struct pci_devices * get_pci_paths(void) {
-  DIR *dirp;
-
-  if ((dirp = opendir(PCI_PATH)) == NULL) {
-    perror("opendir");
-    return NULL;
-  }
-
-  struct dirent *dp;
-  int numDirs = 0;  
-  errno = 0;
-
-  while ((dp = readdir(dirp)) != NULL) {
-    if (strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0)
-      numDirs++;
-  }  
-  if (errno != 0) {
-    perror("readdir");
-    return NULL;
-  }
-
-  rewinddir(dirp);
-
-  struct pci_devices * pci = emalloc(sizeof(struct pci_devices));
-  pci->num_devices = numDirs;
-  pci->devices = emalloc(sizeof(struct pci_device) * pci->num_devices);
-  char * full_path = emalloc(PATH_MAX * sizeof(char));
-  struct stat stbuf;
-  int i = 0;
-
-  while ((dp = readdir(dirp)) != NULL) {
-    if (strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0)
-      continue;
-
-    if (strlen(dp->d_name) > MAX_LENGTH_PCI_DIR_NAME) {
-      printErr("Directory name is too long: %s", dp->d_name);
-      return NULL;
-    }
-
-    memset(full_path, 0, PATH_MAX * sizeof(char));
-    snprintf(full_path, min(strlen(PCI_PATH) + strlen(dp->d_name) + 1, PATH_MAX), "%s%s", PCI_PATH, dp->d_name);    
-
-    if (stat(full_path, &stbuf) == -1) {
-      perror("stat");
-      return NULL;
-    }
-
-    if ((stbuf.st_mode & S_IFMT) == S_IFDIR) {
-      int strLen = min(MAX_LENGTH_PCI_DIR_NAME, strlen(dp->d_name)) + 1;
-      pci->devices[i] = emalloc(sizeof(struct pci_device));
-      pci->devices[i]->path = ecalloc(sizeof(char), strLen);
-      strncpy(pci->devices[i]->path, dp->d_name, strLen);
-      i++;
-    }        
-  }
-  if (errno != 0) {
-    perror("readdir");
-    return NULL;
-  }
-
-  return pci;
-}
-
-// For each PCI device in the list pci, fetch its vendor and 
-// device id using sysfs (e.g., /sys/bus/pci/devices/XXX/{vendor/device})
-void populate_pci_devices(struct pci_devices * pci) {
-  int filelen;
-  char* buf;
-
-  for (int i=0; i < pci->num_devices; i++) {
-    struct pci_device* dev = pci->devices[i];
-    int path_size = strlen(PCI_PATH) + strlen(dev->path) + 2;
-
-    // Read vendor_id
-    char *vendor_id_path = emalloc(sizeof(char) * (path_size + strlen("vendor") + 1));
-    sprintf(vendor_id_path, "%s/%s/%s", PCI_PATH, dev->path, "vendor");
-
-    if ((buf = read_file(vendor_id_path, &filelen)) == NULL) {
-      printWarn("read_file: %s: %s\n", vendor_id_path, strerror(errno));
-      dev->vendor_id = 0;
-    }
-    else {
-      dev->vendor_id = strtol(buf, NULL, 16);
-    }
-
-    // Read device_id
-    char *device_id_path = emalloc(sizeof(char) * (path_size + strlen("device") + 1));
-    sprintf(device_id_path, "%s/%s/%s", PCI_PATH, dev->path, "device");
-
-    if ((buf = read_file(device_id_path, &filelen)) == NULL) {
-      printWarn("read_file: %s: %s\n", device_id_path, strerror(errno));
-      dev->device_id = 0;
-    }
-    else {
-      dev->device_id = strtol(buf, NULL, 16);
-    }
-
-    free(vendor_id_path);
-    free(device_id_path);
-  }
-}
-
-// Return a list of PCI devices that could be used to infer the SoC.
-// The criteria to determine which devices are suitable for this task
-// is decided in filter_pci_devices.
-struct pci_devices * get_pci_devices(void) {
-  struct pci_devices * pci = get_pci_paths();
-
-  if (pci == NULL)
-    return NULL;
-
-  populate_pci_devices(pci);  
-
-  return pci;
-}

src/common/pci.h

@@ -1,23 +0,0 @@
-#ifndef __PCI__
-#define __PCI__
-
-#define PCI_VENDOR_NVIDIA   0x10de
-#define PCI_VENDOR_AMPERE   0x1def
-
-#define PCI_DEVICE_TEGRA_X1 0x0faf
-#define PCI_DEVICE_ALTRA    0xe100
-
-struct pci_device {
-  char * path;
-  uint16_t vendor_id;
-  uint16_t device_id;
-};
-
-struct pci_devices {
-  struct pci_device ** devices;
-  int num_devices;
-};
-
-struct pci_devices * get_pci_devices(void);
-
-#endif

src/common/printer.c

@@ -360,9 +360,6 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter
   else if(art->vendor == CPU_VENDOR_AMD) {
     art->art = choose_ascii_art_aux(&logo_amd_l, &logo_amd, term, lf);
   }
-  else if(art->vendor == CPU_VENDOR_HYGON) {
-    art->art = &logo_hygon;
-  }
   else {
     art->art = &logo_unknown;
   }
@@ -389,12 +386,6 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter
     art->art = &logo_allwinner;
   else if(art->vendor == SOC_VENDOR_ROCKCHIP)
     art->art = &logo_rockchip;
-  else if(art->vendor == SOC_VENDOR_AMPERE)
-    art->art = &logo_ampere;
-  else if(art->vendor == SOC_VENDOR_NXP)
-    art->art = &logo_nxp;
-  else if(art->vendor == SOC_VENDOR_NVIDIA)
-    art->art = choose_ascii_art_aux(&logo_nvidia_l, &logo_nvidia, term, lf);
   else {
     art->art = choose_ascii_art_aux(&logo_arm_l, &logo_arm, term, lf);
   }
@@ -638,11 +629,10 @@ bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct color** cs, struct
     }
 
     // Show the most modern vector instructions.
+    // If AVX is supported show it, otherwise show SSE
     if (strcmp(avx, "No") == 0) {
-      if (strcmp(sse, "No") != 0) {
       setAttribute(art, ATTRIBUTE_SSE, sse);
     }
-    }
     else {
       setAttribute(art, ATTRIBUTE_AVX, avx);
       setAttribute(art, ATTRIBUTE_FMA, fma);

src/common/soc.c

@@ -20,9 +20,6 @@ static char* soc_trademark_string[] = {
   [SOC_VENDOR_APPLE]      = "Apple ",
   [SOC_VENDOR_ROCKCHIP]   = "Rockchip ",
   [SOC_VENDOR_GOOGLE]     = "Google ",
-  [SOC_VENDOR_NVIDIA]     = "NVIDIA ",
-  [SOC_VENDOR_AMPERE]     = "Ampere ",
-  [SOC_VENDOR_NXP]        = "NXP ",
   // RISC-V
   [SOC_VENDOR_SIFIVE]     = "SiFive ",
   [SOC_VENDOR_STARFIVE]   = "StarFive ",

src/common/soc.h

@@ -24,9 +24,6 @@ enum {
   SOC_VENDOR_APPLE,
   SOC_VENDOR_ROCKCHIP,
   SOC_VENDOR_GOOGLE,
-  SOC_VENDOR_NVIDIA,
-  SOC_VENDOR_AMPERE,
-  SOC_VENDOR_NXP,
   // RISC-V
   SOC_VENDOR_SIFIVE,
   SOC_VENDOR_STARFIVE,

src/common/udev.c

@@ -1,10 +1,7 @@
-#include "../common/global.h"
 #include "udev.h"
 #include "global.h"
 #include "cpu.h"
 
-#define _PATH_DEVTREE          "/proc/device-tree/compatible"
-
 // https://www.kernel.org/doc/html/latest/core-api/cpu_hotplug.html
 int get_ncores_from_cpuinfo(void) {
   // Examples:
@@ -352,13 +349,3 @@ bool is_devtree_compatible(char* str) {
   }
   return true;
 }
-
-char* get_devtree_compatible(int *filelen) {
-  char* buf;
-
-  if ((buf = read_file(_PATH_DEVTREE, filelen)) == NULL) {
-    printWarn("read_file: %s: %s", _PATH_DEVTREE, strerror(errno));
-  }
-
-  return buf;
-}

src/common/udev.h

@@ -43,6 +43,5 @@ int get_num_sockets_package_cpus(struct topology* topo);
 int get_ncores_from_cpuinfo(void);
 char* get_field_from_cpuinfo(char* CPUINFO_FIELD);
 bool is_devtree_compatible(char* str);
-char* get_devtree_compatible(int *filelen);
 
 #endif

src/ppc/ppc.c

@@ -14,7 +14,6 @@
 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",
@@ -146,7 +145,6 @@ struct uarch* get_cpu_uarch(struct cpuInfo* cpu) {
 struct frequency* get_frequency_info(void) {
   struct frequency* freq = emalloc(sizeof(struct frequency));
 
-  freq->measured = false;
   freq->max = get_max_freq_from_file(0);
   freq->base = get_min_freq_from_file(0);
 

src/riscv/riscv.c

@@ -19,7 +19,6 @@
 struct frequency* get_frequency_info(uint32_t core) {
   struct frequency* freq = emalloc(sizeof(struct frequency));
 
-  freq->measured = false;
   freq->base = UNKNOWN_DATA;
   freq->max = get_max_freq_from_file(core);
 

src/x86/cpuid.c

@@ -5,9 +5,6 @@
   #include "../common/udev.h"
   #include <unistd.h>
 #endif
-#if defined (__FreeBSD__) || defined (__APPLE__)
-  #include "../common/sysctl.h"
-#endif
 
 #ifdef __linux__
   #include "../common/freq.h"
@@ -29,12 +26,10 @@
 
 #define CPU_VENDOR_INTEL_STRING "GenuineIntel"
 #define CPU_VENDOR_AMD_STRING   "AuthenticAMD"
-#define CPU_VENDOR_HYGON_STRING "HygonGenuine"
 
 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",
@@ -47,7 +42,6 @@ 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",
@@ -478,8 +472,6 @@ struct cpuInfo* get_cpu_info(void) {
     cpu->cpu_vendor = CPU_VENDOR_INTEL;
   else if (strcmp(CPU_VENDOR_AMD_STRING,name) == 0)
     cpu->cpu_vendor = CPU_VENDOR_AMD;
-  else if (strcmp(CPU_VENDOR_HYGON_STRING,name) == 0)
-    cpu->cpu_vendor = CPU_VENDOR_HYGON;
   else {
     cpu->cpu_vendor = CPU_VENDOR_INVALID;
     printErr("Unknown CPU vendor: %s", name);
@@ -659,15 +651,10 @@ bool get_cache_topology_amd(struct cpuInfo* cpu, struct topology* topo) {
 void get_topology_from_udev(struct topology* topo) {
   topo->total_cores = get_ncores_from_cpuinfo();
   // TODO: To be improved in the future
-  if (topo->total_cores == 1) {
+  // Conservative setting as we only know the total
-    // We can assume it's a single core CPU
+  // number of cores.
-    topo->logical_cores = topo->total_cores;
-    topo->physical_cores = topo->total_cores;
-  }
-  else {
   topo->logical_cores = UNKNOWN_DATA;
   topo->physical_cores = UNKNOWN_DATA;
-  }
   topo->smt_available = 1;
   topo->smt_supported = 1;
   topo->sockets = 1;
@@ -712,31 +699,32 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach, int
     topo->total_cores_module = topo->total_cores;
   }
 
-  bool toporet = false;
   switch(cpu->cpu_vendor) {
     case CPU_VENDOR_INTEL:
       if (cpu->maxLevels >= 0x00000004) {
-        toporet = get_topology_from_apic(cpu, topo);
+        bool toporet = get_topology_from_apic(cpu, topo);
-      }
-      else {
-        printWarn("Can't read topology information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000004, cpu->maxLevels);
-      }
         if(!toporet) {
           #ifdef __linux__
-          printWarn("Failed to retrieve topology from APIC, using udev...");
+            printWarn("Failed to retrieve topology from APIC, using udev...\n");
             get_topology_from_udev(topo);
           #else
-          if (cpu->maxLevels >= 0x00000004)
+            printErr("Failed to retrieve topology from APIC, assumming default values...\n");
-            printErr("Failed to retrieve topology from APIC, assumming default values...");
             topo->logical_cores = UNKNOWN_DATA;
             topo->physical_cores = UNKNOWN_DATA;
             topo->smt_available = 1;
             topo->smt_supported = 1;
           #endif
         }
+      }
+      else {
+        printWarn("Can't read topology information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000001, cpu->maxLevels);
+        topo->physical_cores = UNKNOWN_DATA;
+        topo->logical_cores = UNKNOWN_DATA;
+        topo->smt_available = 1;
+        topo->smt_supported = 1;
+      }
       break;
     case CPU_VENDOR_AMD:
-    case CPU_VENDOR_HYGON:
       if (cpu->maxExtendedLevels >= 0x80000008) {
         eax = 0x80000008;
         cpuid(&eax, &ebx, &ecx, &edx);
@@ -753,15 +741,10 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach, int
         }
       }
       else {
-        #ifdef __linux__
-          printWarn("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X), using udev...", 0x80000008, cpu->maxExtendedLevels);
-          get_topology_from_udev(topo);
-        #else
         printWarn("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x80000008, cpu->maxExtendedLevels);
         topo->physical_cores = 1;
         topo->logical_cores = 1;
         topo->smt_supported = 1;
-        #endif
       }
 
       if (cpu->maxLevels >= 0x00000001) {
@@ -938,27 +921,16 @@ struct cache* get_cache_info(struct cpuInfo* cpu) {
 
 struct frequency* get_frequency_info(struct cpuInfo* cpu) {
   struct frequency* freq = emalloc(sizeof(struct frequency));
-  freq->measured = false;
 
   if(cpu->maxLevels < 0x00000016) {
-    #if defined (_WIN32)
+    #if defined (_WIN32) || defined (__APPLE__)
       printWarn("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000016, cpu->maxLevels);
       freq->base = UNKNOWN_DATA;
       freq->max = UNKNOWN_DATA;
-    #elif defined (__FreeBSD__) || defined (__APPLE__)
-      printWarn("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X). Using sysctl", 0x00000016, cpu->maxLevels);
-      uint32_t freq_hz = get_sys_info_by_name(CPUFREQUENCY_SYSCTL);
-      if (freq_hz == 0) {
-        printWarn("Read max CPU frequency from sysctl and got 0 MHz");
-        freq->max = UNKNOWN_DATA;
-      }
-
-      freq->base = UNKNOWN_DATA;
-      freq->max = freq_hz;
     #else
       printWarn("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X). Using udev", 0x00000016, cpu->maxLevels);
       freq->base = UNKNOWN_DATA;
-      freq->max = get_max_freq_from_file(cpu->first_core_id);
+      freq->max = get_max_freq_from_file(0);
 
       if(freq->max == 0) {
         printWarn("Read max CPU frequency from udev and got 0 MHz");
@@ -985,7 +957,7 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
       printWarn("Read max CPU frequency from CPUID and got 0 MHz");
       #ifdef __linux__
         printWarn("Using udev to detect frequency");
-        freq->max = get_max_freq_from_file(cpu->first_core_id);
+        freq->max = get_max_freq_from_file(0);
 
         if(freq->max == 0) {
           printWarn("Read max CPU frequency from udev and got 0 MHz");
@@ -998,11 +970,10 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
   }
 
   #ifdef __linux__
-    if (freq->max == UNKNOWN_DATA || measure_max_frequency_flag()) {
+    if (freq->max == UNKNOWN_DATA) {
-      if (freq->max == UNKNOWN_DATA)
       printWarn("All previous methods failed, measuring CPU frequency");
-      freq->max = measure_max_frequency(cpu->first_core_id);
+      // TODO: Support hybrid architectures
-      freq->measured = true;
+      freq->max = measure_max_frequency(0);
     }
   #endif
 
@@ -1027,33 +998,24 @@ char* get_str_topology(struct cpuInfo* cpu, struct topology* topo, bool dual_soc
     string = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN) + 1));
     strcpy(string, STRING_UNKNOWN);
   }
-  else {
+  else if(topo->smt_supported > 1) {
-    char cores_str[6];
-    memset(cores_str, 0, sizeof(char) * 6);
-    if (topo->physical_cores * topo_sockets > 1)
-      strcpy(cores_str, "cores");
-    else
-      strcpy(cores_str, "core");
-
-    if(topo->smt_supported > 1) {
     // 4 for digits, 21 for ' cores (SMT disabled)' which is the longest possible output
     uint32_t max_size = 4+21+1;
     string = emalloc(sizeof(char) * max_size);
 
     if(topo->smt_available > 1)
-        snprintf(string, max_size, "%d %s (%d threads)", topo->physical_cores * topo_sockets, cores_str, topo->logical_cores * topo_sockets);
+      snprintf(string, max_size, "%d cores (%d threads)", topo->physical_cores * topo_sockets, topo->logical_cores * topo_sockets);
     else {
       if(cpu->cpu_vendor == CPU_VENDOR_AMD)
-          snprintf(string, max_size, "%d %s (SMT disabled)", topo->physical_cores * topo_sockets, cores_str);
+        snprintf(string, max_size, "%d cores (SMT disabled)", topo->physical_cores * topo_sockets);
       else
-          snprintf(string, max_size, "%d %s (HT disabled)", topo->physical_cores * topo_sockets, cores_str);
+        snprintf(string, max_size, "%d cores (HT disabled)", topo->physical_cores * topo_sockets);
     }
   }
   else {
     uint32_t max_size = 4+7+1;
     string = emalloc(sizeof(char) * max_size);
-      snprintf(string, max_size, "%d %s",topo->physical_cores * topo_sockets, cores_str);
+    snprintf(string, max_size, "%d cores",topo->physical_cores * topo_sockets);
-    }
   }
 
   return string;
@@ -1114,14 +1076,8 @@ char* get_str_sse(struct cpuInfo* cpu) {
       last+=SSE4_2_sl;
   }
 
-  if (last == 0) {
-    snprintf(string, 2+1, "No");
-  }
-  else {
   //Purge last comma
   string[last-1] = '\0';
-  }
-
   return string;
 }
 

src/x86/freq/freq.h

@@ -9,5 +9,6 @@
 #define LOOP_ITERS           100000000
 
 int64_t measure_frequency(struct cpuInfo* cpu);
+void nop_function_x86(uint64_t iters);
 
 #endif

src/x86/uarch.c

@@ -47,10 +47,8 @@ typedef uint32_t MICROARCH;
 enum {
   UARCH_UNKNOWN,
   // INTEL //
-  UARCH_I486,
   UARCH_P5,
   UARCH_P5_MMX,
-  UARCH_P6_PRO,
   UARCH_P6_PENTIUM_II,
   UARCH_P6_PENTIUM_III,
   UARCH_DOTHAN,
@@ -99,8 +97,6 @@ enum {
   // AMD //
   UARCH_AM486,
   UARCH_AM5X86,
-  UARCH_SSA5,
-  UARCH_K5,
   UARCH_K6,
   UARCH_K7,
   UARCH_K8,
@@ -153,30 +149,16 @@ struct uarch* get_uarch_from_cpuid_intel(uint32_t ef, uint32_t f, uint32_t em, u
   // ------------------------------------------------------------------------------- //
   //                EF  F  EM   M   S                                                //
   UARCH_START
-  CHECK_UARCH(arch, 0,  4,  0,  0, NA, "i80486DX",          UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  1, NA, "i80486DX-50",       UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  2, NA, "i80486SX",          UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  3, NA, "i80486DX2",         UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  4, NA, "i80486SL",          UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  5, NA, "i80486SX2",         UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  7, NA, "i80486DX2WB",       UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  8, NA, "i80486DX4",         UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch, 0,  4,  0,  9, NA, "i80486DX4WB",       UARCH_I486,            UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
   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, "P54C",              UARCH_P5,              UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch, 0,  5,  0,  2, NA, "P5",                UARCH_P5,              UNK)
-  CHECK_UARCH(arch, 0,  5,  0,  3, NA, "P24T (Overdrive)",  UARCH_P5,              600) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch, 0,  5,  0,  3, NA, "P5",                UARCH_P5,              600)
-  CHECK_UARCH(arch, 0,  5,  0,  4, NA, "P55C (MMX)",        UARCH_P5_MMX,          350) // https://www.cpu-world.com/CPUs/Pentium/TYPE-Pentium%20MMX.html
+  CHECK_UARCH(arch, 0,  5,  0,  4, NA, "P5 (MMX)",          UARCH_P5_MMX,          UNK)
-  CHECK_UARCH(arch, 0,  5,  0,  7, NA, "P54C",              UARCH_P5,              350) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch, 0,  5,  0,  7, NA, "P5 (MMX)",          UARCH_P5_MMX,          UNK)
-  CHECK_UARCH(arch, 0,  5,  0,  8, NA, "Tillamook",         UARCH_P5_MMX,          250) // http://instlatx64.atw.hu./
+  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_MMX,          UNK)
   CHECK_UARCH(arch, 0,  5,  0, 10,  0, "Lakemont",          UARCH_LAKEMONT,         32)
-  CHECK_UARCH(arch, 0,  6,  0,  1,  1, "P6",                UARCH_P6_PRO,          UNK)
-  CHECK_UARCH(arch, 0,  6,  0,  1,  2, "P6",                UARCH_P6_PRO,          UNK)
-  CHECK_UARCH(arch, 0,  6,  0,  1,  6, "P6",                UARCH_P6_PRO,          350)
-  CHECK_UARCH(arch, 0,  6,  0,  1,  7, "P6",                UARCH_P6_PRO,          350)
-  CHECK_UARCH(arch, 0,  6,  0,  1,  9, "P6",                UARCH_P6_PRO,          350)
   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)
@@ -297,16 +279,11 @@ struct uarch* get_uarch_from_cpuid_amd(uint32_t ef, uint32_t f, uint32_t em, uin
   // ----------------------------------------------------------------------------- //
   //                 EF  F  EM   M   S                                             //
   UARCH_START
-  CHECK_UARCH(arch,  0,  4,  0,  3, NA, "Am486DX2",    UARCH_AM486,      UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch,  0,  4,  0,  3, NA, "Am486",       UARCH_AM486,      UNK)
-  CHECK_UARCH(arch,  0,  4,  0,  7, NA, "Am486DX2WB",  UARCH_AM486,      UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch,  0,  4,  0,  7, NA, "Am486",       UARCH_AM486,      UNK)
-  CHECK_UARCH(arch,  0,  4,  0,  8, NA, "Am486DX4",    UARCH_AM486,      UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch,  0,  4,  0,  8, NA, "Am486",       UARCH_AM486,      UNK)
-  CHECK_UARCH(arch,  0,  4,  0,  9, NA, "Am486DX4WB",  UARCH_AM486,      UNK) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch,  0,  4,  0,  9, NA, "Am486",       UARCH_AM486,      UNK)
-  CHECK_UARCH(arch,  0,  4,  0, 14, NA, "Am5x86",      UARCH_AM5X86,     350) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
+  CHECK_UARCH(arch,  0,  4, NA, NA, NA, "Am5x86",      UARCH_AM5X86,     UNK)
-  CHECK_UARCH(arch,  0,  4,  0, 15, NA, "Am5x86WB",    UARCH_AM5X86,     350) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch,  0,  5,  0,  0, NA, "SSA5 (K5)",   UARCH_SSA5,       350) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch,  0,  5,  0,  1, NA, "K5",          UARCH_K5,         350) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch,  0,  5,  0,  2, NA, "K5",          UARCH_K5,         350) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
-  CHECK_UARCH(arch,  0,  5,  0,  3, NA, "K5",          UARCH_K5,         350) // https://sandpile.org/x86/cpuid.htm#level_0000_0001h
   CHECK_UARCH(arch,  0,  5,  0,  6, NA, "K6",          UARCH_K6,         300)
   CHECK_UARCH(arch,  0,  5,  0,  7, NA, "K6",          UARCH_K6,         250) // *p from sandpile.org
   CHECK_UARCH(arch,  0,  5,  0, 10, NA, "K7",          UARCH_K7,         130) // Geode NX
@@ -405,7 +382,6 @@ 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)
@@ -415,25 +391,6 @@ struct uarch* get_uarch_from_cpuid_amd(uint32_t ef, uint32_t f, uint32_t em, uin
   return arch;
 }
 
-struct uarch* get_uarch_from_cpuid_hygon(uint32_t ef, uint32_t f, uint32_t em, uint32_t m, int s) {
-  struct uarch* arch = emalloc(sizeof(struct uarch));
-
-  // EF: Extended Family                                                           //
-  // F:  Family                                                                    //
-  // EM: Extended Model                                                            //
-  // M: Model                                                                      //
-  // S: Stepping                                                                   //
-  // ----------------------------------------------------------------------------- //
-  //                 EF  F  EM   M   S                                             //
-  UARCH_START
-  // https://www.phoronix.com/news/Hygon-Dhyana-AMD-China-CPUs
-  CHECK_UARCH(arch,  9,  15,  0,  1, NA, "Zen",       UARCH_ZEN,      UNK) // https://github.com/Dr-Noob/cpufetch/issues/244
-  // CHECK_UARCH(arch,  9,  15,  0,  2, NA, "???",       ?????????,      UNK) // http://instlatx64.atw.hu/
-  UARCH_END
-
-  return arch;
-}
-
 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));
@@ -478,17 +435,9 @@ struct uarch* get_uarch_from_cpuid(struct cpuInfo* cpu, uint32_t dump, uint32_t
     }
     return get_uarch_from_cpuid_intel(ef, f, em, m, s);
   }
-  else if(cpu->cpu_vendor == CPU_VENDOR_AMD) {
+  else
     return get_uarch_from_cpuid_amd(ef, f, em, m, s);
 }
-  else if(cpu->cpu_vendor == CPU_VENDOR_HYGON) {
-    return get_uarch_from_cpuid_hygon(ef, f, em, m, s);
-  }
-  else {
-    printBug("Invalid CPU vendor: %d", cpu->cpu_vendor);
-    return NULL;
-  }
-}
 
 // If we cannot get the CPU name from CPUID, try to infer it from uarch
 char* infer_cpu_name_from_uarch(struct uarch* arch) {
@@ -502,42 +451,16 @@ char* infer_cpu_name_from_uarch(struct uarch* arch) {
 
   char *str = NULL;
 
-  switch (arch->uarch) {
+  if (arch->uarch == UARCH_P5)
-    // Intel
-    case UARCH_I486:
-      str = "Intel 486";
-      break;
-    case UARCH_P5:
     str = "Intel Pentium";
-      break;
+  else if (arch->uarch == UARCH_P5_MMX)
-    case UARCH_P5_MMX:
     str = "Intel Pentium MMX";
-      break;
+  else if (arch->uarch == UARCH_P6_PENTIUM_II)
-    case UARCH_P6_PRO:
-      str = "Intel Pentium Pro";
-      break;
-    case UARCH_P6_PENTIUM_II:
     str = "Intel Pentium II";
-      break;
+  else if (arch->uarch == UARCH_P6_PENTIUM_III)
-    case UARCH_P6_PENTIUM_III:
     str = "Intel Pentium III";
-      break;
+  else
-
-    // AMD
-    case UARCH_AM486:
-      str = "AMD 486";
-      break;
-    case UARCH_AM5X86:
-      str = "AMD 5x86";
-      break;
-    case UARCH_SSA5:
-      str = "AMD 5k86";
-      break;
-
-    default:
     printErr("Unable to find name from uarch: %d", arch->uarch);
-      break;
-  }
 
   if (str == NULL) {
     cpu_name = ecalloc(strlen(STRING_UNKNOWN) + 1, sizeof(char));