Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/arm/windows/init-by-logical-sys-info.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
HANDLE heap = GetProcessHeap();

/* 1. Count available logical processor groups and processors */
const uint32_t max_group_count = (uint32_t)GetMaximumProcessorGroupCount();

Check warning on line 132 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorGroupCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo_internals.vcxproj]

Check warning on line 132 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorGroupCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo.vcxproj]

Check warning on line 132 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorGroupCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo_internals.vcxproj]

Check warning on line 132 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorGroupCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo.vcxproj]
cpuinfo_log_debug("detected %" PRIu32 " processor group(s)", max_group_count);
/* We need to store the absolute processor ID offsets for every groups,
* because
Expand Down Expand Up @@ -376,7 +376,7 @@
uint32_t nr_of_processors = 0;

for (uint32_t i = 0; i < max_group_count; i++) {
uint32_t nr_of_processors_per_group = GetMaximumProcessorCount((WORD)i);

Check warning on line 379 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo_internals.vcxproj]

Check warning on line 379 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo.vcxproj]

Check warning on line 379 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo_internals.vcxproj]

Check warning on line 379 in src/arm/windows/init-by-logical-sys-info.c

View workflow job for this annotation

GitHub Actions / cmake-uwp

'GetMaximumProcessorCount' undefined; assuming extern returning int [D:\a\cpuinfo\cpuinfo\build\arm64-uwp\cpuinfo.vcxproj]
cpuinfo_log_debug(
"detected %" PRIu32 " processor(s) in group %" PRIu32 "", nr_of_processors_per_group, i);
global_proc_index_per_group[i] = nr_of_processors;
Expand Down Expand Up @@ -750,12 +750,6 @@
if (cores) {
processors[processor_global_index].core = cores + core_id;
cores[core_id].core_id = core_id;

if (chip_info->uarchs == NULL) {
cpuinfo_log_error("uarch is NULL for core %d", core_id);
return;
}

cores[core_id].uarch = chip_info->uarchs[0].uarch;
cores[core_id].frequency = chip_info->uarchs[0].frequency;

Expand Down Expand Up @@ -842,7 +836,6 @@
processor->cluster = cluster;

if (chip_info) {
size_t converted_chars = 0;
if (!WideCharToMultiByte(
CP_UTF8,
WC_ERR_INVALID_CHARS,
Expand Down Expand Up @@ -910,3 +903,4 @@
_BitScanForward64(&index, (unsigned __int64)kaffinity);
return (uint32_t)index;
}

6 changes: 3 additions & 3 deletions src/arm/windows/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ static struct woa_chip_info woa_chip_unknown = {L"Unknown", {{cpuinfo_vendor_unk

BOOL CALLBACK cpuinfo_arm_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context) {
struct woa_chip_info* chip_info = NULL;
enum cpuinfo_vendor vendor = cpuinfo_vendor_unknown;


set_cpuinfo_isa_fields();

chip_info = get_system_info_from_registry();
Expand Down Expand Up @@ -219,4 +218,5 @@ static void set_cpuinfo_isa_fields(void) {
cpuinfo_isa.pmull = crypto;

cpuinfo_isa.crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) != 0;
}

}
Loading