move windows x86_64 builds to PGO

pydantic · Jul 3, 2023 · 383f497 · 383f497
1 parent 9003451
commit 383f497
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -360,11 +360,13 @@ jobs:
             container: messense/manylinux_2_24-cross:s390x
             interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
         exclude:
-          # Optimized PGO builds for manylinux follow a different matrix, maybe in future
-          # maturin-action can support this automatically
+          # Optimized PGO builds for x86_64 manylinux and windows follow a different matrix,
+          # maybe in future maturin-action can support this automatically
           - os: ubuntu
             target: x86_64
             manylinux: auto
+          - os: windows
+            target: x86_64
           # Windows on arm64 only supports Python 3.11+
           - os: windows
             target: aarch64
@@ -410,11 +412,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu]
-        platform: [linux]
+        os: [ubuntu, windows]
         target: [x86_64]
         manylinux: [auto]
-        interpreter: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8", "pypy3.9"]
+        interpreter: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy3.7", "pypy3.8", "pypy3.9"]
+        include:
+          - os: ubuntu
+            platform: linux
+          - os: windows
+            ls: dir
+          - interpreter: 3.12-dev
+            maturin-interpreter: "3.12"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
@@ -445,18 +453,25 @@ jobs:
           args: >
             --release
             --out pgo-wheel
-            --interpreter ${{ matrix.interpreter }}
+            --interpreter ${{ matrix.maturin-interpreter || matrix.interpreter }}
             -- -Cprofile-generate=${{ github.workspace }}/profdata
           rust-toolchain: stable
           docker-options: -e CI
 
+      - name: detect rust host
+        run: echo RUST_HOST=$(rustc -Vv | grep host | cut -d ' ' -f 2) >> "$GITHUB_ENV"
+        shell: bash
+
       - name: generate pgo data
         run: |
           pip install -U pip
           pip install -r tests/requirements.txt
           pip install pydantic-core --no-index --no-deps --find-links pgo-wheel --force-reinstall
           pytest tests/benchmarks
-          rustup run stable bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata'
+          rustup run stable bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/${{ env.RUST_HOST }}/bin/llvm-profdata >> "$GITHUB_ENV"'
+
+      - name: merge pgo data
+        run: ${{ env.LLVM_PROFDATA }} merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata
 
       - name: build pgo-optimized wheel
         uses: PyO3/maturin-action@v1
@@ -466,7 +481,7 @@ jobs:
           args: >
             --release
             --out dist
-            --interpreter ${{ matrix.interpreter }}
+            --interpreter ${{ matrix.maturin-interpreter || matrix.interpreter }}
             -- -Cprofile-use=${{ github.workspace }}/merged.profdata
           rust-toolchain: stable
           docker-options: -e CI