8000 gh-125022: add support for simple SIMD features detection by picnixz · Pull Request #125011 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

gh-125022: add support for simple SIMD features detection #125011

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.

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

Draft
wants to merge 70 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
9a6ccb5
support simple SIMD detection
picnixz Oct 5, 2024
f4e4f99
add _Py prefix
picnixz Oct 5, 2024
5006686
Use `_py` prefix
picnixz Oct 5, 2024
3c0b4f1
make the interface friendlier for future adjustments
picnixz Oct 6, 2024
01ed21a
Allow `cpu_simd_flags` to be merged.
picnixz Oct 6, 2024
969a619
update comments
picnixz Oct 6, 2024
5a5acc2
fix typo
picnixz Oct 6, 2024
ac1b165
fix configure script
picnixz Oct 6, 2024
6f304f2
fix bit detection
picnixz Oct 6, 2024
f3bd027
Harden detection of AVX instructions.
picnixz Oct 7, 2024
16b2aed
do not guard the parsing of `os_xsave`
picnixz Oct 7, 2024
5018fa9
Remove old comment.
picnixz Oct 7, 2024
e758065
Update cpuinfo.c comments
picnixz Oct 7, 2024
731be81
Update pycore_cpuinfo.h comments
picnixz Oct 7, 2024
7947715
fix lint
picnixz Oct 7, 2024
7a17cbb
I really shouldn't use a Web UI
picnixz Oct 7, 2024
76f67b1
Fix _xgetbv() on Windows builds.
picnixz Oct 7, 2024
0b49a50
fix comment
picnixz Oct 8, 2024
9fd6152
harden detection of CPU features
picnixz Oct 8, 2024
97a0fc5
update configure
picnixz Oct 11, 2024
f7da530
Merge remote-tracking branch 'upstream/main' into core/simd-helpers-1…
picnixz Oct 11, 2024
5f2884d
update comments
picnixz Oct 13, 2024
7c3b74e
update Makefile
picnixz Oct 13, 2024
130d099
address Erlend's review
picnixz Oct 14, 2024
cd575f0
lint & comment fixups
picnixz Oct 14, 2024
2b597a4
Update docs
picnixz Oct 27, 2024
78be530
Fix typo
picnixz Oct 27, 2024
fd47f0e
Merge branch 'main' into core/simd-helpers
picnixz Dec 17, 2024
cbb7b53
re-export functions for extension modules
picnixz Dec 17, 2024
21d8ca8
rename os_xsave to osxsave for future automatism
picnixz Dec 17, 2024
1f9dbb4
remember `maxleaf` and make detection more readable
picnixz Dec 18, 2024
553aa7c
use enumeration for flags
picnixz Dec 18, 2024
39d2ba4
fix warnings
picnixz Dec 21, 2024
602bb9c
Merge branch 'main' into core/simd-helpers
picnixz Dec 21, 2024
d6a3523
remove un-necessary comment and newline continuation
picnixz Dec 22, 2024
ff4212e
Merge branch 'main' into core/simd-helpers
picnixz Feb 16, 2025
3cb79f6
regen configure
picnixz Feb 17, 2025
e0a578c
clinic now supports empty comment lines in Python blocks
picnixz Feb 17, 2025
6fdbbdf
Merge remote-tracking branch 'upstream/main' into feat/core/simd-125022
picnixz Mar 11, 2025
c265851
Merge remote-tracking branch 'upstream/main' into feat/core/simd-125022
picnixz Mar 29, 2025
c12f9c7
move cpuinfo enumerations to real invokable Python scripts
picnixz Mar 29, 2025
a6c443f
Merge remote-tracking branch 'upstream/main' into feat/core/simd-125022
picnixz Apr 5, 2025
bd3589f
add comments
picnixz Apr 5, 2025
d213b67
update C comments
picnixz Apr 8, 2025
4109d90
Merge remote-tracking branch 'upstream/main' into feat/core/simd-125022
picnixz Apr 8, 2025
19b7d86
TMP: usage proof-of-concept
picnixz Apr 8, 2025
1732b6b
Merge remote-tracking branch 'upstream/main' into feat/core/simd-125022
picnixz Apr 22, 2025
d59d06d
improve configure.ac
picnixz Apr 22, 2025
bc2c1e5
Merge remote-tracking branch 'upstream/main' into feat/core/simd-125022
picnixz Apr 25, 2025
4a92103
Merge remote-tracking branch 'upstream/main' into feat/core/simd-125022
picnixz Jun 2, 2025
26ed6fd
Merge branch 'main' into feat/core/simd-125022
picnixz Jun 30, 2025
d00da3e
post-merge
picnixz Jun 30, 2025
8b7ecfb
use `_Py` prefix to prevent public namespace pollution
picnixz Jun 30, 2025
3c31ba3
let the compiler decide on the inlineness
picnixz Jun 30, 2025
143d57e
drop CPUID_REG alias
picnixz Jun 30, 2025
ee2a83c
simplify `_Py_cpuid_check_features`
picnixz Jun 30, 2025
e6d4583
amend docs for `_Py_cpuid_disable_features`
picnixz Jun 30, 2025
838f928
use macros to support larger flag ranges
picnixz Jun 30, 2025
62c9a40
handle -Wpedantic
picnixz Jun 30, 2025
a22aa95
reorganize files
picnixz Jul 8, 2025
87039dc
suppress compilation warnings
picnixz Jul 8, 2025
8a4b120
add linting
picnixz Jul 8, 2025
8603e14
typo
picnixz Jul 8, 2025
d6213a5
typo
picnixz Jul 8, 2025
79d5b34
log more!
picnixz Jul 13, 2025
f69d74a
skip CI
picnixz Jul 13, 2025
cb9065d
more printf
picnixz Jul 13, 2025
88df3b7
faster ci
picnixz Jul 13, 2025
db64ba5
!!
picnixz Jul 13, 2025
04012b4
!!
picnixz Jul 13, 2025
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
533 changes: 0 additions & 533 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

