[v1.06][PPC] Small correction

[v1.06][PPC] Small fix to see if helps
[v1.05][PPC] Preeliminary support for Espresso, the Wii U CPU
2026-03-25 16:00:39 +01:00 · 2024-08-25 16:47:43 +01:00 · 2024-08-24 12:25:02 +01:00 · 2024-05-18 23:27:02 +01:00
28 changed files with 163 additions and 814 deletions
--- a/31
+++ b/31
@@ -13,23 +13,17 @@ COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_C
 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

-		ifeq ($(os), Linux)
+                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
+                endif
 		CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
 	else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
 		SRC_DIR=src/ppc/
@@ -38,19 +32,20 @@ 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
-		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
+		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_DIR)udev.c $(SRC_DIR)socs.h
 		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all

+		os := $(shell uname -s)
 		ifeq ($(os), Darwin)
-			SOURCE += $(SRC_COMMON)sysctl.c
-			HEADERS += $(SRC_COMMON)sysctl.h
+			SOURCE += $(SRC_DIR)sysctl.c
+			HEADERS += $(SRC_DIR)sysctl.h
 		endif
-	else ifeq ($(arch), $(filter $(arch), riscv64 riscv32))
-		SRC_DIR=src/riscv/
-		SOURCE += $(COMMON_SRC) $(SRC_DIR)riscv.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
-		HEADERS += $(COMMON_HDR) $(SRC_DIR)riscv.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.h $(SRC_DIR)socs.h
-		CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99 -fstack-protector-all
+        else ifeq ($(arch), $(filter $(arch), riscv64 riscv32))
+                SRC_DIR=src/riscv/
+                SOURCE += $(COMMON_SRC) $(SRC_DIR)riscv.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
+                HEADERS += $(COMMON_HDR) $(SRC_DIR)riscv.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.h $(SRC_DIR)socs.h
+                CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99 -fstack-protector-all
 	else
 		# Error lines should not be tabulated because Makefile complains about it
 $(warning Unsupported arch detected: $(arch). See https://github.com/Dr-Noob/cpufetch#1-support)
--- a/src/arm/midr.c
+++ b/src/arm/midr.c
@@ -8,14 +8,12 @@
 #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 "udev.h"
 #include "midr.h"
 #include "uarch.h"
@@ -41,17 +39,8 @@ 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)
-        printWarn("Unable to find max frequency from udev, measuring CPU frequency");
-      freq->max = measure_max_frequency(core);
-      freq->measured = true;
-    }
-  #endif

  return freq;
 }
--- a/src/arm/soc.c
+++ b/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
@@ -835,43 +834,6 @@ struct system_on_chip* guess_soc_from_uarch(struct system_on_chip* soc, struct c
  return soc;
 }

