From 0736fbf2d0796da5b5bf3e0c22cffdb021257e9d Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 00:44:43 +0100
Subject: [PATCH 01/16] wip

---
 .github/scripts/build-pgo.sh           | 14 ++++++++++++++
 .github/workflows/dist-build-setup.yml |  3 +++
 .github/workflows/release.yml          |  3 +++
 dist-workspace.toml                    |  1 +
 4 files changed, 21 insertions(+)
 create mode 100755 .github/scripts/build-pgo.sh
 create mode 100644 .github/workflows/dist-build-setup.yml

diff --git a/.github/scripts/build-pgo.sh b/.github/scripts/build-pgo.sh
new file mode 100755
index 000000000..57d584da2
--- /dev/null
+++ b/.github/scripts/build-pgo.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+cd "$(dirname "$0")/../.."
+
+cargo install cargo-pgo
+rustup component add llvm-tools-preview
+
+cargo pgo build -- --profile dist --features cli,asm,mimalloc
+find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol' -exec \
+    ./target/x86_64-unknown-linux-gnu/dist/solar {} +
+
+llvm-profdata merge -o target/pgo-profiles/merged.profdata target/pgo-profiles
+echo "RUSTFLAGS=-Cprofile-use=$PWD/target/pgo-profiles/merged.profdata" >> "$GITHUB_ENV"
diff --git a/.github/workflows/dist-build-setup.yml b/.github/workflows/dist-build-setup.yml
new file mode 100644
index 000000000..fe568b694
--- /dev/null
+++ b/.github/workflows/dist-build-setup.yml
@@ -0,0 +1,3 @@
+- name: Build with PGO
+  if: ${{ contains(matrix.targets, 'x86_64-unknown-linux') }}
+  run: .github/scripts/build-pgo.sh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efc9655aa..8121a8ac0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -130,6 +130,9 @@ jobs:
           fi
       - name: Use rustup to set correct Rust version
         run: rustup update "stable" --no-self-update && rustup default "stable"
+      - name: "Build with PGO"
+        if: "${{ contains(matrix.targets, 'x86_64-unknown-linux') }}"
+        run: ".github/scripts/build-pgo.sh"
       - name: Install dist
         run: ${{ matrix.install_dist.run }}
       # Get the dist-manifest
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 755b3e915..9f84e07f0 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -31,6 +31,7 @@ dispatch-releases = false
 github-release = "announce"
 # Whether to install an updater program
 install-updater = false
+github-build-setup = "dist-build-setup.yml"
 # Path that installers should place binaries in
 install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 # The preferred Rust toolchain to use in CI (rustup toolchain syntax)

From e6d79dab3f7f84c29840d776f8524dde878e7aa5 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 14:51:51 +0100
Subject: [PATCH 02/16] perf: add PGO optimization to release builds

