Skip to content

gh-132132: Upgrade LLVM on tail calling CI #132098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 5, 2025
Merged

gh-132132: Upgrade LLVM on tail calling CI #132098

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
701aa8d
Fix double redeclaration on MSVC+clang-cl
Fidget-Spinner Apr 4, 2025
e449148
trigger CI
Fidget-Spinner Apr 4, 2025
5eea591
Upgrade to LLVM 20
Fidget-Spinner Apr 4, 2025
fcb45ef
Fix
Fidget-Spinner Apr 4, 2025
ce1a4ae
fix macos
Fidget-Spinner Apr 4, 2025
d2002cd
fix macOS
Fidget-Spinner Apr 4, 2025
c8afa07
fix macOS for real this time
Fidget-Spinner Apr 4, 2025
728eb68
maybe fix macOS?
Fidget-Spinner Apr 4, 2025
bc1d927
Convince clang to behave like on Linux
Fidget-Spinner Apr 4, 2025
a468604
remove useless extern
Fidget-Spinner Apr 4, 2025
07cafa9
Update remote_debugging.c
Fidget-Spinner Apr 4, 2025
bd00b78
Update remote_debugging.c
Fidget-Spinner Apr 4, 2025
04d34df
Update remote_debugging.c
Fidget-Spinner Apr 4, 2025
5de6b43
revert debug offset changes
Fidget-Spinner Apr 5, 2025
e786fd8
Merge remote-tracking branch 'upstream/main' into fix-double-redeclar…
Fidget-Spinner Apr 5, 2025
e4ff0e0
try eval brew shellenv
Fidget-Spinner Apr 5, 2025
b9c97f6
revert eval
Fidget-Spinner Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .github/workflows/tail-call.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- aarch64-unknown-linux-gnu/gcc
- free-threading
llvm:
- 19
- 20
include:
# - target: i686-pc-windows-msvc/msvc
# architecture: Win32
Expand Down Expand Up @@ -83,9 +83,9 @@ jobs:
if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
shell: cmd
run: |
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.5
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
set PlatformToolset=clangcl
set LLVMToolsVersion=${{ matrix.llvm }}.1.5
set LLVMToolsVersion=${{ matrix.llvm }}.1.0
set LLVMInstallDir=C:\Program Files\LLVM
call ./PCbuild/build.bat --tail-call-interp -d -p ${{ matrix.architecture }}
call ./PCbuild/rt.bat -d -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
Expand All @@ -95,26 +95,28 @@ jobs:
if: runner.os == 'Windows' && matrix.architecture == 'ARM64'
shell: cmd
run: |
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.5
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
set PlatformToolset=clangcl
set LLVMToolsVersion=${{ matrix.llvm }}.1.5
set LLVMToolsVersion=${{ matrix.llvm }}.1.0
set LLVMInstallDir=C:\Program Files\LLVM
./PCbuild/build.bat --tail-call-interp -p ${{ matrix.architecture }}

# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
# the symlink to the pre-installed Python so that the Homebrew Python is used instead.
# Note: when a new LLVM is released, the homebrew installation directory changes, so the builds will fail.
# We either need to upgrade LLVM or change the directory being pointed to.
- name: Native macOS (release)
if: runner.os == 'macOS'
run: |
brew update
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
brew install llvm@${{ matrix.llvm }}
export SDKROOT="$(xcrun --show-sdk-path)"
export PATH="/opt/homebrew/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
export PATH="/usr/local/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
CC=clang-19 ./configure --with-tail-call-interp
export PATH="/usr/local/opt/llvm/bin:$PATH"
export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
Comment on lines +117 to +118
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wonder whether
eval "$(brew shellenv)"
is just enough for both intel and arm mac

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point. Let me try that later.

CC=clang-20 ./configure --with-tail-call-interp
make all --jobs 4
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3

Expand All @@ -123,7 +125,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-19 ./configure --with-tail-call-interp --with-pydebug
CC=clang-20 ./configure --with-tail-call-interp --with-pydebug
make all --jobs 4
./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3

Expand All @@ -132,7 +134,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-19 ./configure --with-tail-call-interp --disable-gil
CC=clang-20 ./configure --with-tail-call-interp --disable-gil
make all --jobs 4
./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3

Loading