From 7094e30a007a2d1a2dcc1ceceb52bfa30d639328 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 23 Mar 2026 12:52:31 -0700 Subject: [PATCH] ci/amd: Switch radv-raven-traces-restricted over to gpu-trace-replay.sh The new tool has much better image diffing presentation (thanks to Danilo's work on turnip's private trace CI), better performance, flake checking within a single run, parallelized downloads along with replays, system monitoring for replay debug (OOMs especially), and DXVK support (I've added a few traces, but not most of the collection because I didn't want to block on stabilizing this job with everything). Part-of: --- src/amd/ci/gitlab-ci.yml | 9 ++- src/amd/ci/restricted-traces-amd.yml | 34 ---------- src/amd/ci/traces-amd-restricted.toml | 98 +++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 39 deletions(-) delete mode 100644 src/amd/ci/restricted-traces-amd.yml create mode 100644 src/amd/ci/traces-amd-restricted.toml diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index a583924e2f3..52a85292f23 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -85,17 +85,16 @@ amd-raven-skqp: radv-raven-traces-restricted: extends: - - .lava-x86_64-piglit-traces + - .lava-x86_64-test-vk + - .traces-test + - .test-wine - .radv-raven-test:x86_64 - .lava-lenovo-TPad-C13-Yoga-zork:x86_64 - .radv-collabora-restricted-rules variables: HWCI_START_WESTON: 1 ANGLE_TRACE_FILES_TAG: "2025-03-28" - PIGLIT_REPLAY_ANGLE_ARCH: x64 - PIGLIT_TRACES_FILE: restricted-traces-amd.yml - PIGLIT_REPLAY_DEVICE_NAME: "vk-${GPU_VERSION}" - PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE} + REPLAY_CONFIG: traces-amd-restricted.toml FDO_CI_CONCURRENT: 5 # Run the 10 traces in 2 sets of 5 to avoid OOMs allow_failure: true diff --git a/src/amd/ci/restricted-traces-amd.yml b/src/amd/ci/restricted-traces-amd.yml deleted file mode 100644 index 3471713be3c..00000000000 --- a/src/amd/ci/restricted-traces-amd.yml +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.2 ---- - -traces: - angle/libangle_restricted_traces_among_us.so: - vk-radv-raven: - checksum: 585cd5d19a7c562b1eae61740d5a1a30 - angle/libangle_restricted_traces_asphalt_9.so: - vk-radv-raven: - checksum: 1f367de5b7c00abaf666a0ade04dd0d9 - angle/libangle_restricted_traces_brawl_starts.so: - vk-radv-raven: - checksum: c2264076c2f0ca6b48c3bab152a65a36 - angle/libangle_restricted_traces_candy_crush_soda_saga.so: - vk-radv-raven: - checksum: a3e8f7c78583fb0e6c5d13f576dad5d2 - angle/libangle_restricted_traces_free_fire.so: - vk-radv-raven: - checksum: 62307dd7a10d656733bca7e0f065ac99 - angle/libangle_restricted_traces_google_maps.so: - vk-radv-raven: - checksum: b14a53a8ccd4fa9dbfe94a0c0edb1f4f - angle/libangle_restricted_traces_minetest.so: - vk-radv-raven: - checksum: 63969c1f61a6d25e4f68af9e80e69007 - angle/libangle_restricted_traces_mobile_legends.so: - vk-radv-raven: - checksum: 47c004fed88bed8d3d387295399f0810 - angle/libangle_restricted_traces_pubg_mobile_battle_royale.so: - vk-radv-raven: - checksum: f028e6aeb48690e5a36744be55a56773 - angle/libangle_restricted_traces_temple_run_300.so: - vk-radv-raven: - checksum: 4fa6a73dad7d9dd747ba7cbf82aae42e diff --git a/src/amd/ci/traces-amd-restricted.toml b/src/amd/ci/traces-amd-restricted.toml new file mode 100644 index 00000000000..96d84f31c94 --- /dev/null +++ b/src/amd/ci/traces-amd-restricted.toml @@ -0,0 +1,98 @@ +[traces_db] +download_url = "https://s3.freedesktop.org/mesa-tracie-private/" + +[[traces]] +path = "angle/angle_trace_tests/among_us" +[traces.devices] +radv-raven = { checksum = "cba5142fef374856c462fbc0d51d60b40cd208e0515222483c92d07735e22b15" } + +[[traces]] +path = "angle/angle_trace_tests/asphalt_9" +[traces.devices] +radv-raven = { checksum = "69ad73f3c68c993161616535fead74c40d3a474261ea98e62d40cf5468759d3d" } + +[[traces]] +path = "angle/angle_trace_tests/brawl_starts" +[traces.devices] +radv-raven = { checksum = "af1e95679a6de6a7bbbb097e098894e51ee50b402ca2207c89245ecabbd51bbc" } + +[[traces]] +path = "angle/angle_trace_tests/candy_crush_soda_saga" +[traces.devices] +radv-raven = { checksum = "24127f4c59470c738984c878ac35b62d6e34075d200b884a245db11378d533f1" } + +[[traces]] +path = "angle/angle_trace_tests/google_maps" +[traces.devices] +radv-raven = { checksum = "aa6a7cb360c512598cae45077ec85efdf3d744205c5ddc154d4f03f04b3247d8" } + +[[traces]] +path = "angle/angle_trace_tests/free_fire" +[traces.devices] +radv-raven = { checksum = "93fef722d4306301b05a449a9a7a201cfb7eddf4aab95ae11ece854db93ef4dc" } + +[[traces]] +path = "angle/angle_trace_tests/minetest" +[traces.devices] +radv-raven = { checksum = "55f9bc8f7e631e4672f63a8e218230b9365d09a3bdb5a57864aa5f786bd29dd2" } + +[[traces]] +path = "angle/angle_trace_tests/mobile_legends" +[traces.devices] +radv-raven = { checksum = "256017105d46cb1e924c47686de1e48bad798282f78ecb3e9a4f4dc464dd1378" } + +[[traces]] +path = "angle/angle_trace_tests/pubg_mobile_battle_royale" +[traces.devices] +radv-raven = { checksum = "52f99b5b6da1969db6299650fa877acab6a5b209cda70a3bfc1d5e20df426ddc" } + +[[traces]] +path = "angle/angle_trace_tests/temple_run_300" +[traces.devices] +radv-raven = { checksum = "35d2c4f94af8d4b4a4c401aee7f928d1547926cba53f250d6632f4afd0eb38b1" } + +[[traces]] +path = "steam-d3d9/deadspace3_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +radv-raven = { checksum = "8b2ec9131338d94d909c92b848a6a488ad5fa094f934927e1c29738577aff51f" } + +[[traces]] +path = "steam-d3d9/drakensang_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +radv-raven = { checksum = "dad5709cdd48152a51f331a89c0c87f960f7e20e5148bea72cf08ab42090b070" } + +[[traces]] +path = "steam-d3d9/FalloutNewVegas_unknown_dx9_YesMan_ultra_1080p.trace" +[traces.devices] +radv-raven = { checksum = "48d68b309831d699fc4cb39a0d76ce99f8f810e518436230a0840d66d0b94e3e" } + +[[traces]] +path = "steam-d3d9/FarCry2_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +radv-raven = { checksum = "2c26eeb43d9f9d06ea14c7260ebd2efc3b7f0df2b9d3d0665aaebe1baecd29cf" } + +[[traces]] +path = "steam-d3d9/KbWoTn_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +radv-raven = { checksum = "ddad71225331f2b8c41b79fed277dc266515e49ee03035daf678faa0d96ae5cc" } + +[[traces]] +path = "steam-d3d9/Oblivion_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +radv-raven = { checksum = "2d5ad1465abdb462130f172e6a11da9372c8d7f0134cba2e31a2dec9ccd8aa93" } + +[[traces]] +path = "steam-d3d9/SpiderMan_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +radv-raven = { checksum = "b088ffbd7d3bfac77af352c94a829eef268f759b681befe739e283b1978dcb3f" } + +[[traces]] +path = "steam-d3d9/psychonauts_unknown_dx9_unknown_unknown_none.trace" +nonloopable = true +[traces.devices] +radv-raven = { checksum = "53d87cec9dbf01a72f22b7f57a7590d5a1103c656d02e26413fc412eb5f7caf5" } + +[[traces]] +path = "steam-d3d9/TFT_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +radv-raven = { checksum = "e45ad6267faee71c7be5339db4381c156b1aad5069c3a37a88758801a3cef323" }