179 changes: 179 additions & 0 deletions Include/internal/pycore_cpuinfo.h
8000
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
/*
* @author Bénédikt Tran
*
* Interface for detecting the different CPUID flags in an opaque manner.
* See https://en.wikipedia.org/wiki/CPUID for details on the bit values.
*
* If a module requires to support SIMD instructions, it should determine
* the compiler flags and the instruction sets required for the intrinsics
* to work.
*
* For the headers and expected CPUID bits needed by Intel intrinsics, see
* https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html.
*/

#ifndef Py_INTERNAL_CPUINFO_H
#define Py_INTERNAL_CPUINFO_H

#ifdef __cplusplus
extern "C" {
#endif

#ifndef Py_BUILD_CORE
# error "this header requires Py_BUILD_CORE define"
#endif

#include "Python.h"
#include "pycore_cpuinfo_cpuid_features.h"
#include "pycore_cpuinfo_xsave_features.h"

typedef struct _Py_cpuid_features_s {
uint32_t maxleaf;
/*
* Macro to declare a member flag of '_Py_cpuid_features' as a uint8_t.
* Whenever this macro is used, do not forget to update the number of
* fields and the bitsize of the 'ready' member (see structure end).
*/
#define _Py_CPUID_DECL_FLAG(MEMBER_NAME) uint8_t MEMBER_NAME:1
// --- Streaming SIMD Extensions ------------------------------------------
_Py_CPUID_DECL_FLAG(sse);
_Py_CPUID_DECL_FLAG(sse2);
_Py_CPUID_DECL_FLAG(sse3);
_Py_CPUID_DECL_FLAG(ssse3); // Supplemental SSE3 instructions
_Py_CPUID_DECL_FLAG(sse41); // SSE4.1
_Py_CPUID_DECL_FLAG(sse42); // SSE4.2

// --- Advanced Vector Extensions -----------------------------------------
_Py_CPUID_DECL_FLAG(avx);
_Py_CPUID_DECL_FLAG(avx_ifma);
_Py_CPUID_DECL_FLAG(avx_ne_convert);

_Py_CPUID_DECL_FLAG(avx_vnni);
_Py_CPUID_DECL_FLAG(avx_vnni_int8);
_Py_CPUID_DECL_FLAG(avx_vnni_int16);

// --- Advanced Vector Extensions 2 ---------------------------------------
_Py_CPUID_DECL_FLAG(avx2);

// --- Advanced Vector Extensions (512-bit) -------------------------------
/*
* AVX-512 instruction set are grouped by the processor generation
* that implements them (see https://en.wikipedia.org/wiki/AVX-512).
*
* We do not include GFNI, VPCLMULQDQ and VAES instructions since
* they are not exactly AVX-512 per se, nor do we include BF16 or
* FP16 since they operate on bfloat16 and binary16 (half-float).
*
* See https://en.wikipedia.org/wiki/AVX-512#Instruction_set for
* the suffix meanings (for instance 'f' stands for 'Foundation').
*/
_Py_CPUID_DECL_FLAG(avx512_f);
_Py_CPUID_DECL_FLAG(avx512_cd);

_Py_CPUID_DECL_FLAG(avx512_er);
_Py_CPUID_DECL_FLAG(avx512_pf);

_Py_CPUID_DECL_FLAG(avx512_4fmaps);
_Py_CPUID_DECL_FLAG(avx512_4vnniw);

_Py_CPUID_DECL_FLAG(avx512_vpopcntdq);

_Py_CPUID_DECL_FLAG(avx512_vl);
_Py_CPUID_DECL_FLAG(avx512_dq);
_Py_CPUID_DECL_FLAG(avx512_bw);

_Py_CPUID_DECL_FLAG(avx512_ifma);
_Py_CPUID_DECL_FLAG(avx512_vbmi);

_Py_CPUID_DECL_FLAG(avx512_vnni);

_Py_CPUID_DECL_FLAG(avx512_vbmi2);
_Py_CPUID_DECL_FLAG(avx512_bitalg);

_Py_CPUID_DECL_FLAG(avx512_vp2intersect);

// --- Instructions -------------------------------------------------------
_Py_CPUID_DECL_FLAG(cmov);
_Py_CPUID_DECL_FLAG(fma);
_Py_CPUID_DECL_FLAG(popcnt);
_Py_CPUID_DECL_FLAG(pclmulqdq);

_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'
// so that the size of this structure is a multiple of 8.
uint8_t ready; // set if the structure is ready for usage
} _Py_cpuid_features;

/*
* Explicitly set all members to zero to guarantee that
* we never have a non-initialized attribute at runtime
* which could lead to an illegal instruction error.
*
* This readiness state of 'flags' is ignored and left untouched.
*
* Note: This function does not set any exception and thus never fails.
*/
PyAPI_FUNC(void)
_Py_cpuid_disable_features(_Py_cpuid_features *flags);

/*
* Check whether the structure is ready and flags are inter-compatible,
* returning 1 on success and 0 otherwise.
*
* The caller should disable all CPUID detected features if the check
* fails to avoid encountering runtime illegal instruction errors.
*
* Note: This function does not set any exception and thus never fails.
*/
PyAPI_FUNC(int)
_Py_cpuid_check_features(const _Py_cpuid_features *flags);

/*
* Return 1 if all expected flags are set in 'actual', 0 otherwise.
*
* If 'actual' or 'expect' are not ready yet, this also returns 0.
*
* Note: This function does not set any exception and thus never fails.
*/
PyAPI_FUNC(int)
_Py_cpuid_has_features(const _Py_cpuid_features *actual,
const _Py_cpuid_features *expect);

/*
* Return 1 if 'actual' and 'expect' are identical, 0 otherwise.
*
* If 'actual' or 'expect' are not ready yet, this also returns 0.
*
* Note: This function does not set any exception and thus never fails.
*/
PyAPI_FUNC(int)
_Py_cpuid_match_features(const _Py_cpuid_features *actual,
const _Py_cpuid_features *expect);

/*
* Detect the available host features, storing the result in 'flags'.
*
* Note: This function does not set any exception and thus never fails.
*/
PyAPI_FUNC(void)
_Py_cpuid_detect_features(_Py_cpuid_features *flags);

#ifdef __cplusplus
}
#endif

