From 01cb0249223239beaf3755a95fc2830df8d6af5f Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 23 Mar 2026 12:57:01 -0700 Subject: [PATCH] ci/intel: Switch over to the new tool for restricted traces. 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/intel/ci/gitlab-ci.yml | 9 +-- src/intel/ci/restricted-traces-intel.yml | 34 -------- src/intel/ci/traces-intel-restricted.toml | 98 +++++++++++++++++++++++ 3 files changed, 102 insertions(+), 39 deletions(-) delete mode 100644 src/intel/ci/restricted-traces-intel.yml create mode 100644 src/intel/ci/traces-intel-restricted.toml diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index 90f7a2fd45a..e3214fc3af2 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -130,17 +130,16 @@ anv-adl-angle: anv-adl-traces-restricted: extends: - - .lava-x86_64-piglit-traces + - .lava-x86_64-test-vk + - .traces-test + - .test-wine - .anv-test - .lava-acer-chromebox-cxi5-brask:x86_64 - .anv-restricted-rules variables: HWCI_START_WESTON: 1 ANGLE_TRACE_FILES_TAG: "2025-03-28" - PIGLIT_REPLAY_ANGLE_ARCH: x64 - PIGLIT_TRACES_FILE: restricted-traces-intel.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-intel-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/intel/ci/restricted-traces-intel.yml b/src/intel/ci/restricted-traces-intel.yml deleted file mode 100644 index e20304d6010..00000000000 --- a/src/intel/ci/restricted-traces-intel.yml +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.2 ---- - -traces: - angle/libangle_restricted_traces_among_us.so: - vk-anv-adl: - checksum: 06b628f9cb4fc4e59cc31b54451151e3 - angle/libangle_restricted_traces_asphalt_9.so: - vk-anv-adl: - checksum: b0f121660eee2ba3fb45bef218e55ce2 - angle/libangle_restricted_traces_brawl_starts.so: - vk-anv-adl: - checksum: e038ef82470fff7b94cf958fa869d130 - angle/libangle_restricted_traces_candy_crush_soda_saga.so: - vk-anv-adl: - checksum: dc5d96a70af6165d88f882b96fb73e73 - angle/libangle_restricted_traces_free_fire.so: - vk-anv-adl: - checksum: 1a9f03ed30ee254842afe7ab7792a493 - angle/libangle_restricted_traces_google_maps.so: - vk-anv-adl: - checksum: 3b6fa15ed853da3a073fdbd70f2d1b7a - angle/libangle_restricted_traces_minetest.so: - vk-anv-adl: - checksum: a2d769be52e38da9be5f61f6bb32e325 - angle/libangle_restricted_traces_mobile_legends.so: - vk-anv-adl: - checksum: ae8371870059d87d475da217a453acfc - angle/libangle_restricted_traces_pubg_mobile_battle_royale.so: - vk-anv-adl: - checksum: 692350e4315d58f2644f5901b954fa15 - angle/libangle_restricted_traces_temple_run_300.so: - vk-anv-adl: - checksum: 72610fdadbfb7d99aa5de13d78598ff2 diff --git a/src/intel/ci/traces-intel-restricted.toml b/src/intel/ci/traces-intel-restricted.toml new file mode 100644 index 00000000000..2651a4056f8 --- /dev/null +++ b/src/intel/ci/traces-intel-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] +anv-adl = { checksum = "54494f980da7e7af996f48aca9a2b74946ce3248ae4d05578190b450520bd19e" } + +[[traces]] +path = "angle/angle_trace_tests/asphalt_9" +[traces.devices] +anv-adl = { checksum = "726844c6243ff9f2782ffd1e0e29f636239c9c58885336d08b86a55562a1a73d" } + +[[traces]] +path = "angle/angle_trace_tests/brawl_starts" +[traces.devices] +anv-adl = { checksum = "3845dd1a5ca119c2ca13d918023201d462b9d6969a61c7114bdef65869445d49" } + +[[traces]] +path = "angle/angle_trace_tests/candy_crush_soda_saga" +[traces.devices] +anv-adl = { checksum = "57450987a3587607ec5813fc13b6f0a990cceab28e676d027b76af11279e891b" } + +[[traces]] +path = "angle/angle_trace_tests/free_fire" +[traces.devices] +anv-adl = { checksum = "a55f7e1bcf8004fadbe722dfd86c09bc026f7cf414efd57d13b973344df9175b" } + +[[traces]] +path = "angle/angle_trace_tests/google_maps" +[traces.devices] +anv-adl = { checksum = "f0c803f23cb4a40b7bc78145a309772baa32c147acd46162ce39b5b22b6a0b4f" } + +[[traces]] +path = "angle/angle_trace_tests/minetest" +[traces.devices] +anv-adl = { checksum = "63bcea065b22589bf4f0cf26a6b5f174d8e1d48819214dc32eb19258e7a3e22f" } + +[[traces]] +path = "angle/angle_trace_tests/mobile_legends" +[traces.devices] +anv-adl = { checksum = "c5538bd3b68a8048c06ee925ac723e1bc24543960105a92997a85754dc7f145e" } + +[[traces]] +path = "angle/angle_trace_tests/pubg_mobile_battle_royale" +[traces.devices] +anv-adl = { checksum = "baa2fa1d2f5b7ab2606a48ee6a599e8dbabb526f6466590f2b58629cfcb9f680" } + +[[traces]] +path = "angle/angle_trace_tests/temple_run_300" +[traces.devices] +anv-adl = { checksum = "843e12d5a56ffa3d37682d69054476665859e4af896129d9ac54da00a4506319" } + +[[traces]] +path = "steam-d3d9/deadspace3_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +anv-adl = { checksum = "8a7f5047a8c2587da500a97ba28074c34f555e9d2d796cb55879b8b366a6942b" } + +[[traces]] +path = "steam-d3d9/drakensang_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +# Uses about 1GB on our device with 3GB available. +anv-adl = { checksum = "1e5c0225c36659ad9515ddb5eabb0f8e26846cc8e89649405163576c7ae7d195", singlethread = true } + +[[traces]] +path = "steam-d3d9/FalloutNewVegas_unknown_dx9_YesMan_ultra_1080p.trace" +[traces.devices] +anv-adl = { checksum = "5a408c19dbcf30cf3344ac93d88b0a2804f0f15104f2a4423de1f66ca2c8b259" } + +# steam-d3d9/FarCry2_unknown_dx9_unknown_unknown_none.trace: Had a crash flake. + +[[traces]] +path = "steam-d3d9/KbWoTn_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +# Uses about 1.5GB on our device with 3GB available. +anv-adl = { checksum = "99849e5cfc168931ff56b8cb9f915b2d463ccb56ba7f4f94d12503bd70594c93", singlethread = true } + +[[traces]] +path = "steam-d3d9/Oblivion_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +anv-adl = { checksum = "2a50d28ae44c750354bdffcfb04d46adfa21434a1b1f99b4ff6ad6115e02c7dd" } + +[[traces]] +path = "steam-d3d9/SpiderMan_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +anv-adl = { checksum = "082ac3af6a833f52ab0826d03a68d1b9c42afa21aaf928d5e3d5c78638f2684e" } + +[[traces]] +path = "steam-d3d9/psychonauts_unknown_dx9_unknown_unknown_none.trace" +nonloopable = true +[traces.devices] +anv-adl = { checksum = "06fac809f402e90d93809bc9cba4b8112091bfbc4462bc8422a58376a698ef1c" } + +[[traces]] +path = "steam-d3d9/TFT_unknown_dx9_unknown_unknown_none.trace" +[traces.devices] +# Uses about 1GB on our device with 3GB available. +anv-adl = { checksum = "d6e11e7b3c3b4af355a565e6cdbc3c32bead81100660a5f3e90ebe04536f6fc3", singlethread = true }