python · diegorusso · Nov 27, 2024 · Nov 27, 2024 · Nov 27, 2024 · Nov 27, 2024
@@ -235,10 +235,19 @@ jobs:
  free-threading:
  - false
  - true
+ os:
+ - ubuntu-24.04
+ - ubuntu-24.04-aarch64
+ is-fork: # only used for the exclusion trick
+ - ${{github.repository_owner != 'python'}}
+ exclude:
+ - os: ubuntu-24.04-aarch64
+ is-fork: true
  uses: ./.github/workflows/reusable-ubuntu.yml
  with:
  config_hash: ${{needs.check_source.outputs.config_hash }}
  free-threading: ${{matrix.free-threading }}
+ os: ${{matrix.os }}
 
  build_ubuntu_ssltests:
  name: 'Ubuntu SSL tests with OpenSSL'

@@ -1,6 +1,9 @@
 name: JIT
 on:
  pull_request:
+ branches:
+ - 'main'
+ - '3.*'
  paths:
  - '**jit**'
  - 'Python/bytecodes.c'
@@ -9,6 +12,9 @@ on:
  - '!**/*.md'
  - '!**/*.ini'
  push:
+ branches:
+ - 'main'
+ - '3.*'
  paths:
  - '**jit**'
  - 'Python/bytecodes.c'
@@ -25,10 +31,13 @@ concurrency:
  group: ${{github.workflow }}-${{github.head_ref || github.run_id }}
  cancel-in-progress: true
 
+env:
+ llvm: 19
+
 jobs:
  interpreter:
  name: Interpreter (Debug)
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
  timeout-minutes: 90
  steps:
  - uses: actions/checkout@v4
@@ -39,129 +48,122 @@ jobs:
  - name: Test tier two interpreter
  run: |
  ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
- jit:
- name: ${{matrix.target }} (${{matrix.debug && 'Debug' || 'Release'}})
+
+ jit-windows:
+ name: Windows (${{matrix.arch }}, ${{matrix.debug && 'Debug' || 'Release'}})
  needs: interpreter
- runs-on: ${{matrix.runner }}
+ runs-on: windows-latest
  timeout-minutes: 90
  strategy:
  fail-fast: false
  matrix:
- target:
- - i686-pc-windows-msvc/msvc
- - x86_64-pc-windows-msvc/msvc
- - aarch64-pc-windows-msvc/msvc
- - x86_64-apple-darwin/clang
- - aarch64-apple-darwin/clang
- - x86_64-unknown-linux-gnu/gcc
- - aarch64-unknown-linux-gnu/gcc
+ arch:
+ - x64
+ - Win32
+ - ARM64
  debug:
  - true
  - false
- llvm:
- - 19
- include:
- - target: i686-pc-windows-msvc/msvc
- architecture: Win32
- runner: windows-latest
- - target: x86_64-pc-windows-msvc/msvc
- architecture: x64
- runner: windows-latest
- - target: aarch64-pc-windows-msvc/msvc
- architecture: ARM64
- runner: windows-latest
- - target: x86_64-apple-darwin/clang
- architecture: x86_64
- runner: macos-13
- - target: aarch64-apple-darwin/clang
- architecture: aarch64
- runner: macos-14
- - target: x86_64-unknown-linux-gnu/gcc
- architecture: x86_64
- runner: ubuntu-22.04
- - target: aarch64-unknown-linux-gnu/gcc
- architecture: aarch64
- runner: ubuntu-22.04
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-python@v5
  with:
  python-version: '3.11'
 
  - name: Native Windows
- if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
+ if: matrix.arch != 'ARM64'
  run: |
