thelilfrog/cpufetch
1
0
Fork 0
mirror of https://github.com/Dr-Noob/cpufetch.git synced 2026-03-25 07:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[v0.89][ARM][BUGFIX] Two CPUs are equal when Main ID Register AND frequency are equal, not just when Main ID register are equal

Browse Source
This commit is contained in:
Dr-Noob
2020-11-24 13:21:27 +01:00
parent fbea497740
commit 0bc978564e
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/arm/midr.c
View File

@@ -78,23 +78,11 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach) {
return topo; return topo;
} }
int count_distinct(uint32_t* arr, int n) { bool cores_are_equal(int c1pos, int c2pos, uint32_t* midr_array, int32_t* freq_array) {
int res = 1; return midr_array[c1pos] == midr_array[c2pos] && freq_array[c1pos] == freq_array[c2pos];
for (int i = 1; i < n; i++) {
int j = 0;
for (j = 0; j < i; j++) {
if (arr[i] == arr[j])
break;
}
if (i == j)
res++;
}
return res;
} }
uint32_t fill_ids_from_midr(uint32_t* midr_array, uint32_t* ids_array, int len) { 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; uint32_t latest_id = 0;
bool found; bool found;
ids_array[0] = latest_id; ids_array[0] = latest_id;
@@ -104,7 +92,7 @@ uint32_t fill_ids_from_midr(uint32_t* midr_array, uint32_t* ids_array, int len)
found = false; found = false;
for (j = 0; j < len && !found; j++) { for (j = 0; j < len && !found; j++) {
if (i != j && midr_array[i] == midr_array[j]) { if (i != j && cores_are_equal(i, j, midr_array, freq_array)) {
if(j > i) { if(j > i) {
latest_id++; latest_id++;
ids_array[i] = latest_id; ids_array[i] = latest_id;
@@ -130,6 +118,7 @@ struct cpuInfo* get_cpu_info() {
int ncores = get_ncores_from_cpuinfo(); int ncores = get_ncores_from_cpuinfo();
bool success = false; bool success = false;
int32_t* freq_array = malloc(sizeof(uint32_t) * ncores);
uint32_t* midr_array = malloc(sizeof(uint32_t) * ncores); uint32_t* midr_array = malloc(sizeof(uint32_t) * ncores);
uint32_t* ids_array = malloc(sizeof(uint32_t) * ncores); uint32_t* ids_array = malloc(sizeof(uint32_t) * ncores);
@@ -140,8 +129,14 @@ struct cpuInfo* get_cpu_info() {
printWarn("Unable to fetch MIDR for core %d. This is probably because the core is offline", i); printWarn("Unable to fetch MIDR for core %d. This is probably because the core is offline", i);
midr_array[i] = midr_array[0]; midr_array[i] = midr_array[0];
} }
freq_array[i] = get_max_freq_from_file(i);
if(freq_array[i] == UNKNOWN_FREQ) {
printWarn("Unable to fetch max frequency for core %d. This is probably because the core is offline", i);
freq_array[i] = freq_array[0];
}
} }
uint32_t sockets = fill_ids_from_midr(midr_array, ids_array, ncores); uint32_t sockets = fill_ids_from_midr(midr_array, freq_array, ids_array, ncores);
struct cpuInfo* ptr = cpu; struct cpuInfo* ptr = cpu;
int midr_idx = 0; int midr_idx = 0;
@@ -152,7 +147,7 @@ struct cpuInfo* get_cpu_info() {
ptr = ptr->next_cpu; ptr = ptr->next_cpu;
tmp_midr_idx = midr_idx; tmp_midr_idx = midr_idx;
while(midr_array[midr_idx] == midr_array[tmp_midr_idx]) tmp_midr_idx++; while(cores_are_equal(midr_idx, tmp_midr_idx, midr_array, freq_array)) tmp_midr_idx++;
midr_idx = tmp_midr_idx; midr_idx = tmp_midr_idx;
} }
ptr->next_cpu = NULL; ptr->next_cpu = NULL;