ci: skip first-run onboarding too, A/B main window against PR 3104 patches

Author: richiemcilroy

.github/workflows/idle-win-busy-ab.yml

@@ -49,42 +49,61 @@ jobs:
         env:
           RUST_TARGET_TRIPLE: x86_64-pc-windows-msvc
 
-      - name: Build
+      - name: Build base
         shell: bash
         run: |
           set -euxo pipefail
           node scripts/sync-desktop-versions.mjs
           ./scripts/prepare-gpui-dependency.sh
           git -C ../zed-cap apply "$GITHUB_WORKSPACE/scripts/probe/frame-trace.patch"
           cargo +1.95.0 build --manifest-path apps/desktop-gpui/Cargo.toml --locked --target x86_64-pc-windows-msvc --bin cap-gpui
+          mkdir -p "$RUNNER_TEMP/base"
+          cp apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap-gpui.exe apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap_gpui.pdb "$RUNNER_TEMP/base/"
 
-      - name: Fetch samply
-        shell: pwsh
-        continue-on-error: true
+      - name: Build head (PR 3104 patches)
+        shell: bash
         run: |
-          Invoke-WebRequest https://github.com/mstange/samply/releases/download/samply-v0.13.1/samply-x86_64-pc-windows-msvc.zip -OutFile $env:RUNNER_TEMP\samply.zip
-          Expand-Archive $env:RUNNER_TEMP\samply.zip -DestinationPath $env:RUNNER_TEMP\samply
-          Get-ChildItem -Recurse $env:RUNNER_TEMP\samply | Select-Object FullName
+          set -euxo pipefail
+          git fetch --no-tags --depth 1 origin perf/idle-vblank-win-x11
+          mkdir -p "$RUNNER_TEMP/head-patches"
+          for p in zed-gpui zed-windows zed-linux zed-idle-frames zed-streaming-image; do
+            git show "FETCH_HEAD:apps/desktop-gpui/patches/$p.patch" > "$RUNNER_TEMP/head-patches/$p.patch"
+          done
+          git -C ../zed-cap reset -q --hard
+          git -C ../zed-cap clean -fdq
+          for p in zed-gpui zed-windows zed-linux zed-idle-frames zed-streaming-image; do
+            git -C ../zed-cap apply --unidiff-zero "$RUNNER_TEMP/head-patches/$p.patch"
+          done
+          git -C ../zed-cap apply "$GITHUB_WORKSPACE/scripts/probe/frame-trace.patch" || echo "trace patch did not apply on head"
+          cargo +1.95.0 build --manifest-path apps/desktop-gpui/Cargo.toml --locked --target x86_64-pc-windows-msvc --bin cap-gpui
+          mkdir -p "$RUNNER_TEMP/head"
+          cp apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap-gpui.exe apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap_gpui.pdb "$RUNNER_TEMP/head/"
 
       - name: Profile
         shell: bash
         run: |
           set -uo pipefail
           export PATH="$(cygpath "$GITHUB_WORKSPACE/target/debug"):$PATH"
-          app="apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap-gpui.exe"
           out="$RUNNER_TEMP/out"
-          samply="$(find "$RUNNER_TEMP/samply" -name samply.exe | head -1)"
-          python scripts/probe/thread_profile.py --label main-trace --out "$out" ${samply:+--samply "$samply"} \
-            --env CAP_PERF_SKIP_ONBOARDING=1 --env CAP_FRAME_TRACE=1 --env RUST_LOG=info "$app"
-          python scripts/probe/thread_profile.py --label main-clean --out "$out" \
-            --env CAP_PERF_SKIP_ONBOARDING=1 "$app"
-          python scripts/probe/thread_profile.py --label onboarding-trace --out "$out" \
-            --env CAP_FRAME_TRACE=1 --env RUST_LOG=info "$app"
-          for f in "$out"/*-app.log; do
+          prof() { python scripts/probe/thread_profile.py --out "$out" "$@" || echo "profile failed: $*"; }
+          skip="--env CAP_PERF_SKIP_ONBOARDING=1"
+          prof --label main-base-trace $skip --env CAP_FRAME_TRACE=1 --env RUST_LOG=info "$RUNNER_TEMP/base/cap-gpui.exe"
+          prof --label main-head-trace $skip --env CAP_FRAME_TRACE=1 --env RUST_LOG=info "$RUNNER_TEMP/head/cap-gpui.exe"
+          for round in 1 2 3; do
+            if (( round % 2 )); then order="base head"; else order="head base"; fi
+            for v in $order; do
+              prof --label "main-$v-r$round" $skip "$RUNNER_TEMP/$v/cap-gpui.exe"
+            done
+          done
+          for round in 1 2 3; do
+            prof --label "onboarding-base-r$round" "$RUNNER_TEMP/base/cap-gpui.exe"
+          done
+          prof --label onboarding-base-trace --env CAP_FRAME_TRACE=1 --env RUST_LOG=info "$RUNNER_TEMP/base/cap-gpui.exe"
+          for f in "$out"/*trace-app.log; do
             echo "=== $f"
-            grep -v FRAMETRACE "$f" | tail -60
+            grep -v FRAMETRACE "$f" | tail -40
             echo "--- last FRAMETRACE blocks"
-            grep FRAMETRACE "$f" | tail -50
+            grep FRAMETRACE "$f" | tail -30
           done
           true
 

apps/desktop-gpui/src/main.rs

@@ -348,6 +348,7 @@ fn main() {
         // starts hidden instead of flashing up before onboarding replaces it.
         // Linux keeps the gate: its main window tracks retained visibility.
         let first_run = cfg!(not(target_os = "linux"))
+            && std::env::var("CAP_PERF_SKIP_ONBOARDING").is_err()
             && (!crate::store::has_completed_startup()
                 || !crate::store::has_completed_onboarding());
         let window_handle = cx

scripts/probe/thread_profile.py

@@ -213,7 +213,10 @@ def main():
             })
         rows.sort(key=lambda r: -r["mcycles_per_s"])
         total = (s1["cycles"] - s0["cycles"]) / wall / 1e6
-        print(f"## {a.label}: process {total:.1f} Mcycles/s, {len(rows)} threads", flush=True)
+        main_row = next(r for r in rows if r["main"])
+        all_sw = sum(r["switches_per_s"] for r in rows)
+        print(f"## {a.label}: process {total:.1f} Mcycles/s, main {main_row['mcycles_per_s']:.1f} Mcycles/s, main wakeups {main_row['switches_per_s']:.2f}/s, process wakeups {all_sw:.1f}/s, {len(rows)} threads", flush=True)
+        print("RESULT " + json.dumps({"label": a.label, "process_mcycles_per_s": total, "main_mcycles_per_s": main_row["mcycles_per_s"], "main_wakeups_per_s": main_row["switches_per_s"], "process_wakeups_per_s": all_sw}), flush=True)
         for r in rows:
             print(f"  tid={r['tid']:>6} main={int(r['main'])} {r['mcycles_per_s']:9.1f} Mc/s {r['switches_per_s']:8.1f} sw/s name={r['name']!r} start={r['start']}", flush=True)
         top = [r["tid"] for r in rows[:10]]