1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2025-10-03 11:01:30 +00:00

Support for hybrid CPU (#166)

* Set CMAKE_C_FLAGS_DEBUG to display warnings during build

CI workflows are reporting warnings. Adding more C flags here help to avoid that.

* Add new types

* Add set_cpu_affinity function

* Add cpu_identify_all function

* Add cpu_request_core_type function

* Add cpuid_get_all_raw_data, cpuid_serialize_all_raw_data and cpuid_deserialize_all_raw_data functions

* Detect hybrid architecture for Intel CPUs

* Update cpuid_tool to detect all CPU logical cores

* Rename tests subdirectories for Intel Core

* Update all tests

Since e4309a6c4bc3ad875711a1599cba01a205b3103e, new fields are reported by cpuid_tool

* Add Intel Alder Lake

Fix #157

* Remove convert_instlatx64.c

This tool is not useful anymore because the cpuid_deserialize_raw_data_internal() function can natively parse them since 5667e1401c

* Fix affinity_mask computation

* Define _GNU_SOURCE in configure.ac

Forgotten in 4f80964db5

* Use dynamic raw array in cpu_raw_data_array_t

* Add cpu_affinity_mask_t type

* Improve set_cpu_affinity function

- Print a warning if logical CPU number is not supported on operating system
- Return a boolean value in case of success instead of an integer

* Improve cpu_identify_all and cpu_request_core_type functions

* Use dynamic array for cpu_types in system_id_t

This commit also adds cleanups, fixes and consistency

* Tests: update Ryzen 5 Matisse with all CPU cores

* Add affinity_mask_str_r function and address other comments

- Fixed cpuid_grow_raw_data_array and cpu_raw_data_array_t.logical_cpu_t with the correct type
- Added a note about hard limit of cpu_raw_data_array_t
- Fixed a typo in cpuid_deserialize_raw_data_internal

* Fix build on Windows
This commit is contained in:
Xorg 2022-09-15 18:37:08 +02:00 committed by GitHub
commit 2b8023f733
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
157 changed files with 8473 additions and 384 deletions

View file

@ -5,11 +5,11 @@ import os, sys, re, random
### Constants:
fields = [ "family", "model", "stepping", "extfamily", "extmodel", "cores",
"logical", "l1d-cache", "l1i-cache", "l2-cache", "l3-cache", "l4-cache",
"l1d-assoc", "l1i-assoc", "l2-assoc", "l3-assoc", "l4-assoc", "l1d-cacheline",
"l1i-cacheline", "l2-cacheline", "l3-cacheline", "l4-cacheline", "sse-size",
"codename", "flags" ]
fields = [ "architecture", "purpose", "family", "model", "stepping", "extfamily",
"extmodel", "cores", "logical", "l1d-cache", "l1i-cache", "l2-cache",
"l3-cache", "l4-cache", "l1d-assoc", "l1i-assoc", "l2-assoc", "l3-assoc",
"l4-assoc", "l1d-cacheline", "l1i-cacheline", "l2-cacheline", "l3-cacheline",
"l4-cacheline", "sse-size", "codename", "flags" ]
args = sys.argv
fix = False
@ -71,7 +71,7 @@ def fixFile(filename, input_lines, output_lines):
f.writelines([s + "\n" for s in output_lines])
f.close()
def do_test(inp, expected_out, binary, test_file_name):
def do_test(inp, expected_out, binary, test_file_name, num_cpu_type):
fninp = make_tempname("cpuidin")
fnoutp = make_tempname("cpuidout")
f = open(fninp, "wt")
@ -83,17 +83,19 @@ def do_test(inp, expected_out, binary, test_file_name):
real_out = []
try:
f = open(fnoutp, "rt")
real_out = [s.strip() for s in f.readlines()]
for s in f.readlines():
if "-----" not in s:
real_out.append(s.strip())
f.close()
os.unlink(fnoutp)
except IOError:
return "Exception"
if len(real_out) != len(expected_out) or len(real_out) != len(fields):
if len(real_out) != len(expected_out) or len(real_out) != len(fields) * num_cpu_type:
return "Unexpected number of records returned"
err_fields = []
for i in range(len(real_out)):
if real_out[i] != expected_out[i]:
err_fields.append((fields[i], expected_out[i], real_out[i]))
err_fields.append((fields[i % len(fields)], expected_out[i], real_out[i]))
if not err_fields:
return "OK"
else:
@ -104,22 +106,26 @@ def do_test(inp, expected_out, binary, test_file_name):
return "Mismatch in fields:\n%s" % "\n".join([fmt_error(err) for err in err_fields])
errors = False
delimiter = "-" * 80
print("Testing...")
for test_file_name in filelist:
num_cpu_type = 0
current_input = []
current_output = []
build_output = False
with open(test_file_name, "rt") as f:
for line in f.readlines():
if line[:3] == "---":
line = line.strip()
if line == delimiter:
build_output = True
num_cpu_type += 1
else:
if build_output:
current_output.append(line.strip())
current_output.append(line)
else:
current_input.append(line.strip())
current_input.append(line)
#codename = current_output[len(current_output) - 2]
result = do_test(current_input, current_output, cpuid_tool, test_file_name)
result = do_test(current_input, current_output, cpuid_tool, test_file_name, num_cpu_type)
print("Test [%s]: %s" % (test_file_name[:-5], result))
if result != "OK":
errors = True