#endif /* !Py_INTERNAL_CPUINFO_H */
101 changes: 101 additions & 0 deletions Include/internal/pycore_cpuinfo_cpuid_features.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/**
* @author Bénédikt Tran
* @seealso @file Tools/cpuinfo/libcpuinfo/features/cpuid.py
*
* The enumeration describes masks to apply on CPUID output registers.
*
* Member names are _Py_CPUID_MASK_<REGISTER>_L<LEAF>[S<SUBLEAF>]_<FEATURE>,
* where <> (resp. []) denotes a required (resp. optional) group and:
*
* - REGISTER is EAX, EBX, ECX or EDX,
* - LEAF is the initial value of the EAX register (1 or 7),
* - SUBLEAF is the initial value of the ECX register (omitted if 0), and
* - FEATURE is a SIMD feature (with one or more specialized instructions).
*
* For maintainability, the flags are ordered by registers, leafs, subleafs,
* and bits. See https://en.wikipedia.org/wiki/CPUID for the values.
*
* Note 1: The LEAF is also called the 'page' or the 'level'.
* Note 2: The SUBLEAF is also referred to as the 'count'.
*
* The LEAF value should only 1 or 7 as other values may have different
* meanings depending on the underlying architecture.
*/

#ifndef Py_INTERNAL_CPUINFO_CPUID_FEATURES_H
#define Py_INTERNAL_CPUINFO_CPUID_FEATURES_H

