Merge pull request #21354 from BradleyWood/0.51-xr0-aot

(0.51) x86: check xcr0 in AOT compiles

Author: pshipton

runtime/compiler/env/ProcessorDetection.cpp

@@ -116,17 +116,6 @@
 #include <strings.h>
 #endif
 
-#if defined(OMR_OS_WINDOWS) && defined(TR_TARGET_X86)
-#include <intrin.h>
-#elif defined(TR_TARGET_X86)
-inline unsigned long long _xgetbv(unsigned int ecx)
-   {
-   unsigned int eax, edx;
-   __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(ecx));
-   return ((unsigned long long)edx << 32) | eax;
-   }
-#endif
-
 #if defined(J9ZOS390)
 extern "C" bool _isPSWInProblemState();  /* 390 asm stub */
 #endif
@@ -345,43 +334,6 @@ TR_J9VM::initializeProcessorType()
       OMRProcessorDesc processorDescription = TR::Compiler->target.cpu.getProcessorDescription();
       OMRPORT_ACCESS_FROM_OMRPORT(TR::Compiler->omrPortLib);
 
-      bool disableAVX = true;
-      bool disableAVX512 = true;
-
-#if defined(TR_TARGET_X86)
-      // Check XCRO register for OS support of xmm/ymm/zmm
-      if (TRUE == omrsysinfo_processor_has_feature(&processorDescription, OMR_FEATURE_X86_OSXSAVE))
-         {
-         // '6' = mask for XCR0[2:1]='11b' (XMM state and YMM state are enabled)
-         disableAVX = ((6 & _xgetbv(0)) != 6);
-         // 'e6' = (mask for XCR0[7:5]='111b' (Opmask, ZMM_Hi256, Hi16_ZMM) + XCR0[2:1]='11b' (XMM/YMM))
-         disableAVX512 = ((0xe6 & _xgetbv(0)) != 0xe6);
-         }
-#endif
-
-      if (disableAVX)
-         {
-         // Unset AVX/AVX2 if not enabled via CR0 or otherwise disabled
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX2, FALSE);
-         }
-
-      if (disableAVX512)
-         {
-         // Unset AVX-512 if not enabled via CR0 or otherwise disabled
-         // If other AVX-512 extensions are supported in the port library, they need to be disabled here
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512F, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512VL, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512BW, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512CD, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512DQ, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512_BITALG, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512_VBMI, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512_VBMI2, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512_VNNI, FALSE);
-         omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_X86_AVX512_VPOPCNTDQ, FALSE);
-         }
-
       TR::Compiler->target.cpu = TR::CPU::customize(processorDescription);
 
       const char *vendor = TR::Compiler->target.cpu.getProcessorVendorId();

runtime/compiler/x/env/J9CPU.cpp

@@ -67,6 +67,16 @@ J9::X86::CPU::detectRelocatable(OMRPortLibrary * const omrPortLib)
    return TR::CPU::customize(portableProcessorDescription);
    }
 
+TR::CPU
+J9::X86::CPU::detect(OMRPortLibrary * const omrPortLib)
+   {
+   if (omrPortLib == NULL)
+      return TR::CPU();
+
+   TR::CPU::enableFeatureMasks();
+   return OMR::X86::CPU::detect(omrPortLib);
+   }
+
 void
 J9::X86::CPU::enableFeatureMasks()
    {

runtime/compiler/x/env/J9CPU.hpp

@@ -59,6 +59,13 @@ class OMR_EXTENSIBLE CPU : public J9::CPU
     */
    static TR::CPU detectRelocatable(OMRPortLibrary * const omrPortLib);
 
+   /**
+    * @brief A factory method used to construct a CPU object based on the underlying hardware
+    * @param[in] omrPortLib : the port library
+    * @return TR::CPU
+    */
+   static TR::CPU detect(OMRPortLibrary * const omrPortLib);
+
    /**
     * @brief Intialize _supportedFeatureMasks to the list of processor features that will be exploited by the compiler and set _isSupportedFeatureMasksEnabled to true
     * @return void