Commitdf85ce5

committed

it *should* work now

1 parent820d140 commitdf85ce5Copy full SHA for df85ce5

File tree

+70

-4

lines changed

+70

-4

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1938,6 +1938,9 @@ Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydt`
`1938`	`1938`	`$(MULTIARCH_CPPFLAGS) \`
`1939`	`1939`	`-o $@ $(srcdir)/Python/sysmodule.c`
`1940`	`1940`
	`1941`	`+Python/cpuinfo.o: $(srcdir)/Python/cpuinfo.c Makefile`
	`1942`	`+$(CC) -c $(PY_CORE_CFLAGS) @CORE_CPUINFO_CFLAGS@ -o $@ $(srcdir)/Python/cpuinfo.c`
	`1943`	`+`
`1941`	`1944`	`$(IO_OBJS): $(IO_H)`
`1942`	`1945`
`1943`	`1946`	`.PHONY: regen-pegen-metaparser`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@`
`25`	`25`	`# undef HAS_XGETBV_SUPPORT`
`26`	`26`	`#endif`
`27`	`27`
`28`		`-#undef HAS_XGETBV_SUPPORT`
`29`		`-`
`30`	`28`	`// Below, we declare macros for guarding the detection of SSE, AVX/AVX2`
`31`	`29`	`// and AVX-512 instructions. If the compiler does not even recognize the`
`32`	`30`	`// corresponding flags or if we are not on an 64-bit platform we do not`
`@@ -162,6 +160,18 @@ get_xgetbv(uint32_t index)`
`162`	`160`	`{`
`163`	`161`	`assert(index==0);// only XCR0 is supported for now`
`164`	`162`	`# if defined(HAS_CPUID_SUPPORT)&& defined(__x86_64__)&& defined(__GNUC__)`
	`163`	`+# if defined(__clang__)`
	`164`	`+# if_Py__has_builtin(__builtin_ia32_xgetbv)`
	`165`	`+return (uint64_t)_xgetbv(index);`
	`166`	`+# else`
	`167`	`+/*`
	`168`	`+ * Without -mxsave support, directly using xgetbv() with raw opcode`
	`169`	`+ * may still fail on some platforms (e.g., AMD64 + FreeBSD + clang).`
	`170`	`+ * To be on the safe side, we assume that XGETBV is not supported.`
	`171`	`+ */`
	`172`	`+return0;`
	`173`	`+# endif`
	`174`	`+# else/* gcc & icc */`
`165`	`175`	`uint32_teax=0,edx=0;`
`166`	`176`	`__asm__volatile(`
`167`	`177`	`/* raw opcode for xgetbv for compatibility with older toolchains */`
`@@ -170,6 +180,7 @@ get_xgetbv(uint32_t index)`
`170`	`180`	`:"c" (index)`
`171`	`181`	`);`
`172`	`182`	`return ((uint64_t)edx <<32) \|eax;`
	`183`	`+# endif`
`173`	`184`	`# elif defined(HAS_CPUID_SUPPORT)&& defined(_M_X64)`
`174`	`185`	`return (uint64_t)_xgetbv(index);`
`175`	`186`	`# else`

Lines changed: 45 additions & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8003,7 +8003,7 @@ AC_DEFUN([PY_SIMD_DETECT], [`
`8003`	`8003`	`# we do not necessarily know which instruction sets will be used,`
`8004`	`8004`	`# we disable SIMD support on some older Android platforms.`
`8005`	`8005`	`#`
`8006`		`-# Seepy_cpuid_features in pycore_cpuinfo.h for how to order fields`
	`8006`	`+# See_Py_cpuid_features in pycore_cpuinfo.h for how to order fields`
`8007`	`8007`	`# and where to put blank lines to separate processor generations for`
`8008`	`8008`	`# AVX-512 instructions.`
`8009`	`8009`	`#`
`@@ -8058,6 +8058,14 @@ then`
`8058`	`8058`	`PY_SIMD_DETECT([AVX512_VP2INTERSECT],[-mavx512vp2intersect])`
`8059`	`8059`	`fi`
`8060`	`8060`
	`8061`	`+dnl Check that -mxsave can be used for cpuinfo.c as the latter`
	`8062`	`+dnl requires to be compiled with this option for xgetbv() support.`
	`8063`	`+AX_CHECK_COMPILE_FLAG([-mxsave],`
	`8064`	`+[AS_VAR_SET([CORE_CPUINFO_CFLAGS],[-mxsave])],`
	`8065`	`+[AS_VAR_SET([CORE_CPUINFO_CFLAGS],[])],`
	`8066`	`+[-Werror])`
	`8067`	`+AC_SUBST([CORE_CPUINFO_CFLAGS])`
	`8068`	`+`
`8061`	`8069`	`###############################################################################`
`8062`	`8070`	`# HACL* compilation and linking configuration (contact: @picnixz)`
`8063`	`8071`	`#`

Comments

(0)