Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b50740516 | ||
|
|
2fce2c9f52 | ||
|
|
617fd2a520 | ||
|
|
7226adb04d | ||
|
|
a5b321a966 | ||
|
|
6981d61eaf | ||
|
|
bb12a2c276 | ||
|
|
432b2d7c56 | ||
|
|
3928a9e3b6 | ||
|
|
9f29023362 | ||
|
|
40380a2f50 | ||
|
|
b97b43cec7 | ||
|
|
b9988622f2 | ||
|
|
2cdc31392a | ||
|
|
3b7a122956 | ||
|
|
c2b0213b9f | ||
|
|
3641391bd8 | ||
|
|
0350d116bd | ||
|
|
23055483c4 | ||
|
|
bf75716054 | ||
|
|
dd324537ee |
1
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
cpufetch
|
||||
*.o
|
||||
|
||||
26
Makefile
@@ -15,7 +15,14 @@ ifneq ($(OS),Windows_NT)
|
||||
ifeq ($(arch), $(filter $(arch), x86_64 amd64 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
|
||||
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
|
||||
CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
|
||||
else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
|
||||
SRC_DIR=src/ppc/
|
||||
@@ -51,18 +58,27 @@ else
|
||||
OUTPUT=cpufetch.exe
|
||||
endif
|
||||
|
||||
all: CFLAGS += -O3
|
||||
all: CFLAGS += -O2
|
||||
all: $(OUTPUT)
|
||||
|
||||
debug: CFLAGS += -g -O0
|
||||
debug: $(OUTPUT)
|
||||
|
||||
static: CFLAGS += -static -O3
|
||||
static: CFLAGS += -static -O2
|
||||
static: $(OUTPUT)
|
||||
|
||||
strict: CFLAGS += -O3 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
|
||||
strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
|
||||
strict: $(OUTPUT)
|
||||
|
||||
freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h
|
||||
$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
|
||||
|
||||
freq_avx.o: Makefile $(SRC_DIR)freq/freq_avx.c $(SRC_DIR)freq/freq_avx.h
|
||||
$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx -mfma -pthread $(SRC_DIR)freq/freq_avx.c -o $@
|
||||
|
||||
freq_avx512.o: Makefile $(SRC_DIR)freq/freq_avx512.c $(SRC_DIR)freq/freq_avx512.h
|
||||
$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -mfma -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
|
||||
|
||||
$(OUTPUT): Makefile $(SOURCE) $(HEADERS)
|
||||
$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
|
||||
|
||||
@@ -70,7 +86,7 @@ run: $(OUTPUT)
|
||||
./$(OUTPUT)
|
||||
|
||||
clean:
|
||||
@rm -f $(OUTPUT)
|
||||
@rm -f $(OUTPUT) *.o
|
||||
|
||||
install: $(OUTPUT)
|
||||
install -Dm755 "cpufetch" "$(DESTDIR)$(PREFIX)/bin/cpufetch"
|
||||
|
||||
141
README.md
@@ -1,20 +1,35 @@
|
||||
<p align="center"><img width=50% src="./pictures/cpufetch.png"></p>
|
||||
|
||||
<div align="center">
|
||||
|
||||

|
||||
[](https://github.com/Dr-Noob/cpufetch/stargazers)
|
||||
[](https://github.com/Dr-Noob/cpufetch/issues)
|
||||
[](https://repology.org/project/cpufetch/versions)
|
||||
[](https://github.com/Dr-Noob/cpufetch/blob/master/LICENSE)
|
||||
|
||||
<h4 align="center">Simple yet fancy CPU architecture fetching tool</h4>
|
||||
|
||||
|
||||

|
||||
<p align="center"> </p>
|
||||
|
||||
<div align="center">
|
||||
<img height="22px" src="https://img.shields.io/github/v/tag/Dr-Noob/cpufetch?label=cpufetch&style=flat-square">
|
||||
<a href="https://github.com/Dr-Noob/cpufetch/stargazers">
|
||||
<img height="22px" src="https://img.shields.io/github/stars/Dr-Noob/cpufetch?color=4CC61F&style=flat-square">
|
||||
</a>
|
||||
<a href="https://github.com/Dr-Noob/cpufetch/issues">
|
||||
<img height="22px" src="https://img.shields.io/github/issues/Dr-Noob/cpufetch?style=flat-square">
|
||||
</a>
|
||||
<a href="https://github.com/Dr-Noob/cpufetch/blob/master/README.md#1-support">
|
||||
<img height="22px" src="pictures/os-shield.jpg">
|
||||
</a>
|
||||
<a href="https://github.com/Dr-Noob/cpufetch/blob/master/LICENSE">
|
||||
<img height="22px" src="https://img.shields.io/github/license/Dr-Noob/cpufetch?color=orange&style=flat-square">
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<p align="center"> </p>
|
||||
|
||||
<p align="center">
|
||||
cpufetch is a command-line tool written in C that displays the CPU information in a clean and beautiful way
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<img width=80% src="./pictures/examples.gif">
|
||||
</p>
|
||||
|
||||
# Table of contents
|
||||
<!-- UPDATE with: doctoc --notitle README.md -->
|
||||
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
|
||||
@@ -24,12 +39,15 @@
|
||||
- [1. Support](#1-support)
|
||||
- [2. Installation](#2-installation)
|
||||
- [2.1 Installing from a package](#21-installing-from-a-package)
|
||||
- [2.2 Building from source (Linux/Windows/macOS)](#22-building-from-source-linuxwindowsmacos)
|
||||
- [2.2 Building from source](#22-building-from-source)
|
||||
- [2.3 Android](#23-android)
|
||||
- [3. Examples](#3-examples)
|
||||
- [3.1 x86_64 CPUs](#31-x86_64-cpus)
|
||||
- [3.2 ARM CPUs](#32-arm-cpus)
|
||||
- [4. Colors and style](#4-colors-and-style)
|
||||
- [3.1 x86_64](#31-x86_64)
|
||||
- [3.2 ARM](#32-arm)
|
||||
- [3.3 PowerPC](#33-powerpc)
|
||||
- [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)
|
||||
- [5. Implementation](#5-implementation)
|
||||
- [6. Bugs or improvements](#6-bugs-or-improvements)
|
||||
- [7. Acknowledgements](#7-acknowledgements)
|
||||
@@ -37,31 +55,30 @@
|
||||
|
||||
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
|
||||
|
||||
# 1. Support
|
||||
## 1. Support
|
||||
|
||||
cpufetch supports the following architectures:
|
||||
- x86 / x86_64
|
||||
- ARM
|
||||
- PowerPC
|
||||
| OS | x86_64 / x86 | ARM | PowerPC |
|
||||
|:-----------:|:------------------:|:------------------:|:------------------:|
|
||||
| GNU / Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
|
||||
| Windows | :heavy_check_mark: | :x: | :x: |
|
||||
| Android | :heavy_check_mark: | :heavy_check_mark: | :x: |
|
||||
| macOS | :heavy_check_mark: | :heavy_check_mark: | :x: |
|
||||
| FreeBSD | :heavy_check_mark: | :x: | :x: |
|
||||
|
||||
| OS | x86_64 / x86 | ARM | PowerPC | Notes |
|
||||
|:---------:|:------------------:|:------------------:|:------------------:|:-----------------:|
|
||||
| GNU/Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Best support |
|
||||
| Windows | :heavy_check_mark: | :x: | :x: | Some information may be missing. <br> Colors will be used if supported |
|
||||
| Android | :heavy_check_mark: | :heavy_check_mark: | :x: | Some information may be missing |
|
||||
| macOS | :heavy_check_mark: | :heavy_check_mark: | :x: | Only the Apple M1 is supported in ARM |
|
||||
| FreeBSD | :heavy_check_mark: | :x: | :x: | Some information may be missing. |
|
||||
**NOTES:**
|
||||
- Colors will be used in Windows only if the terminal supports it.
|
||||
- Support in macOS ARM is limited to Apple M1 only
|
||||
|
||||
# 2. Installation
|
||||
## 2.1 Installing from a package
|
||||
## 2. Installation
|
||||
### 2.1 Installing from a package
|
||||
Choose the right package for your operating system:
|
||||
|
||||
[](https://repology.org/project/cpufetch/versions)
|
||||
|
||||
If there is no available package for your OS, you can download the cpufetch binary from [the releases page](https://github.com/Dr-Noob/cpufetch/releases), or [build cpufetch from source](#22-building-from-source-linuxwindowsmacos) (see below).
|
||||
|
||||
## 2.2 Building from source (Linux/Windows/macOS)
|
||||
You will need a C compiler (e.g, `gcc`), and `make` to compile `cpufetch`. To do so, just clone the repo and run `make`:
|
||||
### 2.2 Building from source
|
||||
You will need a C compiler (e.g, `gcc`) and `make` to compile `cpufetch`. Just clone the repo and run `make`:
|
||||
|
||||
```
|
||||
git clone https://github.com/Dr-Noob/cpufetch
|
||||
@@ -70,9 +87,7 @@ make
|
||||
./cpufetch
|
||||
```
|
||||
|
||||
The Makefile is designed to work on Linux, Windows and macOS.
|
||||
|
||||
## 2.3 Android
|
||||
### 2.3 Android
|
||||
1. Install `termux` app (terminal emulator)
|
||||
2. Run `pkg install -y git make clang` inside termux.
|
||||
3. Build from source normally:
|
||||
@@ -81,45 +96,65 @@ The Makefile is designed to work on Linux, Windows and macOS.
|
||||
- make
|
||||
- ./cpufetch
|
||||
|
||||
# 3. Examples
|
||||
Here are more examples of how `cpufetch` looks on different CPUs.
|
||||
## 3. Examples
|
||||
### 3.1 x86_64
|
||||
|
||||
## 3.1 x86_64 CPUs
|
||||
<p align="center"><img width=90% src="pictures/epyc.png"></p>
|
||||
<p align="center">AMD EPYC HPC server</p>
|
||||
<p align="center"><img width=90% src="pictures/cascade_lake.jpg"></p>
|
||||
<p align="center">Intel Xeon HPC server</p>
|
||||
|
||||

|
||||
### 3.2 ARM
|
||||
|
||||

|
||||
<p align="center">
|
||||
<img width=45% src="pictures/exynos.jpg">
|
||||
|
||||
<img width=45% src="pictures/snapd.png">
|
||||
</p>
|
||||
<p align="center">Samsung Galaxy S8 (left) Xiaomi Redmi Note 7 (right)</p>
|
||||
|
||||
## 3.2 ARM CPUs
|
||||
### 3.3 PowerPC
|
||||
|
||||

|
||||
<p align="center"><img width=90% src="pictures/ibm.png"></p>
|
||||
<p align="center">Talos II</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:
|
||||
|
||||
# 4. Colors and style
|
||||
By default, `cpufetch` will print the CPU art with the system colorscheme. However, you can always set a custom color scheme, either
|
||||
specifying Intel or AMD, or specifying the colors in RGB format:
|
||||
### 4.1 Specifying a name
|
||||
|
||||
By specifying a name, cpufetch will use the specific colors of each manufacture. Valid values are:
|
||||
|
||||
- intel
|
||||
- intel-new
|
||||
- amd
|
||||
- ibm
|
||||
- arm
|
||||
|
||||
```
|
||||
./cpufetch --color intel (default color for Intel)
|
||||
./cpufetch --color amd (default color for AMD)
|
||||
./cpufetch --color 239,90,45:210,200,200:100,200,45:0,200,200 (example)
|
||||
```
|
||||
|
||||
In the case of setting the colors using RGB, 4 colors must be given in with the format: ``[R,G,B:R,G,B:R,G,B:R,G,B]``. These colors correspond to CPU art color (2 colors) and for the text colors (following 2). Thus, you can customize all the colors.
|
||||
### 4.2 Specifying the colors in RGB format
|
||||
|
||||
# 5. Implementation
|
||||
See [cpufetch programming documentation](https://github.com/Dr-Noob/cpufetch/doc/README.md).
|
||||
5 colors must be given in RGB with the format: ``[R,G,B:R,G,B:R,G,B:R,G,B:R,G,B]``. These colors correspond to the CPU logo color (first 3 colors) and for the text colors (following 2).
|
||||
|
||||
# 6. Bugs or improvements
|
||||
See [cpufetch contributing guidelines](https://github.com/Dr-Noob/cpufetch/CONTRIBUTING.md)
|
||||
```
|
||||
./cpufetch --color 239,90,45:210,200,200:0,0,0:100,200,45:0,200,200
|
||||
```
|
||||
|
||||
# 7. Acknowledgements
|
||||
## 5. Implementation
|
||||
See [cpufetch programming documentation](https://github.com/Dr-Noob/cpufetch/tree/master/doc).
|
||||
|
||||
## 6. Bugs or improvements
|
||||
See [cpufetch contributing guidelines](https://github.com/Dr-Noob/cpufetch/blob/master/CONTRIBUTING.md).
|
||||
|
||||
## 7. Acknowledgements
|
||||
Thanks to the fellow contributors and interested people in the project. Special thanks to:
|
||||
- [Gonzalocl](https://github.com/Gonzalocl), [OdnetninI](https://github.com/OdnetninI): Tested cpufetch in the earlier versions of the project in many different CPUs.
|
||||
- [Kyngo](https://github.com/Kyngo): Tested cpufetch in the Apple M1 CPU.
|
||||
- [avollmerhaus](https://github.com/avollmerhaus): Gave me ssh acess to a PowerPC machine, allowing me to develop the PowerPC port.
|
||||
- [bbonev](https://github.com/bbonev), [stephan-cr](https://github.com/stephan-cr): Reviewed the source code.
|
||||
|
||||
# 8. cpufetch for GPUs (gpufetch)
|
||||
## 8. cpufetch for GPUs (gpufetch)
|
||||
See [gpufetch](https://github.com/Dr-Noob/gpufetch) project!
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3. It was also manually adapted to look correctly
|
||||
.TH CPUFETCH "1" "August 2021" "cpufetch v0.99 (Linux x86_64 build)" "User Commands"
|
||||
.\" help2man -N -n "Simple yet fancy CPU architecture fetching tool" ./cpufetch > cpufetch.1
|
||||
.TH CPUFETCH "1" "September 2021" "cpufetch v1.00 (Linux x86_64 build)" "User Commands"
|
||||
.SH NAME
|
||||
cpufetch \- manual page for cpufetch v0.99 (Linux x86_64 build)
|
||||
cpufetch \- Simple yet fancy CPU architecture fetching tool
|
||||
.SH SYNOPSIS
|
||||
.B cpufetch
|
||||
[\fI\,OPTION\/\fR]...
|
||||
.SH DESCRIPTION
|
||||
Simple yet fancy CPU architecture fetching tool
|
||||
cpufetch is a command-line tool written in C that displays the CPU information in a clean and beautiful way
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
\fB\-c\fR, \fB\-\-color\fR
|
||||
|
||||
BIN
pictures/cascade_lake.jpg
Normal file
|
After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 62 KiB |
BIN
pictures/examples.gif
Normal file
|
After Width: | Height: | Size: 1.7 MiB |
BIN
pictures/exynos.jpg
Normal file
|
After Width: | Height: | Size: 268 KiB |
|
Before Width: | Height: | Size: 44 KiB |
BIN
pictures/i9.png
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 32 KiB |
BIN
pictures/ibm.png
Normal file
|
After Width: | Height: | Size: 47 KiB |
BIN
pictures/os-shield.jpg
Normal file
|
After Width: | Height: | Size: 162 KiB |
BIN
pictures/snapd.png
Normal file
|
After Width: | Height: | Size: 107 KiB |
@@ -24,6 +24,10 @@
|
||||
#include "uarch.h"
|
||||
#include "soc.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];
|
||||
}
|
||||
|
||||
struct cache* get_cache_info(struct cpuInfo* cpu) {
|
||||
struct cache* cach = emalloc(sizeof(struct cache));
|
||||
init_cache_struct(cach);
|
||||
@@ -41,13 +45,13 @@ struct cache* get_cache_info(struct cpuInfo* cpu) {
|
||||
struct frequency* get_frequency_info(uint32_t core) {
|
||||
struct frequency* freq = emalloc(sizeof(struct frequency));
|
||||
|
||||
freq->base = UNKNOWN_FREQ;
|
||||
freq->base = UNKNOWN_DATA;
|
||||
freq->max = get_max_freq_from_file(core);
|
||||
|
||||
return freq;
|
||||
}
|
||||
|
||||
struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach, uint32_t* midr_array, int socket_idx, int ncores) {
|
||||
struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach, uint32_t* midr_array, int32_t* freq_array, int socket_idx, int ncores) {
|
||||
struct topology* topo = emalloc(sizeof(struct topology));
|
||||
init_topology_struct(topo, cach);
|
||||
|
||||
@@ -57,7 +61,7 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach, uint
|
||||
int cores_in_socket = 0;
|
||||
|
||||
while(socket_idx + 1 > sockets_seen) {
|
||||
if(currrent_core_idx < ncores && midr_array[first_core_idx] == midr_array[currrent_core_idx]) {
|
||||
if(currrent_core_idx < ncores && cores_are_equal(first_core_idx, currrent_core_idx, midr_array, freq_array)) {
|
||||
currrent_core_idx++;
|
||||
cores_in_socket++;
|
||||
}
|
||||
@@ -77,7 +81,7 @@ int64_t get_peak_performance(struct cpuInfo* cpu) {
|
||||
|
||||
//First check we have consistent data
|
||||
for(int i=0; i < cpu->num_cpus; ptr = ptr->next_cpu, i++) {
|
||||
if(get_freq(ptr->freq) == UNKNOWN_FREQ) {
|
||||
if(get_freq(ptr->freq) == UNKNOWN_DATA) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -93,10 +97,6 @@ int64_t get_peak_performance(struct cpuInfo* cpu) {
|
||||
return flops;
|
||||
}
|
||||
|
||||
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];
|
||||
}
|
||||
|
||||
uint32_t fill_ids_from_midr(uint32_t* midr_array, int32_t* freq_array, uint32_t* ids_array, int len) {
|
||||
uint32_t latest_id = 0;
|
||||
bool found;
|
||||
@@ -204,7 +204,7 @@ struct cpuInfo* get_cpu_info_linux(struct cpuInfo* cpu) {
|
||||
}
|
||||
|
||||
freq_array[i] = get_max_freq_from_file(i);
|
||||
if(freq_array[i] == UNKNOWN_FREQ) {
|
||||
if(freq_array[i] == UNKNOWN_DATA) {
|
||||
printWarn("Unable to fetch max frequency for core %d. This is probably because the core is offline", i);
|
||||
freq_array[i] = freq_array[0];
|
||||
}
|
||||
@@ -231,7 +231,7 @@ struct cpuInfo* get_cpu_info_linux(struct cpuInfo* cpu) {
|
||||
ptr->feat = get_features_info();
|
||||
ptr->freq = get_frequency_info(midr_idx);
|
||||
ptr->cach = get_cache_info(ptr);
|
||||
ptr->topo = get_topology_info(ptr, ptr->cach, midr_array, i, ncores);
|
||||
ptr->topo = get_topology_info(ptr, ptr->cach, midr_array, freq_array, i, ncores);
|
||||
}
|
||||
|
||||
cpu->num_cpus = sockets;
|
||||
@@ -256,7 +256,7 @@ void fill_cpu_info_firestorm_icestorm(struct cpuInfo* cpu) {
|
||||
ice->topo->cach = ice->cach;
|
||||
ice->topo->total_cores = 4;
|
||||
ice->freq = malloc(sizeof(struct frequency));
|
||||
ice->freq->base = UNKNOWN_FREQ;
|
||||
ice->freq->base = UNKNOWN_DATA;
|
||||
ice->freq->max = 2064;
|
||||
ice->hv = malloc(sizeof(struct hypervisor));
|
||||
ice->hv->present = false;
|
||||
@@ -272,7 +272,7 @@ void fill_cpu_info_firestorm_icestorm(struct cpuInfo* cpu) {
|
||||
fire->topo->cach = fire->cach;
|
||||
fire->topo->total_cores = 4;
|
||||
fire->freq = malloc(sizeof(struct frequency));
|
||||
fire->freq->base = UNKNOWN_FREQ;
|
||||
fire->freq->base = UNKNOWN_DATA;
|
||||
fire->freq->max = 3200;
|
||||
fire->hv = malloc(sizeof(struct hypervisor));
|
||||
fire->hv->present = false;
|
||||
@@ -368,7 +368,7 @@ void print_debug(struct cpuInfo* cpu) {
|
||||
else {
|
||||
printf("0x%.8X ", midr);
|
||||
}
|
||||
if(freq == UNKNOWN_FREQ) {
|
||||
if(freq == UNKNOWN_DATA) {
|
||||
printWarn("Unable to fetch max frequency for core %d. This is probably because the core is offline", i);
|
||||
printf("%ld MHz\n", get_max_freq_from_file(0));
|
||||
}
|
||||
|
||||
@@ -197,12 +197,15 @@ bool match_exynos(char* soc_name, struct system_on_chip* soc) {
|
||||
|
||||
bool match_mediatek(char* soc_name, struct system_on_chip* soc) {
|
||||
char* tmp;
|
||||
char* soc_name_upper = toupperstr(soc_name);
|
||||
|
||||
if((tmp = strstr(soc_name, "MT")) == NULL)
|
||||
if((tmp = strstr(soc_name_upper, "MT")) == NULL)
|
||||
return false;
|
||||
|
||||
SOC_START
|
||||
// Dimensity //
|
||||
SOC_EQ(tmp, "MT6893", "Dimensity 1200", SOC_MTK_MT6893, soc, 6)
|
||||
SOC_EQ(tmp, "MT6891", "Dimensity 1100", SOC_MTK_MT6891, soc, 6)
|
||||
SOC_EQ(tmp, "MT6889", "Dimensity 1000", SOC_MTK_MT6889, soc, 7)
|
||||
SOC_EQ(tmp, "MT6885Z", "Dimensity 1000L", SOC_MTK_MT6885Z, soc, 7)
|
||||
//SOC_EQ(tmp, "?", "Dimensity 700", SOC_MTK_, soc, 7)
|
||||
@@ -447,6 +450,7 @@ bool match_qualcomm(char* soc_name, struct system_on_chip* soc) {
|
||||
SOC_EQ(tmp, "SM8250", "865", SOC_SNAPD_SM8250, soc, 7)
|
||||
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)
|
||||
SOC_END
|
||||
}
|
||||
|
||||
@@ -487,7 +491,6 @@ struct system_on_chip* parse_soc_from_string(struct system_on_chip* soc) {
|
||||
return soc;
|
||||
|
||||
match_broadcom(raw_name, soc);
|
||||
|
||||
return soc;
|
||||
}
|
||||
|
||||
@@ -498,26 +501,37 @@ static inline int android_property_get(const char* key, char* value) {
|
||||
return __system_property_get(key, value);
|
||||
}
|
||||
|
||||
void try_parse_soc_from_string(struct system_on_chip* soc, int soc_len, char* soc_str) {
|
||||
soc->raw_name = emalloc(sizeof(char) * (soc_len + 1));
|
||||
strncpy(soc->raw_name, soc_str, soc_len + 1);
|
||||
soc->raw_name[soc_len] = '\0';
|
||||
soc->soc_vendor = SOC_VENDOR_UNKNOWN;
|
||||
parse_soc_from_string(soc);
|
||||
}
|
||||
|
||||
struct system_on_chip* guess_soc_from_android(struct system_on_chip* soc) {
|
||||
char tmp[100];
|
||||
int property_len = 0;
|
||||
|
||||
property_len = android_property_get("ro.mediatek.platform", (char *) &tmp);
|
||||
if(property_len > 0) {
|
||||
soc->raw_name = emalloc(sizeof(char) * (property_len + 1));
|
||||
strncpy(soc->raw_name, tmp, property_len + 1);
|
||||
soc->raw_name[property_len] = '\0';
|
||||
soc->soc_vendor = SOC_VENDOR_UNKNOWN;
|
||||
return parse_soc_from_string(soc);
|
||||
try_parse_soc_from_string(soc, property_len, tmp);
|
||||
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property ro.mediatek.platform: %s", tmp);
|
||||
else return soc;
|
||||
}
|
||||
|
||||
property_len = android_property_get("ro.product.board", (char *) &tmp);
|
||||
if(property_len > 0) {
|
||||
soc->raw_name = emalloc(sizeof(char) * (property_len + 1));
|
||||
strncpy(soc->raw_name, tmp, property_len + 1);
|
||||
soc->raw_name[property_len] = '\0';
|
||||
soc->soc_vendor = SOC_VENDOR_UNKNOWN;
|
||||
return parse_soc_from_string(soc);
|
||||
try_parse_soc_from_string(soc, property_len, tmp);
|
||||
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) printWarn("SoC detection failed using Android property ro.product.board: %s", tmp);
|
||||
else return soc;
|
||||
}
|
||||
|
||||
property_len = android_property_get("ro.board.platform", (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.board.platform: %s", tmp);
|
||||
else return soc;
|
||||
}
|
||||
|
||||
return soc;
|
||||
|
||||
@@ -63,6 +63,8 @@ enum {
|
||||
SOC_EXYNOS_980,
|
||||
SOC_EXYNOS_880,
|
||||
// Mediatek //
|
||||
SOC_MTK_MT6893,
|
||||
SOC_MTK_MT6891,
|
||||
SOC_MTK_MT6889,
|
||||
SOC_MTK_MT6885Z,
|
||||
SOC_MTK_MT6853,
|
||||
@@ -258,7 +260,7 @@ inline static VENDOR get_soc_vendor_from_soc(SOC soc) {
|
||||
if(soc >= SOC_BCM_2835 && soc <= SOC_BCM_21654) return SOC_VENDOR_BROADCOM;
|
||||
else if(soc >= SOC_HISILICON_3620 && soc <= SOC_HISILICON_3690) return SOC_VENDOR_KIRIN;
|
||||
else if(soc >= SOC_EXYNOS_3475 && soc <= SOC_EXYNOS_880) return SOC_VENDOR_EXYNOS;
|
||||
else if(soc >= SOC_MTK_MT6889 && soc <= SOC_MTK_MT8783) return SOC_VENDOR_MEDIATEK;
|
||||
else if(soc >= SOC_MTK_MT6893 && soc <= SOC_MTK_MT8783) return SOC_VENDOR_MEDIATEK;
|
||||
else if(soc >= SOC_SNAPD_QSD8650 && soc <= SOC_SNAPD_SM8350) return SOC_VENDOR_SNAPDRAGON;
|
||||
else if(soc >= SOC_APPLE_M1 && soc <= SOC_APPLE_M1) return SOC_VENDOR_APPLE;
|
||||
return SOC_VENDOR_UNKNOWN;
|
||||
|
||||
@@ -64,6 +64,7 @@ enum {
|
||||
UARCH_CORTEX_A76,
|
||||
UARCH_CORTEX_A77,
|
||||
UARCH_CORTEX_A78,
|
||||
UARCH_CORTEX_X1,
|
||||
UARCH_NEOVERSE_N1,
|
||||
UARCH_NEOVERSE_E1,
|
||||
UARCH_SCORPION,
|
||||
@@ -130,6 +131,7 @@ static const ISA isas_uarch[] = {
|
||||
[UARCH_CORTEX_A76] = ISA_ARMv8_2_A,
|
||||
[UARCH_CORTEX_A77] = ISA_ARMv8_2_A,
|
||||
[UARCH_CORTEX_A78] = ISA_ARMv8_2_A,
|
||||
[UARCH_CORTEX_X1] = ISA_ARMv8_2_A,
|
||||
[UARCH_NEOVERSE_N1] = ISA_ARMv8_2_A,
|
||||
[UARCH_NEOVERSE_E1] = ISA_ARMv8_2_A,
|
||||
[UARCH_BRAHMA_B15] = ISA_ARMv7_A, // Same as Cortex-A15
|
||||
@@ -236,6 +238,7 @@ struct uarch* get_uarch_from_midr(uint32_t midr, struct cpuInfo* cpu) {
|
||||
CHECK_UARCH(arch, cpu, 'A', 0xD0D, NA, NA, "Cortex-A77", UARCH_CORTEX_A77, CPU_VENDOR_ARM)
|
||||
CHECK_UARCH(arch, cpu, 'A', 0xD0E, NA, NA, "Cortex-A76", UARCH_CORTEX_A76, CPU_VENDOR_ARM)
|
||||
CHECK_UARCH(arch, cpu, 'A', 0xD41, NA, NA, "Cortex-A78", UARCH_CORTEX_A78, CPU_VENDOR_ARM)
|
||||
CHECK_UARCH(arch, cpu, 'A', 0xD44, NA, NA, "Cortex-X1", UARCH_CORTEX_X1, CPU_VENDOR_ARM)
|
||||
CHECK_UARCH(arch, cpu, 'A', 0xD4A, NA, NA, "Neoverse E1", UARCH_NEOVERSE_E1, CPU_VENDOR_ARM)
|
||||
|
||||
CHECK_UARCH(arch, cpu, 'B', 0x00F, NA, NA, "Brahma B15", UARCH_BRAHMA_B15, CPU_VENDOR_BROADCOM)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include "midr.h"
|
||||
|
||||
#define _PATH_DEVICETREE_MODEL "/sys/firmware/devicetree/base/model"
|
||||
#define _PATH_CPUS_PRESENT _PATH_SYS_SYSTEM _PATH_SYS_CPU "/present"
|
||||
#define _PATH_CPUINFO "/proc/cpuinfo"
|
||||
//#define _PATH_CPUINFO "cpuinfo_debug"
|
||||
|
||||
@@ -17,48 +16,6 @@
|
||||
|
||||
#define CPUINFO_CPU_STRING "processor"
|
||||
|
||||
// https://www.kernel.org/doc/html/latest/core-api/cpu_hotplug.html
|
||||
int get_ncores_from_cpuinfo() {
|
||||
// Examples:
|
||||
// 0-271
|
||||
// 0-7
|
||||
// 0
|
||||
|
||||
int filelen;
|
||||
char* buf;
|
||||
if((buf = read_file(_PATH_CPUS_PRESENT, &filelen)) == NULL) {
|
||||
printWarn("read_file: %s: %s\n", _PATH_CPUS_PRESENT, strerror(errno));
|
||||
return UNKNOWN;
|
||||
}
|
||||
|
||||
int ncores;
|
||||
char* tmp1;
|
||||
if((tmp1 = strstr(buf, "-")) == NULL) {
|
||||
// file contains no - character, we assume that it contains 0,
|
||||
// which means that the CPU contains only one core
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
tmp1++;
|
||||
}
|
||||
char* tmp2 = strstr(buf, "\n");
|
||||
char ncores_str[filelen];
|
||||
memset(ncores_str, 0, sizeof(char) * filelen);
|
||||
memcpy(ncores_str, tmp1, tmp2-tmp1);
|
||||
|
||||
char* end;
|
||||
errno = 0;
|
||||
ncores = strtol(ncores_str, &end, 10) + 1;
|
||||
if(errno != 0) {
|
||||
printWarn("strtol: %s:\n", strerror(errno));
|
||||
return UNKNOWN;
|
||||
}
|
||||
|
||||
free(buf);
|
||||
|
||||
return ncores;
|
||||
}
|
||||
|
||||
long parse_cpuinfo_field(char* buf, char* field_str, int field_base) {
|
||||
char* tmp = strstr(buf, field_str);
|
||||
if(tmp == NULL) return -1;
|
||||
|
||||
@@ -25,6 +25,7 @@ struct args_struct {
|
||||
bool debug_flag;
|
||||
bool help_flag;
|
||||
bool raw_flag;
|
||||
bool accurate_pp;
|
||||
bool full_cpu_name_flag;
|
||||
bool logo_long;
|
||||
bool logo_short;
|
||||
@@ -46,6 +47,7 @@ const char args_chr[] = {
|
||||
/* [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',
|
||||
@@ -61,6 +63,7 @@ const char *args_str[] = {
|
||||
/* [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",
|
||||
@@ -92,6 +95,10 @@ bool show_raw() {
|
||||
return args.raw_flag;
|
||||
}
|
||||
|
||||
bool accurate_pp() {
|
||||
return args.accurate_pp;
|
||||
}
|
||||
|
||||
bool show_full_cpu_name() {
|
||||
return args.full_cpu_name_flag;
|
||||
}
|
||||
@@ -211,12 +218,13 @@ char* build_short_options() {
|
||||
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",
|
||||
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_DEBUG], c[ARG_VERBOSE], c[ARG_VERSION]);
|
||||
c[ARG_ACCURATE_PP], c[ARG_DEBUG], c[ARG_VERBOSE],
|
||||
c[ARG_VERSION]);
|
||||
#else
|
||||
sprintf(str, "%c:%c:%c%c%c%c%c%c",
|
||||
c[ARG_STYLE], c[ARG_COLOR], c[ARG_HELP],
|
||||
@@ -235,6 +243,7 @@ bool parse_args(int argc, char* argv[]) {
|
||||
|
||||
bool color_flag = false;
|
||||
args.debug_flag = false;
|
||||
args.accurate_pp = false;
|
||||
args.full_cpu_name_flag = false;
|
||||
args.raw_flag = false;
|
||||
args.verbose_flag = false;
|
||||
@@ -256,6 +265,7 @@ bool parse_args(int argc, char* argv[]) {
|
||||
#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_FULLCPUNAME], no_argument, 0, args_chr[ARG_FULLCPUNAME] },
|
||||
{args_str[ARG_RAW], no_argument, 0, args_chr[ARG_RAW] },
|
||||
#endif
|
||||
@@ -296,6 +306,9 @@ bool parse_args(int argc, char* argv[]) {
|
||||
else if(opt == args_chr[ARG_HELP]) {
|
||||
args.help_flag = true;
|
||||
}
|
||||
else if(opt == args_chr[ARG_ACCURATE_PP]) {
|
||||
args.accurate_pp = true;
|
||||
}
|
||||
else if(opt == args_chr[ARG_FULLCPUNAME]) {
|
||||
args.full_cpu_name_flag = true;
|
||||
}
|
||||
@@ -349,6 +362,13 @@ bool parse_args(int argc, char* argv[]) {
|
||||
args.logo_long = false;
|
||||
}
|
||||
|
||||
#if defined(ARCH_X86) && ! defined(__linux__)
|
||||
if(args.accurate_pp) {
|
||||
printWarn("%s option is valid only in Linux x86_64", args_str[ARG_ACCURATE_PP]);
|
||||
args.help_flag = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Leave log level untouched after returning
|
||||
set_log_level(false);
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ enum {
|
||||
ARG_LOGO_SHORT,
|
||||
ARG_LOGO_INTEL_NEW,
|
||||
ARG_LOGO_INTEL_OLD,
|
||||
ARG_ACCURATE_PP,
|
||||
ARG_DEBUG,
|
||||
ARG_VERBOSE,
|
||||
ARG_VERSION
|
||||
@@ -41,6 +42,7 @@ extern const char *args_str[];
|
||||
int max_arg_str_length();
|
||||
bool parse_args(int argc, char* argv[]);
|
||||
bool show_help();
|
||||
bool accurate_pp();
|
||||
bool show_full_cpu_name();
|
||||
bool show_logo_long();
|
||||
bool show_logo_short();
|
||||
|
||||
@@ -150,7 +150,7 @@ char* get_str_freq(struct frequency* freq) {
|
||||
char* string = emalloc(sizeof(char)*size);
|
||||
memset(string, 0, sizeof(char)*size);
|
||||
|
||||
if(freq->max == UNKNOWN_FREQ || freq->max < 0)
|
||||
if(freq->max == UNKNOWN_DATA || freq->max < 0)
|
||||
snprintf(string,strlen(STRING_UNKNOWN)+1,STRING_UNKNOWN);
|
||||
else if(freq->max >= 1000)
|
||||
snprintf(string,size,"%.3f "STRING_GIGAHERZ,(float)(freq->max)/1000);
|
||||
|
||||
@@ -34,7 +34,7 @@ enum {
|
||||
HV_VENDOR_INVALID
|
||||
};
|
||||
|
||||
#define UNKNOWN_FREQ -1
|
||||
#define UNKNOWN_DATA -1
|
||||
#define CPU_NAME_MAX_LENGTH 64
|
||||
|
||||
typedef int32_t VENDOR;
|
||||
@@ -71,8 +71,8 @@ struct topology {
|
||||
int32_t total_cores;
|
||||
struct cache* cach;
|
||||
#if defined(ARCH_X86) || defined(ARCH_PPC)
|
||||
uint32_t physical_cores;
|
||||
uint32_t logical_cores;
|
||||
int32_t physical_cores;
|
||||
int32_t logical_cores;
|
||||
uint32_t sockets;
|
||||
uint32_t smt_supported; // Number of SMT that CPU supports (equal to smt_available if SMT is enabled)
|
||||
#ifdef ARCH_X86
|
||||
|
||||
@@ -58,9 +58,9 @@ void printBug(const char *fmt, ...) {
|
||||
va_end(args);
|
||||
fprintf(stderr,RED "[ERROR]: "RESET "%s\n",buffer);
|
||||
#if defined(ARCH_X86) || defined(ARCH_PPC)
|
||||
fprintf(stderr,"Please, create a new issue with this error message and the output of 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
||||
fprintf(stderr, "Please, create a new issue with this error message, the output of 'cpufetch' and 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
||||
#elif ARCH_ARM
|
||||
fprintf(stderr,"Please, create a new issue with this error message, your smartphone/computer model and the output of 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
||||
fprintf(stderr, "Please, create a new issue with this error message, your smartphone/computer model, the output of 'cpufetch' and 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
static const char* OS_STR = "Unknown OS";
|
||||
#endif
|
||||
|
||||
static const char* VERSION = "1.00";
|
||||
static const char* VERSION = "1.01";
|
||||
|
||||
void print_help(char *argv[]) {
|
||||
const char **t = args_str;
|
||||
@@ -57,6 +57,9 @@ void print_help(char *argv[]) {
|
||||
printf(" --%s %*s Show the long version of the logo\n", t[ARG_LOGO_LONG], (int) (max_len-strlen(t[ARG_LOGO_LONG])), "");
|
||||
printf(" -%c, --%s %*s Print extra information (if available) about how cpufetch tried fetching information\n", c[ARG_VERBOSE], t[ARG_VERBOSE], (int) (max_len-strlen(t[ARG_VERBOSE])), "");
|
||||
#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])), "");
|
||||
#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])), "");
|
||||
@@ -133,6 +136,7 @@ int main(int argc, char* argv[]) {
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
// TODO: This should be moved to the end of args.c
|
||||
if(show_raw()) {
|
||||
#ifdef ARCH_X86
|
||||
print_version();
|
||||
|
||||
@@ -2,6 +2,48 @@
|
||||
#include "global.h"
|
||||
#include "cpu.h"
|
||||
|
||||
// https://www.kernel.org/doc/html/latest/core-api/cpu_hotplug.html
|
||||
int get_ncores_from_cpuinfo() {
|
||||
// Examples:
|
||||
// 0-271
|
||||
// 0-7
|
||||
// 0
|
||||
|
||||
int filelen;
|
||||
char* buf;
|
||||
if((buf = read_file(_PATH_CPUS_PRESENT, &filelen)) == NULL) {
|
||||
printWarn("read_file: %s: %s\n", _PATH_CPUS_PRESENT, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
int ncores;
|
||||
char* tmp1;
|
||||
if((tmp1 = strstr(buf, "-")) == NULL) {
|
||||
// file contains no - character, we assume that it contains 0,
|
||||
// which means that the CPU contains only one core
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
tmp1++;
|
||||
}
|
||||
char* tmp2 = strstr(buf, "\n");
|
||||
char ncores_str[filelen];
|
||||
memset(ncores_str, 0, sizeof(char) * filelen);
|
||||
memcpy(ncores_str, tmp1, tmp2-tmp1);
|
||||
|
||||
char* end;
|
||||
errno = 0;
|
||||
ncores = strtol(ncores_str, &end, 10) + 1;
|
||||
if(errno != 0) {
|
||||
printWarn("strtol: %s:\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
free(buf);
|
||||
|
||||
return ncores;
|
||||
}
|
||||
|
||||
char* read_file(char* path, int* len) {
|
||||
int fd = open(path, O_RDONLY);
|
||||
|
||||
@@ -33,7 +75,7 @@ long get_freq_from_file(char* path) {
|
||||
char* buf;
|
||||
if((buf = read_file(path, &filelen)) == NULL) {
|
||||
printWarn("Could not open '%s'", path);
|
||||
return UNKNOWN_FREQ;
|
||||
return UNKNOWN_DATA;
|
||||
}
|
||||
|
||||
char* end;
|
||||
@@ -42,7 +84,7 @@ long get_freq_from_file(char* path) {
|
||||
if(errno != 0) {
|
||||
printBug("strtol: %s", strerror(errno));
|
||||
free(buf);
|
||||
return UNKNOWN_FREQ;
|
||||
return UNKNOWN_DATA;
|
||||
}
|
||||
|
||||
// We will be getting the frequency in KHz
|
||||
@@ -50,7 +92,7 @@ long get_freq_from_file(char* path) {
|
||||
// greater than 10 GHz or less than 100 MHz
|
||||
if(ret > 10000 * 1000 || ret < 100 * 1000) {
|
||||
printBug("Invalid data was read from file '%s': %ld\n", path, ret);
|
||||
return UNKNOWN_FREQ;
|
||||
return UNKNOWN_DATA;
|
||||
}
|
||||
|
||||
free(buf);
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#define _PATH_CACHE_L3 "/cache/index3"
|
||||
#define _PATH_CACHE_SIZE "/size"
|
||||
#define _PATH_CACHE_SHARED_MAP "/shared_cpu_map"
|
||||
#define _PATH_CPUS_PRESENT _PATH_SYS_SYSTEM _PATH_SYS_CPU "/present"
|
||||
|
||||
#define _PATH_FREQUENCY_MAX_LEN 100
|
||||
#define _PATH_CACHE_MAX_LEN 200
|
||||
@@ -36,5 +37,6 @@ long get_l1d_cache_size(uint32_t core);
|
||||
long get_l2_cache_size(uint32_t core);
|
||||
long get_l3_cache_size(uint32_t core);
|
||||
int get_num_caches_by_level(struct cpuInfo* cpu, uint32_t level);
|
||||
int get_ncores_from_cpuinfo();
|
||||
|
||||
#endif
|
||||
|
||||
@@ -139,7 +139,7 @@ int64_t get_peak_performance(struct cpuInfo* cpu, struct topology* topo, int64_t
|
||||
*/
|
||||
|
||||
//First check we have consistent data
|
||||
if(freq == UNKNOWN_FREQ) {
|
||||
if(freq == UNKNOWN_DATA) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -313,14 +313,32 @@ bool fill_apic_ids(uint32_t* apic_ids, int n, bool x2apic_id) {
|
||||
usleep(1000);
|
||||
}
|
||||
#else
|
||||
#ifdef __linux__
|
||||
// In Linux we reset the affinity; first we get the original mask
|
||||
cpu_set_t original_mask;
|
||||
if(sched_getaffinity(0, sizeof(original_mask), &original_mask) == -1) {
|
||||
printWarn("sched_getaffinity: %s", strerror(errno));
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
for(int i=0; i < n; i++) {
|
||||
if(!bind_to_cpu(i)) {
|
||||
printErr("Failed binding to CPU %d", i);
|
||||
printErr("Failed binding the process to CPU %d", i);
|
||||
return false;
|
||||
}
|
||||
apic_ids[i] = get_apic_id(x2apic_id);
|
||||
}
|
||||
|
||||
#ifdef __linux__
|
||||
// With the original mask previosly retrieved, we reset the affinity
|
||||
if (sched_setaffinity (0, sizeof(original_mask), &original_mask) == -1) {
|
||||
printWarn("sched_setaffinity: %s", strerror(errno));
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,8 +15,10 @@
|
||||
#include "cpuid.h"
|
||||
#include "cpuid_asm.h"
|
||||
#include "../common/global.h"
|
||||
#include "../common/args.h"
|
||||
#include "apic.h"
|
||||
#include "uarch.h"
|
||||
#include "freq/freq.h"
|
||||
|
||||
#define CPU_VENDOR_INTEL_STRING "GenuineIntel"
|
||||
#define CPU_VENDOR_AMD_STRING "AuthenticAMD"
|
||||
@@ -174,10 +176,10 @@ struct uarch* get_cpu_uarch(struct cpuInfo* cpu) {
|
||||
uint32_t family = (eax >> 8) & 0xF;
|
||||
uint32_t efamily = (eax >> 20) & 0xFF;
|
||||
|
||||
return get_uarch_from_cpuid(cpu, efamily, family, emodel, model, (int)stepping);
|
||||
return get_uarch_from_cpuid(cpu, eax, efamily, family, emodel, model, (int)stepping);
|
||||
}
|
||||
|
||||
int64_t get_peak_performance(struct cpuInfo* cpu, struct topology* topo, int64_t freq) {
|
||||
int64_t get_peak_performance(struct cpuInfo* cpu, struct topology* topo, int64_t max_freq, bool accurate_pp) {
|
||||
/*
|
||||
* PP = PeakPerformance
|
||||
* SP = SinglePrecision
|
||||
@@ -190,8 +192,20 @@ int64_t get_peak_performance(struct cpuInfo* cpu, struct topology* topo, int64_t
|
||||
* 16(If AVX512), 8(If AVX), 4(If SSE) *
|
||||
*/
|
||||
|
||||
int64_t freq;
|
||||
#ifdef __linux__
|
||||
if(accurate_pp)
|
||||
freq = measure_frequency(cpu);
|
||||
else
|
||||
freq = max_freq;
|
||||
#else
|
||||
// Silence compiler warning
|
||||
(void)(accurate_pp);
|
||||
freq = max_freq;
|
||||
#endif
|
||||
|
||||
//First, check we have consistent data
|
||||
if(freq == UNKNOWN_FREQ) {
|
||||
if(freq == UNKNOWN_DATA || topo->logical_cores == UNKNOWN_DATA) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -376,7 +390,7 @@ struct cpuInfo* get_cpu_info() {
|
||||
cpu->freq = get_frequency_info(cpu);
|
||||
cpu->cach = get_cache_info(cpu);
|
||||
cpu->topo = get_topology_info(cpu, cpu->cach);
|
||||
cpu->peak_performance = get_peak_performance(cpu, cpu->topo, get_freq(cpu->freq));
|
||||
cpu->peak_performance = get_peak_performance(cpu, cpu->topo, get_freq(cpu->freq), accurate_pp());
|
||||
|
||||
if(cpu->cach == NULL || cpu->topo == NULL) {
|
||||
return NULL;
|
||||
@@ -458,6 +472,16 @@ bool get_cache_topology_amd(struct cpuInfo* cpu, struct topology* topo) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void get_topology_from_udev(struct cpuInfo* cpu, struct topology* topo) {
|
||||
// TODO: To be improved in the future
|
||||
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;
|
||||
}
|
||||
|
||||
// Main reference: https://software.intel.com/content/www/us/en/develop/articles/intel-64-architecture-processor-topology-enumeration.html
|
||||
// Very interesting resource: https://wiki.osdev.org/Detecting_CPU_Topology_(80x86)
|
||||
struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach) {
|
||||
@@ -487,7 +511,19 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach) {
|
||||
switch(cpu->cpu_vendor) {
|
||||
case CPU_VENDOR_INTEL:
|
||||
if (cpu->maxLevels >= 0x00000004) {
|
||||
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(cpu, 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)", 0x00000001, cpu->maxLevels);
|
||||
@@ -698,16 +734,16 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
|
||||
if(cpu->maxLevels < 0x00000016) {
|
||||
#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_FREQ;
|
||||
freq->max = UNKNOWN_FREQ;
|
||||
freq->base = UNKNOWN_DATA;
|
||||
freq->max = UNKNOWN_DATA;
|
||||
#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_FREQ;
|
||||
freq->base = UNKNOWN_DATA;
|
||||
freq->max = get_max_freq_from_file(0);
|
||||
|
||||
if(freq->max == 0) {
|
||||
printWarn("Read max CPU frequency from udev and got 0 MHz");
|
||||
freq->max = UNKNOWN_FREQ;
|
||||
freq->max = UNKNOWN_DATA;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -724,7 +760,7 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
|
||||
|
||||
if(freq->base == 0) {
|
||||
printWarn("Read base CPU frequency from CPUID and got 0 MHz");
|
||||
freq->base = UNKNOWN_FREQ;
|
||||
freq->base = UNKNOWN_DATA;
|
||||
}
|
||||
if(freq->max == 0) {
|
||||
printWarn("Read max CPU frequency from CPUID and got 0 MHz");
|
||||
@@ -734,10 +770,10 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
|
||||
|
||||
if(freq->max == 0) {
|
||||
printWarn("Read max CPU frequency from udev and got 0 MHz");
|
||||
freq->max = UNKNOWN_FREQ;
|
||||
freq->max = UNKNOWN_DATA;
|
||||
}
|
||||
#else
|
||||
freq->max = UNKNOWN_FREQ;
|
||||
freq->max = UNKNOWN_DATA;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -759,7 +795,11 @@ char* get_str_topology(struct cpuInfo* cpu, struct topology* topo, bool dual_soc
|
||||
int topo_sockets = dual_socket ? topo->sockets : 1;
|
||||
char* string;
|
||||
|
||||
if(topo->smt_supported > 1) {
|
||||
if(topo->logical_cores == UNKNOWN_DATA) {
|
||||
string = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN) + 1));
|
||||
strcpy(string, STRING_UNKNOWN);
|
||||
}
|
||||
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);
|
||||
|
||||
146
src/x86/freq/freq.c
Normal file
@@ -0,0 +1,146 @@
|
||||
#define _GNU_SOURCE
|
||||
#include <stdio.h>
|
||||
|
||||
#include "../../common/global.h"
|
||||
#include "../uarch.h"
|
||||
#include "freq.h"
|
||||
#include "freq_nov.h"
|
||||
#include "freq_avx.h"
|
||||
#include "freq_avx512.h"
|
||||
|
||||
#include <immintrin.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
|
||||
#define MAX_NUMBER_THREADS 512
|
||||
#define FREQ_VECTOR_SIZE 1<<16
|
||||
|
||||
struct freq_thread {
|
||||
bool end;
|
||||
bool measure;
|
||||
double freq;
|
||||
};
|
||||
|
||||
double vector_average_harmonic(double* v, int len) {
|
||||
double acc = 0.0;
|
||||
for(int i=0; i < len; i++) {
|
||||
acc += 1 / v[i];
|
||||
}
|
||||
return len / acc;
|
||||
}
|
||||
|
||||
void sleep_ms(int64_t ms) {
|
||||
struct timespec ts;
|
||||
ts.tv_sec = ms / 1000;
|
||||
ts.tv_nsec = (ms % 1000) * 1000000;
|
||||
nanosleep(&ts, &ts);
|
||||
}
|
||||
|
||||
void* measure_freq(void *freq_ptr) {
|
||||
struct freq_thread* freq = (struct freq_thread*) freq_ptr;
|
||||
|
||||
char* end = NULL;
|
||||
char* line = NULL;
|
||||
size_t len = 0;
|
||||
ssize_t read;
|
||||
|
||||
int v = 0;
|
||||
double* freq_vector = malloc(sizeof(double) * FREQ_VECTOR_SIZE);
|
||||
|
||||
while(!freq->end) {
|
||||
if(!freq->measure) continue;
|
||||
|
||||
FILE* fp = fopen("/proc/cpuinfo", "r");
|
||||
if(fp == NULL) return NULL;
|
||||
while ((read = getline(&line, &len, fp)) != -1) {
|
||||
if((line = strstr(line, "cpu MHz")) != NULL) {
|
||||
line = strstr(line, "\t: ");
|
||||
if(line == NULL) return NULL;
|
||||
line += sizeof("\t: ") - 1;
|
||||
double f = strtold(line, &end);
|
||||
if(errno != 0) {
|
||||
printf("strtol: %s", strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
freq_vector[v] = f;
|
||||
v++;
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
sleep_ms(500);
|
||||
}
|
||||
|
||||
freq->freq = vector_average_harmonic(freq_vector, v);
|
||||
printWarn("AVX2 measured freq=%f\n", freq->freq);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int64_t measure_frequency(struct cpuInfo* cpu) {
|
||||
int ret;
|
||||
int num_spaces;
|
||||
struct freq_thread* freq_struct = malloc(sizeof(struct freq_thread));
|
||||
freq_struct->end = false;
|
||||
freq_struct->measure = false;
|
||||
|
||||
void* (*compute_function)(void*);
|
||||
|
||||
if(cpu->feat->AVX512 && vpus_are_AVX512(cpu)) {
|
||||
printf("cpufetch is measuring the AVX512 frequency...");
|
||||
compute_function = compute_avx512;
|
||||
num_spaces = 45;
|
||||
}
|
||||
else if(cpu->feat->AVX || cpu->feat->AVX2) {
|
||||
printf("cpufetch is measuring the AVX frequency...");
|
||||
compute_function = compute_avx;
|
||||
num_spaces = 42;
|
||||
}
|
||||
else {
|
||||
printf("cpufetch is measuring the frequency (no vector instructions)...");
|
||||
compute_function = compute_nov;
|
||||
num_spaces = 63;
|
||||
}
|
||||
|
||||
fflush(stdout);
|
||||
|
||||
pthread_t freq_t;
|
||||
if(pthread_create(&freq_t, NULL, measure_freq, freq_struct)) {
|
||||
fprintf(stderr, "Error creating thread\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
pthread_t* compute_th = malloc(sizeof(pthread_t) * cpu->topo->total_cores);
|
||||
for(int i=0; i < cpu->topo->total_cores; i++) {
|
||||
ret = pthread_create(&compute_th[i], NULL, compute_function, NULL);
|
||||
|
||||
if(ret != 0) {
|
||||
fprintf(stderr, "Error creating thread\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
sleep_ms(500);
|
||||
freq_struct->measure = true;
|
||||
|
||||
for(int i=0; i < cpu->topo->total_cores; i++) {
|
||||
if(pthread_join(compute_th[i], NULL)) {
|
||||
fprintf(stderr, "Error joining thread\n");
|
||||
return -1;
|
||||
}
|
||||
freq_struct->end = true;
|
||||
}
|
||||
|
||||
if(pthread_join(freq_t, NULL)) {
|
||||
fprintf(stderr, "Error joining thread\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("\r%*c", num_spaces, ' ');
|
||||
return freq_struct->freq;
|
||||
}
|
||||
12
src/x86/freq/freq.h
Normal file
@@ -0,0 +1,12 @@
|
||||
#ifndef __FREQ__
|
||||
#define __FREQ__
|
||||
|
||||
#include <stdint.h>
|
||||
#include "../../common/cpu.h"
|
||||
|
||||
#define MEASURE_TIME_SECONDS 5
|
||||
#define LOOP_ITERS 1000000000
|
||||
|
||||
int64_t measure_frequency(struct cpuInfo* cpu);
|
||||
|
||||
#endif
|
||||
44
src/x86/freq/freq_avx.c
Normal file
@@ -0,0 +1,44 @@
|
||||
#include <stdio.h>
|
||||
#include <immintrin.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
#include <stdint.h>
|
||||
#include "freq.h"
|
||||
|
||||
void* compute_avx() {
|
||||
bool end = false;
|
||||
|
||||
struct timeval begin, now;
|
||||
|
||||
__m256 a = _mm256_set1_ps(1.5);
|
||||
__m256 b = _mm256_set1_ps(1.2);
|
||||
__m256 c = _mm256_set1_ps(0.0);
|
||||
|
||||
gettimeofday(&begin, NULL);
|
||||
while(!end) {
|
||||
for(uint64_t i=0; i < LOOP_ITERS; i++) {
|
||||
c = _mm256_fmadd_ps(a, b, c);
|
||||
}
|
||||
|
||||
gettimeofday(&now, NULL);
|
||||
double elapsed = (now.tv_sec - begin.tv_sec) + ((now.tv_usec - begin.tv_usec)/1000000.0);
|
||||
end = elapsed >= (double) MEASURE_TIME_SECONDS;
|
||||
}
|
||||
|
||||
FILE* fp = fopen("/dev/null", "w");
|
||||
if(fp == NULL) {
|
||||
printf("fopen: %s", strerror(errno));
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "%f", c[0]);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
6
src/x86/freq/freq_avx.h
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifndef __FREQ_AVX__
|
||||
#define __FREQ_AVX__
|
||||
|
||||
void* compute_avx();
|
||||
|
||||
#endif
|
||||
63
src/x86/freq/freq_avx512.c
Normal file
@@ -0,0 +1,63 @@
|
||||
#include <stdio.h>
|
||||
#include <immintrin.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
#include <stdint.h>
|
||||
#include "freq.h"
|
||||
|
||||
/*
|
||||
* For AVX512, it seems that multiple independent
|
||||
* instructions are needed to force the CPU to
|
||||
* use AVX512 frequency, since with only one instruction
|
||||
* (as the AVX implementaion) it still uses AVX frequency
|
||||
*/
|
||||
void* compute_avx512() {
|
||||
bool end = false;
|
||||
|
||||
struct timeval begin, now;
|
||||
|
||||
__m512 a[8];
|
||||
__m512 b[8];
|
||||
__m512 mult;
|
||||
|
||||
for(int i=0; i < 8; i++) {
|
||||
a[i] = _mm512_set1_ps(1.5);
|
||||
b[i] = _mm512_set1_ps(1.2);
|
||||
}
|
||||
|
||||
gettimeofday(&begin, NULL);
|
||||
while(!end) {
|
||||
for(uint64_t i=0; i < LOOP_ITERS; i++) {
|
||||
a[0] = _mm512_fmadd_ps(mult, a[0], b[0]);
|
||||
a[1] = _mm512_fmadd_ps(mult, a[1], b[1]);
|
||||
a[2] = _mm512_fmadd_ps(mult, a[2], b[2]);
|
||||
a[3] = _mm512_fmadd_ps(mult, a[3], b[3]);
|
||||
a[4] = _mm512_fmadd_ps(mult, a[4], b[4]);
|
||||
a[5] = _mm512_fmadd_ps(mult, a[5], b[5]);
|
||||
a[6] = _mm512_fmadd_ps(mult, a[6], b[6]);
|
||||
a[7] = _mm512_fmadd_ps(mult, a[7], b[7]);
|
||||
}
|
||||
|
||||
gettimeofday(&now, NULL);
|
||||
double elapsed = (now.tv_sec - begin.tv_sec) + ((now.tv_usec - begin.tv_usec)/1000000.0);
|
||||
end = elapsed >= (double) MEASURE_TIME_SECONDS;
|
||||
}
|
||||
|
||||
FILE* fp = fopen("/dev/null", "w");
|
||||
if(fp == NULL) {
|
||||
printf("fopen: %s", strerror(errno));
|
||||
}
|
||||
else {
|
||||
for(int i=0; i < 8; i++)
|
||||
fprintf(fp, "%f", a[i][0]);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
6
src/x86/freq/freq_avx512.h
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifndef __FREQ_AVX512__
|
||||
#define __FREQ_AVX512__
|
||||
|
||||
void* compute_avx512();
|
||||
|
||||
#endif
|
||||
44
src/x86/freq/freq_nov.c
Normal file
@@ -0,0 +1,44 @@
|
||||
#include <stdio.h>
|
||||
#include <immintrin.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
#include <stdint.h>
|
||||
#include "freq.h"
|
||||
|
||||
void* compute_nov() {
|
||||
bool end = false;
|
||||
|
||||
struct timeval begin, now;
|
||||
|
||||
float a = 1.5;
|
||||
float b = 1.2;
|
||||
float c = 0.0;
|
||||
|
||||
gettimeofday(&begin, NULL);
|
||||
while(!end) {
|
||||
for(uint64_t i=0; i < LOOP_ITERS; i++) {
|
||||
c = a * b;
|
||||
}
|
||||
|
||||
gettimeofday(&now, NULL);
|
||||
double elapsed = (now.tv_sec - begin.tv_sec) + ((now.tv_usec - begin.tv_usec)/1000000.0);
|
||||
end = elapsed >= (double) MEASURE_TIME_SECONDS;
|
||||
}
|
||||
|
||||
FILE* fp = fopen("/dev/null", "w");
|
||||
if(fp == NULL) {
|
||||
printf("fopen: %s", strerror(errno));
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "%f", c);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
6
src/x86/freq/freq_nov.h
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifndef __FREQ_NO_VECTOR__
|
||||
#define __FREQ_NO_VECTOR__
|
||||
|
||||
void* compute_nov();
|
||||
|
||||
#endif
|
||||
@@ -78,7 +78,7 @@ enum {
|
||||
UARCH_SUNNY_COVE,
|
||||
UARCH_GOLDMONT_PLUS,
|
||||
UARCH_TREMONT,
|
||||
UARCH_WILLOW_COVE,
|
||||
UARCH_LAKEMONT,
|
||||
UARCH_COFFE_LAKE,
|
||||
UARCH_ITANIUM,
|
||||
UARCH_KNIGHTS_FERRY,
|
||||
@@ -89,6 +89,7 @@ enum {
|
||||
UARCH_CEDAR_MILL,
|
||||
UARCH_ITANIUM2,
|
||||
UARCH_ICE_LAKE,
|
||||
UARCH_TIGER_LAKE,
|
||||
// AMD //
|
||||
UARCH_AM486,
|
||||
UARCH_AM5X86,
|
||||
@@ -147,7 +148,9 @@ struct uarch* get_uarch_from_cpuid_intel(uint32_t ef, uint32_t f, uint32_t em, u
|
||||
CHECK_UARCH(arch, 0, 5, 0, 4, NA, "P5 MMX", UARCH_P5, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 7, NA, "P5 MMX", UARCH_P5, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 8, NA, "P5 MMX", UARCH_P5, 250)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 9, 0, "Lakemont", UARCH_LAKEMONT, 32)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 9, NA, "P5 MMX", UARCH_P5, UNK)
|
||||
CHECK_UARCH(arch, 0, 5, 0, 10, 0, "Lakemont", UARCH_LAKEMONT, 32)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 0, NA, "P6 Pentium II", UARCH_P6, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 1, NA, "P6 Pentium II", UARCH_P6, UNK) // process depends on core
|
||||
CHECK_UARCH(arch, 0, 6, 0, 2, NA, "P6 Pentium II", UARCH_P6, UNK)
|
||||
@@ -218,13 +221,14 @@ struct uarch* get_uarch_from_cpuid_intel(uint32_t ef, uint32_t f, uint32_t em, u
|
||||
CHECK_UARCH(arch, 0, 6, 8, 5, NA, "Knights Mill", UARCH_KNIGHTS_MILL, 14) // no spec update; only MSR_CPUID_table* so far
|
||||
CHECK_UARCH(arch, 0, 6, 8, 6, NA, "Tremont", UARCH_TREMONT, 10) // LX*
|
||||
CHECK_UARCH(arch, 0, 6, 8, 10, NA, "Tremont", UARCH_TREMONT, 10) // no spec update; only geekbench.com example
|
||||
CHECK_UARCH(arch, 0, 6, 8, 12, NA, "Willow Cove", UARCH_WILLOW_COVE, 10) // found only on en.wikichip.org
|
||||
CHECK_UARCH(arch, 0, 6, 8, 13, NA, "Willow Cove", UARCH_WILLOW_COVE, 10) // LX*
|
||||
CHECK_UARCH(arch, 0, 6, 8, 14, 9, "Amber Lake", UARCH_AMBER_LAKE, 14) // wikichip
|
||||
CHECK_UARCH(arch, 0, 6, 8, 12, NA, "Tiger Lake", UARCH_TIGER_LAKE, 10) // instlatx64
|
||||
CHECK_UARCH(arch, 0, 6, 8, 13, NA, "Tiger Lake", UARCH_TIGER_LAKE, 10) // instlatx64
|
||||
// CHECK_UARCH(arch, 0, 6, 8, 14, 9, ...) It is not possible to determine uarch only from CPUID dump (can be Kaby Lake or Amber Lake)
|
||||
CHECK_UARCH(arch, 0, 6, 8, 14, 10, "Kaby Lake", UARCH_KABY_LAKE, 14) // wikichip
|
||||
CHECK_UARCH(arch, 0, 6, 8, 14, 11, "Whiskey Lake", UARCH_WHISKEY_LAKE, 14) // wikichip
|
||||
CHECK_UARCH(arch, 0, 6, 8, 14, 12, "Comet Lake", UARCH_COMET_LAKE, 14) // wikichip
|
||||
CHECK_UARCH(arch, 0, 6, 9, 6, NA, "Tremont", UARCH_TREMONT, 10) // LX*
|
||||
CHECK_UARCH(arch, 0, 6, 9, 10, NA, "Tremont", UARCH_TREMONT, 10) // instlatx64
|
||||
CHECK_UARCH(arch, 0, 6, 9, 12, NA, "Tremont", UARCH_TREMONT, 10) // LX*
|
||||
CHECK_UARCH(arch, 0, 6, 9, 13, NA, "Sunny Cove", UARCH_SUNNY_COVE, 10) // LX*
|
||||
CHECK_UARCH(arch, 0, 6, 9, 14, 9, "Kaby Lake", UARCH_KABY_LAKE, 14)
|
||||
@@ -270,7 +274,8 @@ struct uarch* get_uarch_from_cpuid_amd(uint32_t ef, uint32_t f, uint32_t em, uin
|
||||
CHECK_UARCH(arch, 0, 4, NA, NA, NA, "Am5x86", UARCH_AM5X86, UNK)
|
||||
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, 13, NA, "K6", UARCH_K6, 80) // *p from sandpile.org
|
||||
CHECK_UARCH(arch, 0, 5, 0, 10, NA, "K7", UARCH_K7, 130) // Geode NX
|
||||
CHECK_UARCH(arch, 0, 5, 0, 13, NA, "K6", UARCH_K6, 80) // *p from sandpile.org
|
||||
CHECK_UARCH(arch, 0, 5, NA, NA, NA, "K6", UARCH_K6, UNK)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 1, NA, "K7", UARCH_K7, 250)
|
||||
CHECK_UARCH(arch, 0, 6, 0, 2, NA, "K7", UARCH_K7, 180)
|
||||
@@ -325,7 +330,7 @@ struct uarch* get_uarch_from_cpuid_amd(uint32_t ef, uint32_t f, uint32_t em, uin
|
||||
CHECK_UARCH(arch, 2, 15, NA, NA, NA, "Puma 2008", UARCH_PUMA_2008, 65)
|
||||
CHECK_UARCH(arch, 3, 15, NA, NA, NA, "K10", UARCH_K10, 32)
|
||||
CHECK_UARCH(arch, 5, 15, NA, NA, NA, "Bobcat", UARCH_BOBCAT, 40)
|
||||
CHECK_UARCH(arch, 6, 15, 0, 0, NA, "Bulldozer", UARCH_BULLDOZER, 32) // iNAtlatx64 engr sample
|
||||
CHECK_UARCH(arch, 6, 15, 0, 0, NA, "Bulldozer", UARCH_BULLDOZER, 32) // instlatx64 engr sample
|
||||
CHECK_UARCH(arch, 6, 15, 0, 1, NA, "Bulldozer", UARCH_BULLDOZER, 32)
|
||||
CHECK_UARCH(arch, 6, 15, 0, 2, NA, "Piledriver", UARCH_PILEDRIVER, 32)
|
||||
CHECK_UARCH(arch, 6, 15, 1, 0, NA, "Piledriver", UARCH_PILEDRIVER, 32)
|
||||
@@ -333,20 +338,25 @@ struct uarch* get_uarch_from_cpuid_amd(uint32_t ef, uint32_t f, uint32_t em, uin
|
||||
CHECK_UARCH(arch, 6, 15, 3, 0, NA, "Steamroller", UARCH_STEAMROLLER, 28)
|
||||
CHECK_UARCH(arch, 6, 15, 3, 8, NA, "Steamroller", UARCH_STEAMROLLER, 28)
|
||||
CHECK_UARCH(arch, 6, 15, 4, 0, NA, "Steamroller", UARCH_STEAMROLLER, 28) // Software Optimization Guide (15h) says it has the same iNAt latencies as (6,15),(3,x).
|
||||
CHECK_UARCH(arch, 6, 15, 6, 0, NA, "Excavator", UARCH_EXCAVATOR, 28) // undocumented, but iNAtlatx64 samples
|
||||
CHECK_UARCH(arch, 6, 15, 6, 0, NA, "Excavator", UARCH_EXCAVATOR, 28) // undocumented, but instlatx64 samples
|
||||
CHECK_UARCH(arch, 6, 15, 6, 5, NA, "Excavator", UARCH_EXCAVATOR, 28) // undocumented, but sample from Alexandros Couloumbis
|
||||
CHECK_UARCH(arch, 6, 15, 7, 0, NA, "Excavator", UARCH_EXCAVATOR, 28)
|
||||
CHECK_UARCH(arch, 7, 15, 0, 0, NA, "Jaguar", UARCH_JAGUAR, 28)
|
||||
CHECK_UARCH(arch, 7, 15, 2, 6, NA, "Jaguar", UARCH_JAGUAR, 28) // AMD Cato (Xbox One?)
|
||||
CHECK_UARCH(arch, 7, 15, 3, 0, NA, "Puma 2014", UARCH_PUMA_2014, 28)
|
||||
CHECK_UARCH(arch, 8, 15, 0, 0, NA, "Zen", UARCH_ZEN, 14) // iNAtlatx64 engr sample
|
||||
CHECK_UARCH(arch, 8, 15, 0, 0, NA, "Zen", UARCH_ZEN, 14) // instlatx64 engr sample
|
||||
CHECK_UARCH(arch, 8, 15, 0, 1, NA, "Zen", UARCH_ZEN, 14)
|
||||
CHECK_UARCH(arch, 8, 15, 0, 8, NA, "Zen+", UARCH_ZEN_PLUS, 12)
|
||||
CHECK_UARCH(arch, 8, 15, 1, 1, NA, "Zen", UARCH_ZEN, 14) // found only on en.wikichip.org & iNAtlatx64 examples
|
||||
CHECK_UARCH(arch, 8, 15, 1, 1, NA, "Zen", UARCH_ZEN, 14) // found only on en.wikichip.org & instlatx64 examples
|
||||
CHECK_UARCH(arch, 8, 15, 1, 8, NA, "Zen+", UARCH_ZEN_PLUS, 12) // found only on en.wikichip.org
|
||||
CHECK_UARCH(arch, 8, 15, 2, 0, NA, "Zen", UARCH_ZEN, 14) // Dali, found on instlatx64 and en.wikichip.org
|
||||
CHECK_UARCH(arch, 8, 15, 3, 1, NA, "Zen 2", UARCH_ZEN2, 7) // found only on en.wikichip.org
|
||||
CHECK_UARCH(arch, 8, 15, 4, 7, NA, "Zen 2", UARCH_ZEN2, 7) // instlatx64 example (AMD 4700S)
|
||||
CHECK_UARCH(arch, 8, 15, 5, 0, NA, "Zen", UARCH_ZEN, 14) // instlatx64 example (Subor Z+)
|
||||
CHECK_UARCH(arch, 8, 15, 6, 0, NA, "Zen 2", UARCH_ZEN2, 7) // undocumented, geekbench.com example
|
||||
CHECK_UARCH(arch, 8, 15, 6, 8, NA, "Zen 2", UARCH_ZEN2, 7) // found on instlatx64
|
||||
CHECK_UARCH(arch, 8, 15, 7, 1, NA, "Zen 2", UARCH_ZEN2, 7) // samples from Steven Noonan and instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 0, 1, NA, "Zen 3", UARCH_ZEN3, 7) // instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 2, 1, NA, "Zen 3", UARCH_ZEN3, 7) // instlatx64
|
||||
CHECK_UARCH(arch, 10, 15, 5, 0, NA, "Zen 3", UARCH_ZEN3, 7) // instlatx64
|
||||
UARCH_END
|
||||
@@ -354,15 +364,29 @@ 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(struct cpuInfo* cpu, uint32_t ef, uint32_t f, uint32_t em, uint32_t m, int s) {
|
||||
if(cpu->cpu_vendor == CPU_VENDOR_INTEL)
|
||||
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) {
|
||||
if(dump == 0x000806E9) {
|
||||
// It is not possible to determine uarch only from CPUID dump (can be Kaby Lake or Amber Lake)
|
||||
struct uarch* arch = emalloc(sizeof(struct uarch));
|
||||
|
||||
if(strstr(cpu->cpu_name, "Y") != NULL) {
|
||||
fill_uarch(arch, "Amber Lake", UARCH_AMBER_LAKE, 14);
|
||||
}
|
||||
else {
|
||||
fill_uarch(arch, "Kaby Lake", UARCH_KABY_LAKE, 14);
|
||||
}
|
||||
|
||||
return arch;
|
||||
}
|
||||
return get_uarch_from_cpuid_intel(ef, f, em, m, s);
|
||||
}
|
||||
else
|
||||
return get_uarch_from_cpuid_amd(ef, f, em, m, s);
|
||||
}
|
||||
|
||||
bool vpus_are_AVX512(struct cpuInfo* cpu) {
|
||||
return cpu->arch->uarch != UARCH_ICE_LAKE;
|
||||
return cpu->arch->uarch != UARCH_ICE_LAKE && cpu->arch->uarch != UARCH_TIGER_LAKE;
|
||||
}
|
||||
|
||||
bool is_knights_landing(struct cpuInfo* cpu) {
|
||||
@@ -389,6 +413,7 @@ int get_number_of_vpus(struct cpuInfo* cpu) {
|
||||
case UARCH_KNIGHTS_MILL:
|
||||
|
||||
case UARCH_ICE_LAKE:
|
||||
case UARCH_TIGER_LAKE:
|
||||
|
||||
// AMD
|
||||
case UARCH_ZEN2:
|
||||
@@ -402,7 +427,7 @@ int get_number_of_vpus(struct cpuInfo* cpu) {
|
||||
bool choose_new_intel_logo_uarch(struct cpuInfo* cpu) {
|
||||
switch(cpu->arch->uarch) {
|
||||
case UARCH_ROCKET_LAKE:
|
||||
// TODO: case UARCH_TIGER_LAKE: missing?
|
||||
case UARCH_TIGER_LAKE:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
struct uarch;
|
||||
|
||||
struct uarch* get_uarch_from_cpuid(struct cpuInfo* cpu, uint32_t ef, uint32_t f, uint32_t em, uint32_t m, int s);
|
||||
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);
|
||||
bool vpus_are_AVX512(struct cpuInfo* cpu);
|
||||
bool is_knights_landing(struct cpuInfo* cpu);
|
||||
int get_number_of_vpus(struct cpuInfo* cpu);
|
||||
|
||||