Skip to content
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

[Release/8.0] Fix x64 crossbuild on macOS arm64 #91635

Merged
merged 1 commit into from
Sep 6, 2023
+27 −24
Merged

[Release/8.0] Fix x64 crossbuild on macOS arm64 #91635

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
43 changes: 23 additions & 20 deletions src/native/minipal/cpufeatures.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
#include "cpufeatures.h"
#include "cpuid.h"

#if TARGET_WINDOWS
#if HOST_WINDOWS

#include <Windows.h>

#else // TARGET_WINDOWS
#else // HOST_WINDOWS

#include "minipalconfig.h"

Expand All @@ -38,10 +38,10 @@
#include <sys/sysctl.h>
#endif

#endif // !TARGET_WINDOWS
#endif // !HOST_WINDOWS

#if defined(TARGET_UNIX)
#if defined(TARGET_X86) || defined(TARGET_AMD64)
#if defined(HOST_UNIX)
#if defined(HOST_X86) || defined(HOST_AMD64)

static uint32_t xmmYmmStateSupport()
{
Expand All @@ -61,7 +61,7 @@ static uint32_t xmmYmmStateSupport()

static uint32_t avx512StateSupport()
{
#if defined(TARGET_APPLE)
#if defined(HOST_APPLE)
// MacOS has specialized behavior where it reports AVX512 support but doesnt
// actually enable AVX512 until the first instruction is executed and does so
// on a per thread basis. It does this by catching the faulting instruction and
Expand Down Expand Up @@ -95,11 +95,11 @@ static bool IsAvx512Enabled()
{
return true;
}
#endif // defined(TARGET_X86) || defined(TARGET_AMD64)
#endif // TARGET_UNIX
#endif // defined(HOST_X86) || defined(HOST_AMD64)
#endif // HOST_UNIX

#if defined(TARGET_WINDOWS)
#if defined(TARGET_X86) || defined(TARGET_AMD64)
#if defined(HOST_WINDOWS)
#if defined(HOST_X86) || defined(HOST_AMD64)
static uint32_t xmmYmmStateSupport()
{
// check OS has enabled both XMM and YMM state support
Expand All @@ -124,14 +124,14 @@ static bool IsAvx512Enabled()
return ((FeatureMask & XSTATE_MASK_AVX512) != 0);
}

#endif // defined(TARGET_X86) || defined(TARGET_AMD64)
#endif // TARGET_WINDOWS
#endif // defined(HOST_X86) || defined(HOST_AMD64)
#endif // HOST_WINDOWS

int minipal_getcpufeatures(void)
{
int result = 0;

#if defined(TARGET_X86) || defined(TARGET_AMD64)
#if defined(HOST_X86) || defined(HOST_AMD64)

int cpuidInfo[4];

Expand Down Expand Up @@ -315,10 +315,10 @@ int minipal_getcpufeatures(void)
}

}
#endif // TARGET_X86 || TARGET_AMD64
#endif // HOST_X86 || HOST_AMD64

#if defined(TARGET_ARM64)
#if defined(TARGET_UNIX)
#if defined(HOST_ARM64)
#if defined(HOST_UNIX)

#if HAVE_AUXV_HWCAP_H
unsigned long hwCap = getauxval(AT_HWCAP);
Expand Down Expand Up @@ -386,9 +386,9 @@ int minipal_getcpufeatures(void)

result |= ARM64IntrinsicConstants_AdvSimd | ARM64IntrinsicConstants_VectorT128;
#endif // HAVE_AUXV_HWCAP_H
#endif // TARGET_UNIX
#endif // HOST_UNIX

#if defined(TARGET_WINDOWS)
#if defined(HOST_WINDOWS)
// FP and SIMD support are enabled by default
result |= ARM64IntrinsicConstants_AdvSimd | ARM64IntrinsicConstants_VectorT128;

Expand Down Expand Up @@ -418,9 +418,12 @@ int minipal_getcpufeatures(void)
{
result |= ARM64IntrinsicConstants_Rcpc;
}
#endif // TARGET_WINDOWS

#endif // TARGET_ARM64
// TODO: IsProcessorFeaturePresent doesn't support LRCPC2 yet.

#endif // HOST_WINDOWS

#endif // HOST_ARM64

return result;
}
8 changes: 4 additions & 4 deletions src/native/minipal/cpufeatures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Should match the constants defined in the compiler in HardwareIntrinsicHelpers.cs
//

#if defined(TARGET_X86) || defined(TARGET_AMD64)
#if defined(HOST_X86) || defined(HOST_AMD64)
enum XArchIntrinsicConstants
{
XArchIntrinsicConstants_Aes = 0x0001,
Expand Down Expand Up @@ -41,9 +41,9 @@ enum XArchIntrinsicConstants
XArchIntrinsicConstants_VectorT256 = 0x8000000,
XArchIntrinsicConstants_VectorT512 = 0x10000000,
};
#endif // TARGET_X86 || TARGET_AMD64
#endif // HOST_X86 || HOST_AMD64

#if defined(TARGET_ARM64)
#if defined(HOST_ARM64)
enum ARM64IntrinsicConstants
{
ARM64IntrinsicConstants_AdvSimd = 0x0001,
Expand All @@ -64,7 +64,7 @@ enum ARM64IntrinsicConstants
#define ARM64_ATOMICS_FEATURE_FLAG_BIT 7
static_assert((1 << ARM64_ATOMICS_FEATURE_FLAG_BIT) == ARM64IntrinsicConstants_Atomics, "ARM64_ATOMICS_FEATURE_FLAG_BIT must match with ARM64IntrinsicConstants_Atomics");

#endif // TARGET_ARM64
#endif // HOST_ARM64

#ifdef __cplusplus
extern "C"
Expand Down