-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} },
-    {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';
@@ -1042,18 +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 nvmem
+    // If cpufinfo/Android (if available) detection fails, 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);
--- a/src/arm/socs.h
+++ b/src/arm/socs.h
@@ -363,8 +363,6 @@ enum {
  SOC_GOOGLE_TENSOR,
  SOC_GOOGLE_TENSOR_G2,
  SOC_GOOGLE_TENSOR_G3,
-  // NVIDIA,
-  SOC_TEGRA_X1,
  // UNKNOWN
  SOC_MODEL_UNKNOWN
 };
@@ -380,7 +378,6 @@ inline static VENDOR get_soc_vendor_from_soc(SOC soc) {
  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;
  return SOC_VENDOR_UNKNOWN;
 }

--- a/src/common/sysctl.c
+++ b/src/common/sysctl.c
@@ -4,8 +4,8 @@
 #include <string.h>
 #include <errno.h>

-#include "global.h"
-#include "cpu.h"
+#include "../common/global.h"
+#include "../common/cpu.h"

 uint32_t get_sys_info_by_name(char* name) {
  size_t size = 0;
--- a/src/common/sysctl.h
+++ b/src/common/sysctl.h
--- a/src/common/args.c
+++ b/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;
@@ -41,37 +40,35 @@ struct args_struct {
 };

 const char args_chr[] = {
-  /* [ARG_STYLE]            = */ 's',
-  /* [ARG_COLOR]            = */ 'c',
-  /* [ARG_HELP]             = */ 'h',
-  /* [ARG_RAW]              = */ 'r',
-  /* [ARG_FULLCPUNAME]      = */ 'F',
-  /* [ARG_LOGO_LONG]        = */ 1,
-  /* [ARG_LOGO_SHORT]       = */ 2,
-  /* [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',
+  /* [ARG_STYLE]          = */ 's',
+  /* [ARG_COLOR]          = */ 'c',
+  /* [ARG_HELP]           = */ 'h',
+  /* [ARG_RAW]            = */ 'r',
+  /* [ARG_FULLCPUNAME]    = */ 'F',
+  /* [ARG_LOGO_LONG]      = */ 1,
+  /* [ARG_LOGO_SHORT]     = */ 2,
+  /* [ARG_LOGO_INTEL_NEW] = */ 3,
+  /* [ARG_LOGO_INTEL_OLD] = */ 4,
+  /* [ARG_ACCURATE_PP]    = */ 5,
+  /* [ARG_DEBUG]          = */ 'd',
+  /* [ARG_VERBOSE]        = */ 'v',
+  /* [ARG_VERSION]        = */ 'V',
 };

 const char *args_str[] = {
-  /* [ARG_STYLE]            = */ "style",
-  /* [ARG_COLOR]            = */ "color",
-  /* [ARG_HELP]             = */ "help",
-  /* [ARG_RAW]              = */ "raw",
-  /* [ARG_FULLCPUNAME]      = */ "full-cpu-name",
-  /* [ARG_LOGO_LONG]        = */ "logo-long",
-  /* [ARG_LOGO_SHORT]       = */ "logo-short",
-  /* [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",
+  /* [ARG_STYLE]          = */ "style",
+  /* [ARG_COLOR]          = */ "color",
+  /* [ARG_HELP]           = */ "help",
+  /* [ARG_RAW]            = */ "raw",
+  /* [ARG_FULLCPUNAME]    = */ "full-cpu-name",
+  /* [ARG_LOGO_LONG]      = */ "logo-long",
+  /* [ARG_LOGO_SHORT]     = */ "logo-short",
+  /* [ARG_LOGO_INTEL_NEW] = */ "logo-intel-new",
+  /* [ARG_LOGO_INTEL_OLD] = */ "logo-intel-old",
+  /* [ARG_ACCURATE_PP]    = */ "accurate-pp",
+  /* [ARG_DEBUG]          = */ "debug",
+  /* [ARG_VERBOSE]        = */ "verbose",
+  /* [ARG_VERSION]        = */ "version",
 };

 static struct args_struct args;
@@ -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_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_ACCURATE_PP], c[ARG_DEBUG], c[ARG_VERBOSE],
  c[ARG_VERSION]);
 #else
  sprintf(str, "%c:%c:%c%c%c%c%c%c",
@@ -278,24 +263,21 @@ bool parse_args(int argc, char* argv[]) {
  set_log_level(true);

  const struct option long_options[] = {
-    {args_str[ARG_STYLE],            required_argument, 0, args_chr[ARG_STYLE]            },
-    {args_str[ARG_COLOR],            required_argument, 0, args_chr[ARG_COLOR]            },
-    {args_str[ARG_HELP],             no_argument,       0, args_chr[ARG_HELP]             },
+    {args_str[ARG_STYLE],          required_argument, 0, args_chr[ARG_STYLE]          },
+    {args_str[ARG_COLOR],          required_argument, 0, args_chr[ARG_COLOR]          },
+    {args_str[ARG_HELP],           no_argument,       0, args_chr[ARG_HELP]           },
 #ifdef ARCH_X86
-    {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] },
+    {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_FULLCPUNAME],    no_argument,       0, args_chr[ARG_FULLCPUNAME]    },
+    {args_str[ARG_RAW],            no_argument,       0, args_chr[ARG_RAW]            },
 #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]        },
-    {args_str[ARG_DEBUG],            no_argument,       0, args_chr[ARG_DEBUG]            },
-    {args_str[ARG_VERBOSE],          no_argument,       0, args_chr[ARG_VERBOSE]          },
-    {args_str[ARG_VERSION],          no_argument,       0, args_chr[ARG_VERSION]          },
+    {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]      },
+    {args_str[ARG_DEBUG],          no_argument,       0, args_chr[ARG_DEBUG]          },
+    {args_str[ARG_VERBOSE],        no_argument,       0, args_chr[ARG_VERBOSE]        },
+    {args_str[ARG_VERSION],        no_argument,       0, args_chr[ARG_VERSION]        },
    {0, 0, 0, 0}
  };

