Separate clang from tailcall

Author: mdboom

bench_runner/flags.py

@@ -17,7 +17,7 @@ class Flag:
     Flag("tier2", "PYTHON_UOPS", "tier 2 interpreter", "T2"),
     Flag("jit", "JIT", "JIT", "JIT"),
     Flag("nogil", "NOGIL", "free threading", "NOGIL"),
-    Flag("clang", "CLANG", "build with latest clang and tailcall", "CLANG"),
+    Flag("tailcall", "TAILCALL", "tail-calling interpreter", "TAILCALL"),
 ]
 
 

bench_runner/scripts/workflow.py

@@ -135,18 +135,6 @@ def compile_unix(cpython: PathLike, flags: list[str], pgo: bool, pystats: bool)
     cfg = config.get_config_for_current_runner()
 
     env = os.environ.copy()
-    if "CLANG" in flags:
-        match util.get_simple_platform():
-            case "linux":
-                env["CC"] = util.safe_which("clang-19")
-                env["LLVM_AR"] = util.safe_which("llvm-ar-19")
-                env["LLVM_PROFDATA"] = util.safe_which("llvm-profdata-19")
-            case "macos":
-                llvm_prefix = util.get_brew_prefix("llvm")
-                env["PATH"] = f"{llvm_prefix}/bin:{env['PATH']}"
-                env["CC"] = f"{llvm_prefix}/bin/clang"
-                env["LDFLAGS"] = f"-L{llvm_prefix}/lib"
-                env["CFLAGS"] = f"-I{llvm_prefix}/include"
 
     if util.get_simple_platform() == "macos":
         openssl_prefix = util.get_brew_prefix("[email protected]")
@@ -200,24 +188,18 @@ def compile_windows(
     if "NOGIL" in flags:
         args.append("--disable-gil")
     if "CLANG" in flags:
-        args.extend(
-            [
-                "--tail-call-interp",
-                '"/p:PlatformToolset=clangcl"',
-                '"/p:LLVMInstallDir=C:\\Program Files\\LLVM"',
-                '"/p:LLVMToolsVersion=19.1.6"',
-            ]
-        )
+        args.append("--tail-call-interp")
+    if configure_flags := os.environ.get("PYTHON_CONFIGURE_FLAGS"):
+        args.extend(shlex.split(configure_flags))
 
-    with contextlib.chdir(cpython):
-        subprocess.check_call(
-            [
-                "powershell.exe",
-                Path("PCbuild") / "build.bat",
-                *args,
-            ],
-        )
-        shutil.copytree(get_windows_build_dir(force_32bit), "libs", dirs_exist_ok=True)
+    subprocess.check_call(
+        [
+            "powershell.exe",
+            Path("PCbuild") / "build.bat",
+            *args,
+        ],
+    )
+    shutil.copytree(get_windows_build_dir(force_32bit), "libs", dirs_exist_ok=True)
 
 
 def install_pyperformance(venv: PathLike) -> None:

bench_runner/templates/_weekly.src.yml

@@ -79,7 +79,7 @@ jobs:
       tier2: false
       jit: false
       nogil: false
-      clang: true
+      tailcall: true
     secrets: inherit
 
   pystats:

tests/test_gh.py

@@ -59,5 +59,5 @@ def get_args(args, **kwargs):
         "-f",
         "nogil=false",
         "-f",
-        "clang=false",
+        "tailcall=false",
     ]