From 1d829f3a89dd053d286c6c60e19ebfe9c8df46a5 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Wed, 27 May 2026 09:23:20 +0200 Subject: [PATCH] panfrost/ci: Switch traces over to gpu-trace-perf Convert the two nightly panfrost trace replay jobs to @anholt's new GPU trace snapshot comparison tool. This allows running a few traces on t860 that couldn't be replayed before. Signed-off-by: Valentine Burley Part-of: --- src/panfrost/ci/gitlab-ci-inc.yml | 8 +- src/panfrost/ci/gitlab-ci.yml | 4 +- src/panfrost/ci/traces-panfrost.toml | 150 +++++++++++++++++++++++++++ src/panfrost/ci/traces-panfrost.yml | 135 ------------------------ 4 files changed, 157 insertions(+), 140 deletions(-) create mode 100644 src/panfrost/ci/traces-panfrost.toml delete mode 100644 src/panfrost/ci/traces-panfrost.yml diff --git a/src/panfrost/ci/gitlab-ci-inc.yml b/src/panfrost/ci/gitlab-ci-inc.yml index 59e4c2fd0f2..fd6e4d8f0d3 100644 --- a/src/panfrost/ci/gitlab-ci-inc.yml +++ b/src/panfrost/ci/gitlab-ci-inc.yml @@ -18,7 +18,7 @@ - src/panfrost/ci/$GPU_VERSION-gles2-extensions.txt - src/panfrost/ci/$DRIVER_NAME-flakes.txt - src/panfrost/ci/$DRIVER_NAME-skips.txt - - src/panfrost/ci/$PIGLIT_TRACES_FILE + - src/panfrost/ci/REPLAY_CONFIG - src/panfrost/clc/* - src/panfrost/compiler/* - src/panfrost/genxml/* @@ -152,13 +152,15 @@ HWCI_FREQ_MAX: "true" .panfrost-traces: + extends: + - .traces-test variables: PAN_MESA_DEBUG: "deqp,sync" MESA_GLES_VERSION_OVERRIDE: "3.1" MESA_GL_VERSION_OVERRIDE: "3.3" MESA_GLSL_VERSION_OVERRIDE: 330 - EGL_PLATFORM: surfaceless - PIGLIT_TRACES_FILE: traces-panfrost.yml + REPLAY_CONFIG: traces-panfrost.toml + HWCI_START_WESTON: 1 # https://lava.collabora.dev/scheduler/device_type/meson-g12b-a311d-khadas-vim3 .lava-meson-g12b-a311d-khadas-vim3:arm64: diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index a211ae3dc00..6a17727ddf1 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -26,7 +26,7 @@ panfrost-t760-gles:arm32: panfrost-t760-traces:arm32: extends: - - .lava-arm32-piglit-traces + - .lava-arm32-test-gl - .panfrost-midgard-manual-rules - .panfrost-test - .lava-rk3288-veyron-jaq:arm32 @@ -71,7 +71,7 @@ panfrost-t860-egl:arm64: panfrost-t860-traces:arm64: extends: - - .lava-arm64-piglit-traces + - .lava-arm64-test-gl - .panfrost-midgard-manual-rules - .panfrost-test - .lava-rk3399-rock-pi-4b:arm64 diff --git a/src/panfrost/ci/traces-panfrost.toml b/src/panfrost/ci/traces-panfrost.toml new file mode 100644 index 00000000000..b48a7cef327 --- /dev/null +++ b/src/panfrost/ci/traces-panfrost.toml @@ -0,0 +1,150 @@ +[traces_db] +download_url = "https://s3.freedesktop.org/mesa-tracie-public/" + +[[traces]] +path = "behdad-glyphy/glyphy-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "7aa10c6586a6e1c542879922a51aa4b60785edda699158fc25d70a0fff07f7a3" } + +[[traces]] +path = "glxgears/glxgears-2-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "956ac05e0d104d28b384168efec353a5e39c34a71f2add6ce85050f26b6bbfd3" } +panfrost-t760 = { checksum = "956ac05e0d104d28b384168efec353a5e39c34a71f2add6ce85050f26b6bbfd3" } + +# [[traces]] +# path = "pathfinder/demo-v2.trace" +# [traces.devices] + +# [[traces]] +# path = "pathfinder/canvas_moire-v2.trace" +# [traces.devices] + +[[traces]] +path = "pathfinder/canvas_text_v2-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "be8b730df375d252c3af062cabe436940a0b8a9dde7f05f96f0fb87e9a188026" } +panfrost-t760 = { checksum = "be8b730df375d252c3af062cabe436940a0b8a9dde7f05f96f0fb87e9a188026" } + +[[traces]] +path = "gputest/furmark-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "be93c04484d1e354403e823a299ba2ab3da2ad29fa742cb83e7d800a427eb760" } + +[[traces]] +path = "gputest/triangle-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "2d9ec3916cf5654a8594c006907e84b5ee36419ed8a55101fcba9aee4d8a76b0" } +panfrost-t760 = { checksum = "2d9ec3916cf5654a8594c006907e84b5ee36419ed8a55101fcba9aee4d8a76b0" } + +[[traces]] +path = "humus/Portals-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "e5b747bd615fb49b8fab76f842ad9121daa38f8344824a5e55e80b63882c21bd" } +panfrost-t760 = { checksum = "25ee6261e71f6a2f15d0edfadcfa2432b2ffb6be9e4e2339065c75b1b261f571" } + +# [[traces]] +# path = "0ad/0ad-v2.trace" +# [traces.devices] + +# gimark requires an environment var to work around a bug, disable for now +# [[traces]] +# path = "gputest/gimark-v2.trace" +# [traces.devices] +# Some blue rings are missing on the top-left corner, also the penguin watermark. +# panfrost-t860 = { checksum = "0020a77e25003e4e8db1ce929eed8914" } + +[[traces]] +path = "gputest/pixmark-julia-fp32-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "40ed809d3766b84229135260158746e9e3f3bc7fd40e87307bd34c419696592c" } + +[[traces]] +path = "gputest/plot3d-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "905f702df1d8c21ef58965e25569fb538ce01d439ac7db473a9fa0d84394719b" } + +[[traces]] +path = "humus/AmbientAperture-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "851d9a9a1f6209c6cf79a12a36eb674b2661ca753da2bd4b890af887483f36bd" } + +[[traces]] +path = "humus/CelShading-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "d905649f3642e6bf9c86f53f8f8bb514219607bcca80464d92d3288a25b03242" } + +[[traces]] +path = "humus/DynamicBranching3-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "5049dc77e75b188ec23bd9430bcc556630ccce1060274cf793ee8dedbf6995ce" } + +[[traces]] +path = "humus/RaytracedShadows-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "aa020ccb8900c72d22826b27d54220fe4dd037414c84d433b9af4c665e11052e" } + +[[traces]] +path = "humus/VolumetricFogging2-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "ed79d36abcda3514afadcd9a3be35b86c6db30e63d66dcbcc75b4a3925daf6e4" } + +# [[traces]] +# path = "neverball/neverball-v2.trace" +# [traces.devices] +# Missing the coins and the texture on the \"Nev\" of the level. +# panfrost-t860 = { checksum = "53365059f3b84436c199f1cb6f6d3b35" } + +[[traces]] +path = "paraview/pv-manyspheres-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "846fde9480b1877bc52b75e4ff1902b35f57efcf98031978004e50dada19b148" } + +[[traces]] +path = "paraview/pv-waveletcontour-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "fdb2e3cf120be26a8c458aaaacaaa59f55a134df5c3d234ea7349fcf92868636", singlethread = true } + +[[traces]] +path = "paraview/pv-waveletvolume-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "44a68bb926feb07dac94642fe46907cef541fba017fceba84fa7bb493148c31b" } + +[[traces]] +path = "valve/counterstrike-v2.trace" +[traces.devices] +panfrost-t860 = { checksum = "ea458cdc37994d5cb2d3a8956246347690341b620f5d35c372a1fe3ff415e4f8" } + +# [[traces]] +# path = "valve/counterstrike-source-v2.trace" +# [traces.devices] + +# [[traces]] +# path = "ror/ror-default.trace" +# [traces.devices] + +# [[traces]] +# path = "nheko/nheko-colors.trace" +# [traces.devices] + +[[traces]] +path = "warzone2100/warzone2100-default.trace" +[traces.devices] +panfrost-t760 = { checksum = "b0a1cd3eb73cf1c546ce6a4121f54106d4b892c7b48d7cdd49dc32f4e82b53c5" } +panfrost-t860 = { checksum = "8ec666b1f4916f2b1612abf97db387b606184b0084626d79addd0944bef84bf4" } + +# [[traces]] +# path = "blender/blender-demo-cube_diorama.trace" +# [traces.devices] + +# [[traces]] +# path = "blender/blender-demo-ellie_pose.trace" +# [traces.devices] + +# [[traces]] +# path = "unvanquished/unvanquished-lowest.trace" +# [traces.devices] + +# [[traces]] +# path = "unvanquished/unvanquished-ultra.trace" +# [traces.devices] diff --git a/src/panfrost/ci/traces-panfrost.yml b/src/panfrost/ci/traces-panfrost.yml deleted file mode 100644 index e19a81354d4..00000000000 --- a/src/panfrost/ci/traces-panfrost.yml +++ /dev/null @@ -1,135 +0,0 @@ -%YAML 1.2 ---- -traces-db: - download-url: "https://s3.freedesktop.org/mesa-tracie-public/" - -traces: - behdad-glyphy/glyphy-v2.trace: - gl-panfrost-t860: - checksum: 22bf5262745fd47c5c5eadb93d7cc420 - glxgears/glxgears-2-v2.trace: - gl-panfrost-t860: - checksum: bcc73608b6e2b5d92bf926d1c21889c7 - gl-panfrost-t760: - checksum: bcc73608b6e2b5d92bf926d1c21889c7 - pathfinder/demo-v2.trace: - gl-panfrost-t860: - label: [crash] - checksum: c4f5e6bfe0cba230b1aef631c2fa4584 - gl-panfrost-t760: - label: [crash] - checksum: c4f5e6bfe0cba230b1aef631c2fa4584 - pathfinder/canvas_moire-v2.trace: - gl-panfrost-t860: - label: [crash] - checksum: 2fb2c8e83719526cb6c02b6c2e069d61 - gl-panfrost-t760: - label: [crash] - checksum: 2fb2c8e83719526cb6c02b6c2e069d61 - pathfinder/canvas_text_v2-v2.trace: - gl-panfrost-t860: - checksum: 35fbb0c520595e948d3a0f3aaa499d77 - gl-panfrost-t760: - checksum: 35fbb0c520595e948d3a0f3aaa499d77 - gputest/furmark-v2.trace: - gl-panfrost-t860: - checksum: 3a86834f9b096bc8dc9033589641c7d8 - gputest/triangle-v2.trace: - gl-panfrost-t860: - checksum: 75c5a2e261d576d115a659f6cd52a90d - gl-panfrost-t760: - checksum: 75c5a2e261d576d115a659f6cd52a90d - humus/Portals-v2.trace: - gl-panfrost-t860: - checksum: ad04db74ea70b7772719080f8a4c499b - gl-panfrost-t760: - checksum: 4a1937c257107833cd43816daae1d814 - 0ad/0ad-v2.trace: - gl-panfrost-t860: - label: [skip, timeout] -# gimark requires an environment var to work around a bug, disable for now -# # Flaky since the introduction of parallel trace replay -# gputest/gimark-v2.trace: -# gl-panfrost-t860: -# label: [skip, flakes, broken] -# checksum: 0020a77e25003e4e8db1ce929eed8914 -# text: Some blue rings are missing on the top-left corner, also the penguin watermark. - gputest/pixmark-julia-fp32-v2.trace: - gl-panfrost-t860: - checksum: d85b6967b7c768f28395c5c5dfbcfe3e - gputest/plot3d-v2.trace: - gl-panfrost-t860: - checksum: a34223830866a42747db199b04c5e1be - humus/AmbientAperture-v2.trace: - gl-panfrost-t860: - checksum: e4c0b930ef99f14305e1ade7f1779c09 - humus/CelShading-v2.trace: - gl-panfrost-t860: - checksum: 521ca6a236b8400cf692e6817b91c739 - humus/DynamicBranching3-v2.trace: - gl-panfrost-t860: - checksum: 32e349d14319b4ae921c146224d26a0e - humus/RaytracedShadows-v2.trace: - gl-panfrost-t860: - checksum: f7d5129163beaff3150d98ca7b3f11f6 - humus/VolumetricFogging2-v2.trace: - gl-panfrost-t860: - checksum: f53b5b1430aa21804c6fed01bce560aa - neverball/neverball-v2.trace: - gl-panfrost-t860: - label: [broken] - checksum: 53365059f3b84436c199f1cb6f6d3b35 - text: Missing the coins and the texture on the "Nev" of the level. - paraview/pv-manyspheres-v2.trace: - gl-panfrost-t860: - checksum: 1747f5c7609548f1cf325a7e89ea02a9 - paraview/pv-waveletcontour-v2.trace: - gl-panfrost-t860: - label: [crash] - checksum: db43c733f3f3d5253e263838e58d9111 - paraview/pv-waveletvolume-v2.trace: - gl-panfrost-t860: - checksum: e0b4fba1e77005892c06a4899933d71a - valve/counterstrike-v2.trace: - gl-panfrost-t860: - label: [hang] - checksum: b4af9243e34f3de0153b6855dc9c66b6 - valve/counterstrike-source-v2.trace: - gl-panfrost-t860: - label: [hang] - checksum: bbe74b2171d62fc6738086740e1aa0d8 - ror/ror-default.trace: - gl-panfrost-t860: - label: [crash] - nheko/nheko-colors.trace: - gl-panfrost-t760: - label: [skip, flakes] - checksum: bfc0f5e19e858c36f6f66dbdb2040944 - gl-panfrost-t860: - label: [skip, flakes] - checksum: 03251159007917a90247d2aa2cf5f68b - warzone2100/warzone2100-default.trace: - gl-panfrost-t760: - checksum: da86f0bd148b39855050f042490f5dda - gl-panfrost-t860: - checksum: e4e92aa7bda9d68a12770d94b3e98f5a - blender/blender-demo-cube_diorama.trace: - gl-panfrost-t760: - label: [unsupported] - gl-panfrost-t860: - label: [unsupported] - blender/blender-demo-ellie_pose.trace: - gl-panfrost-t760: - label: [unsupported] - gl-panfrost-t860: - label: [unsupported] - unvanquished/unvanquished-lowest.trace: - gl-panfrost-t760: - label: [unsupported] - gl-panfrost-t860: - label: [unsupported] - unvanquished/unvanquished-ultra.trace: - gl-panfrost-t760: - label: [unsupported] - gl-panfrost-t860: - label: [unsupported]