diff --git a/src/gallium/drivers/crocus/ci/traces-crocus.yml b/src/gallium/drivers/crocus/ci/traces-crocus.yml
index cbc2ca46e06..27c8d62ccf7 100644
--- a/src/gallium/drivers/crocus/ci/traces-crocus.yml
+++ b/src/gallium/drivers/crocus/ci/traces-crocus.yml
@@ -2,33 +2,33 @@ traces-db:
   download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
 
 traces:
-  - path: 0ad/0ad.trace
+  - path: 0ad/0ad-v2.trace
     expectations:
       - device: crocus-g41
         checksum: f4f723a73fde41b8a00a2a6518190adf
       - device: crocus-hsw
         checksum: 6567807570543c2875fc6912f00687e5
-  - path: behdad-glyphy/glyphy.trace
+  - path: behdad-glyphy/glyphy-v2.trace
     expectations:
       # glyphs unintelligible on g41, unstable results
       #- device: crocus-g41
       #  checksum: 9d1db810d33f1ab30570bd710476429c
       - device: crocus-hsw
         checksum: 49c62d99a21de18a3e184a57bf655849
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: crocus-g41
         checksum: 18455018dcfa97f69c967f118551ae30
       - device: crocus-hsw
         checksum: f53ac20e17da91c0359c31f2fa3f401e
-  - path: gputest/furmark.trace
+  - path: gputest/furmark-v2.trace
     expectations:
       # Slightly different blurriness from freedreno, neither is obviously wrong.
       - device: crocus-g41
         checksum: c7c3df989f88852e88bef101b5c1dc22
       - device: crocus-hsw
         checksum: bb84373a69751942956d2320cff6dd1d
-  #- path: gputest/gimark.trace
+  #- path: gputest/gimark-v2.trace
   #  expectations:
       # Needs GL3.3.
       # - device: crocus-g41
@@ -37,18 +37,18 @@ traces:
       # Inconsistent checksums, disabled
       # - device: crocus-hsw
       #   checksum: 96d35bcf6b05593754e20823982457f8
-  - path: gputest/pixmark-julia-fp32.trace
+  - path: gputest/pixmark-julia-fp32-v2.trace
     expectations:
       - device: crocus-g41
         checksum: 03776a063ee7049256acd414239a7f13
       - device: crocus-hsw
         checksum: dea71222007af1669cff54ce5e0b8c8d
-  - path: gputest/pixmark-julia-fp64.trace
+  - path: gputest/pixmark-julia-fp64-v2.trace
     expectations:
       # Requires GL4, not for G41.
       - device: crocus-hsw
         checksum: 7e4948c361528a7873dad9712f629770
-  #- path: gputest/pixmark-piano.trace
+  #- path: gputest/pixmark-piano-v2.trace
   #  expectations:
       # Looks like it probably triggers hangcheck on g41
       # - device: crocus-g41
@@ -56,93 +56,93 @@ traces:
       # Has also intermittently hangchecked on the hsw box.
       # - device: crocus-hsw
       #   checksum: 898b89c720f9bddd714633f46553e7a7
-  - path: gputest/pixmark-volplosion.trace
+  - path: gputest/pixmark-volplosion-v2.trace
     expectations:
       # Different geometry in the explosion from freedreno, neither is obviously wrong.
       - device: crocus-g41
         checksum: 6fc94a69b9e1f38693ea3ed4f530c7da
       - device: crocus-hsw
         checksum: b96cddb97eb0cde8a388dad76d8dfef6
-  - path: humus/AmbientAperture.trace
+  - path: humus/AmbientAperture-v2.trace
     expectations:
       # Needs GLSL 130
       # - device: crocus-g41
       #   checksum: 13732b80b207dbf8c69a418e3b1f6c35
       - device: crocus-hsw
         checksum: 5686175a74f9ef6a3b13d30f1bd32b16
-  - path: humus/CelShading.trace
+  - path: humus/CelShading-v2.trace
     expectations:
       - device: crocus-g41
         checksum: 9b6e185ac8e8e67fc13d84f0ad6c3e3b
       - device: crocus-hsw
         checksum: 0f03835fd89b615542ece4bbb4712e48
-  - path: humus/DynamicBranching3.trace
+  - path: humus/DynamicBranching3-v2.trace
     expectations:
       # Needs GLSL 130
       # - device: crocus-g41
       #   checksum: 8a06b8d08a8a01f02f4f0e9c37d4f6ff
       - device: crocus-hsw
         checksum: 16e3458485d1ba75fe80f61f59d124be
-  - path: humus/HDR.trace
+  - path: humus/HDR-v2.trace
     expectations:
       # Needs GLSL 130
       # - device: crocus-g41
       #   checksum: f3a0ed7fe057f3010d2129d33203d656
       - device: crocus-hsw
         checksum: 0dfbc65adca38721831ffddf0ede2af6
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: crocus-g41
         checksum: b090e734ed332e259664851576925d7b
       - device: crocus-hsw
         checksum: 61ea77324581e86cf8d313fe3fb27270
-  - path: humus/RaytracedShadows.trace
+  - path: humus/RaytracedShadows-v2.trace
     expectations:
       - device: crocus-g41
         checksum: dbef340424f4f85eb8dc053ad3a56ae1
       - device: crocus-hsw
         checksum: bac350df35b9262efca6722faf5c4eaa
-  - path: humus/VolumetricFogging2.trace
+  - path: humus/VolumetricFogging2-v2.trace
     expectations:
       # Needs GLSL 130
       # - device: crocus-g41
       #   checksum: 05cd8687f80642137986fe9b2e677e39
       - device: crocus-hsw
         checksum: a4f444b6ca337901ae080d8f2af812b4
-  - path: neverball/neverball.trace
+  - path: neverball/neverball-v2.trace
     expectations:
       - device: crocus-g41
         checksum: 0f14a88f511cd886c920238c80017e5d
       - device: crocus-hsw
         checksum: ec6b2615ab12db73126e06e6b20663ec
-  - path: paraview/pv-manyspheres.trace
+  - path: paraview/pv-manyspheres-v2.trace
     expectations:
       - device: crocus-hsw
         checksum: 73e5d34fb13268b0c7126297bfc34965
-  - path: paraview/pv-waveletcontour.trace
+  - path: paraview/pv-waveletcontour-v2.trace
     expectations:
       - device: crocus-hsw
         checksum: b384e3e81e4843fbd1d50e0c542e600a
-  - path: paraview/pv-waveletvolume.trace
+  - path: paraview/pv-waveletvolume-v2.trace
     expectations:
       - device: crocus-hsw
         checksum: 6ad068ac9f390bf42ab9e2db880ad07b
-  - path: pathfinder/canvas_moire.trace
+  - path: pathfinder/canvas_moire-v2.trace
     expectations:
       - device: crocus-hsw
         checksum: 21bccd42f2deb6416cf6591cd6a99258
-  - path: pathfinder/canvas_text_v2.trace
+  - path: pathfinder/canvas_text_v2-v2.trace
     expectations:
       - device: crocus-hsw
         checksum: 448886e3b24f6408e013ea13f7c96d28
-  - path: pathfinder/demo.trace
+  - path: pathfinder/demo-v2.trace
     expectations:
       - device: crocus-hsw
         checksum: d9b33f0a2efe17c21b7933242afd9ec7
   # Fails to run / times out.
-  # - path: pioneer/pioneer.trace
+  # - path: pioneer/pioneer-v2.trace
   #   expectations:
-  #- path: thedarkmod/thedarkmod.trace
+  #- path: thedarkmod/thedarkmod-v2.trace
   #  expectations:
   # context create fail
   #    - device: crocus-g41
@@ -150,7 +150,7 @@ traces:
   # Reasonable looking rendering, but inconsistent checksums
   #    - device: crocus-hsw
   #      checksum: 26bab35cd52c38010b617eb115e6713c
-  - path: supertuxkart/supertuxkart-mansion-egl-gles.trace
+  - path: supertuxkart/supertuxkart-mansion-egl-gles-v2.trace
     expectations:
       # Different lighting from freedreno
       - device: crocus-hsw
@@ -181,7 +181,7 @@ traces:
         checksum: d1e3bb943aa32a3fc9d2681106c4a087
       - device: crocus-hsw
         checksum: 98eeb4c504b0f03b136d5fd89edd6d5c
-  #- path: xonotic/xonotic-keybench-high.trace
+  #- path: xonotic/xonotic-keybench-high-v2.trace
   #  expectations:
     # Requires GLSL 140
     #  - device: crocus-g41
diff --git a/src/gallium/drivers/i915/ci/traces-i915.yml b/src/gallium/drivers/i915/ci/traces-i915.yml
index d0fa23e8b90..ca6c3afa33d 100644
--- a/src/gallium/drivers/i915/ci/traces-i915.yml
+++ b/src/gallium/drivers/i915/ci/traces-i915.yml
@@ -5,54 +5,54 @@ traces-db:
 # Xorg in the x86 docker images we're using.
 
 traces:
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: i915-g33
         checksum: ee8dcdb3b9eaef2b32a2914b89373419
