Fix windows

PCbuild/regen.targets

@@ -30,7 +30,7 @@
     <_KeywordOutputs Include="$(PySourcePath)Lib\keyword.py" />
     <!-- Taken from _Target._compute_digest in Tools\jit\_targets.py: -->
     <_JITSources Include="$(PySourcePath)Python\executor_cases.c.h;$(GeneratedPyConfigDir)pyconfig.h;$(PySourcePath)Tools\jit\**"/>
-    <_JITOutputs Include="$(GeneratedPyConfigDir)jit_stencils.h"/>
+    <_JITOutputs Include="$(GeneratedPyConfigDir)jit_stencils.h;$(PySourcePath)Tools\jit\stencils\**"/>
     <_CasesSources Include="$(PySourcePath)Python\bytecodes.c;$(PySourcePath)Python\optimizer_bytecodes.c;"/>
     <_CasesOutputs Include="$(PySourcePath)Python\generated_cases.c.h;$(PySourcePath)Include\opcode_ids.h;$(PySourcePath)Include\internal\pycore_uop_ids.h;$(PySourcePath)Python\opcode_targets.h;$(PySourcePath)Include\internal\pycore_opcode_metadata.h;$(PySourcePath)Include\internal\pycore_uop_metadata.h;$(PySourcePath)Python\optimizer_cases.c.h;$(PySourcePath)Lib\_opcode_metadata.py"/>
     <_SbomSources Include="$(PySourcePath)PCbuild\get_externals.bat" />

Tools/jit/_targets.py

@@ -7,6 +7,7 @@
 import os
 import pathlib
 import re
+import shutil
 import sys
 import tempfile
 import typing
@@ -44,18 +45,6 @@ class _Target(typing.Generic[_S, _R]):
     verbose: bool = False
     known_symbols: dict[str, int] = dataclasses.field(default_factory=dict)
 
-    def _compute_digest(self, out: pathlib.Path) -> str:
-        hasher = hashlib.sha256()
-        hasher.update(self.triple.encode())
-        hasher.update(self.debug.to_bytes())
-        # These dependencies are also reflected in _JITSources in regen.targets:
-        hasher.update(PYTHON_EXECUTOR_CASES_C_H.read_bytes())
-        hasher.update((out / "pyconfig.h").read_bytes())
-        for dirpath, _, filenames in sorted(os.walk(TOOLS_JIT)):
-            for filename in filenames:
-                hasher.update(pathlib.Path(dirpath, filename).read_bytes())
-        return hasher.hexdigest()
-
     async def _parse(self, path: pathlib.Path) -> _stencils.StencilGroup:
         group = _stencils.StencilGroup()
         args = ["--disassemble", "--reloc", f"{path}"]
@@ -177,41 +166,31 @@ async def _build_stencils(self) -> dict[str, _stencils.StencilGroup]:
         return stencil_groups
 
     def build(
-        self, out: pathlib.Path, *, comment: str = "", force: bool = False
+        self, out: pathlib.Path, *, force: bool = False
     ) -> None:
         """Build jit_stencils.h in the given directory."""
         if not self.stable:
             warning = f"JIT support for {self.triple} is still experimental!"
             request = "Please report any issues you encounter.".center(len(warning))
             outline = "=" * len(warning)
             print("\n".join(["", outline, warning, request, outline, ""]))
-        digest = f"// {self._compute_digest(out)}\n"
 
         target = self.triple
         darwin_index = target.find("-darwin")
         if darwin_index != -1:
             target = self.triple[: darwin_index + len("-darwin")]
 
-        jit_stencils = out / "Tools" / "jit" / "stencils" / f"{target}.h"
+        jit_stencils = CPYTHON / "Tools" / "jit" / "stencils" / f"{target}.h"
         print(f"Building {jit_stencils}...")
-        if (
-            not force
-            and jit_stencils.exists()
-            and jit_stencils.read_text().startswith(digest)
-        ):
-            return
         stencil_groups = asyncio.run(self._build_stencils())
-        jit_stencils_new = out / "Tools" / "jit" / "stencils" / f"{target}.h.new"
+        jit_stencils_new = CPYTHON / "Tools" / "jit" / "stencils" / f"{target}.h.new"
         try:
             with jit_stencils_new.open("w") as file:
-                file.write(digest)
-                if comment:
-                    file.write(f"// {comment}\n")
-                file.write("\n")
                 for line in _writer.dump(stencil_groups, self.known_symbols):
                     file.write(f"{line}\n")
             try:
                 jit_stencils_new.replace(jit_stencils)
+                shutil.copy(jit_stencils, out / "jit_stencils.h")
             except FileNotFoundError:
                 # another process probably already moved the file
                 if not jit_stencils.is_file():

Tools/jit/build.py

@@ -8,7 +8,6 @@
 import _targets
 
 if __name__ == "__main__":
-    comment = f"$ {shlex.join([pathlib.Path(sys.executable).name] + sys.argv)}"
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument(
         "target", type=_targets.get_target, help="a PEP 11 target triple to compile for"
@@ -25,4 +24,4 @@
     args = parser.parse_args()
     args.target.debug = args.debug
     args.target.verbose = args.verbose
-    args.target.build(pathlib.Path.cwd(), comment=comment, force=args.force)
+    args.target.build(pathlib.Path.cwd(), force=args.force)