From 1973909fa679dfc4ed1ff62b552a5141764ae66b Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Fri, 6 Feb 2026 11:29:16 -0800 Subject: [PATCH 1/7] Clean up tail call CI --- .github/workflows/tail-call.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index a47e532d396bc0..aadb60c6ac9098 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -38,13 +38,13 @@ jobs: # Un-comment as we add support for more platforms for tail-calling interpreters. # - i686-pc-windows-msvc/msvc - x86_64-pc-windows-msvc/msvc - - free-threading-msvc + - x86_64-pc-windows-msvc/msvc-free-threading # - aarch64-pc-windows-msvc/msvc - x86_64-apple-darwin/clang - aarch64-apple-darwin/clang - x86_64-unknown-linux-gnu/gcc + - x86_64-unknown-linux-gnu/gcc-free-threading - aarch64-unknown-linux-gnu/gcc - - free-threading llvm: - 20 include: @@ -54,9 +54,10 @@ jobs: - target: x86_64-pc-windows-msvc/msvc architecture: x64 runner: windows-2025-vs2026 - - target: free-threading-msvc + - target: x86_64-pc-windows-msvc/msvc-free-threading architecture: x64 runner: windows-2025-vs2026 + free_threading: true # - target: aarch64-pc-windows-msvc/msvc # architecture: ARM64 # runner: windows-2022 @@ -69,12 +70,13 @@ jobs: - target: x86_64-unknown-linux-gnu/gcc architecture: x86_64 runner: ubuntu-24.04 + - target: x86_64-unknown-linux-gnu/gcc-free-threading + architecture: x86_64 + runner: ubuntu-24.04 + free_threading: true - target: aarch64-unknown-linux-gnu/gcc architecture: aarch64 runner: ubuntu-24.04-arm - - target: free-threading - architecture: x86_64 - runner: ubuntu-24.04 steps: - uses: actions/checkout@v6 with: @@ -84,7 +86,7 @@ jobs: python-version: '3.11' - name: Native Windows MSVC (release) - if: runner.os == 'Windows' && matrix.architecture != 'ARM64' && matrix.target != 'free-threading-msvc' + if: runner.os == 'Windows' && matrix.architecture != 'ARM64' && !matrix.free_threading shell: pwsh run: | $env:PlatformToolset = "v145" @@ -93,7 +95,7 @@ jobs: # No tests: - name: Native Windows MSVC with free-threading (release) - if: matrix.target == 'free-threading-msvc' + if: runner.os == 'Windows' && matrix.free_threading shell: pwsh run: | $env:PlatformToolset = "v145" @@ -123,7 +125,7 @@ jobs: ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - name: Native Linux (debug) - if: runner.os == 'Linux' && matrix.target != 'free-threading' + if: runner.os == 'Linux' && !matrix.free_threading run: | sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH" @@ -132,7 +134,7 @@ jobs: ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - name: Native Linux with free-threading (release) - if: matrix.target == 'free-threading' + if: runner.os == 'Linux' && matrix.free_threading run: | sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH" From c81873c5ee9cf6f77977d7c02cf3b1a4be9d1583 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 6 Feb 2026 22:54:47 +0200 Subject: [PATCH 2/7] Use matrix.llvm variable for clang-X version --- .github/workflows/tail-call.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index aadb60c6ac9098..5b8d58085e7065 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -120,7 +120,7 @@ jobs: export SDKROOT="$(xcrun --show-sdk-path)" export PATH="/usr/local/opt/llvm@${{ matrix.llvm }}/bin:$PATH" export PATH="/opt/homebrew/opt/llvm@${{ matrix.llvm }}/bin:$PATH" - CC=clang-20 ./configure --with-tail-call-interp + CC=clang-${{ matrix.llvm }} ./configure --with-tail-call-interp make all --jobs 4 ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 @@ -129,7 +129,7 @@ jobs: run: | sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH" - CC=clang-20 ./configure --with-tail-call-interp --with-pydebug + CC=clang-${{ matrix.llvm }} ./configure --with-tail-call-interp --with-pydebug make all --jobs 4 ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 @@ -138,6 +138,6 @@ jobs: run: | sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH" - CC=clang-20 ./configure --with-tail-call-interp --disable-gil + CC=clang-${{ matrix.llvm }} ./configure --with-tail-call-interp --disable-gil make all --jobs 4 ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 From 0be481bfbe22500a86194778ac7817aa08429e85 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 6 Feb 2026 22:56:38 +0200 Subject: [PATCH 3/7] Combine Linux steps into one --- .github/workflows/tail-call.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index 5b8d58085e7065..adb213205fd0c3 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -70,13 +70,16 @@ jobs: - target: x86_64-unknown-linux-gnu/gcc architecture: x86_64 runner: ubuntu-24.04 + configure_flags: --with-pydebug - target: x86_64-unknown-linux-gnu/gcc-free-threading architecture: x86_64 runner: ubuntu-24.04 + configure_flags: --disable-gil free_threading: true - target: aarch64-unknown-linux-gnu/gcc architecture: aarch64 runner: ubuntu-24.04-arm + configure_flags: --with-pydebug steps: - uses: actions/checkout@v6 with: @@ -124,20 +127,11 @@ jobs: make all --jobs 4 ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - - name: Native Linux (debug) - if: runner.os == 'Linux' && !matrix.free_threading + - name: Native Linux + if: runner.os == 'Linux' run: | sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH" - CC=clang-${{ matrix.llvm }} ./configure --with-tail-call-interp --with-pydebug - make all --jobs 4 - ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - - - name: Native Linux with free-threading (release) - if: runner.os == 'Linux' && matrix.free_threading - run: | - sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} - export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH" - CC=clang-${{ matrix.llvm }} ./configure --with-tail-call-interp --disable-gil + CC=clang-${{ matrix.llvm }} ./configure --with-tail-call-interp ${{ matrix.configure_flags }} make all --jobs 4 ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 From b3af4fa64e11f36196cd9ed917b0d358c8aa3f01 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 6 Feb 2026 23:03:41 +0200 Subject: [PATCH 4/7] Remove unused free_threading flag for Linux --- .github/workflows/tail-call.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index adb213205fd0c3..48ec44fe161741 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -75,7 +75,6 @@ jobs: architecture: x86_64 runner: ubuntu-24.04 configure_flags: --disable-gil - free_threading: true - target: aarch64-unknown-linux-gnu/gcc architecture: aarch64 runner: ubuntu-24.04-arm From 37a355b4485dc3e189ca39eace2c1c5dc192f2a0 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sat, 7 Feb 2026 00:28:34 +0200 Subject: [PATCH 5/7] Combine Windows steps into one --- .github/workflows/tail-call.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index 48ec44fe161741..fee8530e7e3434 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -54,10 +54,13 @@ jobs: - target: x86_64-pc-windows-msvc/msvc architecture: x64 runner: windows-2025-vs2026 + build_flags: "" + run_tests: true - target: x86_64-pc-windows-msvc/msvc-free-threading architecture: x64 runner: windows-2025-vs2026 - free_threading: true + build_flags: --disable-gil + run_tests: false # - target: aarch64-pc-windows-msvc/msvc # architecture: ARM64 # runner: windows-2022 @@ -88,20 +91,14 @@ jobs: python-version: '3.11' - name: Native Windows MSVC (release) - if: runner.os == 'Windows' && matrix.architecture != 'ARM64' && !matrix.free_threading + if: runner.os == 'Windows' && matrix.architecture != 'ARM64' shell: pwsh run: | $env:PlatformToolset = "v145" - ./PCbuild/build.bat --tail-call-interp -c Release -p ${{ matrix.architecture }} - ./PCbuild/rt.bat -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - - # No tests: - - name: Native Windows MSVC with free-threading (release) - if: runner.os == 'Windows' && matrix.free_threading - shell: pwsh - run: | - $env:PlatformToolset = "v145" - ./PCbuild/build.bat --tail-call-interp --disable-gil -c Release -p ${{ matrix.architecture }} + ./PCbuild/build.bat --tail-call-interp ${{ matrix.build_flags }} -c Release -p ${{ matrix.architecture }} + if ("${{ matrix.run_tests }}" -eq "true") { + ./PCbuild/rt.bat -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3 + } # No tests (yet): - name: Emulated Windows Clang (release) From 9fc8d68630f0cfeb485457e6f9d2f5df5b42d32b Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Fri, 6 Feb 2026 14:53:43 -0800 Subject: [PATCH 6/7] Remove commented and unused jobs --- .github/workflows/tail-call.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index fee8530e7e3434..f22396652322a9 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -35,11 +35,8 @@ jobs: fail-fast: false matrix: target: -# Un-comment as we add support for more platforms for tail-calling interpreters. -# - i686-pc-windows-msvc/msvc - x86_64-pc-windows-msvc/msvc - x86_64-pc-windows-msvc/msvc-free-threading -# - aarch64-pc-windows-msvc/msvc - x86_64-apple-darwin/clang - aarch64-apple-darwin/clang - x86_64-unknown-linux-gnu/gcc @@ -48,9 +45,6 @@ jobs: llvm: - 20 include: -# - target: i686-pc-windows-msvc/msvc -# architecture: Win32 -# runner: windows-2022 - target: x86_64-pc-windows-msvc/msvc architecture: x64 runner: windows-2025-vs2026 @@ -61,9 +55,6 @@ jobs: runner: windows-2025-vs2026 build_flags: --disable-gil run_tests: false -# - target: aarch64-pc-windows-msvc/msvc -# architecture: ARM64 -# runner: windows-2022 - target: x86_64-apple-darwin/clang architecture: x86_64 runner: macos-15-intel @@ -100,17 +91,6 @@ jobs: ./PCbuild/rt.bat -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3 } - # No tests (yet): - - name: Emulated Windows Clang (release) - if: runner.os == 'Windows' && matrix.architecture == 'ARM64' - shell: pwsh - run: | - choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0 - $env:PlatformToolset = "clangcl" - $env:LLVMToolsVersion = "${{ matrix.llvm }}.1.0" - $env:LLVMInstallDir = "C:\Program Files\LLVM" - ./PCbuild/build.bat --tail-call-interp -p ${{ matrix.architecture }} - - name: Native macOS (release) if: runner.os == 'macOS' run: | From f78c2a7632f8adcf7b96d43a3acb190990bfa838 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Fri, 6 Feb 2026 14:56:20 -0800 Subject: [PATCH 7/7] Remove guard since all jobs are x86_64 windows --- .github/workflows/tail-call.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index f22396652322a9..5a96d532febe1c 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -82,7 +82,7 @@ jobs: python-version: '3.11' - name: Native Windows MSVC (release) - if: runner.os == 'Windows' && matrix.architecture != 'ARM64' + if: runner.os == 'Windows' shell: pwsh run: | $env:PlatformToolset = "v145"