Fix event loop binding error for _CORES in FAT builds

python · savannahostrowski · Apr 30, 2025 · Feb 20, 2024 · Sep 25, 2024 · Sep 25, 2024
commit 348f2b6d24186acb28aa8ab7bdc5098feac93a1e
diff --git a/.gitignore b/.gitignore
@@ -137,7 +137,7 @@ Tools/unicode/data/
 # hendrikmuhs/ccache-action@v1
 /.ccache
 /cross-build/
-/jit_stencils.h
+/jit_stencils*.h
 /platform
 /profile-clean-stamp
 /profile-run-stamp

diff --git a/Tools/jit/_llvm.py b/Tools/jit/_llvm.py
@@ -32,12 +32,19 @@ async def wrapper(
     return wrapper
 
 
-_CORES = asyncio.BoundedSemaphore(os.cpu_count() or 1)
+_CORES: asyncio.BoundedSemaphore | None = None
+
+
+def _get_cores() -> asyncio.BoundedSemaphore:
+    global _CORES
+    if _CORES is None:
+        _CORES = asyncio.BoundedSemaphore(os.cpu_count() or 1)
+    return _CORES
 
 
 async def _run(tool: str, args: typing.Iterable[str], echo: bool = False) -> str | None:
     command = [tool, *args]
-    async with _CORES:
+    async with _get_cores():
         if echo:
             print(shlex.join(command))
         try:

@@ -25,7 +25,6 @@
 CPYTHON = TOOLS.parent
 PYTHON_EXECUTOR_CASES_C_H = CPYTHON / "Python" / "executor_cases.c.h"
 TOOLS_JIT_TEMPLATE_C = TOOLS_JIT / "template.c"
-ASYNCIO_RUNNER = asyncio.Runner()
 
 _S = typing.TypeVar("_S", _schema.COFFSection, _schema.ELFSection, _schema.MachOSection)
 _R = typing.TypeVar(
@@ -45,7 +44,6 @@ class _Target(typing.Generic[_S, _R]):
     debug: bool = False
     verbose: bool = False
     known_symbols: dict[str, int] = dataclasses.field(default_factory=dict)
-    basename: str = ""
 
     def _compute_digest(self, out: pathlib.Path) -> str:
         hasher = hashlib.sha256()
@@ -201,7 +199,7 @@ def build(
             and jit_stencils.read_text().startswith(digest)
         ):
             return
-        stencil_groups = ASYNCIO_RUNNER.run(self._build_stencils())
+        stencil_groups = asyncio.run(self._build_stencils())
         jit_stencils_new = out / "jit_stencils.h.new"
         try:
             with jit_stencils_new.open("w") as file:
@@ -506,9 +504,7 @@ def get_target(host: str) -> _COFF | _ELF | _MachO:
     target: _COFF | _ELF | _MachO
     if re.fullmatch(r"aarch64-apple-darwin.*", host):
         condition = "defined(__aarch64__) && defined(__APPLE__)"
-        target = _MachO(
-            host, condition, alignment=8, prefix="_", basename="aarch64-apple-darwin"
-        )
+        target = _MachO(host, condition, alignment=8, prefix="_")
     elif re.fullmatch(r"aarch64-pc-windows-msvc", host):
         args = ["-fms-runtime-lib=dll", "-fplt"]
         condition = "defined(_M_ARM64)"
@@ -532,7 +528,7 @@ def get_target(host: str) -> _COFF | _ELF | _MachO:
         target = _COFF(host, condition, args=args, prefix="_")
     elif re.fullmatch(r"x86_64-apple-darwin.*", host):
         condition = "defined(__x86_64__) && defined(__APPLE__)"
-        target = _MachO(host, condition, prefix="_", basename="x86_64-apple-darwin")
+        target = _MachO(host, condition, prefix="_")
     elif re.fullmatch(r"x86_64-pc-windows-msvc", host):
         args = ["-fms-runtime-lib=dll"]
         condition = "defined(_M_X64)"

@@ -26,21 +26,14 @@
         "-v", "--verbose", action="store_true", help="echo commands as they are run"
     )
     args = parser.parse_args()
-    print(args.target)
 
     if len(args.target) == 1:
-        # Single triple specified, assume this is a normal build
-        target = args.target[0]
-        target.debug = args.debug
-        target.force = args.force
-        target.verbose = args.verbose
-        target.build(pathlib.Path.cwd(), comment=comment)
+        args.target.debug = args.debug
+        args.target.verbose = args.verbose
+        args.target.build(pathlib.Path.cwd(), comment=comment, force=args.force)
 
     else:
-        # Multiple triples specified, assume this is a macOS multi-architecture build
-        # - Generate multiple stencil headers
-        # - Generate a helper header that includes the stencils for the current
-        #   architecture.
+        # Build for multiple targets (e.g. universal2)
         for target in args.target:
             target.debug = args.debug
             target.force = args.force
@@ -49,6 +42,7 @@
                 pathlib.Path.cwd(),
                 comment=comment,
                 stencils_h=f"jit_stencils-{target.triple}.h",
+                force=args.force,
             )
 
         with open("jit_stencils.h", "w") as fp:
@@ -57,5 +51,5 @@
                 fp.write(f'#   include "jit_stencils-{target.triple}.h"\n')
 
             fp.write("#else\n")
-            fp.write('#  error "unexpected cpu type"\n')
+            fp.write('#  error "unexpected target"\n')
             fp.write("#endif\n")