remove support for XCR0 registers

Include/internal/pycore_cpuinfo.h

@@ -25,7 +25,6 @@ extern "C" {
 
 #include "Python.h"
 #include "pycore_cpuinfo_cpuid_features.h"
-#include "pycore_cpuinfo_xsave_features.h"
 
 typedef struct _Py_cpuid_features_s {
     uint32_t maxleaf;
@@ -101,21 +100,11 @@ typedef struct _Py_cpuid_features_s {
     _Py_CPUID_DECL_FLAG(xsave);   // XSAVE/XRSTOR/XSETBV/XGETBV
     _Py_CPUID_DECL_FLAG(osxsave); // XSAVE is enabled by the OS
 
-    // --- XCR0 register bits -------------------------------------------------
-    _Py_CPUID_DECL_FLAG(xcr0_sse);
-    // On some Intel CPUs, it is possible for the CPU to support AVX2
-    // instructions even though the underlying OS does not know about
-    // AVX. In particular, only (SSE) XMM registers will be saved and
-    // restored on context-switch, but not (AVX) YMM registers.
-    _Py_CPUID_DECL_FLAG(xcr0_avx);
-    _Py_CPUID_DECL_FLAG(xcr0_avx512_opmask);
-    _Py_CPUID_DECL_FLAG(xcr0_avx512_zmm_hi256);
-    _Py_CPUID_DECL_FLAG(xcr0_avx512_hi16_zmm);
 #undef _Py_CPUID_DECL_FLAG
     // Whenever a field is added or removed above, update the
-    // number of fields (40) and adjust the bitsize of 'ready'
+    // number of fields (35) and adjust the bitsize of 'ready'
     // so that the size of this structure is a multiple of 8.
-    uint8_t ready; // set if the structure is ready for usage
+    uint8_t ready: 5;  // set if the structure is ready for usage
 } _Py_cpuid_features;
 
 /*

Makefile.pre.in

@@ -1297,7 +1297,6 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/internal/pycore_context.h \
 		$(srcdir)/Include/internal/pycore_cpuinfo.h \
 		$(srcdir)/Include/internal/pycore_cpuinfo_cpuid_features.h \
-		$(srcdir)/Include/internal/pycore_cpuinfo_xsave_features.h \
 		$(srcdir)/Include/internal/pycore_critical_section.h \
 		$(srcdir)/Include/internal/pycore_crossinterp.h \
 		$(srcdir)/Include/internal/pycore_crossinterp_data_registry.h \
@@ -1938,9 +1937,6 @@ Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydt
 		$(MULTIARCH_CPPFLAGS) \
 		-o $@ $(srcdir)/Python/sysmodule.c
 
-Python/cpuinfo.o: $(srcdir)/Python/cpuinfo.c Makefile
-	$(CC) -c $(PY_CORE_CFLAGS) @CORE_CPUINFO_CFLAGS@ -o $@ $(srcdir)/Python/cpuinfo.c
-
 $(IO_OBJS): $(IO_H)
 
 .PHONY: regen-pegen-metaparser

PCbuild/pythoncore.vcxproj

@@ -231,7 +231,6 @@
     <ClInclude Include="..\Include\internal\pycore_context.h" />
     <ClInclude Include="..\Include\internal\pycore_cpuinfo.h" />
     <ClInclude Include="..\Include\internal\pycore_cpuinfo_cpuid_features.h" />
-    <ClInclude Include="..\Include\internal\pycore_cpuinfo_xsave_features.h" />
     <ClInclude Include="..\Include\internal\pycore_critical_section.h" />
     <ClInclude Include="..\Include\internal\pycore_crossinterp.h" />
     <ClInclude Include="..\Include\internal\pycore_crossinterp_data_registry.h" />

PCbuild/pythoncore.vcxproj.filters

@@ -606,9 +606,6 @@
     <ClInclude Include="..\Include\internal\pycore_cpuinfo_cpuid_features.h">
       <Filter>Include\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_cpuinfo_xsave_features.h">
-      <Filter>Include\internal</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_critical_section.h">
       <Filter>Include\internal</Filter>
     </ClInclude>

Python/cpuinfo.c

@@ -11,10 +11,8 @@
 #define HAS_CPUID_SUPPORT
 #if defined(__x86_64__) && defined(__GNUC__)
 #  include <cpuid.h>            // __cpuid_count()
-#  include <immintrin.h>        // _xgetbv()
 #elif defined(_M_X64) || defined(__amd64__) || defined(_M_AMD64)
 #  include <intrin.h>           // __cpuidex()
-#  include <immintrin.h>        // _xgetbv()
 #else
 #  undef HAS_CPUID_SUPPORT
 #endif
@@ -24,13 +22,6 @@
 // corresponding flags or if we are not on an 64-bit platform we do not
 // even try to inspect the output of CPUID for those specific features.
 #ifdef HAS_CPUID_SUPPORT
-#if defined(_Py_CPUINFO_USE_XGETBV_FUNC)        \
-    || defined(_Py_CPUINFO_USE_XGETBV_OPCODE)
-#  define HAS_XGETBV_SUPPORT
-#endif
-
-#undef HAS_XGETBV_SUPPORT
-
 #if defined(_Py_CAN_COMPILE_SIMD_SSE_INSTRUCTIONS)          \
     || defined(_Py_CAN_COMPILE_SIMD_SSE2_INSTRUCTIONS)      \
     || defined(_Py_CAN_COMPILE_SIMD_SSE3_INSTRUCTIONS)      \
@@ -155,34 +146,6 @@ get_cpuid_info(uint32_t level /* input eax */,
 #endif
 }
 
-#if defined(HAS_XGETBV_SUPPORT) && defined(SHOULD_PARSE_CPUID_L1)
-static uint64_t /* should only be used after calling cpuid(1, 0, ...) */
-get_xgetbv(uint32_t index)
-{
-    assert(index == 0); // only XCR0 is supported for now
-#if defined(_Py_CPUINFO_USE_XGETBV_FUNC)
-    /* directly use the compiler's helper if -mxsave is available */
-    return (uint64_t)_xgetbv(index);
-#elif defined(__x86_64__) && defined(__GNUC__)
-    uint32_t eax = 0, edx = 0;
-    __asm__ volatile(
-        /* raw opcode for xgetbv for compatibility with older toolchains */
-        ".byte 0x0f, 0x01, 0xd0"
-        : "=a" (eax), "=d" (edx)
-        : "c" (index)
-    );
-    return ((uint64_t)edx << 32) | eax;
-#elif defined(_M_X64)
-    return (uint64_t)_xgetbv(index);
-#else
-    (void)index;
-    return 0;
-#endif
-}
-#else
-#define get_xgetbv(_INDEX)  0
-#endif
-
 /* Highest Function Parameter and Manufacturer ID (LEAF=0, SUBLEAF=0). */
 static uint32_t
 detect_cpuid_maxleaf(void)
@@ -349,23 +312,6 @@ detect_cpuid_extended_features_L7S1(_Py_cpuid_features *flags,
 }
 #endif
 
-#ifdef SHOULD_PARSE_CPUID_L1
-static void /* should only be used after calling cpuid(1, 0, ...) */
-detect_cpuid_xsave_state(_Py_cpuid_features *flags)
-{
-    assert(flags->ready == 0);
-    assert(flags->maxleaf >= 1);
-    (void)flags;
-    // Keep the ordering and newlines as they are declared in the structure.
-    uint64_t xcr0 = flags->xsave && flags->osxsave ? get_xgetbv(0) : 0;
-    flags->xcr0_sse = XSAVE_CHECK_REG(xcr0, XCR0_SSE);
-    flags->xcr0_avx = XSAVE_CHECK_REG(xcr0, XCR0_AVX);
-    flags->xcr0_avx512_opmask = XSAVE_CHECK_REG(xcr0, XCR0_AVX512_OPMASK);
-    flags->xcr0_avx512_zmm_hi256 = XSAVE_CHECK_REG(xcr0, XCR0_AVX512_ZMM_HI256);
-    flags->xcr0_avx512_hi16_zmm = XSAVE_CHECK_REG(xcr0, XCR0_AVX512_HI16_ZMM);
-}
-#endif
-
 static void
 cpuid_features_finalize(_Py_cpuid_features *flags)
 {
@@ -460,12 +406,6 @@ _Py_cpuid_check_features(const _Py_cpuid_features *flags)
                                         \
         MACRO(xsave);                   \
         MACRO(osxsave);                 \
-                                        \
-        MACRO(xcr0_sse);                \
-        MACRO(xcr0_avx);                \
-        MACRO(xcr0_avx512_opmask);      \
-        MACRO(xcr0_avx512_zmm_hi256);   \
-        MACRO(xcr0_avx512_hi16_zmm);    \
     } while (0)
 
 void
@@ -530,7 +470,6 @@ cpuid_detect_l1_features(_Py_cpuid_features *flags)
         uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
         get_cpuid_info(1, 0, &eax, &ebx, &ecx, &edx);
         detect_cpuid_features(flags, ecx, edx);
-        detect_cpuid_xsave_state(flags);
     }
 }
 #else