-  - path: gputest/plot3d.trace
+  - path: gputest/plot3d-v2.trace
     expectations:
       - device: i915-g33
         checksum: 456d98a570563af3bc61d91fd1742868
-  - path: gputest/triangle.trace
+  - path: gputest/triangle-v2.trace
     expectations:
       # Weird white bar behind Tux's head.
       - device: i915-g33
         checksum: ef9b19e9a6dcd928d3bd44e7eee95029
   # Requires GLSL 1.30
-  #- path: humus/AmbientAperture.trace
+  #- path: humus/AmbientAperture-v2.trace
   #  expectations:
   #    - device: i915-g33
   #      checksum: 8d4c52f0af9c09710d358f24c73fae3c
-  - path: humus/CelShading.trace
+  - path: humus/CelShading-v2.trace
     # The cel shading is pretty chunky, but maybe that's just precision stuff.
     expectations:
       - device: i915-g33
         checksum: 7518414e4f1a4f1e07c04ec1500f53e7
   # Requires GLSL 1.30
-  #- path: humus/DynamicBranching3.trace
+  #- path: humus/DynamicBranching3-v2.trace
   #  expectations:
   #    - device: i915-g33
   #      checksum: 765fa742b87e411763921c6f988b2573
   # Requires GLSL 1.30
-  #- path: humus/HDR.trace
+  #- path: humus/HDR-v2.trace
   #  expectations:
   #    - device: i915-g33
   #      checksum: 80b164e85e96a413568d18ce308caae3
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: i915-g33
         checksum: f782469019417923831d5d53dbe6a507
   # The shadow raytracing shader fails to compile
-  #- path: humus/RaytracedShadows.trace
+  #- path: humus/RaytracedShadows-v2.trace
   #  expectations:
   #    - device: i915-g33
   #      checksum: 5dc0af9fead0102a791784d0f6122096
   # Requires GLSL 1.30
-  #- path: humus/VolumetricFogging2.trace
+  #- path: humus/VolumetricFogging2-v2.trace
   #  expectations:
   #    - device: i915-g33
   #      checksum: aec880cec7ba460f3144b789bc517891
-  - path: neverball/neverball.trace
+  - path: neverball/neverball-v2.trace
     expectations:
       - device: i915-g33
         checksum: f925aa92da47ebc757285f826113f4db
diff --git a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
index 38e79b664b3..52760a4ec41 100644
--- a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
+++ b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
@@ -2,7 +2,7 @@ traces-db:
   download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
 
 traces:
-  - path: 0ad/0ad.trace
+  - path: 0ad/0ad-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 73171898acd606e5729b45ecf7e8def7
@@ -134,59 +134,59 @@ traces:
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 83bf05971404700b874c4e9d9edd1379
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
+  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: fa54af7770699dfe78c3e33061312739
-  - path: glmark2/jellyfish.trace
+  - path: glmark2/jellyfish-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: da850394d7f99a895322222cc95170af
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
-  - path: gputest/furmark.trace
+  - path: gputest/furmark-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 58a6a276abc0e28fcb2a8acea3342712
-  - path: gputest/pixmark-piano.trace
+  - path: gputest/pixmark-piano-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 11e2a97c14c74e771483ca0d90f9bde3
-  - path: gputest/triangle.trace
+  - path: gputest/triangle-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 7812de00011a3a059892e36cea19c696
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: a55dd3d87a86b3b47121ff67861028c3
-  - path: jvgs/jvgs-d27fb67.trace
+  - path: jvgs/jvgs-d27fb67-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: b8c21bf76e667735d1640b215f456531
-  - path: pathfinder/demo.trace
+  - path: pathfinder/demo-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: a053c56658bc830249bc94317a3b3ea8
-  - path: paraview/pv-manyspheres.trace
+  - path: paraview/pv-manyspheres-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: b740377ea4bbb3becd304d1696a55247
-  - path: paraview/pv-waveletcontour.trace
+  - path: paraview/pv-waveletcontour-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: db43c733f3f3d5253e263838e58d9111
-  - path: paraview/pv-waveletvolume.trace
+  - path: paraview/pv-waveletvolume-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: f4af4067b37c00861fa5911e4c0a6629
-  - path: pathfinder/canvas_moire.trace
+  - path: pathfinder/canvas_moire-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 25ba8f18274126670311bd3ffe058f74
-  - path: pathfinder/canvas_text_v2.trace
+  - path: pathfinder/canvas_text_v2-v2.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: a1446d0c42a78771240fca6f3b1e10d8
diff --git a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml
index 6db8122132a..b44661fa697 100644
--- a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml
+++ b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml
@@ -2,167 +2,167 @@ traces-db:
   download-url: "http://caching-proxy/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/"
 
 traces:
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
+  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 740fa8f8e9a9d815cf160b1893370755
-  - path: glmark2/jellyfish.trace
+  - path: glmark2/jellyfish-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 5bc7d5c250b7d568313c4afd064082f6
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: ef3653f50d4853d3e9cb3244c799565a
-  - path: 0ad/0ad.trace
+  - path: 0ad/0ad-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 8d71757cb74f8d71bf87c8af7e7f725a
-  - path: pathfinder/demo.trace
+  - path: pathfinder/demo-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 86318ec31a55a1246cb4a136a15475fd
-  - path: pathfinder/canvas_moire.trace
+  - path: pathfinder/canvas_moire-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 78dd2357ad6e5ffc049a75bfb11c5497
-  - path: pathfinder/canvas_text_v2.trace
+  - path: pathfinder/canvas_text_v2-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 6cb8190a2ee4c335291914fbc70a8bb8
-  - path: gputest/furmark.trace
+  - path: gputest/furmark-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 4ceea12000bb5995b915228d2d4b49c7
-  - path: gputest/triangle.trace
+  - path: gputest/triangle-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 2d0527e7288a0fc31099404546dadbfb
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 5b96333495b794691e4ed071ae92ff19
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 5db05161041946e8971f39f12bbd847c
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: e2154c522fcdb4f43b31b31c17adda74
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 70298e48479147af2d848a5441fb5f47
-  - path: glmark2/bump:bump-render=height.trace
+  - path: glmark2/bump:bump-render=height-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: f5129b06e401a5fefa18a9895b18deec
-  - path: glmark2/bump:bump-render=high-poly.trace
+  - path: glmark2/bump:bump-render=high-poly-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 3fc1adf0caa289b3296a80c2c13834ca
-  - path: glmark2/bump:bump-render=normals.trace
+  - path: glmark2/bump:bump-render=normals-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 596fd7a084d3a7a6b61b322593385f45
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: fb2eda378ace8ca8b81d73d20cbfbbf7
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: b8575de0e043f540b12f13209054d000
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: f70625a1f9bd9d2c211e330032b86f85
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
+  - path: glmark2/desktop:windows=4:effect=shadow-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 384015de55daf7dd406c9463576018e9
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
+  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: e3677a85bc346a9bd52a6569d17bbe6e
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
+  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: f8af0ba4f5162fc91937a90c17445b50
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=low-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 9efd8bb5df15f9483a18a00f9650caa9
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 9bdd506c0404cb11a7148cb08b429d1b
-  - path: glmark2/build:use-vbo=false.trace
+  - path: glmark2/build:use-vbo=false-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 506b1910317b04e5d32aacf2bd70bd0d
-  - path: glmark2/build:use-vbo=true.trace
+  - path: glmark2/build:use-vbo=true-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 793dc29115ae442b279276adb89d0999
-  - path: glmark2/ideas:speed=10000.trace
+  - path: glmark2/ideas:speed=10000-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 1ae057093620f868aad846167f04c6e0
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 6fb2f9bce414879e3751bb51d1a8d481
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 27fabda45ca2a989c21b4ec386a2e8f6
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 05ac8be6e2e0c03ea1caec85f037cddd
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
+  - path: glmark2/pulsar:quads=5:texture=false:light=false-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 0b62b9c04e4c00f44eba64b366c47783
-  - path: glmark2/refract.trace
+  - path: glmark2/refract-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: c711f3a07f6aa9e0f19c544c6d7c2000
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
+  - path: glmark2/shading:shading=blinn-phong-inf-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 429c6bbdf99d573cc4eaaee3c0471257
-  - path: glmark2/shading:shading=cel.trace
+  - path: glmark2/shading:shading=cel-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 330d9a8375970e42ba5ddc3142dc6477
-  - path: glmark2/shading:shading=gouraud.trace
+  - path: glmark2/shading:shading=gouraud-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: e22908309d41af8c9753c5c7cae73b29
-  - path: glmark2/shading:shading=phong.trace
+  - path: glmark2/shading:shading=phong-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 2ac9f1b6ba39f8924b374d18181edeeb
-  - path: glmark2/shadow.trace
+  - path: glmark2/shadow-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 9215a1525dfe5b12999652b3a3ba05d8
-  - path: glmark2/terrain.trace
+  - path: glmark2/terrain-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 80a1bba6ff969c9a82c68de0306f2b61
-  - path: glmark2/texture:texture-filter=linear.trace
+  - path: glmark2/texture:texture-filter=linear-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 928479421abda4823a673393cd59ff81
-  - path: glmark2/texture:texture-filter=mipmap.trace
+  - path: glmark2/texture:texture-filter=mipmap-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: cb94bca58ed8f41c5f6f6dda3fb15600
-  - path: glmark2/texture:texture-filter=nearest.trace
+  - path: glmark2/texture:texture-filter=nearest-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 63762536d93048c0dadb19b22381cb90
@@ -170,63 +170,63 @@ traces:
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 0e7441a7f2c86c75eeac72269786e7a1
-  - path: gputest/gimark.trace
+  - path: gputest/gimark-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 3e021c1c5f2900e53c3375e0366eeda9
-  - path: gputest/pixmark-julia-fp32.trace
+  - path: gputest/pixmark-julia-fp32-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: b5e0ae5ad680d884432f89a923f3e70d
-  - path: gputest/pixmark-julia-fp64.trace
+  - path: gputest/pixmark-julia-fp64-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: b181b0a910f5ae5b161df70f834c3d5f
-  - path: gputest/pixmark-volplosion.trace
+  - path: gputest/pixmark-volplosion-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: c8321043b7c05156b71f9837b54e7b50
-  - path: gputest/plot3d.trace
+  - path: gputest/plot3d-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 2832d2190df232bcbde71a4b720303e1
-  - path: gputest/tessmark.trace
+  - path: gputest/tessmark-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: b4bc7998ff804bf25aac9f9609b8acbf
-  - path: humus/AmbientAperture.trace
+  - path: humus/AmbientAperture-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 679dc88e5f0d3b3608e0490b4b39fbea
-  - path: humus/CelShading.trace
+  - path: humus/CelShading-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: ebd3f460386b9461aab6adef04dc0547
-  - path: humus/DynamicBranching3.trace
+  - path: humus/DynamicBranching3-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 9f932808ccce10a2bf7568ddafe1a1cf
-  - path: humus/HDR.trace
+  - path: humus/HDR-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: fddf642f7a4e3946f1975e33cf773220
-  - path: humus/RaytracedShadows.trace
+  - path: humus/RaytracedShadows-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 743ce9c218b87404cfe615ed7951d5b8
-  - path: paraview/pv-manyspheres.trace
+  - path: paraview/pv-manyspheres-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 7728082892aa81ee74484b1ed239db74
-  - path: paraview/pv-waveletcontour.trace
+  - path: paraview/pv-waveletcontour-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: c49b01d08b9716cd3408173d2dd1c9ef
-  - path: paraview/pv-waveletvolume.trace
+  - path: paraview/pv-waveletvolume-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: 491d0572ab0bcbcbc9827521597b3787
-  - path: humus/VolumetricFogging2.trace
+  - path: humus/VolumetricFogging2-v2.trace
     expectations:
       - device: gl-radeonsi-stoney
         checksum: e3eb8d6934c23cbef7133ba501821698