#ifdef __cplusplus
extern "C" {
#endif

#ifndef Py_BUILD_CORE
# error "this header requires Py_BUILD_CORE define"
#endif

#include "Python.h"

/*[python input]
import os, sys
sys.path.insert(0, os.path.realpath(os.path.join(os.getcwd(), "Tools/cpuinfo")))
from libcpuinfo.features.cpuid import make_cpuid_features_constants
print(make_cpuid_features_constants())
[python start generated code]*/
// clang-format off
/** Constants for CPUID features */
/* CPUID (LEAF=1, SUBLEAF=0) [ECX] */
#define _Py_CPUID_MASK_ECX_L1_SSE3 0x00000001 // bit = 0
#define _Py_CPUID_MASK_ECX_L1_PCLMULQDQ 0x00000002 // bit = 1
#define _Py_CPUID_MASK_ECX_L1_SSSE3 0x00000200 // bit = 9
#define _Py_CPUID_MASK_ECX_L1_FMA 0x00001000 // bit = 12
#define _Py_CPUID_MASK_ECX_L1_SSE4_1 0x00080000 // bit = 19
#define _Py_CPUID_MASK_ECX_L1_SSE4_2 0x00100000 // bit = 20
#define _Py_CPUID_MASK_ECX_L1_POPCNT 0x00800000 // bit = 23
#define _Py_CPUID_MASK_ECX_L1_XSAVE 0x04000000 // bit = 26
#define _Py_CPUID_MASK_ECX_L1_OSXSAVE 0x08000000 // bit = 27
#define _Py_CPUID_MASK_ECX_L1_AVX 0x10000000 // bit = 28

/* CPUID (LEAF=1, SUBLEAF=0) [EDX] */
#define _Py_CPUID_MASK_EDX_L1_CMOV 0x00008000 // bit = 15
#define _Py_CPUID_MASK_EDX_L1_SSE 0x02000000 // bit = 25
#define _Py_CPUID_MASK_EDX_L1_SSE2 0x04000000 // bit = 26

/* CPUID (LEAF=7, SUBLEAF=0) [EBX] */
#define _Py_CPUID_MASK_EBX_L7_AVX2 0x00000020 // bit = 5
#define _Py_CPUID_MASK_EBX_L7_AVX512_F 0x00010000 // bit = 16
#define _Py_CPUID_MASK_EBX_L7_AVX512_DQ 0x00020000 // bit = 17
#define _Py_CPUID_MASK_EBX_L7_AVX512_IFMA 0x00200000 // bit = 21
#define _Py_CPUID_MASK_EBX_L7_AVX512_PF 0x04000000 // bit = 26
#define _Py_CPUID_MASK_EBX_L7_AVX512_ER 0x08000000 // bit = 27
#define _Py_CPUID_MASK_EBX_L7_AVX512_CD 0x10000000 // bit = 28
#define _Py_CPUID_MASK_EBX_L7_AVX512_BW 0x40000000 // bit = 30
#define _Py_CPUID_MASK_EBX_L7_AVX512_VL 0x80000000 // bit = 31

/* CPUID (LEAF=7, SUBLEAF=0) [ECX] */
#define _Py_CPUID_MASK_ECX_L7_AVX512_VBMI 0x00000002 // bit = 1
#define _Py_CPUID_MASK_ECX_L7_AVX512_VBMI2 0x00000040 // bit = 6
#define _Py_CPUID_MASK_ECX_L7_AVX512_VNNI 0x00000800 // bit = 11
#define _Py_CPUID_MASK_ECX_L7_AVX512_BITALG 0x00001000 // bit = 12
#define _Py_CPUID_MASK_ECX_L7_AVX512_VPOPCNTDQ 0x00004000 // bit = 14

/* CPUID (LEAF=7, SUBLEAF=0) [EDX] */
#define _Py_CPUID_MASK_EDX_L7_AVX512_4VNNIW 0x00000004 // bit = 2
#define _Py_CPUID_MASK_EDX_L7_AVX512_4FMAPS 0x00000008 // bit = 3
#define _Py_CPUID_MASK_EDX_L7_AVX512_VP2INTERSECT 0x00000100 // bit = 8

/* CPUID (LEAF=7, SUBLEAF=1) [EAX] */
#define _Py_CPUID_MASK_EAX_L7S1_AVX_VNNI 0x00000010 // bit = 4
#define _Py_CPUID_MASK_EAX_L7S1_AVX_IFMA 0x00800000 // bit = 23

/* CPUID (LEAF=7, SUBLEAF=1) [EDX] */
#define _Py_CPUID_MASK_EDX_L7S1_AVX_VNNI_INT8 0x00000010 // bit = 4
#define _Py_CPUID_MASK_EDX_L7S1_AVX_NE_CONVERT 0x00000020 // bit = 5
#define _Py_CPUID_MASK_EDX_L7S1_AVX_VNNI_INT16 0x00000400 // bit = 10
// clang-format on
/*[python end generated code: output=e9112f064e2effec input=71ec6b4356052ec3]*/

#ifdef __cplusplus
}
#endif

