Unify hardware feature detection between CoreCLR JIT and AOT

Follow up on #87865
dotnet · Jul 22, 2023 · 539b8e5 · 539b8e5
1 parent a2ce877
commit 539b8e5
Show file tree

Hide file tree

Showing 25 changed files with 192 additions and 1,447 deletions.
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -191,7 +191,6 @@ include_directories("debug/inc/${ARCH_SOURCES_DIR}")
 include_directories("debug/inc/dump")
 include_directories("md/inc")
 include_directories("classlibnative/bcltype")
-include_directories("classlibnative/cryptography")
 include_directories("classlibnative/inc")
 include_directories("${GENERATED_INCLUDE_DIR}")
 include_directories("hosts/inc")

diff --git a/src/coreclr/classlibnative/bcltype/system.cpp b/src/coreclr/classlibnative/bcltype/system.cpp
@@ -30,7 +30,7 @@
 #include "array.h"
 #include "eepolicy.h"
 
-
+#include <minipal/cpuid.h>
 
 
 FCIMPL0(UINT32, SystemNative::GetTickCount)
@@ -50,8 +50,6 @@ FCIMPL0(UINT64, SystemNative::GetTickCount64)
 FCIMPLEND;
 
 
-
-
 extern "C" VOID QCALLTYPE Environment_Exit(INT32 exitcode)
 {
     QCALL_CONTRACT;

diff --git a/src/coreclr/gc/vxsort/isa_detection.cpp b/src/coreclr/gc/vxsort/isa_detection.cpp
@@ -19,28 +19,6 @@ enum class SupportedISA
 
 #if defined(TARGET_AMD64) && defined(TARGET_WINDOWS)
 
-static DWORD64 GetEnabledXStateFeaturesHelper()
-{
-    // On Windows we have an api(GetEnabledXStateFeatures) to check if AVX is supported
-    typedef DWORD64(WINAPI* PGETENABLEDXSTATEFEATURES)();
-    PGETENABLEDXSTATEFEATURES pfnGetEnabledXStateFeatures = NULL;
-
-    HMODULE hMod = LoadLibraryExW(L"kernel32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
-    if (hMod == NULL)
-        return 0;
-
-    pfnGetEnabledXStateFeatures = (PGETENABLEDXSTATEFEATURES)GetProcAddress(hMod, "GetEnabledXStateFeatures");
-
-    if (pfnGetEnabledXStateFeatures == NULL)
-    {
-        return 0;
-    }
-
-    DWORD64 FeatureMask = pfnGetEnabledXStateFeatures();
-
-    return FeatureMask;
-}
-
 SupportedISA DetermineSupportedISA()
 {
     // register definitions to make the following code more readable
@@ -78,7 +56,7 @@ SupportedISA DetermineSupportedISA()
     DWORD64 xcr0 = _xgetbv(0);
 
     // get OS XState info
-    DWORD64 FeatureMask = GetEnabledXStateFeaturesHelper();
+    DWORD64 FeatureMask = GetEnabledXStateFeatures();
 
     // get processor extended feature flag info
     __cpuidex(reg, 7, 0);

diff --git a/src/coreclr/minipal/Unix/CMakeLists.txt b/src/coreclr/minipal/Unix/CMakeLists.txt
@@ -1,5 +1,18 @@
-add_library(coreclrminipal
-    STATIC
+set(SOURCES
     doublemapping.cpp
     dn-u16.cpp
 )
+
+if(NOT CLR_CROSS_COMPONENTS_BUILD)
+    list(APPEND SOURCES
+        ${CLR_SRC_NATIVE_DIR}/minipal/cpufeatures.c
+    )
+endif()
+
+add_library(coreclrminipal
+    STATIC
+    ${SOURCES}
+)
+
+include(${CLR_SRC_NATIVE_DIR}/minipal/configure.cmake)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/coreclr/minipal/Windows/CMakeLists.txt b/src/coreclr/minipal/Windows/CMakeLists.txt
@@ -1,5 +1,15 @@
-add_library(coreclrminipal
-    STATIC
+set(SOURCES
     doublemapping.cpp
     dn-u16.cpp
 )
+
+if(NOT CLR_CROSS_COMPONENTS_BUILD)
+    list(APPEND SOURCES
+        ${CLR_SRC_NATIVE_DIR}/minipal/cpufeatures.c
+    )
+endif()
+
+add_library(coreclrminipal
+    STATIC
+    ${SOURCES}
+)
diff --git a/src/coreclr/nativeaot/Runtime/amd64/MemClrForGC.asm b/src/coreclr/nativeaot/Runtime/amd64/MemClrForGC.asm
diff --git a/src/coreclr/nativeaot/Runtime/i386/MemClrForGC.asm b/src/coreclr/nativeaot/Runtime/i386/MemClrForGC.asm