Skip to content

shims: correct the check for newer SLPI enumerators #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2021
Merged

shims: correct the check for newer SLPI enumerators #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
include_directories(BEFORE SYSTEM ${DISPATCH_INCLUDES})
dispatch_windows_lib_for_arch(${CMAKE_SYSTEM_PROCESSOR} DISPATCH_LIBDIR)
link_directories(${DISPATCH_LIBDIR})

include(CheckCSourceCompiles)
check_c_source_compiles([=[
#include <Windows.h>
int main(int argc, char *argv[]) {
switch ((LOGICAL_PROCESSOR_RELATIONSHIP)0) {
case RelationProcessorDie:
case RelationNumaNodeEx:
return 0;
}
return 0;
}
]=] DISPATCH_HAVE_EXTENDED_SLPI_20348)
if(DISPATCH_HAVE_EXTENDED_SLPI_20348)
add_compile_definitions(DISPATCH_HAVE_EXTENDED_SLPI_20348)
endif()
endif()

set(CMAKE_C_STANDARD 11)
Expand Down
6 changes: 6 additions & 0 deletions src/shims/hw_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,14 @@ _dispatch_hw_get_config(_dispatch_hw_config_t c)
++dwProcessorPhysicalCount;
dwProcessorLogicalCount += __popcnt64(slpiCurrent->ProcessorMask);
break;
#if defined(DISPATCH_HAVE_EXTENDED_SLPI_20348)
case RelationProcessorDie:
#endif
case RelationProcessorPackage:
case RelationNumaNode:
#if defined(DISPATCH_HAVE_EXTENDED_SLPI_20348)
case RelationNumaNodeEx:
#endif
case RelationCache:
case RelationGroup:
case RelationAll:
Expand Down