#endif // !Py_INTERNAL_CPUINFO_CPUID_FEATURES_H
43 changes: 43 additions & 0 deletions Include/internal/pycore_cpuinfo_xsave_features.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* @author Bénédikt Tran
* @seealso @file Tools/cpuinfo/libcpuinfo/features/xsave.py
*
* XSAVE state components (XCR0 control register).
*
* See https://en.wikipedia.org/wiki/Control_register#XCR0_and_XSS.
*/

#ifndef Py_INTERNAL_CPUINFO_XSAVE_FEATURES_H
#define Py_INTERNAL_CPUINFO_XSAVE_FEATURES_H

#ifdef __cplusplus
extern "C" {
#endif

#ifndef Py_BUILD_CORE
# error "this header requires Py_BUILD_CORE define"
#endif

#include "Python.h"

/*[python input]
import os, sys
sys.path.insert(0, os.path.realpath(os.path.join(os.getcwd(), "Tools/cpuinfo")))
from libcpuinfo.features.xsave import make_xsave_features_constants
print(make_xsave_features_constants())
[python start generated code]*/
// clang-format off
/** Constants for XSAVE components */
#define _Py_XSAVE_MASK_XCR0_SSE 0x00000002 // bit = 1
#define _Py_XSAVE_MASK_XCR0_AVX 0x00000004 // bit = 2
#define _Py_XSAVE_MASK_XCR0_AVX512_OPMASK 0x00000020 // bit = 5
#define _Py_XSAVE_MASK_XCR0_AVX512_ZMM_HI256 0x00000040 // bit = 6
#define _Py_XSAVE_MASK_XCR0_AVX512_HI16_ZMM 0x00000080 // bit = 7
// clang-format on
/*[python end generated code: output=ac059b802b4317cb input=0a1b0774d3271477]*/

#ifdef __cplusplus
}
#endif

#endif // !Py_INTERNAL_CPUINFO_XSAVE_FEATURES_H
4 changes: 4 additions & 0 deletions Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ PYTHON_OBJS= \
Python/codegen.o \
Python/compile.o \
Python/context.o \
Python/cpuinfo.o \
Python/critical_section.o \
Python/crossinterp.o \
Python/dynamic_annotations.o \
Expand Down Expand Up @@ -1294,6 +1295,9 @@ PYTHON_HEADERS= \
$(srcdir)/Include/internal/pycore_complexobject.h \
$(srcdir)/Include/internal/pycore_condvar.h \
$(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 \
Expand Down
Loading
0