diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index f39c1851..fdd1b776 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -307,7 +307,7 @@ jobs: # cases are spread so the shards of a cell come out even (tools/trace_replay/trace_cases.py, # shard_matrix). A smaller value gives more and shorter jobs, each of which pays the # emulator boot again; every case is replayed once per cell whatever the value. - RETRACE_SHARD_SECONDS: "720" + RETRACE_SHARD_SECONDS: "580" # The most a shard runner may spend on its cases. A shard gets the time in which every # one of its cases could run to the end of its own time budget, up to this cap. RETRACE_SHARD_DEADLINE_CAP_SECONDS: "7200" @@ -578,6 +578,12 @@ jobs: echo "EMULATOR_LOG=${RUNNER_TEMP}/mobilegl-emulator.log" >> "$GITHUB_ENV" echo "EMULATOR_PID_FILE=${RUNNER_TEMP}/mobilegl-emulator.pid" >> "$GITHUB_ENV" + # The swap file, the fixture bundle and the AVD image share the runner's disk, and a + # runner that starts short of space fails the whole shard. The two reports say how much + # was free before and after them. + - name: Report free disk space + run: df -h / "${GITHUB_WORKSPACE}" + - name: Set swap space uses: ./.github/actions/set-swap-space with: @@ -610,6 +616,9 @@ jobs: ${{ env.ANDROID_SDK_ROOT }}/system-images/android-35/google_apis/x86_64 key: ${{ runner.os }}-mobilegl-avd-api35-google_apis-x86_64-pixel_6-v4-${{ hashFiles('android-plugin/run-avd-ci.sh') }} + - name: Report free disk space after the restores + run: df -h / "${GITHUB_WORKSPACE}" + # The cache holds everything a retrace job runs (emulator, adb, image, AVD); the SDK manager # is only needed to create the AVD when the cache missed. - name: Use the cached SDK tools diff --git a/scripts/ci/configure_build.sh b/scripts/ci/configure_build.sh index 924f6943..c04fb4be 100644 --- a/scripts/ci/configure_build.sh +++ b/scripts/ci/configure_build.sh @@ -79,4 +79,8 @@ case "${variant}" in ;; esac +# The command line goes to the job log, so the log shows which options a build was made with. +printf 'configure_build.sh:' +printf ' %q' cmake "${common[@]}" "${flags[@]}" "$@" +echo cmake "${common[@]}" "${flags[@]}" "$@" diff --git a/tools/trace_replay/trace_cases.py b/tools/trace_replay/trace_cases.py index eedb8044..5f365c50 100644 --- a/tools/trace_replay/trace_cases.py +++ b/tools/trace_replay/trace_cases.py @@ -598,7 +598,7 @@ MIN_SHARD_SECONDS = 90 # Replay seconds one emulator shard aims for, the one tunable of the Android layout. A cell is # split into as many shards as that takes. -DEFAULT_ANDROID_SHARD_SECONDS = 720 +DEFAULT_ANDROID_SHARD_SECONDS = 580 # The hint a row without a transport uses. The verify lane has timings of its own. HINT_KIND_MONOLITH = "monolith" diff --git a/tools/trace_replay/trace_duration_hints.json b/tools/trace_replay/trace_duration_hints.json index 41bb9596..2f2a7d85 100644 --- a/tools/trace_replay/trace_duration_hints.json +++ b/tools/trace_replay/trace_duration_hints.json @@ -34,7 +34,7 @@ "minecraft-1.21.4-fabric-iris-photon-v1.1-in-world": {"DirectGLES": {"inproc": 25, "monolith": 34, "spawn": 21}, "DirectVulkan": {"inproc": 24, "monolith": 24, "spawn": 33}}, "minecraft-1.21.4-fabric-iris-photon-v1.3b-in-world": {"DirectGLES": {"inproc": 29, "monolith": 36, "spawn": 29}, "DirectVulkan": {"inproc": 30, "monolith": 27, "spawn": 36}}, "minecraft-1.21.4-fabric-iris-sundial-lite-in-world": {"DirectGLES": {"inproc": 35, "monolith": 27, "spawn": 21}, "DirectVulkan": {"inproc": 31, "monolith": 20, "spawn": 30}}, - "minecraft-1.21.4-fabric-iris-super-duper-vanilla-in-world": {"DirectGLES": {"monolith": 22, "spawn": 21}, "DirectVulkan": {"inproc": 14, "monolith": 20, "spawn": 14}}, + "minecraft-1.21.4-fabric-iris-super-duper-vanilla-in-world": {"DirectGLES": {"inproc": 11, "monolith": 22, "spawn": 21}, "DirectVulkan": {"inproc": 14, "monolith": 20, "spawn": 14}}, "minecraft-1.21.4-fabric-journeymap-in-world": {"DirectGLES": {"inproc": 43, "monolith": 66, "spawn": 65}, "DirectVulkan": {"inproc": 41, "monolith": 60, "spawn": 90}}, "minecraft-1.21.4-fabric-journeymap-in-world-normal-world": {"DirectGLES": {"inproc": 10, "monolith": 12, "spawn": 14}, "DirectVulkan": {"inproc": 15, "monolith": 12, "spawn": 14}}, "minecraft-1.21.4-fabric-modernui-inventory": {"DirectGLES": {"inproc": 54, "monolith": 50, "spawn": 67}, "DirectVulkan": {"inproc": 50, "monolith": 66, "spawn": 70}}, @@ -52,48 +52,48 @@ } }, "android": { - "source": "MobileGL APK run 43666299861 (2026-11-15), step 'Retrace and validate' of each one-case emulator job, APK install included", + "source": "in-shard seconds of MobileGL APK runs 43732107527 and 43735077666 (2026-11-15), one APK install per shard; the monolith and spawn rows outside android_smoke are one-case samples of run 43666299861 scaled to in-shard time", "seconds": { - "OpenRA": {"DirectGLES": {"inproc": 28, "monolith": 28, "spawn": 24}, "DirectVulkan": {"inproc": 24, "monolith": 22, "spawn": 16}}, - "improved-transparency-minecraft-26.3": {"DirectGLES": {"inproc": 179, "monolith": 170, "spawn": 142}, "DirectVulkan": {"inproc": 169, "monolith": 209, "spawn": 153}}, - "minecraft-1.17-main-menu-854": {"DirectGLES": {"inproc": 27, "monolith": 19, "spawn": 22}, "DirectVulkan": {"inproc": 25, "monolith": 25, "spawn": 26}}, - "minecraft-1.20.1-fabric-iris-iterationt-in-world": {"DirectGLES": {"inproc": 131, "monolith": 147, "spawn": 153}, "DirectVulkan": {"inproc": 149, "monolith": 111, "spawn": 116}}, - "minecraft-1.21.1-neoforge-create-indirect-in-world-align1024": {"DirectGLES": {"inproc": 74, "monolith": 85, "spawn": 73}, "DirectVulkan": {"inproc": 44, "monolith": 31, "spawn": 53}}, - "minecraft-1.21.1-neoforge-create-instancing-in-world": {"DirectGLES": {"inproc": 74, "monolith": 56, "spawn": 78}, "DirectVulkan": {"inproc": 42, "monolith": 49, "spawn": 37}}, - "minecraft-1.21.11-main-menu": {"DirectGLES": {"inproc": 38, "monolith": 37, "spawn": 30}, "DirectVulkan": {"inproc": 46, "monolith": 25, "spawn": 45}}, - "minecraft-1.21.4-fabric-common-mods-in-world": {"DirectGLES": {"inproc": 66, "monolith": 51, "spawn": 61}, "DirectVulkan": {"inproc": 70, "monolith": 62, "spawn": 53}}, - "minecraft-1.21.4-fabric-common-mods-inventory": {"DirectGLES": {"inproc": 74, "monolith": 86, "spawn": 41}, "DirectVulkan": {"inproc": 61, "monolith": 55, "spawn": 67}}, - "minecraft-1.21.4-fabric-iris-bliss-in-world": {"DirectGLES": {"inproc": 74, "monolith": 70, "spawn": 53}, "DirectVulkan": {"inproc": 53, "monolith": 69, "spawn": 50}}, - "minecraft-1.21.4-fabric-iris-bsl-esc-menu-854": {"DirectGLES": {"inproc": 220, "monolith": 171, "spawn": 176}, "DirectVulkan": {"inproc": 138, "monolith": 234, "spawn": 193}}, - "minecraft-1.21.4-fabric-iris-bsl-in-world": {"DirectGLES": {"inproc": 60, "monolith": 42, "spawn": 48}, "DirectVulkan": {"inproc": 56, "monolith": 48, "spawn": 60}}, - "minecraft-1.21.4-fabric-iris-chocapic-v6-lite-in-world": {"DirectGLES": {"inproc": 62, "monolith": 54, "spawn": 50}, "DirectVulkan": {"inproc": 51, "monolith": 42, "spawn": 36}}, - "minecraft-1.21.4-fabric-iris-complementary-reimagined-in-world": {"DirectGLES": {"inproc": 93, "monolith": 94, "spawn": 110}, "DirectVulkan": {"inproc": 92, "monolith": 112, "spawn": 88}}, - "minecraft-1.21.4-fabric-iris-complementary-unbound-in-world": {"DirectGLES": {"inproc": 99, "monolith": 97, "spawn": 99}, "DirectVulkan": {"inproc": 98, "monolith": 107, "spawn": 115}}, - "minecraft-1.21.4-fabric-iris-derivative-main-d24.4.14-in-world": {"DirectGLES": {"inproc": 67, "monolith": 81, "spawn": 60}, "DirectVulkan": {"inproc": 77, "monolith": 76, "spawn": 47}}, - "minecraft-1.21.4-fabric-iris-iterationrp-in-world": {"DirectVulkan": {"inproc": 102, "monolith": 108, "spawn": 94}}, - "minecraft-1.21.4-fabric-iris-iterationt-in-world": {"DirectGLES": {"inproc": 40, "monolith": 57, "spawn": 48}, "DirectVulkan": {"inproc": 66, "monolith": 56, "spawn": 61}}, - "minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world": {"DirectGLES": {"inproc": 68, "monolith": 65, "spawn": 39}, "DirectVulkan": {"inproc": 43, "monolith": 70, "spawn": 66}}, - "minecraft-1.21.4-fabric-iris-makeup-ultrafast-in-world": {"DirectGLES": {"inproc": 32, "monolith": 47, "spawn": 46}, "DirectVulkan": {"inproc": 39, "monolith": 42, "spawn": 43}}, - "minecraft-1.21.4-fabric-iris-mellow-in-world": {"DirectGLES": {"inproc": 47, "monolith": 37, "spawn": 42}, "DirectVulkan": {"inproc": 46, "monolith": 40, "spawn": 40}}, - "minecraft-1.21.4-fabric-iris-nostalgia-in-world": {"DirectGLES": {"inproc": 92, "monolith": 51, "spawn": 87}, "DirectVulkan": {"inproc": 60, "monolith": 55, "spawn": 83}}, - "minecraft-1.21.4-fabric-iris-photon-v1.1-in-world": {"DirectGLES": {"inproc": 107, "monolith": 105, "spawn": 79}, "DirectVulkan": {"inproc": 59, "monolith": 100, "spawn": 96}}, - "minecraft-1.21.4-fabric-iris-photon-v1.3b-in-world": {"DirectGLES": {"inproc": 127, "monolith": 114, "spawn": 60}, "DirectVulkan": {"inproc": 94, "monolith": 106, "spawn": 81}}, - "minecraft-1.21.4-fabric-iris-sundial-lite-in-world": {"DirectGLES": {"inproc": 80, "monolith": 77, "spawn": 77}, "DirectVulkan": {"inproc": 76, "monolith": 77, "spawn": 91}}, - "minecraft-1.21.4-fabric-iris-super-duper-vanilla-in-world": {"DirectGLES": {"inproc": 71, "monolith": 63, "spawn": 48}, "DirectVulkan": {"inproc": 53, "monolith": 67, "spawn": 49}}, - "minecraft-1.21.4-fabric-journeymap-in-world": {"DirectGLES": {"inproc": 139, "monolith": 241, "spawn": 172}, "DirectVulkan": {"inproc": 180, "monolith": 257}}, - "minecraft-1.21.4-fabric-journeymap-in-world-normal-world": {"DirectGLES": {"inproc": 56, "monolith": 37, "spawn": 67}, "DirectVulkan": {"inproc": 51, "monolith": 53, "spawn": 54}}, - "minecraft-1.21.4-fabric-modernui-inventory": {"DirectGLES": {"inproc": 207, "monolith": 248, "spawn": 105}, "DirectVulkan": {"inproc": 303, "monolith": 324, "spawn": 195}}, - "minecraft-1.21.4-fabric-modernui-inventory-normal-world": {"DirectGLES": {"inproc": 56, "monolith": 58, "spawn": 53}, "DirectVulkan": {"inproc": 60, "monolith": 58, "spawn": 81}}, - "minecraft-1.21.4-fabric-rei-inventory": {"DirectGLES": {"inproc": 328, "monolith": 337, "spawn": 144}, "DirectVulkan": {"inproc": 325, "monolith": 197, "spawn": 199}}, - "minecraft-1.21.4-fabric-rei-inventory-normal-world": {"DirectGLES": {"inproc": 79, "monolith": 62, "spawn": 46}, "DirectVulkan": {"inproc": 82, "monolith": 51, "spawn": 66}}, - "minecraft-1.21.4-fabric-sodium-in-world": {"DirectGLES": {"inproc": 178, "monolith": 175, "spawn": 91}, "DirectVulkan": {"inproc": 166, "monolith": 136, "spawn": 72}}, - "minecraft-1.21.4-fabric-xaero-minimap-in-world": {"DirectGLES": {"inproc": 231, "monolith": 254, "spawn": 99}, "DirectVulkan": {"inproc": 278, "monolith": 225, "spawn": 127}}, - "minecraft-1.21.4-fabric-xaero-minimap-in-world-normal-world": {"DirectGLES": {"inproc": 61, "monolith": 47, "spawn": 46}, "DirectVulkan": {"inproc": 61, "monolith": 44, "spawn": 42}}, - "minecraft-1.21.4-fabric-xaero-world-map-in-world": {"DirectGLES": {"inproc": 313, "monolith": 223, "spawn": 104}, "DirectVulkan": {"inproc": 276, "monolith": 277, "spawn": 121}}, - "minecraft-1.21.4-fabric-xaero-world-map-in-world-normal-world": {"DirectGLES": {"inproc": 62, "monolith": 47, "spawn": 41}, "DirectVulkan": {"inproc": 52, "monolith": 40, "spawn": 69}}, - "minecraft-1.21.4-in-world": {"DirectGLES": {"inproc": 44, "monolith": 59, "spawn": 43}, "DirectVulkan": {"inproc": 53, "monolith": 59, "spawn": 51}}, - "minecraft-1.21.4-main-menu": {"DirectGLES": {"inproc": 54, "monolith": 48, "spawn": 35}, "DirectVulkan": {"inproc": 58, "monolith": 67, "spawn": 46}}, - "minecraft-1.21.4-startup": {"DirectGLES": {"inproc": 22, "monolith": 19, "spawn": 19}, "DirectVulkan": {"inproc": 18, "monolith": 14, "spawn": 14}} + "OpenRA": {"DirectGLES": {"inproc": 17, "monolith": 21, "spawn": 18}, "DirectVulkan": {"inproc": 16, "monolith": 22, "spawn": 15}}, + "improved-transparency-minecraft-26.3": {"DirectGLES": {"inproc": 116, "monolith": 144, "spawn": 98}, "DirectVulkan": {"inproc": 182, "monolith": 200, "spawn": 138}}, + "minecraft-1.17-main-menu-854": {"DirectGLES": {"inproc": 25, "monolith": 20, "spawn": 18}, "DirectVulkan": {"inproc": 18, "monolith": 19, "spawn": 17}}, + "minecraft-1.20.1-fabric-iris-iterationt-in-world": {"DirectGLES": {"inproc": 116, "monolith": 108, "spawn": 93}, "DirectVulkan": {"inproc": 93, "monolith": 96, "spawn": 82}}, + "minecraft-1.21.1-neoforge-create-indirect-in-world-align1024": {"DirectGLES": {"inproc": 92, "monolith": 61, "spawn": 79}, "DirectVulkan": {"inproc": 21, "monolith": 42, "spawn": 18}}, + "minecraft-1.21.1-neoforge-create-instancing-in-world": {"DirectGLES": {"inproc": 74, "monolith": 86, "spawn": 89}, "DirectVulkan": {"inproc": 19, "monolith": 24, "spawn": 20}}, + "minecraft-1.21.11-main-menu": {"DirectGLES": {"inproc": 28, "monolith": 28, "spawn": 20}, "DirectVulkan": {"inproc": 34, "monolith": 24, "spawn": 27}}, + "minecraft-1.21.4-fabric-common-mods-in-world": {"DirectGLES": {"inproc": 54, "monolith": 38, "spawn": 35}, "DirectVulkan": {"inproc": 45, "monolith": 47, "spawn": 35}}, + "minecraft-1.21.4-fabric-common-mods-inventory": {"DirectGLES": {"inproc": 56, "monolith": 65, "spawn": 35}, "DirectVulkan": {"inproc": 68, "monolith": 53, "spawn": 40}}, + "minecraft-1.21.4-fabric-iris-bliss-in-world": {"DirectGLES": {"inproc": 48, "monolith": 43, "spawn": 37}, "DirectVulkan": {"inproc": 28, "monolith": 60, "spawn": 26}}, + "minecraft-1.21.4-fabric-iris-bsl-esc-menu-854": {"DirectGLES": {"inproc": 197, "monolith": 134, "spawn": 107}, "DirectVulkan": {"inproc": 134, "monolith": 172, "spawn": 153}}, + "minecraft-1.21.4-fabric-iris-bsl-in-world": {"DirectGLES": {"inproc": 26, "monolith": 27, "spawn": 42}, "DirectVulkan": {"inproc": 25, "monolith": 30, "spawn": 37}}, + "minecraft-1.21.4-fabric-iris-chocapic-v6-lite-in-world": {"DirectGLES": {"inproc": 30, "monolith": 37, "spawn": 30}, "DirectVulkan": {"inproc": 24, "monolith": 34, "spawn": 25}}, + "minecraft-1.21.4-fabric-iris-complementary-reimagined-in-world": {"DirectGLES": {"inproc": 91, "monolith": 89, "spawn": 59}, "DirectVulkan": {"inproc": 52, "monolith": 63, "spawn": 67}}, + "minecraft-1.21.4-fabric-iris-complementary-unbound-in-world": {"DirectGLES": {"inproc": 81, "monolith": 77, "spawn": 63}, "DirectVulkan": {"inproc": 48, "monolith": 81, "spawn": 75}}, + "minecraft-1.21.4-fabric-iris-derivative-main-d24.4.14-in-world": {"DirectGLES": {"inproc": 38, "monolith": 69, "spawn": 49}, "DirectVulkan": {"inproc": 34, "monolith": 63, "spawn": 42}}, + "minecraft-1.21.4-fabric-iris-iterationrp-in-world": {"DirectVulkan": {"inproc": 66, "monolith": 77, "spawn": 53}}, + "minecraft-1.21.4-fabric-iris-iterationt-in-world": {"DirectGLES": {"inproc": 41, "monolith": 51, "spawn": 32}, "DirectVulkan": {"inproc": 30, "monolith": 51, "spawn": 44}}, + "minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world": {"DirectGLES": {"inproc": 51, "monolith": 54, "spawn": 28}, "DirectVulkan": {"inproc": 23, "monolith": 45, "spawn": 44}}, + "minecraft-1.21.4-fabric-iris-makeup-ultrafast-in-world": {"DirectGLES": {"inproc": 32, "monolith": 32, "spawn": 33}, "DirectVulkan": {"inproc": 16, "monolith": 35, "spawn": 28}}, + "minecraft-1.21.4-fabric-iris-mellow-in-world": {"DirectGLES": {"inproc": 33, "monolith": 31, "spawn": 29}, "DirectVulkan": {"inproc": 15, "monolith": 31, "spawn": 28}}, + "minecraft-1.21.4-fabric-iris-nostalgia-in-world": {"DirectGLES": {"inproc": 63, "monolith": 59, "spawn": 53}, "DirectVulkan": {"inproc": 38, "monolith": 54, "spawn": 49}}, + "minecraft-1.21.4-fabric-iris-photon-v1.1-in-world": {"DirectGLES": {"inproc": 51, "monolith": 86, "spawn": 59}, "DirectVulkan": {"inproc": 42, "monolith": 81, "spawn": 55}}, + "minecraft-1.21.4-fabric-iris-photon-v1.3b-in-world": {"DirectGLES": {"inproc": 75, "monolith": 82, "spawn": 52}, "DirectVulkan": {"inproc": 46, "monolith": 87, "spawn": 58}}, + "minecraft-1.21.4-fabric-iris-sundial-lite-in-world": {"DirectGLES": {"inproc": 43, "monolith": 46, "spawn": 49}, "DirectVulkan": {"inproc": 44, "monolith": 59, "spawn": 35}}, + "minecraft-1.21.4-fabric-iris-super-duper-vanilla-in-world": {"DirectGLES": {"inproc": 49, "monolith": 53, "spawn": 34}, "DirectVulkan": {"inproc": 28, "monolith": 53, "spawn": 37}}, + "minecraft-1.21.4-fabric-journeymap-in-world": {"DirectGLES": {"inproc": 281, "monolith": 175, "spawn": 112}, "DirectVulkan": {"inproc": 212, "monolith": 199, "spawn": 138}}, + "minecraft-1.21.4-fabric-journeymap-in-world-normal-world": {"DirectGLES": {"inproc": 19, "monolith": 26, "spawn": 44}, "DirectVulkan": {"inproc": 25, "monolith": 48, "spawn": 32}}, + "minecraft-1.21.4-fabric-modernui-inventory": {"DirectGLES": {"inproc": 289, "monolith": 219, "spawn": 97}, "DirectVulkan": {"inproc": 254, "monolith": 251, "spawn": 126}}, + "minecraft-1.21.4-fabric-modernui-inventory-normal-world": {"DirectGLES": {"inproc": 29, "monolith": 45, "spawn": 43}, "DirectVulkan": {"inproc": 31, "monolith": 45, "spawn": 48}}, + "minecraft-1.21.4-fabric-rei-inventory": {"DirectGLES": {"inproc": 264, "monolith": 241, "spawn": 106}, "DirectVulkan": {"inproc": 237, "monolith": 210, "spawn": 131}}, + "minecraft-1.21.4-fabric-rei-inventory-normal-world": {"DirectGLES": {"inproc": 30, "monolith": 44, "spawn": 37}, "DirectVulkan": {"inproc": 35, "monolith": 54, "spawn": 49}}, + "minecraft-1.21.4-fabric-sodium-in-world": {"DirectGLES": {"inproc": 111, "monolith": 118, "spawn": 57}, "DirectVulkan": {"inproc": 145, "monolith": 154, "spawn": 60}}, + "minecraft-1.21.4-fabric-xaero-minimap-in-world": {"DirectGLES": {"inproc": 219, "monolith": 172, "spawn": 95}, "DirectVulkan": {"inproc": 224, "monolith": 201, "spawn": 112}}, + "minecraft-1.21.4-fabric-xaero-minimap-in-world-normal-world": {"DirectGLES": {"inproc": 51, "monolith": 33, "spawn": 35}, "DirectVulkan": {"inproc": 23, "monolith": 41, "spawn": 33}}, + "minecraft-1.21.4-fabric-xaero-world-map-in-world": {"DirectGLES": {"inproc": 171, "monolith": 195, "spawn": 75}, "DirectVulkan": {"inproc": 165, "monolith": 199, "spawn": 90}}, + "minecraft-1.21.4-fabric-xaero-world-map-in-world-normal-world": {"DirectGLES": {"inproc": 32, "monolith": 40, "spawn": 30}, "DirectVulkan": {"inproc": 21, "monolith": 37, "spawn": 45}}, + "minecraft-1.21.4-in-world": {"DirectGLES": {"inproc": 62, "monolith": 44, "spawn": 29}, "DirectVulkan": {"inproc": 40, "monolith": 47, "spawn": 33}}, + "minecraft-1.21.4-main-menu": {"DirectGLES": {"inproc": 41, "monolith": 37, "spawn": 27}, "DirectVulkan": {"inproc": 47, "monolith": 53, "spawn": 29}}, + "minecraft-1.21.4-startup": {"DirectGLES": {"inproc": 15, "monolith": 11, "spawn": 12}, "DirectVulkan": {"inproc": 13, "monolith": 12, "spawn": 7}} } } }