Skip to content

Improve crossgen HWIntrinsics handling #34849

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
tannergooding merged 2 commits into from
Apr 14, 2020
Merged

Improve crossgen HWIntrinsics handling #34849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d77075f
improve crossgen HWIntrinsics handling
saucecontrol Apr 11, 2020
9ed24e2
use fIsPlatformSubArchitecture for all x64 checks
saucecontrol Apr 14, 2020
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
39 changes: 31 additions & 8 deletions src/coreclr/src/zap/zapinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2134,7 +2134,7 @@ DWORD FilterNamedIntrinsicMethodAttribs(ZapInfo* pZapInfo, DWORD attribs, CORINF

#if defined(TARGET_X86) || defined(TARGET_AMD64)
fIsPlatformHWIntrinsic = strcmp(namespaceName, "System.Runtime.Intrinsics.X86") == 0;
#elif TARGET_ARM64
#elif defined(TARGET_ARM64)
fIsPlatformHWIntrinsic = strcmp(namespaceName, "System.Runtime.Intrinsics.Arm") == 0;
#endif

Expand All @@ -2152,24 +2152,34 @@ DWORD FilterNamedIntrinsicMethodAttribs(ZapInfo* pZapInfo, DWORD attribs, CORINF
// answer for the CPU the code is running on.
fTreatAsRegularMethodCall = (fIsGetIsSupportedMethod && fIsPlatformHWIntrinsic) || (!fIsPlatformHWIntrinsic && fIsHWIntrinsic);

#if defined(TARGET_X86) || defined(TARGET_AMD64)
if (fIsPlatformHWIntrinsic)
{
// Simplify the comparison logic by grabbing the name of the ISA
const char* isaName = (enclosingClassName == nullptr) ? className : enclosingClassName;

if ((strcmp(isaName, "Sse") == 0) || (strcmp(isaName, "Sse2") == 0))
bool fIsPlatformRequiredISA = false;
bool fIsPlatformSubArchitecture = false;

#if defined(TARGET_X86) || defined(TARGET_AMD64)
fIsPlatformRequiredISA = (strcmp(isaName, "Sse") == 0) || (strcmp(isaName, "Sse2") == 0);
fIsPlatformSubArchitecture = strcmp(className, "X64") == 0;
#elif defined(TARGET_ARM64)
fIsPlatformRequiredISA = (strcmp(isaName, "ArmBase") == 0) || (strcmp(isaName, "AdvSimd") == 0);
fIsPlatformSubArchitecture = strcmp(className, "Arm64") == 0;
#endif

if (fIsPlatformRequiredISA)
{
if ((enclosingClassName == nullptr) || (strcmp(className, "X64") == 0))
if ((enclosingClassName == nullptr) || fIsPlatformSubArchitecture)
{
// If it's anything related to Sse/Sse2, we can expand unconditionally since this is
// a baseline requirement of CoreCLR.
// If the ISA is required by CoreCLR for the platform, we can expand unconditionally
fTreatAsRegularMethodCall = false;
}
}
else if ((strcmp(className, "Avx") == 0) || (strcmp(className, "Fma") == 0) || (strcmp(className, "Avx2") == 0) || (strcmp(className, "Bmi1") == 0) || (strcmp(className, "Bmi2") == 0))
#if defined(TARGET_X86) || defined(TARGET_AMD64)
else if ((strcmp(isaName, "Avx") == 0) || (strcmp(isaName, "Fma") == 0) || (strcmp(isaName, "Avx2") == 0) || (strcmp(isaName, "Bmi1") == 0) || (strcmp(isaName, "Bmi2") == 0))
{
if ((enclosingClassName == nullptr) || (strcmp(className, "X64") == 0))
if ((enclosingClassName == nullptr) || fIsPlatformSubArchitecture)
{
// If it is the get_IsSupported method for an ISA which requires the VEX
// encoding we want to expand unconditionally. This will force those code
Expand All @@ -2182,7 +2192,20 @@ DWORD FilterNamedIntrinsicMethodAttribs(ZapInfo* pZapInfo, DWORD attribs, CORINF
fTreatAsRegularMethodCall = !fIsGetIsSupportedMethod;
}
}
#endif // defined(TARGET_X86) || defined(TARGET_AMD64)
#ifdef TARGET_X86
Comment thread
saucecontrol marked this conversation as resolved.
else if (fIsPlatformSubArchitecture)
{
Comment thread
saucecontrol marked this conversation as resolved.
// For ISAs not handled explicitly above, the IsSupported check will always
// be treated as a regular method call. If we are evaulating a method in the X64
// namespace, we know it will never be supported on x86, so we can allow the code
// to be treated as dead. We treat all non-IsSupported methods as regular method
// calls so they throw PNSE if used withoug the IsSupported check.
fTreatAsRegularMethodCall = !fIsGetIsSupportedMethod;
}
#endif // TARGET_X86
}
#if defined(TARGET_X86) || defined(TARGET_AMD64)
else if (strcmp(namespaceName, "System") == 0)
{
if ((strcmp(className, "Math") == 0) || (strcmp(className, "MathF") == 0))
Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/src/zap/zapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,10 +1180,10 @@ void Zapper::InitializeCompilerFlags(CORCOMPILE_VERSION_INFO * pVersionInfo)
m_pOpt->m_compilerFlags.Set(CORJIT_FLAGS::CORJIT_FLAG_USE_FCOMI);
}

// .NET Core requires SSE2.
#endif // TARGET_X86

#if defined(TARGET_X86) || defined(TARGET_AMD64)
// .NET Core requires SSE2.
m_pOpt->m_compilerFlags.Set(InstructionSet_SSE);
m_pOpt->m_compilerFlags.Set(InstructionSet_SSE2);
#endif
Expand All @@ -1205,8 +1205,6 @@ void Zapper::InitializeCompilerFlags(CORCOMPILE_VERSION_INFO * pVersionInfo)
m_pOpt->m_compilerFlags.Set(CORJIT_FLAGS::CORJIT_FLAG_FEATURE_SIMD);

#if defined(TARGET_X86) || defined(TARGET_AMD64)
m_pOpt->m_compilerFlags.Set(InstructionSet_SSE);
m_pOpt->m_compilerFlags.Set(InstructionSet_SSE2);
Comment thread
saucecontrol marked this conversation as resolved.
m_pOpt->m_compilerFlags.Set(InstructionSet_AES);
m_pOpt->m_compilerFlags.Set(InstructionSet_PCLMULQDQ);
m_pOpt->m_compilerFlags.Set(InstructionSet_SSE3);
Expand Down