Add PGO (Profile-Guided Optimization) to cargo-dist release workflow:
- .github/scripts/build-pgo.sh: Uses cargo-pgo to build instrumented
  binary, gather profiles from testdata/*.sol, and set RUSTFLAGS
- .github/workflows/dist-build-setup.yml: Runs PGO script before dist
- .github/workflows/test-pgo-bolt.yml: Test workflow that builds
  baseline/PGO/PGO+BOLT binaries and benchmarks with hyperfine

The test workflow also includes BOLT optimization which provides
additional ~1% speedup on top of PGO's ~7% improvement. BOLT is not
yet integrated into the release workflow as it requires post-build
processing that cargo-dist doesn't support via hooks.

Benchmark results (GitHub Actions runner):
- Small files: PGO+BOLT is 8% faster than baseline
- Large files: PGO+BOLT is 8% faster than baseline

Co-authored-by: Amp <amp@ampcode.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019bf7a1-0015-74f4-a5f6-c71ce48b4663
---
 .github/scripts/build-pgo.sh        |  65 +++++++++++++++--
 .github/workflows/test-pgo-bolt.yml | 104 ++++++++++++++++++++++++++++
 2 files changed, 164 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/test-pgo-bolt.yml

diff --git a/.github/scripts/build-pgo.sh b/.github/scripts/build-pgo.sh
index 57d584da2..a3889499f 100755
--- a/.github/scripts/build-pgo.sh
+++ b/.github/scripts/build-pgo.sh
@@ -1,14 +1,69 @@
 #!/usr/bin/env bash
+# PGO (Profile-Guided Optimization) build script for cargo-dist releases.
+#
+# This script gathers PGO profiles from representative workloads and sets
+# RUSTFLAGS so that cargo-dist's build uses the profiles.
 set -euo pipefail
 
 cd "$(dirname "$0")/../.."
 
+PROFILE=dist
+FEATURES=cli,asm,mimalloc
+
+# Install cargo-pgo and llvm-tools-preview.
 cargo install cargo-pgo
 rustup component add llvm-tools-preview
 
-cargo pgo build -- --profile dist --features cli,asm,mimalloc
-find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol' -exec \
-    ./target/x86_64-unknown-linux-gnu/dist/solar {} +
+# Get list of test files for profiling.
+readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
+echo "Profiling with ${#TESTDATA[@]} files: ${TESTDATA[*]}"
+
+# ============================================================================
+# Step 1: Build PGO-instrumented binary
+# ============================================================================
+echo "=== Building PGO-instrumented binary ==="
+cargo pgo build -- --profile "$PROFILE" --features "$FEATURES"
+
+# ============================================================================
+# Step 2: Gather PGO profiles
+# ============================================================================
+echo "=== Gathering PGO profiles ==="
+cargo pgo run -- --profile "$PROFILE" --features "$FEATURES" -- "${TESTDATA[@]}"
+
+# ============================================================================
+# Step 3: Merge profiles and set RUSTFLAGS for cargo-dist build
+# ============================================================================
+echo "=== Merging PGO profiles ==="
+
+# Find llvm-profdata from rustup's llvm-tools.
+LLVM_PROFDATA=$(find "$(rustc --print sysroot)" -name llvm-profdata -type f | head -1)
+if [[ -z "$LLVM_PROFDATA" ]]; then
+    echo "Error: llvm-profdata not found"
+    exit 1
+fi
+
+# Merge raw profiles into a single profdata file.
+PROFILE_DIR="$PWD/target/pgo-profiles"
+MERGED_PROFILE="$PROFILE_DIR/merged.profdata"
+"$LLVM_PROFDATA" merge -o "$MERGED_PROFILE" "$PROFILE_DIR"
+
+if [[ ! -f "$MERGED_PROFILE" ]]; then
+    echo "Error: Failed to create merged profile at $MERGED_PROFILE"
+    exit 1
+fi
+
+echo "=== Setting up RUSTFLAGS for PGO-optimized build ==="
+
+# Set RUSTFLAGS for the subsequent dist build.
+# -Cprofile-use: Use PGO profiles for optimization
+RUSTFLAGS="-Cprofile-use=${MERGED_PROFILE}"
+
+if [[ -n "${GITHUB_ENV:-}" ]]; then
+    echo "RUSTFLAGS=${RUSTFLAGS}" >> "$GITHUB_ENV"
+    echo "Exported RUSTFLAGS to GITHUB_ENV"
+else
+    echo "RUSTFLAGS=${RUSTFLAGS}"
+    export RUSTFLAGS
+fi
 
-llvm-profdata merge -o target/pgo-profiles/merged.profdata target/pgo-profiles
-echo "RUSTFLAGS=-Cprofile-use=$PWD/target/pgo-profiles/merged.profdata" >> "$GITHUB_ENV"
+echo "=== PGO build setup complete ==="
diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
new file mode 100644
index 000000000..b3c4eee37
--- /dev/null
+++ b/.github/workflows/test-pgo-bolt.yml
@@ -0,0 +1,104 @@
+name: Test PGO+BOLT
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test-pgo-bolt:
+    name: Test PGO+BOLT build
+    runs-on: ubuntu-22.04
+    env:
+      PROFILE: dist
+      FEATURES: cli,asm,mimalloc
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
+
+      - name: Install Rust
+        run: rustup update stable --no-self-update && rustup default stable
+
+      - name: Build baseline (no optimization)
+        run: |
+          cargo build --profile $PROFILE --features $FEATURES
+          cp target/$PROFILE/solar /tmp/solar-baseline
+          ls -lh /tmp/solar-baseline
+
+      - name: Clean for PGO build
+        run: cargo clean
+
+      - name: Run build-pgo.sh script
+        run: |
+          export GITHUB_ENV=$(mktemp)
+          .github/scripts/build-pgo.sh
+          cat "$GITHUB_ENV"
+
+      - name: Build with PGO (using RUSTFLAGS from script)
+        run: |
+          export RUSTFLAGS="-Cprofile-use=$PWD/target/pgo-profiles/merged.profdata"
+          cargo build --profile $PROFILE --features $FEATURES
+          cp target/$PROFILE/solar /tmp/solar-pgo
+          ls -lh /tmp/solar-pgo
+
+      - name: Install BOLT
+        run: |
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc > /dev/null
+          echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null
+          sudo apt-get update -qq
+          sudo apt-get install -y -qq bolt-21
+          sudo ln -sf /usr/bin/llvm-bolt-21 /usr/local/bin/llvm-bolt
+          sudo ln -sf /usr/bin/merge-fdata-21 /usr/local/bin/merge-fdata
+
+      - name: Build BOLT-instrumented binary (with PGO)
+        run: cargo pgo bolt build --with-pgo -- --profile $PROFILE --features $FEATURES
+
+      - name: Gather BOLT profiles
+        run: |
+          readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
+          # cargo-pgo bolt build outputs instrumented binary to target/<triple>/<profile>/solar-bolt-instrumented
+          BOLT_BIN="target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-instrumented"
+          "$BOLT_BIN" "${TESTDATA[@]}" || true
+
+      - name: Build BOLT-optimized binary
+        run: |
+          cargo pgo bolt optimize --with-pgo -- --profile $PROFILE --features $FEATURES
+          # cargo-pgo outputs to target/<triple>/<profile>/solar-bolt-optimized
+          cp target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-optimized /tmp/solar-pgo-bolt
+          ls -lh /tmp/solar-pgo-bolt
+
+      - name: Verify binaries work
+        run: |
+          /tmp/solar-baseline --version && /tmp/solar-baseline testdata/Counter.sol
+          /tmp/solar-pgo --version && /tmp/solar-pgo testdata/Counter.sol
+          /tmp/solar-pgo-bolt --version && /tmp/solar-pgo-bolt testdata/Counter.sol
+
+      - name: Install hyperfine
+        run: |
+          wget -qO- https://github.com/sharkdp/hyperfine/releases/download/v1.19.0/hyperfine-v1.19.0-x86_64-unknown-linux-gnu.tar.gz | tar xz
+          sudo mv hyperfine-v1.19.0-x86_64-unknown-linux-gnu/hyperfine /usr/local/bin/
+
+      - name: Benchmark comparison
+        run: |
+          hyperfine --warmup 3 --min-runs 20 \
+            '/tmp/solar-baseline testdata/Counter.sol testdata/Vm.sol testdata/console.sol' \
+            '/tmp/solar-pgo testdata/Counter.sol testdata/Vm.sol testdata/console.sol' \
+            '/tmp/solar-pgo-bolt testdata/Counter.sol testdata/Vm.sol testdata/console.sol' \
+            --export-markdown /tmp/bench-small.md
+          cat /tmp/bench-small.md
+          
+          hyperfine --warmup 2 --min-runs 10 \
+            '/tmp/solar-baseline testdata/Solady.sol testdata/Seaport.sol' \
+            '/tmp/solar-pgo testdata/Solady.sol testdata/Seaport.sol' \
+            '/tmp/solar-pgo-bolt testdata/Solady.sol testdata/Seaport.sol' \
+            --export-markdown /tmp/bench-large.md
+          cat /tmp/bench-large.md
+
+      - name: Upload benchmark results
+        uses: actions/upload-artifact@v4
+        with:
+          name: benchmark-results
+          path: /tmp/bench-*.md

From 0d94e39e0d199777d36eb290fd8b3bdaaada26d0 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:20:42 +0100
Subject: [PATCH 03/16] fix: use literal 'dist' profile path in BOLT steps

Amp-Thread-ID: https://ampcode.com/threads/T-019bfaad-39e4-7636-a853-0c3e7b08d2c9
Co-authored-by: Amp <amp@ampcode.com>
---
 .github/workflows/test-pgo-bolt.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
index b3c4eee37..d6da266c2 100644
--- a/.github/workflows/test-pgo-bolt.yml
+++ b/.github/workflows/test-pgo-bolt.yml
@@ -60,14 +60,16 @@ jobs:
         run: |
           readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
           # cargo-pgo bolt build outputs instrumented binary to target/<triple>/<profile>/solar-bolt-instrumented
-          BOLT_BIN="target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-instrumented"
+          ls -la target/x86_64-unknown-linux-gnu/dist/
+          BOLT_BIN="target/x86_64-unknown-linux-gnu/dist/solar-bolt-instrumented"
           "$BOLT_BIN" "${TESTDATA[@]}" || true
 
       - name: Build BOLT-optimized binary
         run: |
           cargo pgo bolt optimize --with-pgo -- --profile $PROFILE --features $FEATURES
           # cargo-pgo outputs to target/<triple>/<profile>/solar-bolt-optimized
-          cp target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-optimized /tmp/solar-pgo-bolt
+          ls -la target/x86_64-unknown-linux-gnu/dist/
+          cp target/x86_64-unknown-linux-gnu/dist/solar-bolt-optimized /tmp/solar-pgo-bolt
           ls -lh /tmp/solar-pgo-bolt
 
       - name: Verify binaries work

From 72c9906a87091fe4f3771051dddfd23ec1b003cf Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:27:15 +0100
Subject: [PATCH 04/16] refactor: move BOLT into apply-bolt.sh script, simplify
 test workflow

Amp-Thread-ID: https://ampcode.com/threads/T-019bfaad-39e4-7636-a853-0c3e7b08d2c9
Co-authored-by: Amp <amp@ampcode.com>
---
 .github/scripts/apply-bolt.sh       | 110 ++++++++++++++++++++++++++++
 .github/workflows/test-pgo-bolt.yml |  95 +++---------------------
 2 files changed, 122 insertions(+), 83 deletions(-)
 create mode 100755 .github/scripts/apply-bolt.sh

diff --git a/.github/scripts/apply-bolt.sh b/.github/scripts/apply-bolt.sh
new file mode 100755
index 000000000..1a493f5aa
--- /dev/null
+++ b/.github/scripts/apply-bolt.sh
@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+# BOLT (Binary Optimization and Layout Tool) post-processing script.
+#
+# This script applies BOLT optimization to a PGO-optimized binary.
+# It instruments the binary, gathers profiles, and applies BOLT optimizations.
+#
+# Usage: ./apply-bolt.sh <binary-path>
+set -euo pipefail
+
+if [[ $# -lt 1 ]]; then
+    echo "Usage: $0 <binary-path>"
+    exit 1
+fi
+
+BINARY="$1"
+if [[ ! -f "$BINARY" ]]; then
+    echo "Error: Binary not found: $BINARY"
+    exit 1
+fi
+
+cd "$(dirname "$0")/../.."
+
+# Get LLVM version from rustc to install matching BOLT.
+LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
+echo "Detected LLVM version: $LLVM_VERSION"
+
+# Install BOLT from apt.llvm.org.
+install_bolt() {
+    echo "=== Installing BOLT (LLVM $LLVM_VERSION) ==="
+    
+    if command -v llvm-bolt &>/dev/null; then
+        echo "llvm-bolt already installed"
+        return
+    fi
+    
+    # Add LLVM apt repository.
+    wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc >/dev/null
+    
+    # Detect Ubuntu codename.
+    CODENAME=$(lsb_release -cs)
+    echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-$LLVM_VERSION main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null
+    
+    sudo apt-get update -qq
+    sudo apt-get install -y -qq "bolt-$LLVM_VERSION"
+    
+    # Symlink to standard names.
+    sudo ln -sf "/usr/bin/llvm-bolt-$LLVM_VERSION" /usr/local/bin/llvm-bolt
+    sudo ln -sf "/usr/bin/merge-fdata-$LLVM_VERSION" /usr/local/bin/merge-fdata
+}
+
+install_bolt
+
+# Get test files for profiling.
+readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
+echo "Profiling with ${#TESTDATA[@]} files"
+
+# Paths for BOLT workflow.
+INSTRUMENTED="${BINARY}.inst"
+PROFILE_DIR="$PWD/target/bolt-profiles"
+MERGED_PROFILE="$PROFILE_DIR/merged.fdata"
+OPTIMIZED="${BINARY}.bolt"
+
+mkdir -p "$PROFILE_DIR"
+
+# ============================================================================
+# Step 1: Instrument binary with BOLT
+# ============================================================================
+echo "=== Instrumenting binary with BOLT ==="
+llvm-bolt "$BINARY" \
+    -instrument \
+    -instrumentation-file-append-pid \
+    -instrumentation-file="$PROFILE_DIR/prof" \
+    -o "$INSTRUMENTED"
+
+# ============================================================================
+# Step 2: Gather BOLT profiles
+# ============================================================================
+echo "=== Gathering BOLT profiles ==="
+"$INSTRUMENTED" "${TESTDATA[@]}" || true
+
+# ============================================================================
+# Step 3: Merge profiles
+# ============================================================================
+echo "=== Merging BOLT profiles ==="
+PROFILE_FILES=("$PROFILE_DIR"/prof.*.fdata)
+if [[ ${#PROFILE_FILES[@]} -eq 0 ]]; then
+    echo "Warning: No BOLT profiles generated, skipping optimization"
+    exit 0
+fi
+
+merge-fdata "$PROFILE_DIR"/prof.*.fdata > "$MERGED_PROFILE"
+
+# ============================================================================
+# Step 4: Apply BOLT optimization
+# ============================================================================
+echo "=== Applying BOLT optimization ==="
+llvm-bolt "$BINARY" \
+    -o "$OPTIMIZED" \
+    -data="$MERGED_PROFILE" \
+    -reorder-blocks=ext-tsp \
+    -reorder-functions=hfsort \
+    -split-functions \
+    -split-all-cold \
+    -split-eh \
+    -dyno-stats
+
+# Replace original binary with optimized version.
+mv "$OPTIMIZED" "$BINARY"
+echo "=== BOLT optimization complete ==="
+ls -lh "$BINARY"
diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
index d6da266c2..0d4213dfb 100644
--- a/.github/workflows/test-pgo-bolt.yml
+++ b/.github/workflows/test-pgo-bolt.yml
@@ -1,18 +1,13 @@
 name: Test PGO+BOLT
 
 on:
-  push:
-    branches: [main]
   pull_request:
   workflow_dispatch:
 
 jobs:
   test-pgo-bolt:
-    name: Test PGO+BOLT build
-    runs-on: ubuntu-22.04
-    env:
-      PROFILE: dist
-      FEATURES: cli,asm,mimalloc
+    name: Test PGO+BOLT scripts
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -22,85 +17,19 @@ jobs:
       - name: Install Rust
         run: rustup update stable --no-self-update && rustup default stable
 
-      - name: Build baseline (no optimization)
-        run: |
-          cargo build --profile $PROFILE --features $FEATURES
-          cp target/$PROFILE/solar /tmp/solar-baseline
-          ls -lh /tmp/solar-baseline
-
-      - name: Clean for PGO build
-        run: cargo clean
-
-      - name: Run build-pgo.sh script
-        run: |
-          export GITHUB_ENV=$(mktemp)
-          .github/scripts/build-pgo.sh
-          cat "$GITHUB_ENV"
+      - name: Run build-pgo.sh
+        run: .github/scripts/build-pgo.sh
 
-      - name: Build with PGO (using RUSTFLAGS from script)
+      - name: Build with PGO
         run: |
           export RUSTFLAGS="-Cprofile-use=$PWD/target/pgo-profiles/merged.profdata"
-          cargo build --profile $PROFILE --features $FEATURES
-          cp target/$PROFILE/solar /tmp/solar-pgo
-          ls -lh /tmp/solar-pgo
-
-      - name: Install BOLT
-        run: |
-          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc > /dev/null
-          echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null
-          sudo apt-get update -qq
-          sudo apt-get install -y -qq bolt-21
-          sudo ln -sf /usr/bin/llvm-bolt-21 /usr/local/bin/llvm-bolt
-          sudo ln -sf /usr/bin/merge-fdata-21 /usr/local/bin/merge-fdata
-
-      - name: Build BOLT-instrumented binary (with PGO)
-        run: cargo pgo bolt build --with-pgo -- --profile $PROFILE --features $FEATURES
-
-      - name: Gather BOLT profiles
-        run: |
-          readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
-          # cargo-pgo bolt build outputs instrumented binary to target/<triple>/<profile>/solar-bolt-instrumented
-          ls -la target/x86_64-unknown-linux-gnu/dist/
-          BOLT_BIN="target/x86_64-unknown-linux-gnu/dist/solar-bolt-instrumented"
-          "$BOLT_BIN" "${TESTDATA[@]}" || true
-
-      - name: Build BOLT-optimized binary
-        run: |
-          cargo pgo bolt optimize --with-pgo -- --profile $PROFILE --features $FEATURES
-          # cargo-pgo outputs to target/<triple>/<profile>/solar-bolt-optimized
-          ls -la target/x86_64-unknown-linux-gnu/dist/
-          cp target/x86_64-unknown-linux-gnu/dist/solar-bolt-optimized /tmp/solar-pgo-bolt
-          ls -lh /tmp/solar-pgo-bolt
-
-      - name: Verify binaries work
-        run: |
-          /tmp/solar-baseline --version && /tmp/solar-baseline testdata/Counter.sol
-          /tmp/solar-pgo --version && /tmp/solar-pgo testdata/Counter.sol
-          /tmp/solar-pgo-bolt --version && /tmp/solar-pgo-bolt testdata/Counter.sol
+          cargo build --profile dist --features cli,asm,mimalloc
+          ls -lh target/dist/solar
 
-      - name: Install hyperfine
-        run: |
-          wget -qO- https://github.com/sharkdp/hyperfine/releases/download/v1.19.0/hyperfine-v1.19.0-x86_64-unknown-linux-gnu.tar.gz | tar xz
-          sudo mv hyperfine-v1.19.0-x86_64-unknown-linux-gnu/hyperfine /usr/local/bin/
+      - name: Run apply-bolt.sh
+        run: .github/scripts/apply-bolt.sh target/dist/solar
 
-      - name: Benchmark comparison
+      - name: Verify binary works
         run: |
-          hyperfine --warmup 3 --min-runs 20 \
-            '/tmp/solar-baseline testdata/Counter.sol testdata/Vm.sol testdata/console.sol' \
-            '/tmp/solar-pgo testdata/Counter.sol testdata/Vm.sol testdata/console.sol' \
-            '/tmp/solar-pgo-bolt testdata/Counter.sol testdata/Vm.sol testdata/console.sol' \
-            --export-markdown /tmp/bench-small.md
-          cat /tmp/bench-small.md
-          
-          hyperfine --warmup 2 --min-runs 10 \
-            '/tmp/solar-baseline testdata/Solady.sol testdata/Seaport.sol' \
-            '/tmp/solar-pgo testdata/Solady.sol testdata/Seaport.sol' \
-            '/tmp/solar-pgo-bolt testdata/Solady.sol testdata/Seaport.sol' \
-            --export-markdown /tmp/bench-large.md
-          cat /tmp/bench-large.md
-
-      - name: Upload benchmark results
-        uses: actions/upload-artifact@v4
-        with:
-          name: benchmark-results
-          path: /tmp/bench-*.md
+          target/dist/solar --version
+          target/dist/solar testdata/Counter.sol

From 548f8d88dcee46720ed3b7d48e94d1168880ecad Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:28:01 +0100
Subject: [PATCH 05/16] refactor: use cargo-pgo for BOLT instead of calling
 llvm-bolt manually

Amp-Thread-ID: https://ampcode.com/threads/T-019bfaad-39e4-7636-a853-0c3e7b08d2c9
Co-authored-by: Amp <amp@ampcode.com>
---
 .github/scripts/apply-bolt.sh       | 82 +++++++----------------------
 .github/workflows/test-pgo-bolt.yml |  8 +--
 2 files changed, 20 insertions(+), 70 deletions(-)

diff --git a/.github/scripts/apply-bolt.sh b/.github/scripts/apply-bolt.sh
index 1a493f5aa..8f4f404aa 100755
--- a/.github/scripts/apply-bolt.sh
+++ b/.github/scripts/apply-bolt.sh
@@ -1,25 +1,15 @@
 #!/usr/bin/env bash
-# BOLT (Binary Optimization and Layout Tool) post-processing script.
+# BOLT optimization script using cargo-pgo.
 #
-# This script applies BOLT optimization to a PGO-optimized binary.
-# It instruments the binary, gathers profiles, and applies BOLT optimizations.
-#
-# Usage: ./apply-bolt.sh <binary-path>
+# Assumes PGO profiles already exist (run build-pgo.sh first).
+# Uses cargo-pgo's BOLT integration for instrumentation and optimization.
 set -euo pipefail
 
-if [[ $# -lt 1 ]]; then
-    echo "Usage: $0 <binary-path>"
-    exit 1
-fi
-
-BINARY="$1"
-if [[ ! -f "$BINARY" ]]; then
-    echo "Error: Binary not found: $BINARY"
-    exit 1
-fi
-
 cd "$(dirname "$0")/../.."
 
+PROFILE=dist
+FEATURES=cli,asm,mimalloc
+
 # Get LLVM version from rustc to install matching BOLT.
 LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
 echo "Detected LLVM version: $LLVM_VERSION"
@@ -33,17 +23,11 @@ install_bolt() {
         return
     fi
     
-    # Add LLVM apt repository.
     wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc >/dev/null
-    
-    # Detect Ubuntu codename.
     CODENAME=$(lsb_release -cs)
     echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-$LLVM_VERSION main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null
-    
     sudo apt-get update -qq
     sudo apt-get install -y -qq "bolt-$LLVM_VERSION"
-    
-    # Symlink to standard names.
     sudo ln -sf "/usr/bin/llvm-bolt-$LLVM_VERSION" /usr/local/bin/llvm-bolt
     sudo ln -sf "/usr/bin/merge-fdata-$LLVM_VERSION" /usr/local/bin/merge-fdata
 }
@@ -54,57 +38,29 @@ install_bolt
 readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
 echo "Profiling with ${#TESTDATA[@]} files"
 
-# Paths for BOLT workflow.
-INSTRUMENTED="${BINARY}.inst"
-PROFILE_DIR="$PWD/target/bolt-profiles"
-MERGED_PROFILE="$PROFILE_DIR/merged.fdata"
-OPTIMIZED="${BINARY}.bolt"
-
-mkdir -p "$PROFILE_DIR"
-
 # ============================================================================
-# Step 1: Instrument binary with BOLT
+# Step 1: Build BOLT-instrumented binary (with PGO)
 # ============================================================================
-echo "=== Instrumenting binary with BOLT ==="
-llvm-bolt "$BINARY" \
-    -instrument \
-    -instrumentation-file-append-pid \
-    -instrumentation-file="$PROFILE_DIR/prof" \
-    -o "$INSTRUMENTED"
+echo "=== Building BOLT-instrumented binary ==="
+cargo pgo bolt build --with-pgo -- --profile "$PROFILE" --features "$FEATURES"
 
 # ============================================================================
 # Step 2: Gather BOLT profiles
 # ============================================================================
 echo "=== Gathering BOLT profiles ==="
+INSTRUMENTED="target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-instrumented"
 "$INSTRUMENTED" "${TESTDATA[@]}" || true
 
 # ============================================================================
-# Step 3: Merge profiles
+# Step 3: Build BOLT-optimized binary
 # ============================================================================
-echo "=== Merging BOLT profiles ==="
-PROFILE_FILES=("$PROFILE_DIR"/prof.*.fdata)
-if [[ ${#PROFILE_FILES[@]} -eq 0 ]]; then
-    echo "Warning: No BOLT profiles generated, skipping optimization"
-    exit 0
-fi
+echo "=== Building BOLT-optimized binary ==="
+cargo pgo bolt optimize --with-pgo -- --profile "$PROFILE" --features "$FEATURES"
 
-merge-fdata "$PROFILE_DIR"/prof.*.fdata > "$MERGED_PROFILE"
-
-# ============================================================================
-# Step 4: Apply BOLT optimization
-# ============================================================================
-echo "=== Applying BOLT optimization ==="
-llvm-bolt "$BINARY" \
-    -o "$OPTIMIZED" \
-    -data="$MERGED_PROFILE" \
-    -reorder-blocks=ext-tsp \
-    -reorder-functions=hfsort \
-    -split-functions \
-    -split-all-cold \
-    -split-eh \
-    -dyno-stats
-
-# Replace original binary with optimized version.
-mv "$OPTIMIZED" "$BINARY"
+OPTIMIZED="target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-optimized"
 echo "=== BOLT optimization complete ==="
-ls -lh "$BINARY"
+ls -lh "$OPTIMIZED"
+
+# Copy to standard location for cargo-dist.
+cp "$OPTIMIZED" "target/$PROFILE/solar"
+echo "Copied to target/$PROFILE/solar"
diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
index 0d4213dfb..d3bd6230a 100644
--- a/.github/workflows/test-pgo-bolt.yml
+++ b/.github/workflows/test-pgo-bolt.yml
@@ -20,14 +20,8 @@ jobs:
       - name: Run build-pgo.sh
         run: .github/scripts/build-pgo.sh
 
-      - name: Build with PGO
-        run: |
-          export RUSTFLAGS="-Cprofile-use=$PWD/target/pgo-profiles/merged.profdata"
-          cargo build --profile dist --features cli,asm,mimalloc
-          ls -lh target/dist/solar
-
       - name: Run apply-bolt.sh
-        run: .github/scripts/apply-bolt.sh target/dist/solar
+        run: .github/scripts/apply-bolt.sh
 
       - name: Verify binary works
         run: |

From 9c4043afc228e3e1764e7f070e5f6409c51cf230 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:34:20 +0100
Subject: [PATCH 06/16] mv

---
 .github/{workflows => scripts}/dist-build-setup.yml | 0
 dist-workspace.toml                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .github/{workflows => scripts}/dist-build-setup.yml (100%)

diff --git a/.github/workflows/dist-build-setup.yml b/.github/scripts/dist-build-setup.yml
similarity index 100%
rename from .github/workflows/dist-build-setup.yml
rename to .github/scripts/dist-build-setup.yml
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 9f84e07f0..235a238d5 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -31,7 +31,7 @@ dispatch-releases = false
 github-release = "announce"
 # Whether to install an updater program
 install-updater = false
-github-build-setup = "dist-build-setup.yml"
+github-build-setup = "../scripts/dist-build-setup.yml"
 # Path that installers should place binaries in
 install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 # The preferred Rust toolchain to use in CI (rustup toolchain syntax)

From b776ad9f677340bcbe8cee817ba21834ddb3721a Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:41:41 +0100
Subject: [PATCH 07/16] refactor: merge PGO+BOLT into single script following
 cargo-pgo docs

Amp-Thread-ID: https://ampcode.com/threads/T-019bfaad-39e4-7636-a853-0c3e7b08d2c9
Co-authored-by: Amp <amp@ampcode.com>
---
 .github/scripts/apply-bolt.sh       | 66 ---------------------------
 .github/scripts/build-pgo-bolt.sh   | 42 ++++++++++++++++++
 .github/scripts/build-pgo.sh        | 69 -----------------------------
 .github/workflows/test-pgo-bolt.yml | 11 ++---
 4 files changed, 46 insertions(+), 142 deletions(-)
 delete mode 100755 .github/scripts/apply-bolt.sh
 create mode 100755 .github/scripts/build-pgo-bolt.sh
 delete mode 100755 .github/scripts/build-pgo.sh

diff --git a/.github/scripts/apply-bolt.sh b/.github/scripts/apply-bolt.sh
deleted file mode 100755
index 8f4f404aa..000000000
--- a/.github/scripts/apply-bolt.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# BOLT optimization script using cargo-pgo.
-#
-# Assumes PGO profiles already exist (run build-pgo.sh first).
-# Uses cargo-pgo's BOLT integration for instrumentation and optimization.
-set -euo pipefail
-
-cd "$(dirname "$0")/../.."
-
-PROFILE=dist
-FEATURES=cli,asm,mimalloc
-
-# Get LLVM version from rustc to install matching BOLT.
-LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
-echo "Detected LLVM version: $LLVM_VERSION"
-
-# Install BOLT from apt.llvm.org.
-install_bolt() {
-    echo "=== Installing BOLT (LLVM $LLVM_VERSION) ==="
-    
-    if command -v llvm-bolt &>/dev/null; then
-        echo "llvm-bolt already installed"
-        return
-    fi
-    
-    wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc >/dev/null
-    CODENAME=$(lsb_release -cs)
-    echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-$LLVM_VERSION main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null
-    sudo apt-get update -qq
-    sudo apt-get install -y -qq "bolt-$LLVM_VERSION"
-    sudo ln -sf "/usr/bin/llvm-bolt-$LLVM_VERSION" /usr/local/bin/llvm-bolt
-    sudo ln -sf "/usr/bin/merge-fdata-$LLVM_VERSION" /usr/local/bin/merge-fdata
-}
-
-install_bolt
-
-# Get test files for profiling.
-readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
-echo "Profiling with ${#TESTDATA[@]} files"
-
-# ============================================================================
-# Step 1: Build BOLT-instrumented binary (with PGO)
-# ============================================================================
-echo "=== Building BOLT-instrumented binary ==="
-cargo pgo bolt build --with-pgo -- --profile "$PROFILE" --features "$FEATURES"
-
-# ============================================================================
-# Step 2: Gather BOLT profiles
-# ============================================================================
-echo "=== Gathering BOLT profiles ==="
-INSTRUMENTED="target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-instrumented"
-"$INSTRUMENTED" "${TESTDATA[@]}" || true
-
-# ============================================================================
-# Step 3: Build BOLT-optimized binary
-# ============================================================================
-echo "=== Building BOLT-optimized binary ==="
-cargo pgo bolt optimize --with-pgo -- --profile "$PROFILE" --features "$FEATURES"
-
-OPTIMIZED="target/x86_64-unknown-linux-gnu/$PROFILE/solar-bolt-optimized"
-echo "=== BOLT optimization complete ==="
-ls -lh "$OPTIMIZED"
-
-# Copy to standard location for cargo-dist.
-cp "$OPTIMIZED" "target/$PROFILE/solar"
-echo "Copied to target/$PROFILE/solar"
diff --git a/.github/scripts/build-pgo-bolt.sh b/.github/scripts/build-pgo-bolt.sh
new file mode 100755
index 000000000..ddfba123b
--- /dev/null
+++ b/.github/scripts/build-pgo-bolt.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+cd "$(dirname "$0")/../.."
+
+PROFILE="${PROFILE:-dist}"
+FEATURES="${FEATURES:-cli,asm,mimalloc}"
+CARGO_ARGS=(--profile "$PROFILE" --features "$FEATURES")
+
+TARGET=$(rustc -Vv | grep host | cut -d' ' -f2)
+LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
+
+install_bolt() {
+    if command -v llvm-bolt &>/dev/null; then
+        return
+    fi
+    wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc >/dev/null
+    CODENAME=$(lsb_release -cs)
+    echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-$LLVM_VERSION main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null
+    sudo apt-get update -qq
+    sudo apt-get install -y -qq "bolt-$LLVM_VERSION"
+    sudo ln -sf "/usr/bin/llvm-bolt-$LLVM_VERSION" /usr/local/bin/llvm-bolt
+    sudo ln -sf "/usr/bin/merge-fdata-$LLVM_VERSION" /usr/local/bin/merge-fdata
+}
+
+cargo install cargo-pgo
+rustup component add llvm-tools-preview
+install_bolt
+
+readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
+
+# PGO: build instrumented, run, gather profiles
+cargo pgo build -- "${CARGO_ARGS[@]}"
+"target/$TARGET/release/solar" "${TESTDATA[@]}"
+
+# BOLT: build instrumented with PGO, run, optimize
+cargo pgo bolt build --with-pgo -- "${CARGO_ARGS[@]}"
+"target/$TARGET/$PROFILE/solar-bolt-instrumented" "${TESTDATA[@]}" || true
+cargo pgo bolt optimize --with-pgo -- "${CARGO_ARGS[@]}"
+
+cp "target/$TARGET/$PROFILE/solar-bolt-optimized" "target/$PROFILE/solar"
+ls -lh "target/$PROFILE/solar"
diff --git a/.github/scripts/build-pgo.sh b/.github/scripts/build-pgo.sh
deleted file mode 100755
index a3889499f..000000000
--- a/.github/scripts/build-pgo.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-# PGO (Profile-Guided Optimization) build script for cargo-dist releases.
-#
-# This script gathers PGO profiles from representative workloads and sets
-# RUSTFLAGS so that cargo-dist's build uses the profiles.
-set -euo pipefail
-
-cd "$(dirname "$0")/../.."
-
-PROFILE=dist
-FEATURES=cli,asm,mimalloc
-
-# Install cargo-pgo and llvm-tools-preview.
-cargo install cargo-pgo
-rustup component add llvm-tools-preview
-
-# Get list of test files for profiling.
-readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
-echo "Profiling with ${#TESTDATA[@]} files: ${TESTDATA[*]}"
-
-# ============================================================================
-# Step 1: Build PGO-instrumented binary
-# ============================================================================
-echo "=== Building PGO-instrumented binary ==="
-cargo pgo build -- --profile "$PROFILE" --features "$FEATURES"
-
-# ============================================================================
-# Step 2: Gather PGO profiles
-# ============================================================================
-echo "=== Gathering PGO profiles ==="
-cargo pgo run -- --profile "$PROFILE" --features "$FEATURES" -- "${TESTDATA[@]}"
-
-# ============================================================================
-# Step 3: Merge profiles and set RUSTFLAGS for cargo-dist build
-# ============================================================================
-echo "=== Merging PGO profiles ==="
-
-# Find llvm-profdata from rustup's llvm-tools.
-LLVM_PROFDATA=$(find "$(rustc --print sysroot)" -name llvm-profdata -type f | head -1)
-if [[ -z "$LLVM_PROFDATA" ]]; then
-    echo "Error: llvm-profdata not found"
-    exit 1
-fi
-
-# Merge raw profiles into a single profdata file.
-PROFILE_DIR="$PWD/target/pgo-profiles"
-MERGED_PROFILE="$PROFILE_DIR/merged.profdata"
-"$LLVM_PROFDATA" merge -o "$MERGED_PROFILE" "$PROFILE_DIR"
-
-if [[ ! -f "$MERGED_PROFILE" ]]; then
-    echo "Error: Failed to create merged profile at $MERGED_PROFILE"
-    exit 1
-fi
-
-echo "=== Setting up RUSTFLAGS for PGO-optimized build ==="
-
-# Set RUSTFLAGS for the subsequent dist build.
-# -Cprofile-use: Use PGO profiles for optimization
-RUSTFLAGS="-Cprofile-use=${MERGED_PROFILE}"
-
-if [[ -n "${GITHUB_ENV:-}" ]]; then
-    echo "RUSTFLAGS=${RUSTFLAGS}" >> "$GITHUB_ENV"
-    echo "Exported RUSTFLAGS to GITHUB_ENV"
-else
-    echo "RUSTFLAGS=${RUSTFLAGS}"
-    export RUSTFLAGS
-fi
-
-echo "=== PGO build setup complete ==="
diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
index d3bd6230a..7ef57469c 100644
--- a/.github/workflows/test-pgo-bolt.yml
+++ b/.github/workflows/test-pgo-bolt.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test-pgo-bolt:
-    name: Test PGO+BOLT scripts
+    name: Test PGO+BOLT
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -17,13 +17,10 @@ jobs:
       - name: Install Rust
         run: rustup update stable --no-self-update && rustup default stable
 
-      - name: Run build-pgo.sh
-        run: .github/scripts/build-pgo.sh
+      - name: Run build-pgo-bolt.sh
+        run: .github/scripts/build-pgo-bolt.sh
 
-      - name: Run apply-bolt.sh
-        run: .github/scripts/apply-bolt.sh
-
-      - name: Verify binary works
+      - name: Verify binary
         run: |
           target/dist/solar --version
           target/dist/solar testdata/Counter.sol

From 181d8f617e0018b31dedc63796367ba784e0bb9d Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 16:12:42 +0100
Subject: [PATCH 08/16] wip

---
 .github/scripts/build-pgo-bolt.sh    | 14 +++++++++-----
 .github/scripts/dist-build-setup.yml |  2 +-
 .github/workflows/ci.yml             | 13 +++++++++++++
 .github/workflows/test-pgo-bolt.yml  | 26 --------------------------
 Cargo.toml                           |  5 +++++
 5 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/test-pgo-bolt.yml

diff --git a/.github/scripts/build-pgo-bolt.sh b/.github/scripts/build-pgo-bolt.sh
index ddfba123b..6299acd98 100755
--- a/.github/scripts/build-pgo-bolt.sh
+++ b/.github/scripts/build-pgo-bolt.sh
@@ -3,9 +3,11 @@ set -euo pipefail
 
 cd "$(dirname "$0")/../.."
 
-PROFILE="${PROFILE:-dist}"
+PROFILE=dist-bolt
+PROFILE2=dist
 FEATURES="${FEATURES:-cli,asm,mimalloc}"
 CARGO_ARGS=(--profile "$PROFILE" --features "$FEATURES")
+CARGO_ARGS2=(--profile "$PROFILE2" --features "$FEATURES")
 
 TARGET=$(rustc -Vv | grep host | cut -d' ' -f2)
 LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
@@ -26,17 +28,19 @@ install_bolt() {
 cargo install cargo-pgo
 rustup component add llvm-tools-preview
 install_bolt
+cargo pgo info
 
 readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
 
 # PGO: build instrumented, run, gather profiles
 cargo pgo build -- "${CARGO_ARGS[@]}"
-"target/$TARGET/release/solar" "${TESTDATA[@]}"
+"target/$TARGET/$PROFILE/solar" "${TESTDATA[@]}" || true
 
 # BOLT: build instrumented with PGO, run, optimize
 cargo pgo bolt build --with-pgo -- "${CARGO_ARGS[@]}"
 "target/$TARGET/$PROFILE/solar-bolt-instrumented" "${TESTDATA[@]}" || true
-cargo pgo bolt optimize --with-pgo -- "${CARGO_ARGS[@]}"
+cargo pgo bolt optimize --with-pgo -- "${CARGO_ARGS2[@]}"
 
-cp "target/$TARGET/$PROFILE/solar-bolt-optimized" "target/$PROFILE/solar"
-ls -lh "target/$PROFILE/solar"
+mkdir -p "target/$PROFILE2"
+cp "target/$TARGET/$PROFILE2/solar-bolt-optimized" "target/$PROFILE2/solar"
+ls -lh "target/$PROFILE2/solar"
diff --git a/.github/scripts/dist-build-setup.yml b/.github/scripts/dist-build-setup.yml
index fe568b694..6153f2853 100644
--- a/.github/scripts/dist-build-setup.yml
+++ b/.github/scripts/dist-build-setup.yml
@@ -1,3 +1,3 @@
 - name: Build with PGO
   if: ${{ contains(matrix.targets, 'x86_64-unknown-linux') }}
-  run: .github/scripts/build-pgo.sh
+  run: .github/scripts/build-pgo-bolt.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ead535441..54d9b09f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,6 +50,19 @@ jobs:
       - name: doctest
         run: cargo test --doc --workspace
 
+  test-pgo-bolt:
+    name: Test PGO+BOLT
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Run build-pgo-bolt.sh
+        run: .github/scripts/build-pgo-bolt.sh
+      - name: Verify binary
+        run: |
+          target/dist/solar --version
+          target/dist/solar testdata/Counter.sol
+
   feature-checks:
     name: features
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
deleted file mode 100644
index 7ef57469c..000000000
--- a/.github/workflows/test-pgo-bolt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Test PGO+BOLT
-
-on:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test-pgo-bolt:
-    name: Test PGO+BOLT
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-          submodules: recursive
-
-      - name: Install Rust
-        run: rustup update stable --no-self-update && rustup default stable
-
-      - name: Run build-pgo-bolt.sh
-        run: .github/scripts/build-pgo-bolt.sh
-
-      - name: Verify binary
-        run: |
-          target/dist/solar --version
-          target/dist/solar testdata/Counter.sol
diff --git a/Cargo.toml b/Cargo.toml
index 00e42965d..755af5d3a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,6 +79,11 @@ inherits = "release"
 lto = "fat"
 codegen-units = 1
 
+[profile.dist-bolt]
+inherits = "dist"
+debug = "full"
+strip = false
+
 # `dist` with debug assertions.
 [profile.dist-dbg]
 inherits = "dist"

From 1df134c0cbfefb32e5986bc87b09e4394b771cfc Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:54:38 +0100
Subject: [PATCH 09/16] fix

---
 .github/scripts/build-pgo-bolt.sh | 22 +++++++++++++---------
 Cargo.toml                        |  5 -----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/scripts/build-pgo-bolt.sh b/.github/scripts/build-pgo-bolt.sh
index 6299acd98..809fb916b 100755
--- a/.github/scripts/build-pgo-bolt.sh
+++ b/.github/scripts/build-pgo-bolt.sh
@@ -3,11 +3,9 @@ set -euo pipefail
 
 cd "$(dirname "$0")/../.."
 
-PROFILE=dist-bolt
-PROFILE2=dist
+PROFILE="${PROFILE:-dist}"
 FEATURES="${FEATURES:-cli,asm,mimalloc}"
 CARGO_ARGS=(--profile "$PROFILE" --features "$FEATURES")
-CARGO_ARGS2=(--profile "$PROFILE2" --features "$FEATURES")
 
 TARGET=$(rustc -Vv | grep host | cut -d' ' -f2)
 LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
@@ -25,6 +23,12 @@ install_bolt() {
     sudo ln -sf "/usr/bin/merge-fdata-$LLVM_VERSION" /usr/local/bin/merge-fdata
 }
 
+run() {
+    "$1" "${TESTDATA[@]}" --emit abi &>/dev/null || true
+}
+
+export LLVM_PROFILE_FILE=$PWD/target/pgo-profiles/solar_%m_%p.profraw
+
 cargo install cargo-pgo
 rustup component add llvm-tools-preview
 install_bolt
@@ -34,13 +38,13 @@ readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optim
 
 # PGO: build instrumented, run, gather profiles
 cargo pgo build -- "${CARGO_ARGS[@]}"
-"target/$TARGET/$PROFILE/solar" "${TESTDATA[@]}" || true
+run "target/$TARGET/$PROFILE/solar"
 
 # BOLT: build instrumented with PGO, run, optimize
 cargo pgo bolt build --with-pgo -- "${CARGO_ARGS[@]}"
-"target/$TARGET/$PROFILE/solar-bolt-instrumented" "${TESTDATA[@]}" || true
-cargo pgo bolt optimize --with-pgo -- "${CARGO_ARGS2[@]}"
+run "target/$TARGET/$PROFILE/solar-bolt-instrumented"
+cargo pgo bolt optimize --with-pgo -- "${CARGO_ARGS[@]}"
 
-mkdir -p "target/$PROFILE2"
-cp "target/$TARGET/$PROFILE2/solar-bolt-optimized" "target/$PROFILE2/solar"
-ls -lh "target/$PROFILE2/solar"
+# mkdir -p "target/$PROFILE"
+# cp "target/$TARGET/$PROFILE/solar-bolt-optimized" "target/$PROFILE/solar"
+# ls -lh "target/$PROFILE/solar"
diff --git a/Cargo.toml b/Cargo.toml
index 755af5d3a..00e42965d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,11 +79,6 @@ inherits = "release"
 lto = "fat"
 codegen-units = 1
 
-[profile.dist-bolt]
-inherits = "dist"
-debug = "full"
-strip = false
-
 # `dist` with debug assertions.
 [profile.dist-dbg]
 inherits = "dist"

From a24f90a94c3391a3eca927d0b6bd2dff7ed9bf17 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 18:07:15 +0100
Subject: [PATCH 10/16] feat: integrate PGO+BOLT into cargo-dist release
 workflow

- Run build-pgo-bolt.sh before dist build for x86_64-linux-gnu
- Replace binary in tarball with BOLT-optimized version after dist build
- Add allow-dirty = ["ci"] to preserve manual release.yml edits
- Re-add test-pgo-bolt.yml workflow

Amp-Thread-ID: https://ampcode.com/threads/T-019bfaad-39e4-7636-a853-0c3e7b08d2c9
Co-authored-by: Amp <amp@ampcode.com>
---
 .github/workflows/release.yml       | 23 ++++++++++++++++++++---
 .github/workflows/test-pgo-bolt.yml | 26 ++++++++++++++++++++++++++
 dist-workspace.toml                 |  2 +-
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/test-pgo-bolt.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8121a8ac0..853dc842a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -130,9 +130,11 @@ jobs:
           fi
       - name: Use rustup to set correct Rust version
         run: rustup update "stable" --no-self-update && rustup default "stable"
-      - name: "Build with PGO"
-        if: "${{ contains(matrix.targets, 'x86_64-unknown-linux') }}"
-        run: ".github/scripts/build-pgo.sh"
+      - name: Build with PGO+BOLT (x86_64-linux-gnu)
+        if: contains(matrix.targets, 'x86_64-unknown-linux-gnu')
+        run: |
+          .github/scripts/build-pgo-bolt.sh
+          cp target/dist/solar /tmp/solar-pgo-bolt
       - name: Install dist
         run: ${{ matrix.install_dist.run }}
       # Get the dist-manifest
@@ -150,6 +152,21 @@ jobs:
           # Actually do builds and make zips and whatnot
           dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
           echo "dist ran successfully"
+      - name: Replace with PGO+BOLT binary (x86_64-linux-gnu)
+        if: contains(matrix.targets, 'x86_64-unknown-linux-gnu')
+        run: |
+          # Find and repack the tarball with the BOLT-optimized binary
+          TARBALL=$(find target/distrib -name 'solar-*-x86_64-unknown-linux-gnu.tar.gz' | head -1)
+          if [[ -n "$TARBALL" && -f /tmp/solar-pgo-bolt ]]; then
+            echo "Repacking $TARBALL with PGO+BOLT binary"
+            TMPDIR=$(mktemp -d)
+            tar -xzf "$TARBALL" -C "$TMPDIR"
+            cp /tmp/solar-pgo-bolt "$TMPDIR"/*/solar
+            tar -czf "$TARBALL" -C "$TMPDIR" .
+            rm -rf "$TMPDIR"
+            # Update checksum
+            sha256sum "$TARBALL" | cut -d' ' -f1 > "$TARBALL.sha256"
+          fi
       - id: cargo-dist
         name: Post-build
         # We force bash here just because github makes it really hard to get values up
diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
new file mode 100644
index 000000000..7ef57469c
--- /dev/null
+++ b/.github/workflows/test-pgo-bolt.yml
@@ -0,0 +1,26 @@
+name: Test PGO+BOLT
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test-pgo-bolt:
+    name: Test PGO+BOLT
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
+
+      - name: Install Rust
+        run: rustup update stable --no-self-update && rustup default stable
+
+      - name: Run build-pgo-bolt.sh
+        run: .github/scripts/build-pgo-bolt.sh
+
+      - name: Verify binary
+        run: |
+          target/dist/solar --version
+          target/dist/solar testdata/Counter.sol
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 235a238d5..3e43d7d81 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -31,7 +31,7 @@ dispatch-releases = false
 github-release = "announce"
 # Whether to install an updater program
 install-updater = false
-github-build-setup = "../scripts/dist-build-setup.yml"
+allow-dirty = ["ci"]
 # Path that installers should place binaries in
 install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 # The preferred Rust toolchain to use in CI (rustup toolchain syntax)

From f8e6e9afb89f5dca5eda940741b0614feda6aeab Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 18:16:56 +0100
Subject: [PATCH 11/16] feat: use custom build workflow for PGO+BOLT releases

- Add build-binaries.yml reusable workflow for all targets
- Enable PGO+BOLT for x86_64-unknown-linux-gnu
- Use build-local-artifacts=false + local-artifacts-jobs
- cargo-dist now calls our workflow instead of its own build job
- No manual release.yml modifications needed

