Skip to content

Commit a654701

Browse files
authored
Merge branch 'main' into tail-call-windows
2 parents 422c560 + f1cb96a commit a654701

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

PROVISIONING.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,16 @@ Install [git for Windows](https://git-scm.com/download/win).
8585
### Install Python
8686

8787
Install Python 3.9 or later from [python.org](https://python.org), and install for all users.
88+
89+
### Install Clang 19
90+
91+
For support for building with Clang and the tail-call interpreter, install
92+
the right version of the windows-msvc clang+llvm package from
93+
https://github.com/llvm/llvm-project/releases ([direct link to clang+llvm 19.1.6
94+
for x86_64](https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.6/clang+llvm-19.1.6-x86_64-pc-windows-msvc.tar.xz))
95+
and install it by copying its contents to `C:\Program Files\LLVM`, such that
96+
`C:\Program Files\LLVM\bin\clang-cl.exe` and `C:\Program
97+
Files\LLVM\lib\clang\19\` exist. (The version and installation
98+
directory are passed to `PCbuild\build.bat` in
99+
`bench_runner/templates/_benchmark.src.yml`, using `/p:LLVMInstallDir` and
100+
`/p:LLVMToolsVersion`.)

bench_runner/result.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,8 @@ def load_all_results(
901901
key=lambda x: (
902902
x.parsed_version,
903903
x.commit_datetime,
904+
tuple(x.flags),
905+
x.filename, # Just to produce a stable ordering
904906
),
905907
reverse=True,
906908
)

bench_runner/templates/_benchmark.src.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
- name: Running pyperformance
127127
if: ${{ steps.should_run.outputs.should_run != 'false' }}
128128
run: |
129-
venv\Scripts\python.exe -m bench_runner run_benchmarks benchmark cpython\$env:BUILD_DEST\python.exe ${{ inputs.fork }} ${{ inputs.ref }} ${{ inputs.benchmarks || 'all' }} "${{ env.flags }}" --run_id ${{ github.run_id }}
129+
venv\Scripts\python.exe -m bench_runner run_benchmarks benchmark ${{ (inputs.nogil == true && '(get-item cpython/$env:BUILD_DEST/python3.*.exe).FullName' || 'cpython/$env:BUILD_DEST/python.exe') }} ${{ inputs.fork }} ${{ inputs.ref }} ${{ inputs.benchmarks || 'all' }} "${{ env.flags }}" --run_id ${{ github.run_id }}
130130
# Pull again, since another job may have committed results in the meantime
131131
- name: Pull benchmarking
132132
if: ${{ steps.should_run.outputs.should_run != 'false' }}

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ test = [
3131
"black==25.1.0",
3232
"filelock==3.18.0",
3333
"flake8==7.1.2",
34-
"pyright==1.1.396",
34+
"pyright==1.1.397",
3535
"pytest==8.3.5",
3636
"pytest-xdist==3.6.1",
3737
]

0 commit comments

Comments
 (0)