Skip to content

Skip including cpuid.h under Windows with Clang-cl #296

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

Open
ericstone93 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Skip including cpuid.h under Windows with Clang-cl #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef9188f
Skip including cpuid.h under Windows Clang build where _MSC_VER is de…
ericstone93 Apr 29, 2026
7907aa5
Skip _cpuid_count usage under Windows Clang-cl build
ericstone93 Apr 30, 2026
40b6ee7
Address PR feedback
ericstone93 May 1, 2026
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
4 changes: 2 additions & 2 deletions Extensions/DirectXMathAVX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
Expand All @@ -37,7 +37,7 @@ namespace DirectX
if (CPUInfo[0] < 1)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand Down
6 changes: 3 additions & 3 deletions Extensions/DirectXMathAVX2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
Expand All @@ -38,7 +38,7 @@ namespace DirectX
if (CPUInfo[0] < 7)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand All @@ -48,7 +48,7 @@ namespace DirectX
if ((CPUInfo[2] & 0x38081001) != 0x38081001)
return false;

#if defined(__clang__) || defined(__GNUC__)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid_count(7, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuidex(CPUInfo, 7, 0);
Expand Down
4 changes: 2 additions & 2 deletions Extensions/DirectXMathBE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
Expand All @@ -68,7 +68,7 @@ namespace DirectX
if (CPUInfo[0] < 1)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand Down
4 changes: 2 additions & 2 deletions Extensions/DirectXMathF16C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
Expand All @@ -38,7 +38,7 @@ namespace DirectX
if (CPUInfo[0] < 1)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand Down
4 changes: 2 additions & 2 deletions Extensions/DirectXMathFMA3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
Expand All @@ -37,7 +37,7 @@ namespace DirectX
if (CPUInfo[0] < 1)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand Down
12 changes: 6 additions & 6 deletions Extensions/DirectXMathFMA4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
Expand All @@ -42,7 +42,7 @@ namespace DirectX
if (CPUInfo[0] < 1)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand All @@ -52,20 +52,20 @@ namespace DirectX
if ((CPUInfo[2] & 0x18000000) != 0x18000000)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0x80000000, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0x80000000);
__cpuid(CPUInfo, static_cast<int>(0x80000000));
#endif

if (uint32_t(CPUInfo[0]) < 0x80000001u)
return false;

// We check for FMA4
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0x80000001, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0x80000001);
__cpuid(CPUInfo, static_cast<int>(0x80000001));
#endif

return (CPUInfo[2] & 0x10000);
Expand Down
4 changes: 2 additions & 2 deletions Extensions/DirectXMathSSE3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
#endif
if (CPUInfo[0] < 1)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand Down
4 changes: 2 additions & 2 deletions Extensions/DirectXMathSSE4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ namespace DirectX

// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
#endif
if (CPUInfo[0] < 1)
return false;

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand Down
2 changes: 1 addition & 1 deletion Inc/DirectXMath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
#pragma warning(pop)
#endif

#if (defined(__clang__) || defined(__GNUC__)) && (__x86_64__ || __i386__) && !defined(__MINGW32__)
#if (defined(__clang__) || defined(__GNUC__)) && (__x86_64__ || __i386__) && !defined(__MINGW32__) && !defined(_MSC_VER)
#include <cpuid.h>
#endif

Expand Down
6 changes: 3 additions & 3 deletions Inc/DirectXMathMisc.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ inline bool XMVerifyCPUSupport() noexcept
{
#if defined(_XM_SSE_INTRINSICS_) && !defined(__powerpc64__) && !defined(_XM_NO_INTRINSICS_)
int CPUInfo[4] = { -1 };
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 0);
Expand All @@ -1987,7 +1987,7 @@ inline bool XMVerifyCPUSupport() noexcept
return false;
#endif

#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuid(CPUInfo, 1);
Expand Down Expand Up @@ -2022,7 +2022,7 @@ inline bool XMVerifyCPUSupport() noexcept
return false; // No SSE2/SSE support

#if defined(__AVX2__) || defined(_XM_AVX2_INTRINSICS_)
#if defined(__clang__) || defined(__GNUC__)
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
__cpuid_count(7, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
#else
__cpuidex(CPUInfo, 7, 0);
Expand Down