diff --git a/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml b/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml
index 874308be255..27ee05e573c 100644
--- a/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml
@@ -3,253 +3,249 @@ traces-db:
 
 traces:
 # Crash in crosvm: ../src/dispatch_common.c:858: epoxy_get_proc_address: Assertion `0 && "Couldn't find current GLX or EGL context.\n"' failed.
-#  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
+#  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace
 #    expectations:
 #      - device: gl-virgl
 #        checksum: 2fc8433c4a38b796173bda2bcfb924cc
-  - path: glmark2/jellyfish.trace
+  - path: glmark2/jellyfish-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 9b6a4191680b2e75f4089b69b31a75b8
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f53ac20e17da91c0359c31f2fa3f401e
-  - path: gputest/furmark.trace
+  - path: gputest/furmark-v2.trace
     expectations:
       - device: gl-virgl
         checksum: c377f21f7bfaca0c04983612e7c9a7bb
-  - path: gputest/pixmark-piano.trace
+  - path: gputest/pixmark-piano-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f2338b10aebf05d7c10d805852d2e774
-  - path: gputest/triangle.trace
+  - path: gputest/triangle-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 5f694874b15bcd7a3689b387c143590b
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 32e8b627a33ad08d416dfdb804920371
-  - path: 0ad/0ad.trace
+  - path: 0ad/0ad-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 784d20f0166ef66b4b65f25f2858a5ee
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 64c12e5b89aef72c95184e860c6a70a2
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: dbe8fc3027495c3c433ff2638b789314
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 7dd3d9b641333dcd4fba4e04d0c20f93
-  - path: glmark2/bump:bump-render=height.trace
+  - path: glmark2/bump:bump-render=height-v2.trace
     expectations:
       - device: gl-virgl
         checksum: cd32f46925906c53fae747372a8f2ed8
-  - path: glmark2/bump:bump-render=high-poly.trace
+  - path: glmark2/bump:bump-render=high-poly-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 11b7a4820b452934e6f12b57b8910a9a
-  - path: glmark2/bump:bump-render=normals.trace
+  - path: glmark2/bump:bump-render=normals-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 822a9f45a9eb10f28dba5fd7b750ead5
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5-v2.trace
     expectations:
       - device: gl-virgl
         checksum: ef659484c57854a3fedb54c4f5b3983e
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
+  - path: glmark2/desktop:windows=4:effect=shadow-v2.trace
     expectations:
       - device: gl-virgl
         checksum: fb613653ec149be57cafa29f8e077b59
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
+  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;-v2.trace
     expectations:
       - device: gl-virgl
         checksum: e3677a85bc346a9bd52a6569d17bbe6e
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
+  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;-v2.trace
     expectations:
       - device: gl-virgl
         checksum: b80963dae6ecf40c83bfb16943ef1011
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=low-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 2ead7a061d05a6431c0efd076cb8731a
-  - path: glmark2/build:use-vbo=false.trace
+  - path: glmark2/build:use-vbo=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: cf8ee908ffab16537acf899cd31698d3
-  - path: glmark2/build:use-vbo=true.trace
+  - path: glmark2/build:use-vbo=true-v2.trace
     expectations:
       - device: gl-virgl
         checksum: ef075cad089512504539bdb4139190f5
-  - path: glmark2/ideas:speed=10000.trace
+  - path: glmark2/ideas:speed=10000-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 61683b2126c758375fdc75d7e6e34720
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 6c5675c503aec910095e57f0390d0311
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 35521cba43b8c537f335bf65a31b6492
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
+  - path: glmark2/pulsar:quads=5:texture=false:light=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 36596dbbd11804a538790c19ff05622d
-  - path: glmark2/refract.trace
+  - path: glmark2/refract-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 99f8afc6528241cb0dc013a038179118
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
+  - path: glmark2/shading:shading=blinn-phong-inf-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 3b1bfe5792425fb989df394d248ad16a
-  - path: glmark2/shading:shading=cel.trace
+  - path: glmark2/shading:shading=cel-v2.trace
     expectations:
       - device: gl-virgl
         checksum: adf3d3fd63b94dff23312fad6939e789
-  - path: glmark2/shading:shading=gouraud.trace
+  - path: glmark2/shading:shading=gouraud-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 76d7f65e289f474a7024a44152252aa8
-  - path: glmark2/shading:shading=phong.trace
+  - path: glmark2/shading:shading=phong-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 6714070f3b88fdf1446abb2550f3264a
-  - path: glmark2/shadow.trace
+  - path: glmark2/shadow-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 5d152ef79b699de16dfc1e2c72951346
-  - path: glmark2/texture:texture-filter=linear.trace
+  - path: glmark2/texture:texture-filter=linear-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 4ca969ae421ae34ba90a833ecf0052c8
-  - path: glmark2/texture:texture-filter=mipmap.trace
+  - path: glmark2/texture:texture-filter=mipmap-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f335d1e56904d576631e5393b0eedff1
-  - path: glmark2/texture:texture-filter=nearest.trace
+  - path: glmark2/texture:texture-filter=nearest-v2.trace
     expectations:
       - device: gl-virgl
         checksum: cac64fd2e5d61123b30ab744f9471dc6
-  - path: glxgears/glxgears.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 87b8bcd27cc03a1dbf36aeca66748541
 # Crash
-#  - path: gputest/gimark.trace
+#  - path: gputest/gimark-v2.trace
 #    expectations:
 #      - device: gl-virgl
 #        checksum: 2cf40180a1315795389d0dfc18aad988