@@ -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;
    }
--- a/src/common/args.h
+++ b/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);
--- a/src/common/ascii.h
+++ b/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,27 +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##   ##    ###    ##  ######   ## ##     ##  "
-
 // --------------------- LONG LOGOS ------------------------- //
 #define ASCII_AMD_L \
 "$C1                                                              \
@@ -526,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;

 //                        +-----------------------------------------------------------------------------------------------------------------+
@@ -551,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}   };
@@ -568,7 +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}   };

 // Long variants          | ----------------------------------------------------------------------------------------------------------------|
 asciiL logo_amd_l       = { ASCII_AMD_L,       62, 19, true,  {C_BG_WHITE, C_BG_GREEN},                       {C_FG_WHITE, C_FG_GREEN}     };
@@ -578,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
--- a/src/common/cpu.c
+++ b/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) {
-    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);
-  }
+  else if(freq->max >= 1000)
+    snprintf(string,size,"%.3f "STRING_GIGAHERZ,(float)(freq->max)/1000);
+  else
+    snprintf(string,size,"%d "STRING_MEGAHERZ,freq->max);

  return string;
 }
--- a/src/common/cpu.h
+++ b/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,
@@ -58,8 +57,6 @@ typedef int32_t VENDOR;
 struct frequency {
  int32_t base;
  int32_t max;
-  // Indicates if max frequency was measured
-  bool measured;
 };

 struct hypervisor {
--- a/src/common/freq.c
+++ b/src/common/freq.c
@@ -1,195 +0,0 @@
-#ifdef __linux__
-
-#define _GNU_SOURCE
-
-#include <time.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <asm/unistd.h>
-#include <sys/ioctl.h>
-#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,
-                int cpu, int group_fd, unsigned long flags) {
-    int ret;
-    ret = syscall(__NR_perf_event_open, hw_event, pid, cpu,
-                    group_fd, flags);
-    return ret;
-}
-
-#define INSERT_ASM_ONCE __asm volatile("nop");
-#define INSERT_ASM_10_TIMES \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-    INSERT_ASM_ONCE         \
-
-#define INSERT_ASM_100_TIMES \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES      \
-    INSERT_ASM_10_TIMES
-
-#define INSERT_ASM_1000_TIMES \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-    INSERT_ASM_100_TIMES     \
-
-void nop_function(uint64_t iters) {
-  for (uint64_t i = 0; i < iters; i++) {
-    INSERT_ASM_1000_TIMES
-    INSERT_ASM_1000_TIMES
-    INSERT_ASM_1000_TIMES
-    INSERT_ASM_1000_TIMES
-  }
-}
-
-// Run the nop_function with the number of iterations specified and
-// measure both the time and number of cycles
-int measure_freq_iters(uint64_t iters, uint32_t core, double* freq) {
-  clockid_t clock = CLOCK_PROCESS_CPUTIME_ID;
-  struct timespec start, end;
-  struct perf_event_attr pe;
-  uint64_t cycles;
-  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);
-  pe.config = PERF_COUNT_HW_CPU_CYCLES;
-  pe.disabled = 1;
-  pe.exclude_kernel = 1;
-  pe.exclude_hv = 1;
-
-  fd = perf_event_open(&pe, pid, core, -1, 0);
-  if (fd == -1) {
-    perror("perf_event_open");
-    if (errno == EPERM || errno == EACCES) {
-      printErr("You may not have permission to collect stats.\n"\
-      "Consider tweaking /proc/sys/kernel/perf_event_paranoid or running as root");
-    }
-    return -1;
-  }
-
-  if (clock_gettime(clock, &start) == -1) {
-    perror("clock_gettime");
-    return -1;
-  }
-  if(ioctl(fd, PERF_EVENT_IOC_RESET, 0) == -1) {
-    perror("ioctl");
-    return -1;
-  }
-  if(ioctl(fd, PERF_EVENT_IOC_ENABLE, 0) == -1) {
-    perror("ioctl");
-    return -1;
-  }
-
-  nop_function(iters);
-
-  ssize_t ret = read(fd, &cycles, 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;
-  }
-  if (clock_gettime(clock, &end) == -1) {
-    perror("clock_gettime");
-    return -1;
-  }
-
-  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);
-  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
-  // more reliable and predictable values.
-  return (((int) frequency + 5)/10) * 10;
-}
-
-#endif // #ifdef __linux__
--- a/src/common/freq.h
+++ b/src/common/freq.h
@@ -1,6 +0,0 @@
-#ifndef __COMMON_FREQ__
-#define __COMMON_FREQ__
-
-int64_t measure_max_frequency(uint32_t core);
-
-#endif
--- a/src/common/global.c
+++ b/src/common/global.c
@@ -1,14 +1,3 @@
-#ifdef _WIN32
-  #define NOMINMAX
-  #include <windows.h>
-#elif defined __linux__
-  #define _GNU_SOURCE
-  #include <sched.h>
-#elif defined __FreeBSD__
-  #include <sys/param.h>
-  #include <sys/cpuset.h>
-#endif
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -210,34 +199,6 @@ void* erealloc(void *ptr, size_t size) {
  return newptr;
 }