- choco install llvm --allow-downgrade --no-progress --version ${{matrix.llvm }}.1.0
- ./PCbuild/build.bat --experimental-jit ${{matrix.debug && '-d' || ''}} -p ${{matrix.architecture }}
- ./PCbuild/rt.bat ${{matrix.debug && '-d' || ''}} -p ${{matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
+ choco install llvm --allow-downgrade --no-progress --version ${{env.llvm }}.1.0
+ ./PCbuild/build.bat --experimental-jit ${{matrix.debug && '-d' || ''}} -p ${{matrix.arch }}
+ ./PCbuild/rt.bat ${{matrix.debug && '-d' || ''}} -p ${{matrix.arch }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
 
  # No tests (yet):
  - name: Emulated Windows
- if: runner.os == 'Windows' && matrix.architecture == 'ARM64'
+ if: matrix.arch == 'ARM64'
  run: |
- choco install llvm --allow-downgrade --no-progress --version ${{matrix.llvm }}.1.0
- ./PCbuild/build.bat --experimental-jit ${{matrix.debug && '-d' || ''}} -p ${{matrix.architecture }}
+ choco install llvm --allow-downgrade --no-progress --version ${{env.llvm }}.1.0
+ ./PCbuild/build.bat --experimental-jit ${{matrix.debug && '-d' || ''}} -p ${{matrix.arch }}
 
+ jit-mac:
+ name: macOS (${{matrix.os == 'macos-14' && 'aarch64' || 'x86_64'}}, ${{matrix.debug && 'Debug' || 'Release'}})
+ needs: interpreter
+ runs-on: ${{matrix.os }}
+ timeout-minutes: 90
+ strategy:
+ fail-fast: false
+ matrix:
+ # macos-14 are M1, macos-13 are default GHA Intel.
+ os:
+ - macos-14
+ - macos-13
+ debug:
+ - true
+ - false
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
+ with:
+ python-version: '3.11'
  # 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
+ # 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.
- - name: Native macOS
- if: runner.os == 'macOS'
+ - name: ${{runner.os }} (${{runner.arch }})
  run: |
  brew update
  find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
- brew install llvm@${{matrix.llvm }}
+ brew install llvm@${{env.llvm }}
  export SDKROOT="$(xcrun --show-sdk-path)"
  ./configure --enable-experimental-jit ${{matrix.debug && '--with-pydebug' || ''}}
  make all --jobs 4
  ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
 
- - name: Native Linux
- if: runner.os == 'Linux' && matrix.architecture == 'x86_64'
+ jit-ubuntu:
+ name: Ubuntu (${{matrix.os == 'ubuntu-24.04-aarch64' && 'aarch64' || 'x86_64'}}, ${{matrix.debug && 'Debug' || 'Release'}})
+ needs: interpreter
+ runs-on: ${{matrix.os }}
+ timeout-minutes: 90
+ strategy:
+ fail-fast: false
+ matrix:
+ os:
+ - ubuntu-24.04
+ - ubuntu-24.04-aarch64
+ debug:
+ - true
+ - false
+ is-fork: # only used for the exclusion trick
+ - ${{github.repository_owner != 'python'}}
+ exclude:
+ - os: ubuntu-24.04-aarch64
+ is-fork: true
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
+ with:
+ python-version: '3.11'
+
+ - name: ${{runner.os }} (${{runner.arch }})
  run: |
- sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{matrix.llvm }}
- export PATH="$(llvm-config-${{matrix.llvm }} --bindir):$PATH"
+ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{env.llvm }}
+ export PATH="$(llvm-config-${{env.llvm }} --bindir):$PATH"
  ./configure --enable-experimental-jit ${{matrix.debug && '--with-pydebug' || ''}}
  make all --jobs 4
  ./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
 
- - name: Emulated Linux
- if: runner.os == 'Linux' && matrix.architecture != 'x86_64'
- # The --ignorefile on ./python -m test is used to exclude tests known to fail when running on an emulated 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"
- ./configure --prefix="$(pwd)/../build"
- make install --jobs 4
- make clean --jobs 4
- export HOST=${{matrix.architecture }}-linux-gnu
- sudo apt install --yes "gcc-$HOST" qemu-user
- export QEMU_LD_PREFIX="/usr/$HOST"
- CC="$HOST-gcc" \
- CPP="$HOST-gcc --preprocess" \
- HOSTRUNNER=qemu-${{matrix.architecture }} \
- ./configure --enable-experimental-jit ${{matrix.debug && '--with-pydebug' || ''}} --build=x86_64-linux-gnu --host="$HOST" --with-build-python=../build/bin/python3 --with-pkg-config=no ac_cv_buggy_getaddrinfo=no ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes
- make all --jobs 4
- ./python -m test --ignorefile=Tools/jit/ignore-tests-emulated-linux.txt --multiprocess 0 --timeout 4500 --verbose2 --verbose3
-
  jit-with-disabled-gil:
  name: Free-Threaded (Debug)
  needs: interpreter
- runs-on: ubuntu-22.04
- strategy:
- matrix:
- llvm:
- - 19
+ runs-on: ubuntu-24.04
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-python@v5
  with:
  python-version: '3.11'
  - name: Build with JIT enabled and GIL disabled
  run: |
- sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{matrix.llvm }}
- export PATH="$(llvm-config-${{matrix.llvm }} --bindir):$PATH"
+ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{env.llvm }}
+ export PATH="$(llvm-config-${{env.llvm }} --bindir):$PATH"
  ./configure --enable-experimental-jit --with-pydebug --disable-gil
  make all --jobs 4
  - name: Run tests

@@ -11,16 +11,16 @@ on:
  required: false
  type: boolean
  default: false
+ os:
+ description: OS to run the job
+ required: true
+ type: string
 
 jobs:
  build_ubuntu_reusable:
- name: 'build and test'
+ name: build and test (${{inputs.os }})
  timeout-minutes: 60
- runs-on: ${{matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-24.04, ubuntu-24.04-aarch64]
+ runs-on: ${{inputs.os }}
  env:
  FORCE_COLOR: 1
  OPENSSL_VER: 3.0.15
@@ -42,7 +42,7 @@ jobs:
  uses: actions/cache@v4
  with:
  path: ./multissl/openssl/${{env.OPENSSL_VER }}
- key: ${{matrix.os }}-multissl-openssl-${{env.OPENSSL_VER }}
+ key: ${{inputs.os }}-multissl-openssl-${{env.OPENSSL_VER }}
  - name: Install OpenSSL
  if: steps.cache-openssl.outputs.cache-hit != 'true'
  run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
@@ -84,7 +84,7 @@ jobs:
  working-directory: ${{env.CPYTHON_BUILDDIR }}
  run: make -j
  - name: Build CPython out-of-tree (for compiler warning check)
- if: ${{!inputs.free-threading}}
+ if: ${{!inputs.free-threading}}
  working-directory: ${{env.CPYTHON_BUILDDIR }}
  run: set -o pipefail; make -j --output-sync 2>&1 | tee compiler_output_ubuntu.txt
  - name: Display build info