-  - path: gputest/pixmark-julia-fp32.trace
+  - path: gputest/pixmark-julia-fp32-v2.trace
     expectations:
       - device: gl-virgl
         checksum: fbf5e44a6f46684b84e5bb5ad6d36c67
-  - path: gputest/pixmark-julia-fp64.trace
+  - path: gputest/pixmark-julia-fp64-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 1760aea00af985b8cd902128235b08f6
-  - path: gputest/pixmark-volplosion.trace
+  - path: gputest/pixmark-volplosion-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 00642d04fd37eca519d07f7f345f6b9c
-  - path: gputest/plot3d.trace
+  - path: gputest/plot3d-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 56f11d133f72712a6df13855ec00cdb0
 # Times out
-# - path: gputest/tessmark.trace
+# - path: gputest/tessmark-v2.trace
 #   expectations:
 #     - device: gl-virgl
 #       checksum: 5d04b8d71517238b9bc8a527574e884b
-  - path: humus/AmbientAperture.trace
+  - path: humus/AmbientAperture-v2.trace
     expectations:
       - device: gl-virgl
         checksum: b8e7c0ab1c14345023ae55619ce345d2
-  - path: humus/CelShading.trace
+  - path: humus/CelShading-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 04b500b7a56d01ab35661bebd82d35bc
-  - path: humus/DynamicBranching3.trace
+  - path: humus/DynamicBranching3-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 491dd7e374069b7da45e4306b523587f
-  - path: humus/HDR.trace
+  - path: humus/HDR-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 52a31cbc5dc5c08d80c8ff1287f99652
-  - path: humus/RaytracedShadows.trace
+  - path: humus/RaytracedShadows-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 2cd1b0f0f336bd5a2cd485a795f04620
-  - path: humus/VolumetricFogging2.trace
+  - path: humus/VolumetricFogging2-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 7946d847e0d381495db96e25f4cfa0f6
 # virtio_gpu OOM
-#  - path: itoral-gl-terrain-demo/demo.trace
+#  - path: itoral-gl-terrain-demo/demo-v2.trace
 #    expectations:
 #      - device: gl-virgl
 #        checksum: eb35b96d94ff1eda37aae5e5cc505bad
-  - path: neverball/neverball.trace
+  - path: neverball/neverball-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f481391fd77e7339a44fe73304fce2f8
-  - path: pathfinder/canvas_moire.trace
+  - path: pathfinder/canvas_moire-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 1706229fca06c1d7946ebc94e3b0a66d
-  - path: pathfinder/canvas_text_v2.trace
+  - path: pathfinder/canvas_text_v2-v2.trace
     expectations:
       - device: gl-virgl
         checksum: c824fcadd028eba50d9911ebe1a3f823
-  - path: pathfinder/demo.trace
+  - path: pathfinder/demo-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 558c3d2b1b7acc782b3908c579ce0ce8
   # host crashes with
   # "src/mesa/main/arrayobj.c:800:_mesa_update_vao_derived_arrays: Assertion
   # `attrib->_EffRelativeOffset < binding->Stride' failed. running these.
-  # - path: paraview/pv-manyspheres.trace
+  # - path: paraview/pv-manyspheres-v2.trace
   #   expectations:
   #     - device: gl-virgl
   #       checksum: b740377ea4bbb3becd304d1696a55247
-  # - path: paraview/pv-waveletcontour.trace
+  # - path: paraview/pv-waveletcontour-v2.trace
   #   expectations:
   #    - device: gl-virgl
   #       checksum: db43c733f3f3d5253e263838e58d9111
-  - path: paraview/pv-waveletvolume.trace
+  - path: paraview/pv-waveletvolume-v2.trace
     expectations:
       - device: gl-virgl
         checksum: b36c25e52624cbf8dab73b6acecb8e84
-  - path: supertuxkart/supertuxkart-mansion-egl-gles.trace
+  - path: supertuxkart/supertuxkart-mansion-egl-gles-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 5f09cbda043d1b6ee41ab287209e903d
-  - path: xonotic/xonotic-keybench-high.trace
+  - path: xonotic/xonotic-keybench-high-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 181424f3afd256108be63d8ea0669b6b
diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml
index 229a761306d..a015fd5fccc 100644
--- a/src/gallium/drivers/virgl/ci/traces-virgl.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml
@@ -2,252 +2,248 @@ traces-db:
   download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
 
 traces:
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
+  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 2fc8433c4a38b796173bda2bcfb924cc
-  - path: glmark2/jellyfish.trace
+  - path: glmark2/jellyfish-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 2112a9a5519f39483735509f2ccc61af
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
-  - path: gputest/furmark.trace
+  - path: gputest/furmark-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 57ddd36b117adc9216c65c10d914a37e
-  - path: gputest/pixmark-piano.trace
+  - path: gputest/pixmark-piano-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 0d875bda7edc01698342b157c6f51500
-  - path: gputest/triangle.trace
+  - path: gputest/triangle-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 7812de00011a3a059892e36cea19c696
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: gl-virgl
         checksum: b697edce7776f1afe294a7e80dfc013e
-  - path: 0ad/0ad.trace
+  - path: 0ad/0ad-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 350e0cf64d124ba98d90106f61775eb4
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f80431e56327354b4c88cc45c7e6633a
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 81e12bfa4ae3b7e63b01edbed71a5941
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 08e6d00fe3f4414ebfadc9e5f3c3bf0e
-  - path: glmark2/bump:bump-render=height.trace
+  - path: glmark2/bump:bump-render=height-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 4d5211dfb0fd82a1a1dbb498dc2e5b8b
-  - path: glmark2/bump:bump-render=high-poly.trace
+  - path: glmark2/bump:bump-render=high-poly-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 4b4d4a4b7bb1341bbd0299c7eb3a6ac9
-  - path: glmark2/bump:bump-render=normals.trace
+  - path: glmark2/bump:bump-render=normals-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 832e5baf289b27dd84a665f1c85f57c2
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0-v2.trace
     expectations:
       - device: gl-virgl
         checksum: b78f28d97b675fcc7649cced3930650a
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5-v2.trace
     expectations:
       - device: gl-virgl
         checksum: d0782a516f06a6dddac4f1e1249f41e7
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 1ae280a9c6cae495f2d272516a52167e
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
+  - path: glmark2/desktop:windows=4:effect=shadow-v2.trace
     expectations:
       - device: gl-virgl
         checksum: d4b3e8338327859a029c7267c9916524
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
+  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 35584880539813436d87bfcbe22cf59b
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
+  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;-v2.trace
     expectations:
       - device: gl-virgl
         checksum: b80963dae6ecf40c83bfb16943ef1011
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=low-v2.trace
     expectations:
       - device: gl-virgl
         checksum: da10cb29cab30c5c068e722b5da7c2e5
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 8e40504d9f2ead8c0d02604291bff1b6
-  - path: glmark2/build:use-vbo=false.trace
+  - path: glmark2/build:use-vbo=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 024fc485e1f33461313c956ab1b73bdf
-  - path: glmark2/build:use-vbo=true.trace
+  - path: glmark2/build:use-vbo=true-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 48c45d16cd410a71aea1a12a73e257d3
-  - path: glmark2/ideas:speed=10000.trace
+  - path: glmark2/ideas:speed=10000-v2.trace
     expectations:
       - device: gl-virgl
         checksum: db78cfb035213e31e1435b637b1a8f19
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 7fee2e864e015353ace431d51d41bb22
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: c87127a5c3256c1fe7c79f7931b8f9df
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 5fec1f728bda86891db4243130546187
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
+  - path: glmark2/pulsar:quads=5:texture=false:light=false-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 3e0e6675fb65e00f9128138ff08c2634
-  - path: glmark2/refract.trace
+  - path: glmark2/refract-v2.trace
     expectations:
       - device: gl-virgl
         checksum: cdadfee0518b964433d80c01329ec191
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
+  - path: glmark2/shading:shading=blinn-phong-inf-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 36b07dad759ca65e52f1abf1667e7ca8
-  - path: glmark2/shading:shading=cel.trace
+  - path: glmark2/shading:shading=cel-v2.trace
     expectations:
       - device: gl-virgl
         checksum: cb41cf2531a06d65f6e4f442ab62ae8d
-  - path: glmark2/shading:shading=gouraud.trace
+  - path: glmark2/shading:shading=gouraud-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 3e5469d5038d7cc94ef3549ce9d8c385
-  - path: glmark2/shading:shading=phong.trace
+  - path: glmark2/shading:shading=phong-v2.trace
     expectations:
       - device: gl-virgl
         checksum: e40abcbb4cfbbbfb499d4b0e6d668f41