-#ifndef __APPLE__
-bool bind_to_cpu(int cpu_id) {
-  #ifdef _WIN32
-    HANDLE process = GetCurrentProcess();
-    DWORD_PTR processAffinityMask = 1 << cpu_id;
-    return SetProcessAffinityMask(process, processAffinityMask);
-  #elif defined __linux__
-    cpu_set_t currentCPU;
-    CPU_ZERO(&currentCPU);
-    CPU_SET(cpu_id, &currentCPU);
-    if (sched_setaffinity (0, sizeof(currentCPU), &currentCPU) == -1) {
-      printWarn("sched_setaffinity: %s", strerror(errno));
-      return false;
-    }
-    return true;
-  #elif defined __FreeBSD__
-    cpuset_t currentCPU;
-    CPU_ZERO(&currentCPU);
-    CPU_SET(cpu_id, &currentCPU);
-    if(cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, sizeof(cpuset_t), &currentCPU) == -1) {
-      printWarn("cpuset_setaffinity: %s", strerror(errno));
-      return false;
-    }
-    return true;
-  #endif
-}
-#endif
-
 void print_version(FILE *restrict stream) {
 #ifdef GIT_FULL_VERSION
  fprintf(stream, "cpufetch %s (%s %s)\n", GIT_FULL_VERSION, OS_STR, ARCH_STR);
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -19,9 +19,6 @@ char *strremove(char *str, const char *sub);
 void* emalloc(size_t size);
 void* ecalloc(size_t nmemb, size_t size);
 void* erealloc(void *ptr, size_t size);
-#ifndef __APPLE__
-bool bind_to_cpu(int cpu_id);
-#endif
 void print_version(FILE *restrict stream);

 #endif
--- a/src/common/main.c
+++ b/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 // __linux__
+#endif
  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[]) {
--- a/src/common/pci.c
+++ b/src/common/pci.c
@@ -1,178 +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
-
-/*
- * doc: https://wiki.osdev.org/PCI#Class_Codes
- *      https://pci-ids.ucw.cz/read/PC
- */
-#define PCI_VENDOR_ID_AMD    0x1002
-#define CLASS_VGA_CONTROLLER 0x0300
-#define CLASS_3D_CONTROLLER  0x0302
-
-// 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")));
-    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")));
-    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);
-  }
-}
-
-// Right now, we are interested in PCI devices which
-// vendor is NVIDIA (to be extended in the future).
-// Should we also restrict to VGA controllers only?
-bool pci_device_is_useful(struct pci_device* dev) {
-  return dev->vendor_id == PCI_VENDOR_NVIDIA;
-}
-
-// Filter the input list in order to get only those PCI devices which 
-// we are interested in (decided by pci_device_is_useful)
-// and return the filtered result.
-struct pci_devices * filter_pci_devices(struct pci_devices * pci) {
-  int * devices_to_get = emalloc(sizeof(int) * pci->num_devices);
-  int dev_ptr = 0;
-
-  for (int i=0; i < pci->num_devices; i++) {
-    if (pci_device_is_useful(pci->devices[i])) {
-      devices_to_get[dev_ptr] = i;
-      dev_ptr++;
-    }
-  }
-
-  struct pci_devices * pci_filtered = emalloc(sizeof(struct pci_devices));
-  pci_filtered->num_devices = dev_ptr;
-
-  if (pci_filtered->num_devices == 0) {
-    pci_filtered->devices = NULL;
-  }
-  else {
-    pci_filtered->devices = emalloc(sizeof(struct pci_device) * pci_filtered->num_devices);  
-
-    for (int i=0; i < pci_filtered->num_devices; i++)
-      pci_filtered->devices[i] = pci->devices[devices_to_get[i]];
-  }
-
-  return pci_filtered;
-}
-
-// 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 filter_pci_devices(pci);
-}
--- a/src/common/pci.h
+++ b/src/common/pci.h
@@ -1,20 +0,0 @@
-#ifndef __PCI__
-#define __PCI__
-
-#define PCI_VENDOR_NVIDIA 0x10de
-#define PCI_DEVICE_TEGRA_X1 0x0faf
-
-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
--- a/src/common/printer.c
+++ b/src/common/printer.c
@@ -61,7 +61,6 @@ enum {
  ATTRIBUTE_NCORES,
  ATTRIBUTE_NCORES_DUAL,
 #ifdef ARCH_X86
-  ATTRIBUTE_SSE,
  ATTRIBUTE_AVX,
  ATTRIBUTE_FMA,
 #elif ARCH_PPC
@@ -97,7 +96,6 @@ static const char* ATTRIBUTE_FIELDS [] = {
  "Cores:",
  "Cores (Total):",
 #ifdef ARCH_X86
-  "SSE:",
  "AVX:",
  "FMA:",
 #elif ARCH_PPC
@@ -133,7 +131,6 @@ static const char* ATTRIBUTE_FIELDS_SHORT [] = {
  "Cores:",
  "Cores (Total):",
 #ifdef ARCH_X86
-  "SSE:",
  "AVX:",
  "FMA:",
 #elif ARCH_PPC
@@ -360,9 +357,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,8 +383,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_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);
  }
@@ -597,7 +589,6 @@ bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct color** cs, struct
  for(int i = 0; i < cpu->num_cpus; ptr = ptr->next_cpu, i++) {
    char* max_frequency = get_str_freq(ptr->freq);
    char* avx = get_str_avx(ptr);
-    char* sse = get_str_sse(ptr);
    char* fma = get_str_fma(ptr);
    char* cpu_num = emalloc(sizeof(char) * 9);

@@ -632,17 +623,8 @@ bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct color** cs, struct
        setAttribute(art, ATTRIBUTE_NCORES, n_cores);
      }
    }