Amp-Thread-ID: https://ampcode.com/threads/T-019bfaad-39e4-7636-a853-0c3e7b08d2c9
Co-authored-by: Amp <amp@ampcode.com>
---
 .github/scripts/dist-build-setup.yml |   3 -
 .github/workflows/build-binaries.yml |  99 ++++++++++++++++++++++++
 .github/workflows/release.yml        | 109 +++------------------------
 dist-workspace.toml                  |   3 +-
 4 files changed, 110 insertions(+), 104 deletions(-)
 delete mode 100644 .github/scripts/dist-build-setup.yml
 create mode 100644 .github/workflows/build-binaries.yml

diff --git a/.github/scripts/dist-build-setup.yml b/.github/scripts/dist-build-setup.yml
deleted file mode 100644
index 6153f2853..000000000
--- a/.github/scripts/dist-build-setup.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-- name: Build with PGO
-  if: ${{ contains(matrix.targets, 'x86_64-unknown-linux') }}
-  run: .github/scripts/build-pgo-bolt.sh
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
new file mode 100644
index 000000000..1d155bf54
--- /dev/null
+++ b/.github/workflows/build-binaries.yml
@@ -0,0 +1,99 @@
+name: Build binaries
+
+on:
+  workflow_call:
+    inputs:
+      plan:
+        required: true
+        type: string
+
+jobs:
+  build-binaries:
+    name: build (${{ matrix.target }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-unknown-linux-gnu
+            runner: ubuntu-22.04
+            pgo-bolt: true
+          - target: x86_64-unknown-linux-musl
+            runner: ubuntu-22.04
+          - target: aarch64-unknown-linux-gnu
+            runner: ubuntu-22.04
+          - target: x86_64-apple-darwin
+            runner: macos-14
+          - target: aarch64-apple-darwin
+            runner: macos-14
+          - target: x86_64-pc-windows-msvc
+            runner: windows-2022
+    runs-on: ${{ matrix.runner }}
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust
+        run: |
+          rustup update stable --no-self-update
+          rustup default stable
+          rustup target add ${{ matrix.target }}
+
+      - name: Install cross-compilation tools (aarch64-linux)
+        if: matrix.target == 'aarch64-unknown-linux-gnu'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu
+
+      - name: Install musl tools
+        if: matrix.target == 'x86_64-unknown-linux-musl'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y musl-tools
+
+      - name: Build with PGO+BOLT
+        if: matrix.pgo-bolt
+        run: .github/scripts/build-pgo-bolt.sh
+
+      - name: Build release binary
+        if: ${{ !matrix.pgo-bolt }}
+        run: cargo build --profile dist --target ${{ matrix.target }} --features cli,asm,mimalloc
+        env:
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
+
+      - name: Create archive (Unix)
+        if: runner.os != 'Windows'
+        run: |
+          ARCHIVE_NAME="solar-${{ matrix.target }}"
+          mkdir -p "$ARCHIVE_NAME"
+          if [[ "${{ matrix.pgo-bolt }}" == "true" ]]; then
+            cp target/dist/solar "$ARCHIVE_NAME/"
+          else
+            cp target/${{ matrix.target }}/dist/solar "$ARCHIVE_NAME/"
+          fi
+          # Tarball must have contents nested under root dir with same name as archive
+          tar -czvf "$ARCHIVE_NAME.tar.gz" "$ARCHIVE_NAME"
+          sha256sum "$ARCHIVE_NAME.tar.gz" | cut -d' ' -f1 > "$ARCHIVE_NAME.tar.gz.sha256"
+
+      - name: Create archive (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          $ARCHIVE_NAME = "solar-${{ matrix.target }}"
+          New-Item -ItemType Directory -Path $ARCHIVE_NAME -Force
+          Copy-Item "target/${{ matrix.target }}/dist/solar.exe" -Destination "$ARCHIVE_NAME/"
+          # Zip files should have contents directly in root (no nesting)
+          Compress-Archive -Path "$ARCHIVE_NAME\*" -DestinationPath "$ARCHIVE_NAME.zip"
+          (Get-FileHash -Algorithm SHA256 "$ARCHIVE_NAME.zip").Hash.ToLower() | Out-File -Encoding ascii -NoNewline "$ARCHIVE_NAME.zip.sha256"
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-build-local-${{ matrix.target }}
+          path: |
+            solar-*.tar.gz
+            solar-*.tar.gz.sha256
+            solar-*.zip
+            solar-*.zip.sha256
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 853dc842a..fb4518b17 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -88,111 +88,20 @@ jobs:
           name: artifacts-plan-dist-manifest
           path: plan-dist-manifest.json
 
-  # Build and packages all the platform-specific things
-  build-local-artifacts:
-    name: build-local-artifacts (${{ join(matrix.targets, ', ') }})
-    # Let the initial task tell us to not run (currently very blunt)
+  custom-build-binaries:
     needs:
       - plan
-    if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }}
-    strategy:
-      fail-fast: false
-      # Target platforms/runners are computed by dist in create-release.
-      # Each member of the matrix has the following arguments:
-      #
-      # - runner: the github runner
-      # - dist-args: cli flags to pass to dist
-      # - install-dist: expression to run to install dist on the runner
-      #
-      # Typically there will be:
-      # - 1 "global" task that builds universal installers
-      # - N "local" tasks that build each platform's binaries and platform-specific installers
-      matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }}
-    runs-on: ${{ matrix.runner }}
-    container: ${{ matrix.container && matrix.container.image || null }}
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
-    steps:
-      - name: enable windows longpaths
-        run: |
-          git config --global core.longpaths true
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-          submodules: recursive
-      - name: Install Rust non-interactively if not already installed
-        if: ${{ matrix.container }}
-        run: |
-          if ! command -v cargo > /dev/null 2>&1; then
-            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-            echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-          fi
-      - name: Use rustup to set correct Rust version
-        run: rustup update "stable" --no-self-update && rustup default "stable"
-      - name: Build with PGO+BOLT (x86_64-linux-gnu)
-        if: contains(matrix.targets, 'x86_64-unknown-linux-gnu')
-        run: |
-          .github/scripts/build-pgo-bolt.sh
-          cp target/dist/solar /tmp/solar-pgo-bolt
-      - name: Install dist
-        run: ${{ matrix.install_dist.run }}
-      # Get the dist-manifest
-      - name: Fetch local artifacts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: artifacts-*
-          path: target/distrib/
-          merge-multiple: true
-      - name: Install dependencies
-        run: |
-          ${{ matrix.packages_install }}
-      - name: Build artifacts
-        run: |
-          # Actually do builds and make zips and whatnot
-          dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
-          echo "dist ran successfully"
-      - name: Replace with PGO+BOLT binary (x86_64-linux-gnu)
-        if: contains(matrix.targets, 'x86_64-unknown-linux-gnu')
-        run: |
-          # Find and repack the tarball with the BOLT-optimized binary
-          TARBALL=$(find target/distrib -name 'solar-*-x86_64-unknown-linux-gnu.tar.gz' | head -1)
-          if [[ -n "$TARBALL" && -f /tmp/solar-pgo-bolt ]]; then
-            echo "Repacking $TARBALL with PGO+BOLT binary"
-            TMPDIR=$(mktemp -d)
-            tar -xzf "$TARBALL" -C "$TMPDIR"
-            cp /tmp/solar-pgo-bolt "$TMPDIR"/*/solar
-            tar -czf "$TARBALL" -C "$TMPDIR" .
-            rm -rf "$TMPDIR"
-            # Update checksum
-            sha256sum "$TARBALL" | cut -d' ' -f1 > "$TARBALL.sha256"
-          fi
-      - id: cargo-dist
-        name: Post-build
-        # We force bash here just because github makes it really hard to get values up
-        # to "real" actions without writing to env-vars, and writing to env-vars has
-        # inconsistent syntax between shell and powershell.
-        shell: bash
-        run: |
-          # Parse out what we just built and upload it to scratch storage
-          echo "paths<<EOF" >> "$GITHUB_OUTPUT"
-          dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT"
-          echo "EOF" >> "$GITHUB_OUTPUT"
-
-          cp dist-manifest.json "$BUILD_MANIFEST_NAME"
-      - name: "Upload artifacts"
-        uses: actions/upload-artifact@v4
-        with:
-          name: artifacts-build-local-${{ join(matrix.targets, '_') }}
-          path: |
-            ${{ steps.cargo-dist.outputs.paths }}
-            ${{ env.BUILD_MANIFEST_NAME }}
+    if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' }}
+    uses: ./.github/workflows/build-binaries.yml
+    with:
+      plan: ${{ needs.plan.outputs.val }}
+    secrets: inherit
 
   # Build and package all the platform-agnostic(ish) things
   build-global-artifacts:
     needs:
       - plan
-      - build-local-artifacts
+      - custom-build-binaries
     runs-on: "ubuntu-22.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -240,10 +149,10 @@ jobs:
   host:
     needs:
       - plan
-      - build-local-artifacts
+      - custom-build-binaries
       - build-global-artifacts
     # Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
-    if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
+    if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     runs-on: "ubuntu-22.04"
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 3e43d7d81..0ae93f179 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -31,7 +31,8 @@ dispatch-releases = false
 github-release = "announce"
 # Whether to install an updater program
 install-updater = false
-allow-dirty = ["ci"]
+build-local-artifacts = false
+local-artifacts-jobs = ["./build-binaries"]
 # Path that installers should place binaries in
 install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 # The preferred Rust toolchain to use in CI (rustup toolchain syntax)

From 84e81933299389f3c5bb5414feac9e774d00ea81 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 18:25:34 +0100
Subject: [PATCH 12/16] revert: remove cargo-dist integration, keep script and
 test workflow

Amp-Thread-ID: https://ampcode.com/threads/T-019bfaad-39e4-7636-a853-0c3e7b08d2c9
Co-authored-by: Amp <amp@ampcode.com>
---
 .github/workflows/build-binaries.yml | 99 ----------------------------
 .github/workflows/release.yml        | 92 +++++++++++++++++++++++---
 dist-workspace.toml                  |  3 +-
 3 files changed, 84 insertions(+), 110 deletions(-)
 delete mode 100644 .github/workflows/build-binaries.yml

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
deleted file mode 100644
index 1d155bf54..000000000
--- a/.github/workflows/build-binaries.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-name: Build binaries
-
-on:
-  workflow_call:
-    inputs:
-      plan:
-        required: true
-        type: string
-
-jobs:
-  build-binaries:
-    name: build (${{ matrix.target }})
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: x86_64-unknown-linux-gnu
-            runner: ubuntu-22.04
-            pgo-bolt: true
-          - target: x86_64-unknown-linux-musl
-            runner: ubuntu-22.04
-          - target: aarch64-unknown-linux-gnu
-            runner: ubuntu-22.04
-          - target: x86_64-apple-darwin
-            runner: macos-14
-          - target: aarch64-apple-darwin
-            runner: macos-14
-          - target: x86_64-pc-windows-msvc
-            runner: windows-2022
-    runs-on: ${{ matrix.runner }}
-    env:
-      CARGO_TERM_COLOR: always
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install Rust
-        run: |
-          rustup update stable --no-self-update
-          rustup default stable
-          rustup target add ${{ matrix.target }}
-
-      - name: Install cross-compilation tools (aarch64-linux)
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu
-
-      - name: Install musl tools
-        if: matrix.target == 'x86_64-unknown-linux-musl'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y musl-tools
-
-      - name: Build with PGO+BOLT
-        if: matrix.pgo-bolt
-        run: .github/scripts/build-pgo-bolt.sh
-
-      - name: Build release binary
-        if: ${{ !matrix.pgo-bolt }}
-        run: cargo build --profile dist --target ${{ matrix.target }} --features cli,asm,mimalloc
-        env:
-          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
-
-      - name: Create archive (Unix)
-        if: runner.os != 'Windows'
-        run: |
-          ARCHIVE_NAME="solar-${{ matrix.target }}"
-          mkdir -p "$ARCHIVE_NAME"
-          if [[ "${{ matrix.pgo-bolt }}" == "true" ]]; then
-            cp target/dist/solar "$ARCHIVE_NAME/"
-          else
-            cp target/${{ matrix.target }}/dist/solar "$ARCHIVE_NAME/"
-          fi
-          # Tarball must have contents nested under root dir with same name as archive
-          tar -czvf "$ARCHIVE_NAME.tar.gz" "$ARCHIVE_NAME"
-          sha256sum "$ARCHIVE_NAME.tar.gz" | cut -d' ' -f1 > "$ARCHIVE_NAME.tar.gz.sha256"
-
-      - name: Create archive (Windows)
-        if: runner.os == 'Windows'
-        shell: pwsh
-        run: |
-          $ARCHIVE_NAME = "solar-${{ matrix.target }}"
-          New-Item -ItemType Directory -Path $ARCHIVE_NAME -Force
-          Copy-Item "target/${{ matrix.target }}/dist/solar.exe" -Destination "$ARCHIVE_NAME/"
-          # Zip files should have contents directly in root (no nesting)
-          Compress-Archive -Path "$ARCHIVE_NAME\*" -DestinationPath "$ARCHIVE_NAME.zip"
-          (Get-FileHash -Algorithm SHA256 "$ARCHIVE_NAME.zip").Hash.ToLower() | Out-File -Encoding ascii -NoNewline "$ARCHIVE_NAME.zip.sha256"
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: artifacts-build-local-${{ matrix.target }}
-          path: |
-            solar-*.tar.gz
-            solar-*.tar.gz.sha256
-            solar-*.zip
-            solar-*.zip.sha256
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb4518b17..8121a8ac0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -88,20 +88,94 @@ jobs:
           name: artifacts-plan-dist-manifest
           path: plan-dist-manifest.json
 
-  custom-build-binaries:
+  # Build and packages all the platform-specific things
+  build-local-artifacts:
+    name: build-local-artifacts (${{ join(matrix.targets, ', ') }})
+    # Let the initial task tell us to not run (currently very blunt)
     needs:
       - plan
-    if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' }}
-    uses: ./.github/workflows/build-binaries.yml
-    with:
-      plan: ${{ needs.plan.outputs.val }}
-    secrets: inherit
+    if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }}
+    strategy:
+      fail-fast: false
+      # Target platforms/runners are computed by dist in create-release.
+      # Each member of the matrix has the following arguments:
+      #
+      # - runner: the github runner
+      # - dist-args: cli flags to pass to dist
+      # - install-dist: expression to run to install dist on the runner
+      #
+      # Typically there will be:
+      # - 1 "global" task that builds universal installers
+      # - N "local" tasks that build each platform's binaries and platform-specific installers
+      matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }}
+    runs-on: ${{ matrix.runner }}
+    container: ${{ matrix.container && matrix.container.image || null }}
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
+    steps:
+      - name: enable windows longpaths
+        run: |
+          git config --global core.longpaths true
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Install Rust non-interactively if not already installed
+        if: ${{ matrix.container }}
+        run: |
+          if ! command -v cargo > /dev/null 2>&1; then
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+            echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+          fi
+      - name: Use rustup to set correct Rust version
+        run: rustup update "stable" --no-self-update && rustup default "stable"
+      - name: "Build with PGO"
+        if: "${{ contains(matrix.targets, 'x86_64-unknown-linux') }}"
+        run: ".github/scripts/build-pgo.sh"
+      - name: Install dist
+        run: ${{ matrix.install_dist.run }}
+      # Get the dist-manifest
+      - name: Fetch local artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: artifacts-*
+          path: target/distrib/
+          merge-multiple: true
+      - name: Install dependencies
+        run: |
+          ${{ matrix.packages_install }}
+      - name: Build artifacts
+        run: |
+          # Actually do builds and make zips and whatnot
+          dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
+          echo "dist ran successfully"
+      - id: cargo-dist
+        name: Post-build
+        # We force bash here just because github makes it really hard to get values up
+        # to "real" actions without writing to env-vars, and writing to env-vars has
+        # inconsistent syntax between shell and powershell.
+        shell: bash
+        run: |
+          # Parse out what we just built and upload it to scratch storage
+          echo "paths<<EOF" >> "$GITHUB_OUTPUT"
+          dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+          cp dist-manifest.json "$BUILD_MANIFEST_NAME"
+      - name: "Upload artifacts"
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-build-local-${{ join(matrix.targets, '_') }}
+          path: |
+            ${{ steps.cargo-dist.outputs.paths }}
+            ${{ env.BUILD_MANIFEST_NAME }}
 
   # Build and package all the platform-agnostic(ish) things
   build-global-artifacts:
     needs:
       - plan
-      - custom-build-binaries
+      - build-local-artifacts
     runs-on: "ubuntu-22.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -149,10 +223,10 @@ jobs:
   host:
     needs:
       - plan
-      - custom-build-binaries
+      - build-local-artifacts
       - build-global-artifacts
     # Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
-    if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') }}
+    if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     runs-on: "ubuntu-22.04"
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 0ae93f179..9f84e07f0 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -31,8 +31,7 @@ dispatch-releases = false
 github-release = "announce"
 # Whether to install an updater program
 install-updater = false
-build-local-artifacts = false
-local-artifacts-jobs = ["./build-binaries"]
+github-build-setup = "dist-build-setup.yml"
 # Path that installers should place binaries in
 install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 # The preferred Rust toolchain to use in CI (rustup toolchain syntax)

From e4024114e4e8d4287521b621363350df9171d359 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 18:26:34 +0100
Subject: [PATCH 13/16] rev

---
 .github/workflows/release.yml       |  3 ---
 .github/workflows/test-pgo-bolt.yml | 26 --------------------------
 dist-workspace.toml                 |  1 -
 3 files changed, 30 deletions(-)
 delete mode 100644 .github/workflows/test-pgo-bolt.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8121a8ac0..efc9655aa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -130,9 +130,6 @@ jobs:
           fi
       - name: Use rustup to set correct Rust version
         run: rustup update "stable" --no-self-update && rustup default "stable"
-      - name: "Build with PGO"
-        if: "${{ contains(matrix.targets, 'x86_64-unknown-linux') }}"
-        run: ".github/scripts/build-pgo.sh"
       - name: Install dist
         run: ${{ matrix.install_dist.run }}
       # Get the dist-manifest
diff --git a/.github/workflows/test-pgo-bolt.yml b/.github/workflows/test-pgo-bolt.yml
deleted file mode 100644
index 7ef57469c..000000000
--- a/.github/workflows/test-pgo-bolt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Test PGO+BOLT
-
-on:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test-pgo-bolt:
-    name: Test PGO+BOLT
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-          submodules: recursive
-
-      - name: Install Rust
-        run: rustup update stable --no-self-update && rustup default stable
-
-      - name: Run build-pgo-bolt.sh
-        run: .github/scripts/build-pgo-bolt.sh
-
-      - name: Verify binary
-        run: |
-          target/dist/solar --version
-          target/dist/solar testdata/Counter.sol
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 9f84e07f0..755b3e915 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -31,7 +31,6 @@ dispatch-releases = false
 github-release = "announce"
 # Whether to install an updater program
 install-updater = false
-github-build-setup = "dist-build-setup.yml"
 # Path that installers should place binaries in
 install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
 # The preferred Rust toolchain to use in CI (rustup toolchain syntax)

From fe18c21bff8a95f326d57958a4b107a38fd0b82a Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 19:06:32 +0100
Subject: [PATCH 14/16] rename

---
 .../{build-pgo-bolt.sh => build_pgo_bolt.sh}  |  8 ++--
 .github/workflows/ci.yml                      |  4 +-
 .github/workflows/release.yml                 | 38 +++++++++----------
 crates/solar/dist.toml                        |  1 +
 dist-workspace.toml                           |  2 +-
 5 files changed, 28 insertions(+), 25 deletions(-)
 rename .github/scripts/{build-pgo-bolt.sh => build_pgo_bolt.sh} (89%)

diff --git a/.github/scripts/build-pgo-bolt.sh b/.github/scripts/build_pgo_bolt.sh
similarity index 89%
rename from .github/scripts/build-pgo-bolt.sh
rename to .github/scripts/build_pgo_bolt.sh
index 809fb916b..d611da9d5 100755
--- a/.github/scripts/build-pgo-bolt.sh
+++ b/.github/scripts/build_pgo_bolt.sh
@@ -45,6 +45,8 @@ cargo pgo bolt build --with-pgo -- "${CARGO_ARGS[@]}"
 run "target/$TARGET/$PROFILE/solar-bolt-instrumented"
 cargo pgo bolt optimize --with-pgo -- "${CARGO_ARGS[@]}"
 
-# mkdir -p "target/$PROFILE"
-# cp "target/$TARGET/$PROFILE/solar-bolt-optimized" "target/$PROFILE/solar"
-# ls -lh "target/$PROFILE/solar"
+for out in "target/$TARGET/$PROFILE" "target/$PROFILE"; do
+    mkdir -p "$out"
+    cp "target/$TARGET/$PROFILE/solar-bolt-optimized" "$out/solar"
+done
+ls -lh "target/$PROFILE/solar"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54d9b09f9..6d59bfc1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,8 +56,8 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
-      - name: Run build-pgo-bolt.sh
-        run: .github/scripts/build-pgo-bolt.sh
+      - name: Run build_pgo_bolt.sh
+        run: .github/scripts/build_pgo_bolt.sh
       - name: Verify binary
         run: |
           target/dist/solar --version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efc9655aa..2ec582d67 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -65,9 +65,9 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh"
       - name: Cache dist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/dist
@@ -83,7 +83,7 @@ jobs:
           cat plan-dist-manifest.json
           echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
       - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: artifacts-plan-dist-manifest
           path: plan-dist-manifest.json
@@ -117,7 +117,7 @@ jobs:
       - name: enable windows longpaths
         run: |
           git config --global core.longpaths true
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -134,7 +134,7 @@ jobs:
         run: ${{ matrix.install_dist.run }}
       # Get the dist-manifest
       - name: Fetch local artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -161,7 +161,7 @@ jobs:
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: artifacts-build-local-${{ join(matrix.targets, '_') }}
           path: |
@@ -178,21 +178,21 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           submodules: recursive
       - name: Install Rust
         run: rustup update "stable" --no-self-update && rustup default "stable"
       - name: Install cached dist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -210,7 +210,7 @@ jobs:
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: artifacts-build-global
           path: |
@@ -222,29 +222,29 @@ jobs:
       - plan
       - build-local-artifacts
       - build-global-artifacts
-    # Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
-    if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
+    # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
+    if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     runs-on: "ubuntu-22.04"
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           submodules: recursive
       - name: Install Rust
         run: rustup update "stable" --no-self-update && rustup default "stable"
       - name: Install cached dist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -258,7 +258,7 @@ jobs:
           cat dist-manifest.json
           echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
       - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           # Overwrite the previous copy
           name: artifacts-dist-manifest
@@ -277,13 +277,13 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           submodules: recursive
       # Create a GitHub Release while uploading all files to it
       - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: artifacts-*
           path: artifacts
diff --git a/crates/solar/dist.toml b/crates/solar/dist.toml
index bbad0a769..27b0043af 100644
--- a/crates/solar/dist.toml
+++ b/crates/solar/dist.toml
@@ -1,3 +1,4 @@
 # Required to override Cargo package name.
 [package]
 name = "solar"
+build-command = [".github/scripts/build_pgo_bolt.sh"]
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 755b3e915..9974e5161 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -4,7 +4,7 @@ members = ["cargo:."]
 # Config for 'dist'
 [dist]
 # The preferred dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.30.0"
+cargo-dist-version = "0.30.3"
 # CI backends to support
 ci = "github"
 # The installers to generate for each app

From 1a9448feb0205d9536c7b836bf88d82c5fd3577d Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 19:13:24 +0100
Subject: [PATCH 15/16] rst

---
 .github/workflows/release.yml | 32 ++++++++++++++++----------------
 crates/solar/dist.toml        |  1 -
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2ec582d67..4d07ad7c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: recursive
@@ -67,7 +67,7 @@ jobs:
         shell: bash
         run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh"
       - name: Cache dist
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/dist
@@ -83,7 +83,7 @@ jobs:
           cat plan-dist-manifest.json
           echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
       - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-plan-dist-manifest
           path: plan-dist-manifest.json
@@ -117,7 +117,7 @@ jobs:
       - name: enable windows longpaths
         run: |
           git config --global core.longpaths true
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: recursive
@@ -134,7 +134,7 @@ jobs:
         run: ${{ matrix.install_dist.run }}
       # Get the dist-manifest
       - name: Fetch local artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -161,7 +161,7 @@ jobs:
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-build-local-${{ join(matrix.targets, '_') }}
           path: |
@@ -178,21 +178,21 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: recursive
       - name: Install Rust
         run: rustup update "stable" --no-self-update && rustup default "stable"
       - name: Install cached dist
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -210,7 +210,7 @@ jobs:
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-build-global
           path: |
@@ -230,21 +230,21 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: recursive
       - name: Install Rust
         run: rustup update "stable" --no-self-update && rustup default "stable"
       - name: Install cached dist
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -258,7 +258,7 @@ jobs:
           cat dist-manifest.json
           echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
       - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           # Overwrite the previous copy
           name: artifacts-dist-manifest
@@ -277,13 +277,13 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: recursive
       # Create a GitHub Release while uploading all files to it
       - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
           path: artifacts
diff --git a/crates/solar/dist.toml b/crates/solar/dist.toml
index 27b0043af..bbad0a769 100644
--- a/crates/solar/dist.toml
+++ b/crates/solar/dist.toml
@@ -1,4 +1,3 @@
 # Required to override Cargo package name.
 [package]
 name = "solar"
-build-command = [".github/scripts/build_pgo_bolt.sh"]

From c1272645e29cd46016b3a2d35ca11e59a7d0102e Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:41:38 +0100
Subject: [PATCH 16/16] wipnowork

---
 .cargo/config.toml                |   2 +
 .github/scripts/build_pgo_bolt.sh | 140 ++++++++++++++++++++++++++++--
 .github/workflows/release.yml     |   2 +
 dist-workspace.toml               |   2 +
 tools/xtask/src/flags.rs          |  12 +++
 tools/xtask/src/main.rs           |   6 ++
 6 files changed, 157 insertions(+), 7 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 24e511df2..4f4e7a267 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,7 @@
 [alias]
 xtask = "run --package xtask --bin xtask --"
+# Override `cargo auditable` to run PGO+BOLT build instead (hack for cargo-dist)
+auditable = "xtask pgo-build --"
 tq = "xtask test"
 qt = "tq"
 ryul = "run --package solar-compiler --bin solar -- --language yul -Zparse-yul"
diff --git a/.github/scripts/build_pgo_bolt.sh b/.github/scripts/build_pgo_bolt.sh
index d611da9d5..ad28dd650 100755
--- a/.github/scripts/build_pgo_bolt.sh
+++ b/.github/scripts/build_pgo_bolt.sh
@@ -1,19 +1,120 @@
 #!/usr/bin/env bash
+# PGO+BOLT optimized build script for cargo-dist integration.
+# All output goes to stderr except the final cargo build which uses JSON output for cargo-dist.
+#
+# On Linux x86_64: Does full PGO+BOLT optimization
+# On other platforms: Falls back to regular cargo build (PGO/BOLT not supported)
 set -euo pipefail
 
+# Redirect all output to stderr by default
+exec 3>&1 1>&2
+
 cd "$(dirname "$0")/../.."
 
-PROFILE="${PROFILE:-dist}"
-FEATURES="${FEATURES:-cli,asm,mimalloc}"
+# Parse cargo-dist args passed via environment or command line
+# Expected format: build --profile dist --message-format=json-render-diagnostics --target <triple> ...
+CARGO_DIST_ARGS="${CARGO_DIST_ARGS:-}"
+
+# Extract useful info from cargo-dist args
+TARGET=""
+PROFILE="dist"
+FEATURES=""
+MESSAGE_FORMAT=""
+OTHER_ARGS=()
+
+parse_args() {
+    local args=($CARGO_DIST_ARGS)
+    local i=0
+    while [[ $i -lt ${#args[@]} ]]; do
+        local arg="${args[$i]}"
+        case "$arg" in
+            build)
+                # Skip the 'build' subcommand
+                ;;
+            --target)
+                i=$((i + 1))
+                TARGET="${args[$i]}"
+                ;;
+            --target=*)
+                TARGET="${arg#--target=}"
+                ;;
+            --profile)
+                i=$((i + 1))
+                PROFILE="${args[$i]}"
+                ;;
+            --profile=*)
+                PROFILE="${arg#--profile=}"
+                ;;
+            --features)
+                i=$((i + 1))
+                if [[ -n "$FEATURES" ]]; then
+                    FEATURES="$FEATURES,${args[$i]}"
+                else
+                    FEATURES="${args[$i]}"
+                fi
+                ;;
+            --features=*)
+                local feat="${arg#--features=}"
+                if [[ -n "$FEATURES" ]]; then
+                    FEATURES="$FEATURES,$feat"
+                else
+                    FEATURES="$feat"
+                fi
+                ;;
+            --message-format=*)
+                MESSAGE_FORMAT="$arg"
+                ;;
+            *)
+                OTHER_ARGS+=("$arg")
+                ;;
+        esac
+        i=$((i + 1))
+    done
+}
+
+parse_args
+
+# Fallback to detecting target from rustc if not provided
+if [[ -z "$TARGET" ]]; then
+    TARGET=$(rustc -Vv | grep host | cut -d' ' -f2)
+fi
+
+# Default features if not provided
+if [[ -z "$FEATURES" ]]; then
+    FEATURES="cli,asm,mimalloc"
+fi
+
+LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+' || echo "")
+
+# Check if we can do PGO+BOLT (Linux x86_64 only for now)
+CAN_PGO_BOLT=false
+if [[ "$OSTYPE" == "linux-gnu"* ]] && [[ "$TARGET" == "x86_64-unknown-linux-gnu" ]]; then
+    CAN_PGO_BOLT=true
+fi
+
+echo "=== Build ===" >&2
+echo "Target: $TARGET" >&2
+echo "Profile: $PROFILE" >&2
+echo "Features: $FEATURES" >&2
+echo "LLVM Version: $LLVM_VERSION" >&2
+echo "PGO+BOLT enabled: $CAN_PGO_BOLT" >&2
+
 CARGO_ARGS=(--profile "$PROFILE" --features "$FEATURES")
 
-TARGET=$(rustc -Vv | grep host | cut -d' ' -f2)
-LLVM_VERSION=$(rustc -Vv | grep -oP 'LLVM version: \K\d+')
+# Fallback to regular cargo build for unsupported platforms
+if [[ "$CAN_PGO_BOLT" != "true" ]]; then
+    echo "PGO+BOLT not supported on this platform, falling back to regular build" >&2
+    # Run regular cargo build with JSON output directly to fd 3
+    cargo build "${CARGO_ARGS[@]}" --message-format=json-render-diagnostics >&3
+    exit 0
+fi
 
 install_bolt() {
     if command -v llvm-bolt &>/dev/null; then
+        echo "BOLT already installed" >&2
         return
     fi
+    echo "Installing BOLT from apt.llvm.org..." >&2
     wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc >/dev/null
     CODENAME=$(lsb_release -cs)
     echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-$LLVM_VERSION main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null
@@ -29,24 +130,49 @@ run() {
 
 export LLVM_PROFILE_FILE=$PWD/target/pgo-profiles/solar_%m_%p.profraw
 
-cargo install cargo-pgo
+echo "Installing cargo-pgo..." >&2
+cargo install cargo-pgo --quiet
 rustup component add llvm-tools-preview
 install_bolt
 cargo pgo info
 
 readarray -t TESTDATA < <(find testdata -maxdepth 1 -name '*.sol' ! -name 'Optimism.sol')
+echo "Using ${#TESTDATA[@]} test files for profiling" >&2
 
 # PGO: build instrumented, run, gather profiles
+echo "=== PGO Phase ===" >&2
+echo "Building PGO-instrumented binary..." >&2
 cargo pgo build -- "${CARGO_ARGS[@]}"
+echo "Running instrumented binary to gather profiles..." >&2
 run "target/$TARGET/$PROFILE/solar"
 
 # BOLT: build instrumented with PGO, run, optimize
+echo "=== BOLT Phase ===" >&2
+echo "Building BOLT-instrumented binary with PGO..." >&2
 cargo pgo bolt build --with-pgo -- "${CARGO_ARGS[@]}"
+echo "Running BOLT-instrumented binary..." >&2
 run "target/$TARGET/$PROFILE/solar-bolt-instrumented"
+echo "Optimizing with BOLT..." >&2
 cargo pgo bolt optimize --with-pgo -- "${CARGO_ARGS[@]}"
 
+# Copy optimized binary to expected locations
+OPTIMIZED_BIN="target/$TARGET/$PROFILE/solar-bolt-optimized"
 for out in "target/$TARGET/$PROFILE" "target/$PROFILE"; do
     mkdir -p "$out"
-    cp "target/$TARGET/$PROFILE/solar-bolt-optimized" "$out/solar"
+    cp "$OPTIMIZED_BIN" "$out/solar"
 done
-ls -lh "target/$PROFILE/solar"
+
+echo "=== Build Complete ===" >&2
+ls -lh "target/$PROFILE/solar" >&2
+
+# Now produce JSON output for cargo-dist on stdout (fd 3 which was original stdout)
+# cargo-dist expects JSON messages from cargo build, we simulate a successful build
+# by outputting the artifact path in the expected format
+FINAL_BIN="target/$TARGET/$PROFILE/solar"
+echo "Producing JSON output for cargo-dist..." >&2
+
+# Output JSON message to original stdout for cargo-dist to parse
+cat >&3 <<EOF
+{"reason":"compiler-artifact","package_id":"solar-compiler","manifest_path":"$PWD/crates/compiler/Cargo.toml","target":{"kind":["bin"],"crate_types":["bin"],"name":"solar","src_path":"$PWD/crates/compiler/src/main.rs","edition":"2021","doc":true,"doctest":false,"test":true},"profile":{"opt_level":"3","debuginfo":0,"debug_assertions":false,"overflow_checks":false,"test":false},"features":["cli","asm","mimalloc"],"filenames":["$PWD/$FINAL_BIN"],"executable":"$PWD/$FINAL_BIN","fresh":false}
+{"reason":"build-finished","success":true}
+EOF
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4d07ad7c3..c2b0ed387 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -139,6 +139,8 @@ jobs:
           pattern: artifacts-*
           path: target/distrib/
           merge-multiple: true
+      - name: Install cargo-auditable
+        run: ${{ matrix.install_cargo_auditable.run }}
       - name: Install dependencies
         run: |
           ${{ matrix.packages_install }}
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 9974e5161..64cfa8dc8 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -21,6 +21,8 @@ targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-da
 precise-builds = true
 # Features to pass to cargo build
 features = ["cli", "asm", "mimalloc"]
+# Enable auditable so we can override it with our PGO+BOLT build script
+cargo-auditable = true
 # Whether dist should create a Github Release or use an existing draft
 create-release = true
 # Which actions to run on pull requests
diff --git a/tools/xtask/src/flags.rs b/tools/xtask/src/flags.rs
index 10998cba9..88cfe2104 100644
--- a/tools/xtask/src/flags.rs
+++ b/tools/xtask/src/flags.rs
@@ -13,6 +13,12 @@ xflags::xflags! {
 
             repeated rest: String
         }
+
+        /// Run PGO+BOLT optimized build. Designed to be invoked by cargo-dist via alias.
+        cmd pgo-build {
+            /// Arguments to pass to the final cargo build (from cargo-dist).
+            repeated args: String
+        }
     }
 }
 
@@ -27,6 +33,7 @@ pub struct Xtask {
 #[derive(Debug)]
 pub enum XtaskCmd {
     Test(Test),
+    PgoBuild(PgoBuild),
 }
 
 #[derive(Debug)]
@@ -37,6 +44,11 @@ pub struct Test {
     pub bless: bool,
 }
 
+#[derive(Debug)]
+pub struct PgoBuild {
+    pub args: Vec<String>,
+}
+
 impl Xtask {
     #[allow(dead_code)]
     pub fn from_env_or_exit() -> Self {
diff --git a/tools/xtask/src/main.rs b/tools/xtask/src/main.rs
index d71734f8e..972ae3975 100644
--- a/tools/xtask/src/main.rs
+++ b/tools/xtask/src/main.rs
@@ -35,6 +35,12 @@ fn main() -> anyhow::Result<()> {
             }
             cmd.run()?;
         }
+        flags::XtaskCmd::PgoBuild(flags::PgoBuild { args }) => {
+            let sh = Shell::new()?;
+            // Pass cargo-dist's args to the PGO+BOLT build script via environment variable
+            let args_str = args.join(" ");
+            cmd!(sh, ".github/scripts/build_pgo_bolt.sh").env("CARGO_DIST_ARGS", args_str).run()?;
+        }
     }
 
     Ok(())