-  - path: glmark2/shadow.trace
+  - path: glmark2/shadow-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 2bb7290f8559ff93305c0e29f3d671e1
-  - path: glmark2/texture:texture-filter=linear.trace
+  - path: glmark2/texture:texture-filter=linear-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 914fd8dddb23751d9a187a979d881abb
-  - path: glmark2/texture:texture-filter=mipmap.trace
+  - path: glmark2/texture:texture-filter=mipmap-v2.trace
     expectations:
       - device: gl-virgl
         checksum: ea1939f3c4e8dd9cdbc26d41f9dc891a
-  - path: glmark2/texture:texture-filter=nearest.trace
+  - path: glmark2/texture:texture-filter=nearest-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 1ae652bdebd1188ab912a800a4c37166
-  - path: glxgears/glxgears.trace
-    expectations:
-      - device: gl-virgl
-        checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd
 # Crash
-#  - path: gputest/gimark.trace
+#  - path: gputest/gimark-v2.trace
 #    expectations:
 #      - device: gl-virgl
 #        checksum: 2cf40180a1315795389d0dfc18aad988
-  - path: gputest/pixmark-julia-fp32.trace
+  - path: gputest/pixmark-julia-fp32-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 8b3584b1dd8f1d1bb63205564bd78e4e
-  - path: gputest/pixmark-julia-fp64.trace
+  - path: gputest/pixmark-julia-fp64-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 73ccaff82ea764057fb0f93f0024cf84
-  - path: gputest/pixmark-volplosion.trace
+  - path: gputest/pixmark-volplosion-v2.trace
     expectations:
       - device: gl-virgl
         checksum: aef0b32ce99a3b25d35304ca08032833
-  - path: gputest/plot3d.trace
+  - path: gputest/plot3d-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 817a36e53edccdf946061315596e9cdd
 # Times out
-# - path: gputest/tessmark.trace
+# - path: gputest/tessmark-v2.trace
 #   expectations:
 #     - device: gl-virgl
 #       checksum: 5d04b8d71517238b9bc8a527574e884b
-  - path: humus/AmbientAperture.trace
+  - path: humus/AmbientAperture-v2.trace
     expectations:
       - device: gl-virgl
         checksum: b33fb8ee73b0c50b14822e170f15ab8a
-  - path: humus/CelShading.trace
+  - path: humus/CelShading-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 3629cba72bde53e4275a8365175fde83
-  - path: humus/DynamicBranching3.trace
+  - path: humus/DynamicBranching3-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 0236b28aa8b26fa60172d71bb040f2e9
-  - path: humus/HDR.trace
+  - path: humus/HDR-v2.trace
     expectations:
       - device: gl-virgl
         checksum: eab0801aadeae87ce31aa0d4ff55e8f8
-  - path: humus/RaytracedShadows.trace
+  - path: humus/RaytracedShadows-v2.trace
     expectations:
       - device: gl-virgl
         checksum: df074a376fd3e7abc4dffdd191db8f4b
-  - path: humus/VolumetricFogging2.trace
+  - path: humus/VolumetricFogging2-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 2eb71553403ad8e0171abc9dc25e5bc1
-  - path: itoral-gl-terrain-demo/demo.trace
+  - path: itoral-gl-terrain-demo/demo-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 716d4fe36a6212b161285fed8a423ee8
-  - path: neverball/neverball.trace
+  - path: neverball/neverball-v2.trace
     expectations:
       - device: gl-virgl
         checksum: cc11743f008ccd76adf72695a423436a
-  - path: pathfinder/canvas_moire.trace
+  - path: pathfinder/canvas_moire-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 25ba8f18274126670311bd3ffe058f74
-  - path: pathfinder/canvas_text_v2.trace
+  - path: pathfinder/canvas_text_v2-v2.trace
     expectations:
       - device: gl-virgl
         checksum: a1446d0c42a78771240fca6f3b1e10d8
-  - path: pathfinder/demo.trace
+  - path: pathfinder/demo-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 0702a66c415cfc13d5bae8bec08402cf
   # host crashes with
   # "src/mesa/main/arrayobj.c:800:_mesa_update_vao_derived_arrays: Assertion
   # `attrib->_EffRelativeOffset < binding->Stride' failed. running these.
-  # - path: paraview/pv-manyspheres.trace
+  # - path: paraview/pv-manyspheres-v2.trace
   #   expectations:
   #     - device: gl-virgl
   #       checksum: b740377ea4bbb3becd304d1696a55247
-  # - path: paraview/pv-waveletcontour.trace
+  # - path: paraview/pv-waveletcontour-v2.trace
   #   expectations:
   #    - device: gl-virgl
   #       checksum: db43c733f3f3d5253e263838e58d9111
-  - path: paraview/pv-waveletvolume.trace
+  - path: paraview/pv-waveletvolume-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f4af4067b37c00861fa5911e4c0a6629
-  - path: supertuxkart/supertuxkart-mansion-egl-gles.trace
+  - path: supertuxkart/supertuxkart-mansion-egl-gles-v2.trace
     expectations:
       - device: gl-virgl
         checksum: 092e8ca38e58aaa83df2a9f0b7b8aee5
-  - path: xonotic/xonotic-keybench-high.trace
+  - path: xonotic/xonotic-keybench-high-v2.trace
     expectations:
       - device: gl-virgl
         checksum: f3b184bf8858a6ebccd09e7ca032197e
diff --git a/src/intel/ci/traces-iris.yml b/src/intel/ci/traces-iris.yml
index d061908253e..65896b398e4 100644
--- a/src/intel/ci/traces-iris.yml
+++ b/src/intel/ci/traces-iris.yml
@@ -2,7 +2,7 @@ traces-db:
   download-url: "http://caching-proxy/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/"
 
 traces:
-#  - path: 0ad/0ad.trace
+#  - path: 0ad/0ad-v2.trace
 #    expectations:
 #      - device: gl-intel-apl
 #        checksum: becaa29fae8a988b8b5f4694f59383db
@@ -16,7 +16,7 @@ traces:
 #        checksum: becaa29fae8a988b8b5f4694f59383db
 #      - device: gl-intel-cml
 #        checksum: becaa29fae8a988b8b5f4694f59383db
-  - path: behdad-glyphy/glyphy.trace
+  - path: behdad-glyphy/glyphy-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 5c7e2fc5961b43a18ea65523fe025b96
@@ -30,7 +30,7 @@ traces:
         checksum: 5c7e2fc5961b43a18ea65523fe025b96
       - device: gl-intel-cml
         checksum: 5c7e2fc5961b43a18ea65523fe025b96
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
+  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: c8c96a8cc167e0d07f889d7310316922
@@ -44,7 +44,7 @@ traces:
         checksum: c8c96a8cc167e0d07f889d7310316922
       - device: gl-intel-cml
         checksum: c8c96a8cc167e0d07f889d7310316922
-  - path: glmark2/jellyfish.trace
+  - path: glmark2/jellyfish-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: c31236c496768159903aa48f5a47bcdc
@@ -58,7 +58,7 @@ traces:
         checksum: c31236c496768159903aa48f5a47bcdc
       - device: gl-intel-cml
         checksum: c31236c496768159903aa48f5a47bcdc
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: f53ac20e17da91c0359c31f2fa3f401e
@@ -72,7 +72,7 @@ traces:
         checksum: f53ac20e17da91c0359c31f2fa3f401e
       - device: gl-intel-cml
         checksum: f53ac20e17da91c0359c31f2fa3f401e
-  - path: 0ad/0ad.trace
+  - path: 0ad/0ad-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 45739401f068971e6e1052f10afe9f99
@@ -86,7 +86,7 @@ traces:
         checksum: 45739401f068971e6e1052f10afe9f99
       - device: gl-intel-cml
         checksum: 45739401f068971e6e1052f10afe9f99
-  - path: pathfinder/demo.trace
+  - path: pathfinder/demo-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: d9b33f0a2efe17c21b7933242afd9ec7
@@ -100,7 +100,7 @@ traces:
         checksum: d9b33f0a2efe17c21b7933242afd9ec7
       - device: gl-intel-cml
         checksum: d9b33f0a2efe17c21b7933242afd9ec7
-  - path: pathfinder/canvas_moire.trace
+  - path: pathfinder/canvas_moire-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 21bccd42f2deb6416cf6591cd6a99258
@@ -114,7 +114,7 @@ traces:
         checksum: 21bccd42f2deb6416cf6591cd6a99258
       - device: gl-intel-cml
         checksum: 21bccd42f2deb6416cf6591cd6a99258
-  - path: pathfinder/canvas_text_v2.trace
+  - path: pathfinder/canvas_text_v2-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 448886e3b24f6408e013ea13f7c96d28
@@ -128,7 +128,7 @@ traces:
         checksum: 448886e3b24f6408e013ea13f7c96d28
       - device: gl-intel-cml
         checksum: 448886e3b24f6408e013ea13f7c96d28