-
-    // Show the most modern vector instructions.
-    // If AVX is supported show it, otherwise show SSE
-    if (strcmp(avx, "No") == 0) {
-      setAttribute(art, ATTRIBUTE_SSE, sse);
-    }
-    else {
-      setAttribute(art, ATTRIBUTE_AVX, avx);
-      setAttribute(art, ATTRIBUTE_FMA, fma);
-    }
-
+    setAttribute(art, ATTRIBUTE_AVX, avx);
+    setAttribute(art, ATTRIBUTE_FMA, fma);
    if(l1i != NULL) setAttribute(art, ATTRIBUTE_L1i, l1i);
    if(l1d != NULL) setAttribute(art, ATTRIBUTE_L1d, l1d);
    if(l2 != NULL) setAttribute(art, ATTRIBUTE_L2, l2);
--- a/src/common/soc.c
+++ b/src/common/soc.c
@@ -20,7 +20,6 @@ static char* soc_trademark_string[] = {
  [SOC_VENDOR_APPLE]      = "Apple ",
  [SOC_VENDOR_ROCKCHIP]   = "Rockchip ",
  [SOC_VENDOR_GOOGLE]     = "Google ",
-  [SOC_VENDOR_NVIDIA]     = "NVIDIA ",
  // RISC-V
  [SOC_VENDOR_SIFIVE]     = "SiFive ",
  [SOC_VENDOR_STARFIVE]   = "StarFive ",
--- a/src/common/soc.h
+++ b/src/common/soc.h
@@ -24,7 +24,6 @@ enum {
  SOC_VENDOR_APPLE,
  SOC_VENDOR_ROCKCHIP,
  SOC_VENDOR_GOOGLE,
-  SOC_VENDOR_NVIDIA,
  // RISC-V
  SOC_VENDOR_SIFIVE,
  SOC_VENDOR_STARFIVE,
--- a/src/ppc/ppc.c
+++ b/src/ppc/ppc.c
@@ -81,9 +81,13 @@ struct topology* get_topology_info(struct cache* cach) {
  if(!fill_package_ids_from_sys(package_ids, topo->total_cores)) {
    printWarn("fill_package_ids_from_sys failed, output may be incomplete/invalid");
    for(int i=0; i < topo->total_cores; i++) package_ids[i] = 0;
-    // fill_package_ids_from_sys failed, use a
-    // more sophisticated wat to find the number of sockets
+    // fill_package_ids_from_sys failed, use udev to try
+    // to find the number of sockets
    topo->sockets = get_num_sockets_package_cpus(topo);
+    if (topo->sockets == UNKNOWN_DATA) {
+      printWarn("get_num_sockets_package_cpus failed: assuming 1 socket");
+      topo->sockets = 1;
+    }
  }
  else {
    // fill_package_ids_from_sys succeeded, use the
@@ -146,7 +150,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);

--- a/src/ppc/uarch.c
+++ b/src/ppc/uarch.c
@@ -25,6 +25,7 @@ enum {
  UARCH_PPC603,
  UARCH_PPC440,
  UARCH_PPC470,
+  UARCH_ESPRESSO, // Not exactly an uarch, but the codename of Wii U
  UARCH_PPC970,
  UARCH_PPC970FX,
  UARCH_PPC970MP,
@@ -75,6 +76,7 @@ void fill_uarch(struct uarch* arch, MICROARCH u) {
  FILL_UARCH(arch->uarch, UARCH_PPC603,      "PowerPC 603",   UNK) // varies
  FILL_UARCH(arch->uarch, UARCH_PPC440,      "PowerPC 440",   UNK)
  FILL_UARCH(arch->uarch, UARCH_PPC470,      "PowerPC 470",    45) // strange...
+  FILL_UARCH(arch->uarch, UARCH_ESPRESSO,    "Espresso",       45) // https://en.wikipedia.org/wiki/PowerPC_7xx#Espresso, https://en.wikipedia.org/wiki/Espresso_(processor)
  FILL_UARCH(arch->uarch, UARCH_PPC970,      "PowerPC 970",   130)
  FILL_UARCH(arch->uarch, UARCH_PPC970FX,    "PowerPC 970FX",  90)
  FILL_UARCH(arch->uarch, UARCH_PPC970MP,    "PowerPC 970MP",  90)
@@ -234,6 +236,7 @@ struct uarch* get_uarch_from_pvr(uint32_t pvr) {
  CHECK_UARCH(arch, pvr, 0xffff0000, 0x7ff50000, UARCH_PPC470)
  CHECK_UARCH(arch, pvr, 0xffff0000, 0x00050000, UARCH_PPC470)
  CHECK_UARCH(arch, pvr, 0xffff0000, 0x11a50000, UARCH_PPC470)
+  CHECK_UARCH(arch, pvr, 0xffffffff, 0x70010201, UARCH_ESPRESSO)
  UARCH_END

  return arch;
--- a/src/riscv/riscv.c
+++ b/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);

--- a/src/x86/apic.c
+++ b/src/x86/apic.c
@@ -72,6 +72,34 @@ uint32_t get_apic_id(bool x2apic_id) {
  }
 }

+#ifndef __APPLE__
+bool bind_to_cpu(int cpu_id) {
+  #ifdef _WIN32
+    HANDLE process = GetCurrentProcess();
+    DWORD_PTR processAffinityMask = 1 << cpu_id;
+    return SetProcessAffinityMask(process, processAffinityMask);
+  #elif defined __linux__
+    cpu_set_t currentCPU;
+    CPU_ZERO(&currentCPU);
+    CPU_SET(cpu_id, &currentCPU);
+    if (sched_setaffinity (0, sizeof(currentCPU), &currentCPU) == -1) {
+      printWarn("sched_setaffinity: %s", strerror(errno));
+      return false;
+    }
+    return true;
+  #elif defined __FreeBSD__
+    cpuset_t currentCPU;
+    CPU_ZERO(&currentCPU);
+    CPU_SET(cpu_id, &currentCPU);
+    if(cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, sizeof(cpuset_t), &currentCPU) == -1) {
+      printWarn("cpuset_setaffinity: %s", strerror(errno));
+      return false;
+    }
+    return true;
+  #endif
+}
+#endif
+
 #ifdef __linux__
 int get_total_cores_module(int total_cores, int module) {
  int total_modules = 2;
@@ -369,11 +397,6 @@ bool fill_apic_ids(uint32_t* apic_ids, int first_core, int n, bool x2apic_id) {
 }

 bool get_topology_from_apic(struct cpuInfo* cpu, struct topology* topo) {
-  if (topo->cach == NULL) {
-    printWarn("get_topology_from_apic: cach is NULL");
-    return false;
-  }
-
  uint32_t apic_id;
  uint32_t* apic_ids = emalloc(sizeof(uint32_t) * topo->total_cores_module);
  uint32_t* apic_pkg = emalloc(sizeof(uint32_t) * topo->total_cores_module);
--- a/src/x86/apic.h
+++ b/src/x86/apic.h
@@ -17,6 +17,10 @@ struct apic {
 bool get_topology_from_apic(struct cpuInfo* cpu, struct topology* topo);
 uint32_t is_smt_enabled_amd(struct topology* topo);

+#ifndef __APPLE__
+bool bind_to_cpu(int cpu_id);
+#endif
+
 #ifdef __linux__
 int get_total_cores_module(int total_cores, int module);
 #endif
--- a/src/x86/cpuid.c
+++ b/src/x86/cpuid.c
@@ -6,10 +6,6 @@
  #include <unistd.h>
 #endif

-#ifdef __linux__
-  #include "../common/freq.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,7 +22,6 @@

 #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",
@@ -223,7 +218,7 @@ int64_t get_peak_performance(struct cpuInfo* cpu, bool accurate_pp) {
  #endif

    //First, check we have consistent data
-    if(freq == UNKNOWN_DATA || topo == NULL || topo->logical_cores == UNKNOWN_DATA) {
+    if(freq == UNKNOWN_DATA || topo->logical_cores == UNKNOWN_DATA) {
      return -1;
    }

@@ -456,7 +451,7 @@ struct cpuInfo* get_cpu_info(void) {
  cpu->cach = NULL;
  cpu->feat = NULL;

-  cpu->num_cpus = 1;
+  uint32_t modules = 1;
  uint32_t eax = 0;
  uint32_t ebx = 0;
  uint32_t ecx = 0;
@@ -475,8 +470,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);
@@ -514,12 +507,12 @@ struct cpuInfo* get_cpu_info(void) {
    cpu->hybrid_flag = (edx >> 15) & 0x1;
  }

-  if(cpu->hybrid_flag) cpu->num_cpus = 2;
+  if(cpu->hybrid_flag) modules = 2;

  struct cpuInfo* ptr = cpu;
-  for(uint32_t i=0; i < cpu->num_cpus; i++) {
+  for(uint32_t i=0; i < modules; i++) {
    int32_t first_core;
-    set_cpu_module(i, cpu->num_cpus, &first_core);
+    set_cpu_module(i, modules, &first_core);

    if(i > 0) {
      ptr->next_cpu = emalloc(sizeof(struct cpuInfo));
@@ -554,7 +547,11 @@ struct cpuInfo* get_cpu_info(void) {
      cpu->cpu_name = infer_cpu_name_from_uarch(cpu->arch);
    }

+    // If any field of the struct is NULL,
+    // return early, as next functions
+    // require non NULL fields in cach and topo
    ptr->cach = get_cache_info(ptr);
+    if(ptr->cach == NULL) return cpu;

    if(cpu->hybrid_flag) {
      ptr->topo = get_topology_info(ptr, ptr->cach, i);
@@ -562,23 +559,16 @@ struct cpuInfo* get_cpu_info(void) {
    else {
      ptr->topo = get_topology_info(ptr, ptr->cach, -1);
    }
-
-    // If topo is NULL, return early, as get_peak_performance
-    // requries non-NULL topology.
-    if(ptr->topo == NULL) return cpu;
+    if(cpu->topo == NULL) return cpu;
  }

+  cpu->num_cpus = modules;
  cpu->peak_performance = get_peak_performance(cpu, accurate_pp());

  return cpu;
 }

 bool get_cache_topology_amd(struct cpuInfo* cpu, struct topology* topo) {
-  if (topo->cach == NULL) {
-    printWarn("get_cache_topology_amd: cach is NULL");
-    return false;
-  }
-
  if(cpu->maxExtendedLevels >= 0x8000001D && cpu->topology_extensions) {
    uint32_t i, eax, ebx, ecx, edx, num_sharing_cache, cache_type, cache_level;

@@ -654,17 +644,10 @@ bool get_cache_topology_amd(struct cpuInfo* cpu, struct topology* topo) {

 #ifdef __linux__
 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) {
-    // We can assume it's a single core CPU
-    topo->logical_cores = topo->total_cores;
-    topo->physical_cores = topo->total_cores;
-  }
-  else {
-    topo->logical_cores = UNKNOWN_DATA;
-    topo->physical_cores = UNKNOWN_DATA;
-  }
+  topo->total_cores = get_ncores_from_cpuinfo();
+  topo->logical_cores = topo->total_cores;
+  topo->physical_cores = topo->total_cores;
  topo->smt_available = 1;
  topo->smt_supported = 1;
  topo->sockets = 1;
@@ -711,29 +694,30 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach, int

  switch(cpu->cpu_vendor) {
    case CPU_VENDOR_INTEL:
-      bool toporet = false;
      if (cpu->maxLevels >= 0x00000004) {
-        toporet = get_topology_from_apic(cpu, topo);
+        bool toporet = get_topology_from_apic(cpu, topo);
+        if(!toporet) {
+          #ifdef __linux__
+            printWarn("Failed to retrieve topology from APIC, using udev...\n");
+            get_topology_from_udev(topo);
+          #else
+            printErr("Failed to retrieve topology from APIC, assumming default values...\n");
+            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)", 0x00000004, cpu->maxLevels);
-      }
-      if(!toporet) {
-        #ifdef __linux__
-          printWarn("Failed to retrieve topology from APIC, using udev...");
-          get_topology_from_udev(topo);
-        #else
-          if (cpu->maxLevels >= 0x00000004)
-            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
+        printWarn("Can't read topology information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000001, cpu->maxLevels);
+        topo->physical_cores = 1;
+        topo->logical_cores = 1;
+        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);
@@ -930,7 +914,6 @@ 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) || defined (__APPLE__)
@@ -940,7 +923,7 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
    #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");
@@ -967,7 +950,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");
@@ -979,15 +962,6 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
    }
  }

-  #ifdef __linux__
-    if (freq->max == UNKNOWN_DATA || measure_max_frequency_flag()) {
-      if (freq->max == UNKNOWN_DATA)
-        printWarn("All previous methods failed, measuring CPU frequency");
-      freq->max = measure_max_frequency(cpu->first_core_id);
-      freq->measured = true;
-    }
-  #endif
-
  return freq;
 }

@@ -1009,34 +983,25 @@ 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 {
-    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");
+  else 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_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);
-      else {
-        if(cpu->cpu_vendor == CPU_VENDOR_AMD)
-          snprintf(string, max_size, "%d %s (SMT disabled)", topo->physical_cores * topo_sockets, cores_str);
-        else
-          snprintf(string, max_size, "%d %s (HT disabled)", topo->physical_cores * topo_sockets, cores_str);
-      }
-    }
+    if(topo->smt_available > 1)
+      snprintf(string, max_size, "%d cores (%d threads)", topo->physical_cores * topo_sockets, topo->logical_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);
+      if(cpu->cpu_vendor == CPU_VENDOR_AMD)
+        snprintf(string, max_size, "%d cores (SMT disabled)", topo->physical_cores * topo_sockets);
+      else
+        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 cores",topo->physical_cores * topo_sockets);
+  }

  return string;
 }
--- a/src/x86/uarch.c
+++ b/src/x86/uarch.c
@@ -392,25 +392,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));
@@ -455,16 +436,8 @@ 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
Author	SHA1	Message	Date
Dr-Noob	ae6c7f75ad	[v1.06][PPC] Small correction	2024-08-25 16:47:43 +01:00
Dr-Noob	f84160f97e	[v1.06][PPC] Small fix to see if helps	2024-08-24 12:25:02 +01:00
Dr-Noob	e7ec4d492e	[v1.05][PPC] Preeliminary support for Espresso, the Wii U CPU	2024-05-18 23:27:02 +01:00