reorganize files

Author: picnixz

Include/internal/pycore_cpuinfo_cpuid_features.h

@@ -1,6 +1,6 @@
 /**
  * @author Bénédikt Tran
- * @seealso @file Tools/cpuinfo/cpuid_features_gen.py
+ * @seealso @file Tools/cpuinfo/libcpuinfo/features/cpuid.py
  *
  * The enumeration describes masks to apply on CPUID output registers.
  *
@@ -37,9 +37,9 @@ extern "C" {
 
 /*[python input]
 import os, sys
-sys.path.insert(0, os.path.realpath(os.path.join(os.getcwd(), "Tools")))
-from cpuinfo.cpuid_features_gen import generate_cpuid_features_enum
-print(generate_cpuid_features_enum())
+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 */
@@ -92,6 +92,10 @@ print(generate_cpuid_features_enum())
 #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=d7df15fec9f3daa2]*/
+/*[python end generated code: output=e9112f064e2effec input=71ec6b4356052ec3]*/
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif // !Py_INTERNAL_CPUINFO_CPUID_FEATURES_H

Include/internal/pycore_cpuinfo_xsave_features.h

@@ -1,6 +1,6 @@
 /**
  * @author Bénédikt Tran
- * @seealso @file Tools/cpuinfo/xsave_features_gen.py
+ * @seealso @file Tools/cpuinfo/libcpuinfo/features/xsave.py
  *
  * XSAVE state components (XCR0 control register).
  *
@@ -22,9 +22,9 @@ extern "C" {
 
 /*[python input]
 import os, sys
-sys.path.insert(0, os.path.realpath(os.path.join(os.getcwd(), "Tools")))
-from cpuinfo.xsave_features_gen import generate_xsave_features_enum
-print(generate_xsave_features_enum())
+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 */
@@ -34,6 +34,10 @@ print(generate_xsave_features_enum())
 #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=6323151855b3c9f0]*/
+/*[python end generated code: output=ac059b802b4317cb input=0a1b0774d3271477]*/
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif // !Py_INTERNAL_CPUINFO_XSAVE_FEATURES_H

PCbuild/pythoncore.vcxproj.filters

@@ -601,13 +601,13 @@
       <Filter>Include\internal</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_cpuinfo.h">
-      <Filter>Include\cpython</Filter>
+      <Filter>Include\internal</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_cpuinfo_cpuid_features.h">
-      <Filter>Include\cpython</Filter>
+      <Filter>Include\internal</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_cpuinfo_xsave_features.h">
-      <Filter>Include\cpython</Filter>
+      <Filter>Include\internal</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_critical_section.h">
       <Filter>Include\internal</Filter>

Tools/cpuinfo/__init__.py renamed to Tools/cpuinfo/libcpuinfo/__init__.py

@@ -12,4 +12,9 @@
 A C enumeration is NOT generated as the largest member may not fit
 on an 'int', which is forbidden as ISO C restricts enumerator values
 to that range.
+
+.. note::
+
+   This package must not be used directly and should only be
+   invoked from an Argument Clinic "[python input]" directive.
 """

Tools/cpuinfo/libcpuinfo/features/__init__.py

@@ -23,12 +23,12 @@
 
 from __future__ import annotations
 
-__all__ = ["generate_cpuid_features_enum"]
+__all__ = ["make_cpuid_features_constants"]
 
 from typing import TYPE_CHECKING
 
-from . import _util as util
-from ._util import DOXYGEN_STYLE
+import libcpuinfo.util as util
+from libcpuinfo.util import DOXYGEN_STYLE
 
 if TYPE_CHECKING:
     from typing import Final
@@ -113,7 +113,7 @@ def get_constant_name(
 )
 
 
-def generate_cpuid_features_enum() -> str:
+def make_cpuid_features_constants() -> str:
     """Used by :file:`Include/internal/pycore_cpuinfo_cpuid_features.h`."""
     writer = util.CWriter()
     writer.comment("Constants for CPUID features", style=DOXYGEN_STYLE)

Tools/cpuinfo/cpuid_features_gen.py renamed to Tools/cpuinfo/libcpuinfo/features/cpuid.py

@@ -8,12 +8,12 @@
 
 from __future__ import annotations
 
-__all__ = ["generate_xsave_features_enum"]
+__all__ = ["make_xsave_features_constants"]
 
 from typing import TYPE_CHECKING
 
-from . import _util as util
-from ._util import DOXYGEN_STYLE
+import libcpuinfo.util as util
+from libcpuinfo.util import DOXYGEN_STYLE
 
 if TYPE_CHECKING:
     from typing import Final
@@ -39,7 +39,7 @@ def get_constant_name(feature: Feature) -> str:
 )
 
 
-def generate_xsave_features_enum() -> str:
+def make_xsave_features_constants() -> str:
     """Used by :file:`Include/internal/pycore_cpuinfo_xsave_features.h`."""
     writer = util.CWriter()
     writer.comment("Constants for XSAVE components", style=DOXYGEN_STYLE)