-  - path: gputest/furmark.trace
+  - path: gputest/furmark-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 06d587a2b934295da6ad874b750b9c9d
@@ -145,7 +145,7 @@ traces:
   # Sometimes hangchecks -- has triggered on glk at least, but is a common
   # trigger of hangchecks across multiple drivers because it's a very slow scene
   # to render.
-  #- path: gputest/pixmark-piano.trace
+  #- path: gputest/pixmark-piano-v2.trace
   #  expectations:
   #    - device: gl-intel-apl
   #      checksum: 3899d6cd893b7c3ef6baa637cbd79690
@@ -159,7 +159,7 @@ traces:
   #      checksum: 3899d6cd893b7c3ef6baa637cbd79690
   #    - device: gl-intel-cml
   #      checksum: 3899d6cd893b7c3ef6baa637cbd79690
-  - path: gputest/triangle.trace
+  - path: gputest/triangle-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 0a1524303e0772f6d869e4875fe1f401
@@ -173,7 +173,7 @@ traces:
         checksum: 0a1524303e0772f6d869e4875fe1f401
       - device: gl-intel-cml
         checksum: 0a1524303e0772f6d869e4875fe1f401
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 46052998784defb089ce20fc8f39c6e9
@@ -187,7 +187,7 @@ traces:
         checksum: 46052998784defb089ce20fc8f39c6e9
       - device: gl-intel-cml
         checksum: 46052998784defb089ce20fc8f39c6e9
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
@@ -201,7 +201,7 @@ traces:
         checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
       - device: gl-intel-cml
         checksum: 9ef1ec1d83a0b9448b2303b3c5f78447
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 29a7734de59f3745158596942d0fb2fe
@@ -215,7 +215,7 @@ traces:
         checksum: 29a7734de59f3745158596942d0fb2fe
       - device: gl-intel-cml
         checksum: 29a7734de59f3745158596942d0fb2fe
-  - path: glmark2/bump:bump-render=height.trace
+  - path: glmark2/bump:bump-render=height-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: e299189c84a7005726554f7ca74611eb
@@ -229,7 +229,7 @@ traces:
         checksum: e299189c84a7005726554f7ca74611eb
       - device: gl-intel-cml
         checksum: e299189c84a7005726554f7ca74611eb
-  - path: glmark2/bump:bump-render=high-poly.trace
+  - path: glmark2/bump:bump-render=high-poly-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: a6e89335a4443a80eaf7b1ae75575cac
@@ -243,7 +243,7 @@ traces:
         checksum: a6e89335a4443a80eaf7b1ae75575cac
       - device: gl-intel-cml
         checksum: a6e89335a4443a80eaf7b1ae75575cac
-  - path: glmark2/bump:bump-render=normals.trace
+  - path: glmark2/bump:bump-render=normals-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: c8726956c5a3879b575ea244c36e372b
@@ -257,7 +257,7 @@ traces:
         checksum: c8726956c5a3879b575ea244c36e372b
       - device: gl-intel-cml
         checksum: c8726956c5a3879b575ea244c36e372b
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
@@ -271,7 +271,7 @@ traces:
         checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
       - device: gl-intel-cml
         checksum: 70cd4a7a8ae25177bc4a2e3044c44c2d
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: ef659484c57854a3fedb54c4f5b3983e
@@ -285,7 +285,7 @@ traces:
         checksum: ef659484c57854a3fedb54c4f5b3983e
       - device: gl-intel-cml
         checksum: ef659484c57854a3fedb54c4f5b3983e
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
@@ -299,7 +299,7 @@ traces:
         checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
       - device: gl-intel-cml
         checksum: 0ee6864cc2c68cf767ffa773a1f81b6f
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
+  - path: glmark2/desktop:windows=4:effect=shadow-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 9099e32184329cecdfc6388b2a18964a
@@ -313,7 +313,7 @@ traces:
         checksum: 9099e32184329cecdfc6388b2a18964a
       - device: gl-intel-cml
         checksum: 9099e32184329cecdfc6388b2a18964a
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
+  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: e3677a85bc346a9bd52a6569d17bbe6e
@@ -327,7 +327,7 @@ traces:
         checksum: e3677a85bc346a9bd52a6569d17bbe6e
       - device: gl-intel-cml
         checksum: e3677a85bc346a9bd52a6569d17bbe6e
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
+  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: b80963dae6ecf40c83bfb16943ef1011
@@ -341,7 +341,7 @@ traces:
         checksum: b80963dae6ecf40c83bfb16943ef1011
       - device: gl-intel-cml
         checksum: b80963dae6ecf40c83bfb16943ef1011
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=low-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
@@ -355,7 +355,7 @@ traces:
         checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
       - device: gl-intel-cml
         checksum: 8fa0f14154ac1ec8162ea8a0d5f26092
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 2ead7a061d05a6431c0efd076cb8731a
@@ -369,7 +369,7 @@ traces:
         checksum: 2ead7a061d05a6431c0efd076cb8731a
       - device: gl-intel-cml
         checksum: 2ead7a061d05a6431c0efd076cb8731a
-  - path: glmark2/build:use-vbo=false.trace
+  - path: glmark2/build:use-vbo=false-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: cd8899ad41a62df1425e9b9c9c8d9817
@@ -383,7 +383,7 @@ traces:
         checksum: cd8899ad41a62df1425e9b9c9c8d9817
       - device: gl-intel-cml
         checksum: cd8899ad41a62df1425e9b9c9c8d9817
-  - path: glmark2/build:use-vbo=true.trace
+  - path: glmark2/build:use-vbo=true-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: ef075cad089512504539bdb4139190f5
@@ -397,7 +397,7 @@ traces:
         checksum: ef075cad089512504539bdb4139190f5
       - device: gl-intel-cml
         checksum: ef075cad089512504539bdb4139190f5
-  - path: glmark2/ideas:speed=10000.trace
+  - path: glmark2/ideas:speed=10000-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 6af136c5ad47c86dfb48eaefae99856c
@@ -411,7 +411,7 @@ traces:
         checksum: 6af136c5ad47c86dfb48eaefae99856c
       - device: gl-intel-cml
         checksum: 6af136c5ad47c86dfb48eaefae99856c
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 6c5675c503aec910095e57f0390d0311
@@ -425,7 +425,7 @@ traces:
         checksum: 6c5675c503aec910095e57f0390d0311
       - device: gl-intel-cml
         checksum: 6c5675c503aec910095e57f0390d0311
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 35521cba43b8c537f335bf65a31b6492
@@ -439,7 +439,7 @@ traces:
         checksum: 35521cba43b8c537f335bf65a31b6492
       - device: gl-intel-cml
         checksum: 35521cba43b8c537f335bf65a31b6492
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
@@ -453,7 +453,7 @@ traces:
         checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
       - device: gl-intel-cml
         checksum: 314cebc76c8eb24bc4a453ac7b85e6a7
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
+  - path: glmark2/pulsar:quads=5:texture=false:light=false-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: e5c0ce9da8cd96f9a07dfdf053683b66
@@ -467,7 +467,7 @@ traces:
         checksum: e5c0ce9da8cd96f9a07dfdf053683b66
       - device: gl-intel-cml
         checksum: e5c0ce9da8cd96f9a07dfdf053683b66
-  - path: glmark2/refract.trace
+  - path: glmark2/refract-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: fce8611398afd2fbef4b6d4e571fe878
@@ -481,7 +481,7 @@ traces:
         checksum: fce8611398afd2fbef4b6d4e571fe878
       - device: gl-intel-cml
         checksum: fce8611398afd2fbef4b6d4e571fe878
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
+  - path: glmark2/shading:shading=blinn-phong-inf-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 8e29dfb2accb040d3ea40ad106e776a9
@@ -495,7 +495,7 @@ traces:
         checksum: 8e29dfb2accb040d3ea40ad106e776a9
       - device: gl-intel-cml
         checksum: 8e29dfb2accb040d3ea40ad106e776a9
-  - path: glmark2/shading:shading=cel.trace
+  - path: glmark2/shading:shading=cel-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: adf3d3fd63b94dff23312fad6939e789
@@ -509,7 +509,7 @@ traces:
         checksum: adf3d3fd63b94dff23312fad6939e789
       - device: gl-intel-cml
         checksum: adf3d3fd63b94dff23312fad6939e789
-  - path: glmark2/shading:shading=gouraud.trace
+  - path: glmark2/shading:shading=gouraud-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 76d7f65e289f474a7024a44152252aa8
@@ -523,7 +523,7 @@ traces:
         checksum: 76d7f65e289f474a7024a44152252aa8
       - device: gl-intel-cml
         checksum: 76d7f65e289f474a7024a44152252aa8
-  - path: glmark2/shading:shading=phong.trace
+  - path: glmark2/shading:shading=phong-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: f6b5fd88e53d12d90622f3504b92e6db
@@ -537,7 +537,7 @@ traces:
         checksum: f6b5fd88e53d12d90622f3504b92e6db
       - device: gl-intel-cml
         checksum: f6b5fd88e53d12d90622f3504b92e6db
-  - path: glmark2/shadow.trace
+  - path: glmark2/shadow-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 5d152ef79b699de16dfc1e2c72951346
@@ -551,7 +551,7 @@ traces:
         checksum: 5d152ef79b699de16dfc1e2c72951346
       - device: gl-intel-cml
         checksum: 5d152ef79b699de16dfc1e2c72951346
-  - path: glmark2/terrain.trace
+  - path: glmark2/terrain-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
@@ -565,7 +565,7 @@ traces:
         checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
       - device: gl-intel-cml
         checksum: 4cff4ebdf12cf46ffe3a4baee607f32c
-  - path: glmark2/texture:texture-filter=linear.trace
+  - path: glmark2/texture:texture-filter=linear-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 9c15add29b4c783c93e1cc0d0fa0b084
@@ -579,7 +579,7 @@ traces:
         checksum: 9c15add29b4c783c93e1cc0d0fa0b084
       - device: gl-intel-cml
         checksum: 9c15add29b4c783c93e1cc0d0fa0b084
-  - path: glmark2/texture:texture-filter=mipmap.trace
+  - path: glmark2/texture:texture-filter=mipmap-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: ae4c0e010181f4e97d37e254737238c1
@@ -593,7 +593,7 @@ traces:
         checksum: ae4c0e010181f4e97d37e254737238c1
       - device: gl-intel-cml
         checksum: ae4c0e010181f4e97d37e254737238c1
-  - path: glmark2/texture:texture-filter=nearest.trace
+  - path: glmark2/texture:texture-filter=nearest-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 15d736a49c5457bdcf0abcfb9eb07890
@@ -621,7 +621,7 @@ traces:
         checksum: ba5302821a4a4024ade9b98a191e80cc
       - device: gl-intel-cml
         checksum: ba5302821a4a4024ade9b98a191e80cc
-  - path: gputest/pixmark-julia-fp32.trace
+  - path: gputest/pixmark-julia-fp32-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: a5ec72a5da355dfcd689411f89164f0c
@@ -635,7 +635,7 @@ traces:
         checksum: a5ec72a5da355dfcd689411f89164f0c
       - device: gl-intel-cml
         checksum: a5ec72a5da355dfcd689411f89164f0c
-  - path: gputest/pixmark-julia-fp64.trace
+  - path: gputest/pixmark-julia-fp64-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 95235e084d88bc41f8a1a05b79e88e33
@@ -649,7 +649,7 @@ traces:
         checksum: 95235e084d88bc41f8a1a05b79e88e33
       - device: gl-intel-cml
         checksum: 95235e084d88bc41f8a1a05b79e88e33
-  - path: gputest/pixmark-volplosion.trace
+  - path: gputest/pixmark-volplosion-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 9c891fd21b0cdc79f7071001d95d549c
@@ -663,7 +663,7 @@ traces:
         checksum: 9c891fd21b0cdc79f7071001d95d549c
       - device: gl-intel-cml
         checksum: 9c891fd21b0cdc79f7071001d95d549c
-  - path: gputest/plot3d.trace
+  - path: gputest/plot3d-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: cea8f26227763a3c3b2a2a6af9a0c1da
@@ -677,7 +677,7 @@ traces:
         checksum: cea8f26227763a3c3b2a2a6af9a0c1da
       - device: gl-intel-cml
         checksum: cea8f26227763a3c3b2a2a6af9a0c1da
-  - path: gputest/tessmark.trace
+  - path: gputest/tessmark-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 10e49cd5a5e12d4a01f504c14b4335cc
@@ -691,7 +691,7 @@ traces:
         checksum: 10e49cd5a5e12d4a01f504c14b4335cc
       - device: gl-intel-cml
         checksum: 10e49cd5a5e12d4a01f504c14b4335cc
-  - path: humus/AmbientAperture.trace
+  - path: humus/AmbientAperture-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 5d0d439423d38d2f0f2520e6a1c4c819
@@ -705,7 +705,7 @@ traces:
         checksum: 5d0d439423d38d2f0f2520e6a1c4c819
       - device: gl-intel-cml
         checksum: 5d0d439423d38d2f0f2520e6a1c4c819
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 4b50340b8898687c37a908e799f9238e
@@ -719,7 +719,7 @@ traces:
         checksum: 4b50340b8898687c37a908e799f9238e
       - device: gl-intel-cml
         checksum: 4b50340b8898687c37a908e799f9238e
-  - path: humus/CelShading.trace
+  - path: humus/CelShading-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 5476bd1ed551e20fbe118dc8b4b5d515
@@ -733,7 +733,7 @@ traces:
         checksum: 5476bd1ed551e20fbe118dc8b4b5d515
       - device: gl-intel-cml
         checksum: 5476bd1ed551e20fbe118dc8b4b5d515
-  - path: humus/DynamicBranching3.trace
+  - path: humus/DynamicBranching3-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 51d5ffe732076a80ffaa7f935c528c42
@@ -747,7 +747,7 @@ traces:
         checksum: 51d5ffe732076a80ffaa7f935c528c42
       - device: gl-intel-cml
         checksum: 51d5ffe732076a80ffaa7f935c528c42
-  - path: humus/HDR.trace
+  - path: humus/HDR-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
@@ -761,7 +761,7 @@ traces:
         checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
       - device: gl-intel-cml
         checksum: e23bfd9704f3cc6ce3fd38685f5d3c61
-  - path: humus/RaytracedShadows.trace
+  - path: humus/RaytracedShadows-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: c6ecea7b8ddb60526af4de7ec1a5be62
@@ -775,7 +775,7 @@ traces:
         checksum: c6ecea7b8ddb60526af4de7ec1a5be62
       - device: gl-intel-cml
         checksum: c6ecea7b8ddb60526af4de7ec1a5be62
-  - path: humus/VolumetricFogging2.trace
+  - path: humus/VolumetricFogging2-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 2224e04e0aa162c19a22cbeb5bf16114
@@ -789,7 +789,7 @@ traces:
         checksum: 2224e04e0aa162c19a22cbeb5bf16114
       - device: gl-intel-cml
         checksum: 2224e04e0aa162c19a22cbeb5bf16114
-  - path: neverball/neverball.trace
+  - path: neverball/neverball-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 75acd3160d268de2c5f286ff4546258c
@@ -803,7 +803,7 @@ traces:
         checksum: 75acd3160d268de2c5f286ff4546258c
       - device: gl-intel-cml
         checksum: 75acd3160d268de2c5f286ff4546258c
-  - path: paraview/pv-manyspheres.trace
+  - path: paraview/pv-manyspheres-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 73e5d34fb13268b0c7126297bfc34965
@@ -817,7 +817,7 @@ traces:
         checksum: 73e5d34fb13268b0c7126297bfc34965
       - device: gl-intel-cml
         checksum: 73e5d34fb13268b0c7126297bfc34965
-  - path: paraview/pv-waveletcontour.trace
+  - path: paraview/pv-waveletcontour-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: b384e3e81e4843fbd1d50e0c542e600a
@@ -831,7 +831,7 @@ traces:
         checksum: b384e3e81e4843fbd1d50e0c542e600a
       - device: gl-intel-cml
         checksum: b384e3e81e4843fbd1d50e0c542e600a
-  - path: paraview/pv-waveletvolume.trace
+  - path: paraview/pv-waveletvolume-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 0199b30fe719261436d6d48fe51353c8
@@ -972,7 +972,7 @@ traces:
          checksum: b3c0a68ab6dbcfde8fe72c8d0c44f528
        - device: gl-intel-cml
          checksum: b3c0a68ab6dbcfde8fe72c8d0c44f528
-  - path: xonotic/xonotic-keybench-high.trace
+  - path: xonotic/xonotic-keybench-high-v2.trace
     expectations:
       - device: gl-intel-apl
         checksum: 3d419f45bc5ce210a7df583e92143089
diff --git a/src/panfrost/ci/traces-panfrost.yml b/src/panfrost/ci/traces-panfrost.yml
index 350a9cc4059..bb347181adb 100644
--- a/src/panfrost/ci/traces-panfrost.yml
+++ b/src/panfrost/ci/traces-panfrost.yml
@@ -2,249 +2,249 @@ traces-db:
   download-url: "http://caching-proxy/cache/?uri=https://minio-packet.freedesktop.org/mesa-tracie-public/"
 
 traces:
-  - path: behdad-glyphy/glyphy.trace
+  - path: behdad-glyphy/glyphy-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 22bf5262745fd47c5c5eadb93d7cc420
-  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
+  - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 0b3309c7f8dddef0d5f8eb4c959e6005
       - device: gl-panfrost-t760
         checksum: 1567f39cdcfecf738564f5441e7018a6
-  - path: glmark2/jellyfish.trace
+  - path: glmark2/jellyfish-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 4c4feda29cbc467d7906813804a98cb2
       - device: gl-panfrost-t760
         checksum: f95cfe777ffa6f14dfce7ce20e3497a0
-  - path: glxgears/glxgears-2.trace
+  - path: glxgears/glxgears-2-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: bcc73608b6e2b5d92bf926d1c21889c7
       - device: gl-panfrost-t760
         checksum: bcc73608b6e2b5d92bf926d1c21889c7
-  - path: pathfinder/demo.trace
+  - path: pathfinder/demo-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: c4f5e6bfe0cba230b1aef631c2fa4584
       - device: gl-panfrost-t760
         checksum: c4f5e6bfe0cba230b1aef631c2fa4584
-  - path: pathfinder/canvas_moire.trace
+  - path: pathfinder/canvas_moire-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 2fb2c8e83719526cb6c02b6c2e069d61
       - device: gl-panfrost-t760
         checksum: 2fb2c8e83719526cb6c02b6c2e069d61
-  - path: pathfinder/canvas_text_v2.trace
+  - path: pathfinder/canvas_text_v2-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 35fbb0c520595e948d3a0f3aaa499d77
       - device: gl-panfrost-t760
         checksum: 35fbb0c520595e948d3a0f3aaa499d77
-  - path: gputest/furmark.trace
+  - path: gputest/furmark-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 6540f71b1c051ba82af2a25b93065f34
-  - path: gputest/triangle.trace
+  - path: gputest/triangle-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 75c5a2e261d576d115a659f6cd52a90d
       - device: gl-panfrost-t760
         checksum: 75c5a2e261d576d115a659f6cd52a90d
-  - path: humus/Portals.trace
+  - path: humus/Portals-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: ad04db74ea70b7772719080f8a4c499b
       - device: gl-panfrost-t760
         # Wrong rendering, many elements are missing
         checksum: 67db7302b28cb8e3e217cc79b672af79
-  - path: 0ad/0ad.trace
+  - path: 0ad/0ad-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 5a4fba0ae20e3ab9dc6fc4089add9457
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: d518ab0d0fd7e19d33f9003d55c3d46d
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: d6b17cfbdb6994fc1bcfa2ad0ae25b3b
-  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace
+  - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: bf10418a5e138b876018eb6d3af26f61
-  - path: glmark2/bump:bump-render=height.trace
+  - path: glmark2/bump:bump-render=height-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 73cb74446b0aefcfcf7b41d80eaed016
-  - path: glmark2/bump:bump-render=high-poly.trace
+  - path: glmark2/bump:bump-render=high-poly-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: e6fde05acfff951f4e03fff3f607b314
-  - path: glmark2/bump:bump-render=normals.trace
+  - path: glmark2/bump:bump-render=normals-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: eaff095ef64913f05ea04e27158e309e
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: 9c5d165041f7f91534b0c55db4a80be5
-  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace
+  - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: 32990489087da1beaa5cd749edebeff3
-  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace
+  - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: 9c0bd1768585fb156e0b1288b3f4df45
-  - path: glmark2/desktop:windows=4:effect=shadow.trace
+  - path: glmark2/desktop:windows=4:effect=shadow-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 044a380037f706827c0afa4214bef4ad
-  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace
+  - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 4472d33cd46351290a602f98adb338b9
-  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace
+  - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 667a47069aed836f46645e43761147a2
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=low-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: 1f37cb49a1f4e507a2d602738a4ae541
-  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace
+  - path: glmark2/function:fragment-steps=5:fragment-complexity=medium-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: 1f37cb49a1f4e507a2d602738a4ae541
-  - path: glmark2/build:use-vbo=false.trace
+  - path: glmark2/build:use-vbo=false-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 462c648af68f87413cc88fe3b29c6b15
-  - path: glmark2/build:use-vbo=true.trace
+  - path: glmark2/build:use-vbo=true-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 5577342fa83ed592a3684d39a48b0232
-  - path: glmark2/ideas:speed=10000.trace
+  - path: glmark2/ideas:speed=10000-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: e2cdaa2864c92c6dd25501053cedeea9
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: df44ed65d3aba97f4a155ec643672ef2
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: c96070ddb18a9a8b5f34d72596f1bed4
-  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace
+  - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true-v2.trace
     expectations:
       # Missing most of the grid
       - device: gl-panfrost-t860
         checksum: 7006d7b18a1124554eeb5d1b1053eff2
-  - path: glmark2/pulsar:quads=5:texture=false:light=false.trace
+  - path: glmark2/pulsar:quads=5:texture=false:light=false-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 87f60d44f66e2d42065e17f4940bb995
-  - path: glmark2/refract.trace
+  - path: glmark2/refract-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 427c2ec78338288526a98cedae291703
-  - path: glmark2/shading:shading=blinn-phong-inf.trace
+  - path: glmark2/shading:shading=blinn-phong-inf-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 935cede73a9a6d4c66dd4f3ec91cc970
-  - path: glmark2/shading:shading=cel.trace
+  - path: glmark2/shading:shading=cel-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: cd32b44b107ac21f979e21b7c1bfe464
-  - path: glmark2/shading:shading=gouraud.trace
+  - path: glmark2/shading:shading=gouraud-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: aa13779fff8e60264bf40b207e54fadd
-  - path: glmark2/shading:shading=phong.trace
+  - path: glmark2/shading:shading=phong-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: c6215ff6dbf6f9247ba4677da2fb5593
-  - path: glmark2/shadow.trace
+  - path: glmark2/shadow-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: f2c20b40c53a29459c7b91a01b93751c
   # INSTR_INVALID_ENC faults that I can't reproduce locally
-  # - path: glmark2/terrain.trace
+  # - path: glmark2/terrain-v2.trace
   #   expectations:
   #     - device: gl-panfrost-t860
   #       checksum: 8cc39e8323bd33a696fb14de47305073
-  - path: glmark2/texture:texture-filter=linear.trace
+  - path: glmark2/texture:texture-filter=linear-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 5f1db5ee751cc3f7604b7326b810c7cd
-  - path: glmark2/texture:texture-filter=mipmap.trace
+  - path: glmark2/texture:texture-filter=mipmap-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: af0f3339c57e3686222e6637da6cb97b
-  - path: glmark2/texture:texture-filter=nearest.trace
+  - path: glmark2/texture:texture-filter=nearest-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 68ab52ebb19d47d885ab70f2a2215774
   # Flaky since the introduction of parallel trace replay
-  #- path: gputest/gimark.trace
+  #- path: gputest/gimark-v2.trace
   #  expectations:
   #   - device: gl-panfrost-t860
   #      # Some blue rings are missing on the top-left corner, also the penguin watermark
   #      checksum: 0020a77e25003e4e8db1ce929eed8914
-  - path: gputest/pixmark-julia-fp32.trace
+  - path: gputest/pixmark-julia-fp32-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: d85b6967b7c768f28395c5c5dfbcfe3e
-  - path: gputest/plot3d.trace
+  - path: gputest/plot3d-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: a34223830866a42747db199b04c5e1be
-  - path: humus/AmbientAperture.trace
+  - path: humus/AmbientAperture-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: e4c0b930ef99f14305e1ade7f1779c09
-  - path: humus/CelShading.trace
+  - path: humus/CelShading-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 521ca6a236b8400cf692e6817b91c739
-  - path: humus/DynamicBranching3.trace
+  - path: humus/DynamicBranching3-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 32e349d14319b4ae921c146224d26a0e
-  - path: humus/RaytracedShadows.trace
+  - path: humus/RaytracedShadows-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: b2f909cbf5ea5de03b88f8a685eb2e28
-  - path: humus/VolumetricFogging2.trace
+  - path: humus/VolumetricFogging2-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: f53b5b1430aa21804c6fed01bce560aa
-  - path: neverball/neverball.trace
+  - path: neverball/neverball-v2.trace
     expectations:
       # Missing the coins and the texture on the "Nev" of the level.
       - device: gl-panfrost-t860
         checksum: 12c8f3af1ed07b939b5e1de8067e5edd
-  - path: paraview/pv-manyspheres.trace
+  - path: paraview/pv-manyspheres-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: 1747f5c7609548f1cf325a7e89ea02a9
   # Aborts.
-  # - path: paraview/pv-waveletcontour.trace
+  # - path: paraview/pv-waveletcontour-v2.trace
   #   expectations:
   #     - device: gl-panfrost-t860
   #       checksum: db43c733f3f3d5253e263838e58d9111
-  - path: paraview/pv-waveletvolume.trace
+  - path: paraview/pv-waveletvolume-v2.trace
     expectations:
       - device: gl-panfrost-t860
         checksum: e0b4fba1e77005892c06a4899933d71a