ci: Split traces.yml file per driver

As drivers have been tested with more and more traces, the yml file is
becoming a bit unwieldy. As more drivers are going to be tested with
traces, and more traces will be used, split them in per-driver files so
the size stays manageable.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Reviewed-By: Rohan Garg <rohan.garg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6185>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a81a0f4ce333f7a8955fda098ea5abb0c6ce8965..f37b11dc326dbce9e79b9a532d7c50e1975f32f5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1103,6 +1103,7 @@ arm64_a630_traces:
   variables:
     BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh"
     DEVICE_NAME: "freedreno-a630"
+    DRIVER_NAME: "freedreno"
     TRACIE_NO_UNIT_TESTS: 1
     TRACIE_UPLOAD_TO_MINIO: 1
     # This lets us run several more traces which don't use any features we're
@@ -1318,6 +1319,7 @@ llvmpipe-traces:
     LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "llvmpipe"
     DEVICE_NAME: "gl-vmware-llvmpipe"
+    DRIVER_NAME: "llvmpipe"
 
 radv-polaris10-traces:
   extends:
@@ -1326,6 +1328,7 @@ radv-polaris10-traces:
     - .test-manual
   variables:
     DEVICE_NAME: "vk-amd-polaris10"
+    DRIVER_NAME: "radv"
   tags:
     - polaris10
 
@@ -1336,6 +1339,7 @@ radv-raven-traces:
     - .test-manual
   variables:
     DEVICE_NAME: "vk-amd-raven"
+    DRIVER_NAME: "radv"
   tags:
     - raven
 
@@ -1347,5 +1351,6 @@ virgl-traces:
     LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "virpipe"
     DEVICE_NAME: "gl-virgl"
+    DRIVER_NAME: "virgl"
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"

diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index f59ec918da6eca9adc8d114826ad91a819fff207..f956e61f79fd36c6c7b57b0ff9107a3f7cb11b9f 100755 (executable)
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -19,9 +19,6 @@ echo "nameserver 8.8.8.8" > /etc/resolv.conf
 # Not all DUTs have network
 sntp -sS pool.ntp.org || true
 
-# Overwrite traces.yml file with the baremetal version
-cp /install/traces-baremetal.yml /install/traces.yml
-
 # Start a little daemon to capture the first devcoredump we encounter.  (They
 # expire after 5 minutes, so we poll for them).
 ./capture-devcoredump.sh &

diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh
index 31ffbdda9e8e6dd21a9b95e5be0afb7a5cf6cca2..90e9bbf9ebeaedc383fb3ef927d6e5a599827cb0 100644 (file)
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -36,6 +36,7 @@ for var in \
     DEQP_SKIPS \
     DEQP_VER \
     DEVICE_NAME \
+    DRIVER_NAME \
     FD_MESA_DEBUG \
     FLAKES_CHANNEL \
     IR3_SHADER_DEBUG \

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index d5a51ce41d2bf914ecf17788d78fe10829bc3958..f7c600223ec0571020cb8af2b1bdb2461fb9c511 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -43,7 +43,7 @@ kernel+rootfs_armhf:
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     ENV_VARS: "DEQP_PARALLEL=6"
-    FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_JOB_JWT=${CI_JOB_JWT} TRACIE_NO_UNIT_TESTS=1 TRACIE_UPLOAD_TO_MINIO=1"
+    FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_JOB_JWT=${CI_JOB_JWT} TRACIE_NO_UNIT_TESTS=1 TRACIE_UPLOAD_TO_MINIO=1 DRIVER_NAME=${DRIVER_NAME}"
     DEQP_VERSION: gles2
     ARTIFACTS_PREFIX: "https://minio-packet.freedesktop.org/mesa-lava/"
     MESA_URL: "https://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-${ARCH}.tar.gz"
@@ -183,6 +183,7 @@ panfrost-t760-gles2:armhf:
     DEVICE_TYPE: rk3288-veyron-jaq
     DTB: ${DEVICE_TYPE}
     GPU_VERSION: panfrost-t760
+    DRIVER_NAME: panfrost
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
     ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330"
@@ -196,6 +197,7 @@ panfrost-t760-gles2:armhf:
     DEVICE_TYPE: rk3399-gru-kevin
     DTB: ${DEVICE_TYPE}
     GPU_VERSION: panfrost-t860
+    DRIVER_NAME: panfrost
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
   tags:
@@ -294,6 +296,7 @@ radeonsi-stoney-traces:amd64:
     DEVICE_TYPE: hp-11A-G6-EE-grunt
     DTB: ""
     GPU_VERSION: radeonsi-stoney
+    DRIVER_NAME: radeonsi
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
   tags:

diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index 85b0e5bd098c41d9d3c7a78e1c94181254af3580..e92063da94835307365a80cb73f3c4128af0375b 100755 (executable)
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -26,8 +26,7 @@ echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" >> install/VERSIO
 cp -Rp .gitlab-ci/bare-metal install/
 cp -Rp .gitlab-ci/deqp* install/
 cp -Rp .gitlab-ci/piglit install/
-cp -Rp .gitlab-ci/traces-baremetal.yml install/
-cp -Rp .gitlab-ci/traces.yml install/
+cp -Rp .gitlab-ci/traces*.yml install/
 cp -Rp .gitlab-ci/tracie install/
 cp -Rp .gitlab-ci/tracie-runner-gl.sh install/
 cp -Rp .gitlab-ci/tracie-runner-vk.sh install/

diff --git a/.gitlab-ci/traces-baremetal.yml b/.gitlab-ci/traces-baremetal.yml
deleted file mode 100644 (file)
index a22e20f..0000000
--- a/.gitlab-ci/traces-baremetal.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-# This trace takes an egregious amount of time in replay (5 minutes)
-#  on freedreno for some reason.
-#  - path: glxgears/glxgears.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 5599d6e8e43384c59196b9c9b0161268
-  - path: gputest/furmark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: de674022e53fc9e0a9eb217f8bf0fe03
-# Note: Requires GL3.3
-  - path: gputest/gimark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 2cae8e2104356e2b3017cbd953cf7b4a
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 4a02628395948c34d95d035a9c9735cb
-# Note: Requires GL4 (fp64).
-#  - path: gputest/pixmark-julia-fp64.trace
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-# Intermittent GPU hangs on a630 result in test failures for this.
-#  - path: gputest/pixmark-piano.trace
-#    expectations:
-#      # One of the material textures appears brighter on freedreno than
-#      # i965 in a way that is probably wrong.
-#      - device: freedreno-a630
-#        checksum: 1aad6e1ffe23cae71acdb70695a6184b
-  - path: gputest/pixmark-volplosion.trace
-    expectations:
-      # Looks fine, but totally different shape from the rendering on i965.
-      - device: freedreno-a630
-        checksum: 86d678c70b8adf27095ace1a6bbfe2d2
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 67a9eb692e694b11107860bbcd47d493
-# Note: Requires GL4 for tess.
-  - path: gputest/tessmark.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 985e231b58b7dc4b6da34ff32f8ebb82
-  - path: gputest/triangle.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 1dc6abfb1cfbc5b16adc6f4abf76eec8
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 894a9398f597258cb634bedfb8f2d31e
-  - path: humus/CelShading.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: b0ac8fb4b2b2268cfb87944730125886
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 238f06550db39c36e5b880d3b3d7440f
-  - path: humus/HDR.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 40387a4e89ef71c472a94413b175ff59
-  - path: humus/Portals.trace
-    expectations:
-      # Bad rendering -- some sort of gap in the upper right of the image.
-      - device: freedreno-a630
-        checksum: 38bcb0a348010c7591efe41b3cc0a9e6
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: fa2d20bf642cd413341d83c4ec5ef1d4
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 6027f10cbffa8c68ffe7d8208f84d32d
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 0e32ca8fc815a7250f38a07faeafb21b
-  - path: pathfinder/canvas_text.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: 74129b650bd3ca806ff2dd46813ba6e6
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: freedreno-a630
-        checksum: f6661ed4de9e0a444c6338ebd0cd3768
-  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 1d04a606014f00663e0d078903d190c8
-  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=subdata.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 6c00e3f05fab4b0df449451803b2749a
-  - path: glmark2/buffer-columns=200:interleave=true:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 5706da41ae1877086e7ac2dc9af66e81
-  - path: glmark2/bump-bump-render=height.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 6d06bb78d918ef6376aee4d417c9e9c1
-  - path: glmark2/bump-bump-render=high-poly.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 55312be6739a7142958bdef174e90269
-  - path: glmark2/bump-bump-render=normals.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 9deea36f896b9aea01169839e1913e9b
-  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=0.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 4d654718f516adb891e6adef04924896
-  - path: glmark2/conditionals-fragment-steps=5:vertex-steps=0.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 7937cc1cb07b980da11a7c892a97bcdc
-  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 2977a3bb963096a4ed421dff7001d498
-  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: d750bb0972cf14a4c0bc35896d87da16
-  - path: glmark2/desktop-effect=shadow:windows=4.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 5ff3fe9ab8ad3a53ce4b8bfe7a61900a
-  - path: glmark2/effect2d-kernel=0,1,0;1,-4,1;0,1,0.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b38d1d3ebe30ea3df97713515dab3df0
-  - path: glmark2/effect2d-kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 2346a6597f4d1f20b493e8d6a8f7e592
-  - path: glmark2/function-fragment-complexity=low:fragment-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: d479556facd21af43d526b3cc95bed8b
-  - path: glmark2/function-fragment-complexity=medium:fragment-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 17895715bdb496faa73bba89b06347f6
-  - path: glmark2/glmark2-build-use-vbo-false.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: ecb647d14dae3876eb2a4282633d84f5
-  - path: glmark2/glmark2-build-use-vbo-true.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b2608bba0f80ef93809e42399fb77124
-  - path: glmark2/ideas-speed=duration.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 4f51ce282835db86fd8dc42b81755ef8
-  - path: glmark2/jellyfish.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b50568db464034da63a536a9fe89499b
-  - path: glmark2/loop-fragment-loop=false:fragment-steps=5:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 52397a2278680b28ccfac4d8ba7340dd
-  - path: glmark2/loop-fragment-steps=5:fragment-uniform=false:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: 45ce9b6056ec0e0e4276e7738eaa7fa1
-  - path: glmark2/loop-fragment-steps=5:fragment-uniform=true:vertex-steps=5.rdc
-    expectations:
-      # Incorrect rendering, a bunch of the area is uniform gray when it should
-      # continue the pattern
-      - device: freedreno-a630
-        checksum: ec5ea3eab5b54524748a0c883cc929d6
-  - path: glmark2/pulsar-light=false:quads=5:texture=false.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: e482fd686d39decbec52ada682d93890
-  - path: glmark2/refract.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: a7b60492d31ca93f1506dfa59b462570
-  - path: glmark2/shading-shading=blinn-phong-inf.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b9af27ae43986f6441235044a7f18e2a
-  - path: glmark2/shading-shading=cel.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: fc2c2a68a89ad2ee145819e2a6edcbc5
-  - path: glmark2/shading-shading=gouraud.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: fcc26fca31375b216382e69bc5f113fb
-  - path: glmark2/shading-shading=phong.rdc
-    # Some speckling on the main specular highlight that may just be
-    # mediump artifacts
-    expectations:
-      - device: freedreno-a630
-        checksum: ba29b12892f5cb9f9c506db9cc76f987
-  - path: glmark2/shadow.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: d8b5931669733240797f1acf5d98db25
-    # Very yellow terrain compared to i965, may just be mediump artifacts.
-  - path: glmark2/terrain.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 2368b3132a8768bc3a98b3fda0a4830e
-  - path: glmark2/texture-texture-filter=linear.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: b4beeda82884d2e6de549b16cd9b90e8
-  - path: glmark2/texture-texture-filter=mipmap.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 27e1cdb7e8f3f5bb6a61ebf02927d201
-  - path: glmark2/texture-texture-filter=nearest.rdc
-    expectations:
-      - device: freedreno-a630
-        checksum: 0b0114e48cf37efc43d8b27b926eaadf
-# Throws errors on freedreno
-#  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: supertuxkart/supertuxkart-menu.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0
-#  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
-#    expectations:
-#      - device: freedreno-a630
-#        checksum: 0

diff --git a/.gitlab-ci/traces-freedreno.yml b/.gitlab-ci/traces-freedreno.yml
new file mode 100644 (file)
index 0000000..a22e20f
--- /dev/null
+++ b/.gitlab-ci/traces-freedreno.yml
@@ -0,0 +1,262 @@
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
+
+traces:
+# This trace takes an egregious amount of time in replay (5 minutes)
+#  on freedreno for some reason.
+#  - path: glxgears/glxgears.trace
+#    expectations:
+#      - device: freedreno-a630
+#        checksum: 5599d6e8e43384c59196b9c9b0161268
+  - path: gputest/furmark.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: de674022e53fc9e0a9eb217f8bf0fe03
+# Note: Requires GL3.3
+  - path: gputest/gimark.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 2cae8e2104356e2b3017cbd953cf7b4a
+  - path: gputest/pixmark-julia-fp32.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 4a02628395948c34d95d035a9c9735cb
+# Note: Requires GL4 (fp64).
+#  - path: gputest/pixmark-julia-fp64.trace
+#    expectations:
+#      - device: freedreno-a630
+#        checksum: 0
+# Intermittent GPU hangs on a630 result in test failures for this.
+#  - path: gputest/pixmark-piano.trace
+#    expectations:
+#      # One of the material textures appears brighter on freedreno than
+#      # i965 in a way that is probably wrong.
+#      - device: freedreno-a630
+#        checksum: 1aad6e1ffe23cae71acdb70695a6184b
+  - path: gputest/pixmark-volplosion.trace
+    expectations:
+      # Looks fine, but totally different shape from the rendering on i965.
+      - device: freedreno-a630
+        checksum: 86d678c70b8adf27095ace1a6bbfe2d2
+  - path: gputest/plot3d.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 67a9eb692e694b11107860bbcd47d493
+# Note: Requires GL4 for tess.
+  - path: gputest/tessmark.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 985e231b58b7dc4b6da34ff32f8ebb82
+  - path: gputest/triangle.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 1dc6abfb1cfbc5b16adc6f4abf76eec8
+  - path: humus/AmbientAperture.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 894a9398f597258cb634bedfb8f2d31e
+  - path: humus/CelShading.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: b0ac8fb4b2b2268cfb87944730125886
+  - path: humus/DynamicBranching3.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 238f06550db39c36e5b880d3b3d7440f
+  - path: humus/HDR.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 40387a4e89ef71c472a94413b175ff59
+  - path: humus/Portals.trace
+    expectations:
+      # Bad rendering -- some sort of gap in the upper right of the image.
+      - device: freedreno-a630
+        checksum: 38bcb0a348010c7591efe41b3cc0a9e6
+  - path: humus/RaytracedShadows.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: fa2d20bf642cd413341d83c4ec5ef1d4
+  - path: humus/VolumetricFogging2.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 6027f10cbffa8c68ffe7d8208f84d32d
+  - path: pathfinder/canvas_moire.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 0e32ca8fc815a7250f38a07faeafb21b
+  - path: pathfinder/canvas_text.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: 74129b650bd3ca806ff2dd46813ba6e6
+  - path: pathfinder/demo.trace
+    expectations:
+      - device: freedreno-a630
+        checksum: f6661ed4de9e0a444c6338ebd0cd3768
+  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 1d04a606014f00663e0d078903d190c8
+  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=subdata.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 6c00e3f05fab4b0df449451803b2749a
+  - path: glmark2/buffer-columns=200:interleave=true:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 5706da41ae1877086e7ac2dc9af66e81
+  - path: glmark2/bump-bump-render=height.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 6d06bb78d918ef6376aee4d417c9e9c1
+  - path: glmark2/bump-bump-render=high-poly.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 55312be6739a7142958bdef174e90269
+  - path: glmark2/bump-bump-render=normals.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 9deea36f896b9aea01169839e1913e9b
+  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=0.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: 4d654718f516adb891e6adef04924896
+  - path: glmark2/conditionals-fragment-steps=5:vertex-steps=0.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: 7937cc1cb07b980da11a7c892a97bcdc
+  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=5.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: 2977a3bb963096a4ed421dff7001d498
+  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: d750bb0972cf14a4c0bc35896d87da16
+  - path: glmark2/desktop-effect=shadow:windows=4.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 5ff3fe9ab8ad3a53ce4b8bfe7a61900a
+  - path: glmark2/effect2d-kernel=0,1,0;1,-4,1;0,1,0.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: b38d1d3ebe30ea3df97713515dab3df0
+  - path: glmark2/effect2d-kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 2346a6597f4d1f20b493e8d6a8f7e592
+  - path: glmark2/function-fragment-complexity=low:fragment-steps=5.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: d479556facd21af43d526b3cc95bed8b
+  - path: glmark2/function-fragment-complexity=medium:fragment-steps=5.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: 17895715bdb496faa73bba89b06347f6
+  - path: glmark2/glmark2-build-use-vbo-false.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: ecb647d14dae3876eb2a4282633d84f5
+  - path: glmark2/glmark2-build-use-vbo-true.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: b2608bba0f80ef93809e42399fb77124
+  - path: glmark2/ideas-speed=duration.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 4f51ce282835db86fd8dc42b81755ef8
+  - path: glmark2/jellyfish.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: b50568db464034da63a536a9fe89499b
+  - path: glmark2/loop-fragment-loop=false:fragment-steps=5:vertex-steps=5.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: 52397a2278680b28ccfac4d8ba7340dd
+  - path: glmark2/loop-fragment-steps=5:fragment-uniform=false:vertex-steps=5.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: 45ce9b6056ec0e0e4276e7738eaa7fa1
+  - path: glmark2/loop-fragment-steps=5:fragment-uniform=true:vertex-steps=5.rdc
+    expectations:
+      # Incorrect rendering, a bunch of the area is uniform gray when it should
+      # continue the pattern
+      - device: freedreno-a630
+        checksum: ec5ea3eab5b54524748a0c883cc929d6
+  - path: glmark2/pulsar-light=false:quads=5:texture=false.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: e482fd686d39decbec52ada682d93890
+  - path: glmark2/refract.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: a7b60492d31ca93f1506dfa59b462570
+  - path: glmark2/shading-shading=blinn-phong-inf.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: b9af27ae43986f6441235044a7f18e2a
+  - path: glmark2/shading-shading=cel.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: fc2c2a68a89ad2ee145819e2a6edcbc5
+  - path: glmark2/shading-shading=gouraud.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: fcc26fca31375b216382e69bc5f113fb
+  - path: glmark2/shading-shading=phong.rdc
+    # Some speckling on the main specular highlight that may just be
+    # mediump artifacts
+    expectations:
+      - device: freedreno-a630
+        checksum: ba29b12892f5cb9f9c506db9cc76f987
+  - path: glmark2/shadow.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: d8b5931669733240797f1acf5d98db25
+    # Very yellow terrain compared to i965, may just be mediump artifacts.
+  - path: glmark2/terrain.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 2368b3132a8768bc3a98b3fda0a4830e
+  - path: glmark2/texture-texture-filter=linear.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: b4beeda82884d2e6de549b16cd9b90e8
+  - path: glmark2/texture-texture-filter=mipmap.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 27e1cdb7e8f3f5bb6a61ebf02927d201
+  - path: glmark2/texture-texture-filter=nearest.rdc
+    expectations:
+      - device: freedreno-a630
+        checksum: 0b0114e48cf37efc43d8b27b926eaadf
+# Throws errors on freedreno
+#  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
+#    expectations:
+#      - device: freedreno-a630
+#        checksum: 0
+#  - path: supertuxkart/supertuxkart-menu.rdc
+#    expectations:
+#      - device: freedreno-a630
+#        checksum: 0
+#  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
+#    expectations:
+#      - device: freedreno-a630
+#        checksum: 0
+#  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
+#    expectations:
+#      - device: freedreno-a630
+#        checksum: 0

diff --git a/.gitlab-ci/traces-llvmpipe.yml b/.gitlab-ci/traces-llvmpipe.yml
new file mode 100644 (file)
index 0000000..c1e885d
--- /dev/null
+++ b/.gitlab-ci/traces-llvmpipe.yml
@@ -0,0 +1,48 @@
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
+
+traces:
+  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: 8867f3a41f180626d0d4b7661ff5c0f4
+  - path: glmark2/jellyfish.rdc
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: e0fe979fee129c0ed42a3059d1a4e1c9
+  - path: glxgears/glxgears-2.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
+  - path: 0ad/0ad.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: d76d0f5b5b064bba3e6a2a122c0799cf
+  - path: pathfinder/demo.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: e624d76c70cc3c532f4f54439e13659a
+  - path: pathfinder/canvas_moire.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: c4ee0eef519f1a32ba24b7b392b31b28
+  - path: pathfinder/canvas_text.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: f8c6d9a5c9248821ed9aaa376bef05c3
+  - path: gputest/furmark.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: 248ee9534a1f333b479e599646f56f63
+  - path: gputest/pixmark-piano.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: 022b43b7fff9e8623dcfcd91e6bbe7aa
+  - path: gputest/triangle.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: c8848dec77ee0c55292417f54c0a1a49
+  - path: humus/Portals.trace
+    expectations:
+      - device: gl-vmware-llvmpipe
+        checksum: d6eb6aee7a8a1c85d504a498cbf94659

diff --git a/.gitlab-ci/traces-panfrost.yml b/.gitlab-ci/traces-panfrost.yml
new file mode 100644 (file)
index 0000000..0d3f7a2
--- /dev/null
+++ b/.gitlab-ci/traces-panfrost.yml
@@ -0,0 +1,56 @@
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
+
+traces:
+  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: 95df5e619a36e88fe408e45567a2d149
+      - device: gl-panfrost-t760
+        checksum: 30663eac9a4767d26fbf9b6db9712d9f
+  - path: glmark2/jellyfish.rdc
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: 1d609b089732be5b6e3e78370abcb149
+      - device: gl-panfrost-t760
+        checksum: f98ef9118eeaba660c15065dac46e580
+  - path: glxgears/glxgears-2.trace
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: bcc73608b6e2b5d92bf926d1c21889c7
+      - device: gl-panfrost-t760
+        checksum: bcc73608b6e2b5d92bf926d1c21889c7
+  - path: pathfinder/demo.trace
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: c4f5e6bfe0cba230b1aef631c2fa4584
+      - device: gl-panfrost-t760
+        checksum: c4f5e6bfe0cba230b1aef631c2fa4584
+  - path: pathfinder/canvas_moire.trace
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: 2fb2c8e83719526cb6c02b6c2e069d61
+      - device: gl-panfrost-t760
+        checksum: 2fb2c8e83719526cb6c02b6c2e069d61
+  - path: pathfinder/canvas_text.trace
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: 939038749a5204ec2b1448d3b9208fb3
+      - device: gl-panfrost-t760
+        checksum: 939038749a5204ec2b1448d3b9208fb3
+  - path: gputest/furmark.trace
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: dc4ece101ed145228840d1f0654118c6
+  - path: gputest/triangle.trace
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: 6def0c34ade7d4ec930b45d0eef6e46a
+      - device: gl-panfrost-t760
+        checksum: 6def0c34ade7d4ec930b45d0eef6e46a
+  - path: humus/Portals.trace
+    expectations:
+      - device: gl-panfrost-t860
+        checksum: 5415bbf2a69b605bb1052a0e0b0f7040
+      - device: gl-panfrost-t760
+        checksum: a41f53e9318cbd32c27b48d304df1ea6

diff --git a/.gitlab-ci/traces-radeonsi.yml b/.gitlab-ci/traces-radeonsi.yml
new file mode 100644 (file)
index 0000000..f35e523
--- /dev/null
+++ b/.gitlab-ci/traces-radeonsi.yml
@@ -0,0 +1,240 @@
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
+
+traces:
+  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 316650141be869c8afe76b42d3573b49
+  - path: glmark2/jellyfish.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 2c57f9d33489dd43c8807bd0f06c3ed8
+  - path: glxgears/glxgears-2.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: eb9b3d497be567f02a6e039fa32f2b13
+  - path: 0ad/0ad.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: bfd97a7190f2b9de24ddfd446fcc4850
+  - path: pathfinder/demo.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: c81c85f9b247dd1b06c3dd5b669cc283
+  - path: pathfinder/canvas_moire.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 78dd2357ad6e5ffc049a75bfb11c5497
+  - path: pathfinder/canvas_text.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 56d1398206ceea45562f80f8ea9d3814
+  - path: gputest/furmark.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 1c569668d608c644f353caa177d577c6
+  - path: gputest/pixmark-piano.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 061226c3fd179c611b8d60acaa44474f
+  - path: gputest/triangle.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 2d0527e7288a0fc31099404546dadbfb
+  - path: humus/Portals.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: b6f00f39566152c3c8462903b7a1f258
+  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: ee76b7ffb344d545ee22c1b83d61f893
+  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=subdata.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 8f90923d9b9daf7b3708f10b3b019af8
+  - path: glmark2/buffer-columns=200:interleave=true:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: db55995d943f1284c39637a116ceb645
+  - path: glmark2/bump-bump-render=height.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: da75c0dfbcb27b44fbaed15b2f29509c
+  - path: glmark2/bump-bump-render=high-poly.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: e2e83a59d4eb6763d2fe922932aa14b5
+  - path: glmark2/bump-bump-render=normals.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: b7beae443e41e229d34da46ab2047a98
+  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=0.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: e95f9a5ce73727a92eeb4109d28caba4
+  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=5.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: e9ff7521f88eebd8a6770ab5eb28fad4
+  - path: glmark2/conditionals-fragment-steps=5:vertex-steps=0.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 0381a3eb918cfecec03a64d06158d1a3
+  - path: glmark2/desktop-effect=shadow:windows=4.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: c21cf8fe26107351eaa97725e6f9883f
+  - path: glmark2/effect2d-kernel=0,1,0;1,-4,1;0,1,0.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 2958ae3442ed26b681b6978e278ba10d
+  - path: glmark2/effect2d-kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 2d4384b59505215932dc2f01ae174379
+  - path: glmark2/function-fragment-complexity=low:fragment-steps=5.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: f84fc1a1ff1a8342678bca081f8a5c0d
+  - path: glmark2/function-fragment-complexity=medium:fragment-steps=5.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 4097ffd5e97bd56589dfab374574d116
+  - path: glmark2/glmark2-build-use-vbo-false.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: e344777696ef13adc2bd943dfd4199a2
+  - path: glmark2/glmark2-build-use-vbo-true.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 51da69c3490816c93c130e63686d2483
+  - path: glmark2/ideas-speed=duration.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 966191b52dc4885cfc56c0e7c80856b2
+  - path: glmark2/loop-fragment-loop=false:fragment-steps=5:vertex-steps=5.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 65cfa43254eaa0ca09ceb8792b4e4ee7
+  - path: glmark2/loop-fragment-steps=5:fragment-uniform=false:vertex-steps=5.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 716f1ebf84d9ab30a8c4261ecbed492b
+  - path: glmark2/loop-fragment-steps=5:fragment-uniform=true:vertex-steps=5.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 45061884dc857a9e0c31d0b0c02d4cbe
+  - path: glmark2/pulsar-light=false:quads=5:texture=false.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 605881a1cb0d8d59e28e19663b6f5eb0
+  - path: glmark2/refract.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: db300d3a8afb6cecc19ae8e38c7b87c6
+  - path: glmark2/shading-shading=blinn-phong-inf.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 36b193b33127144f8080aa60d582e65e
+  - path: glmark2/shading-shading=cel.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: faac1e367720e1ccd9820f2b78808294
+  - path: glmark2/shading-shading=gouraud.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 22bd04eb9862eb4ecff525ac83b2826d
+  - path: glmark2/shading-shading=phong.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: fda002d281d57b3eacb5c2c8f619a62d
+  - path: glmark2/shadow.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 4bf5ca9ce641de1031eb8125d80a3005
+  - path: glmark2/terrain.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 52f19a65bd77ae03b5f51ee0038a2982
+  - path: glmark2/texture-texture-filter=linear.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 992eb4af603d68a3920014f64f0973b1
+  - path: glmark2/texture-texture-filter=mipmap.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: c635b1741e4103cf48cd554882e15a4c
+  - path: glmark2/texture-texture-filter=nearest.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: bd00656bf6683dae40bfa26a6416061d
+  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 2ddcda6b1c136ce1448714a3ff8432eb
+  - path: gputest/gimark.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 98e742377cef049e98014300a34d7bba
+  - path: gputest/pixmark-julia-fp32.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: ad472cdef2a68ffaabcbf2a694c4aefe
+  - path: gputest/pixmark-julia-fp64.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: b181b0a910f5ae5b161df70f834c3d5f
+  - path: gputest/pixmark-piano.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 061226c3fd179c611b8d60acaa44474f
+  - path: gputest/pixmark-volplosion.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 2fba173643c014bcfa4b31eb55a514b9
+  - path: gputest/plot3d.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 799ce7b2d8050d6ba2e3ae595cf8729e
+  - path: gputest/tessmark.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: d6597f93caa383c492d8290036c60919
+  - path: humus/AmbientAperture.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 56291d097c4be9c079fb771c849c6a2e
+  - path: humus/CelShading.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 7d30dbe3470873c327464ea7ebe6bcf0
+  - path: humus/DynamicBranching3.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 0f02743d054c66f04da404add87d67dc
+  - path: humus/HDR.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: b44ce4cb377321f6423a5a62a9083794
+  - path: humus/RaytracedShadows.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 4209605af96a1d7c20aa7324aa93839f
+  - path: humus/VolumetricFogging2.trace
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 12ad73ad05b01854da65eb0094612ebf
+  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 17f4039392a65ad23133cb2cac82dba4
+  - path: supertuxkart/supertuxkart-menu.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: bc851bb8808b311c2df9c36a6c289e6e
+  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
+    expectations:
+      - device: gl-radeonsi-stoney
+        checksum: 46f08af5c49d711b41d4082f8a5cf6d6

diff --git a/.gitlab-ci/traces-radv.yml b/.gitlab-ci/traces-radv.yml
new file mode 100644 (file)
index 0000000..8f009c3
--- /dev/null
+++ b/.gitlab-ci/traces-radv.yml
@@ -0,0 +1,23 @@
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
+
+traces:
+  - path: KhronosGroup-Vulkan-Tools/amd/polaris10/vkcube.gfxr
+    expectations:
+      - device: vk-amd-polaris10
+        checksum: 917cbbf4f09dd62ea26d247a1c70c16e
+      - device: vk-amd-raven
+        checksum: 45f9a89c7eabdaee5bc52ad4f45e598f
+  - path: LunarG-VulkanSamples/amd/polaris10/Hologram:-w:640:-h:480.gfxr
+    expectations:
+      - device: vk-amd-polaris10
+        checksum: cfde36cd7377068a739c30e3fd171d08
+      - device: vk-amd-raven
+        checksum: cfde36cd7377068a739c30e3fd171d08
+  - path: Wicked-Engine/Tests:Cloth_Physics_Test.trace-dxgi
+    expectations:
+      - device: vk-amd-polaris10
+        checksum: 6b6d27df609b8d086cc3335e6d103581
+      - device: vk-amd-raven
+        checksum: f013465b97fd8ba0217bcde74c262384
+

diff --git a/.gitlab-ci/traces-virgl.yml b/.gitlab-ci/traces-virgl.yml
new file mode 100644 (file)
index 0000000..5b14292
--- /dev/null
+++ b/.gitlab-ci/traces-virgl.yml
@@ -0,0 +1,32 @@
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
+
+traces:
+  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
+    expectations:
+      - device: gl-virgl
+        checksum: 8867f3a41f180626d0d4b7661ff5c0f4
+  - path: glmark2/jellyfish.rdc
+    expectations:
+      - device: gl-virgl
+        checksum: e0fe979fee129c0ed42a3059d1a4e1c9
+  - path: glxgears/glxgears-2.trace
+    expectations:
+      - device: gl-virgl
+        checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
+  - path: gputest/furmark.trace
+    expectations:
+      - device: gl-virgl
+        checksum: 87ffd45be95f2d55f82325c86ce32f20
+  - path: gputest/pixmark-piano.trace
+    expectations:
+      - device: gl-virgl
+        checksum: 24eb95484e5b8288b3d5d65117c98641
+  - path: gputest/triangle.trace
+    expectations:
+      - device: gl-virgl
+        checksum: 848436d1a2448bdc76fd6220382d8606
+  - path: humus/Portals.trace
+    expectations:
+      - device: gl-virgl
+        checksum: 7caf9a1b50b7fc312a623be7c45553cb

diff --git a/.gitlab-ci/traces.yml b/.gitlab-ci/traces.yml
deleted file mode 100644 (file)
index 5f0e259..0000000
--- a/.gitlab-ci/traces.yml
+++ /dev/null
@@ -1,328 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 8867f3a41f180626d0d4b7661ff5c0f4
-      - device: gl-virgl
-        checksum: 8867f3a41f180626d0d4b7661ff5c0f4
-      - device: gl-panfrost-t860
-        checksum: 95df5e619a36e88fe408e45567a2d149
-      - device: gl-panfrost-t760
-        checksum: 30663eac9a4767d26fbf9b6db9712d9f
-      - device: gl-radeonsi-stoney
-        checksum: 316650141be869c8afe76b42d3573b49
-  - path: glmark2/jellyfish.rdc
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: e0fe979fee129c0ed42a3059d1a4e1c9
-      - device: gl-virgl
-        checksum: e0fe979fee129c0ed42a3059d1a4e1c9
-      - device: gl-panfrost-t860
-        checksum: 1d609b089732be5b6e3e78370abcb149
-      - device: gl-panfrost-t760
-        checksum: f98ef9118eeaba660c15065dac46e580
-      - device: gl-radeonsi-stoney
-        checksum: 2c57f9d33489dd43c8807bd0f06c3ed8
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
-      - device: gl-virgl
-        checksum: f8eba0fec6e3e0af9cb09844bc73bdc8
-      - device: gl-panfrost-t860
-        checksum: bcc73608b6e2b5d92bf926d1c21889c7
-      - device: gl-panfrost-t760
-        checksum: bcc73608b6e2b5d92bf926d1c21889c7
-      - device: gl-radeonsi-stoney
-        checksum: eb9b3d497be567f02a6e039fa32f2b13
-  - path: KhronosGroup-Vulkan-Tools/amd/polaris10/vkcube.gfxr
-    expectations:
-      - device: vk-amd-polaris10
-        checksum: 917cbbf4f09dd62ea26d247a1c70c16e
-      - device: vk-amd-raven
-        checksum: 45f9a89c7eabdaee5bc52ad4f45e598f
-  - path: LunarG-VulkanSamples/amd/polaris10/Hologram:-w:640:-h:480.gfxr
-    expectations:
-      - device: vk-amd-polaris10
-        checksum: cfde36cd7377068a739c30e3fd171d08
-      - device: vk-amd-raven
-        checksum: cfde36cd7377068a739c30e3fd171d08
-  - path: Wicked-Engine/Tests:Cloth_Physics_Test.trace-dxgi
-    expectations:
-      - device: vk-amd-polaris10
-        checksum: 6b6d27df609b8d086cc3335e6d103581
-      - device: vk-amd-raven
-        checksum: f013465b97fd8ba0217bcde74c262384
-  - path: 0ad/0ad.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: d76d0f5b5b064bba3e6a2a122c0799cf
-      - device: gl-radeonsi-stoney
-        checksum: bfd97a7190f2b9de24ddfd446fcc4850
-  - path: pathfinder/demo.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: e624d76c70cc3c532f4f54439e13659a
-      - device: gl-panfrost-t860
-        checksum: c4f5e6bfe0cba230b1aef631c2fa4584
-      - device: gl-panfrost-t760
-        checksum: c4f5e6bfe0cba230b1aef631c2fa4584
-      - device: gl-radeonsi-stoney
-        checksum: c81c85f9b247dd1b06c3dd5b669cc283
-  - path: pathfinder/canvas_moire.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: c4ee0eef519f1a32ba24b7b392b31b28
-      - device: gl-panfrost-t860
-        checksum: 2fb2c8e83719526cb6c02b6c2e069d61
-      - device: gl-panfrost-t760
-        checksum: 2fb2c8e83719526cb6c02b6c2e069d61
-      - device: gl-radeonsi-stoney
-        checksum: 78dd2357ad6e5ffc049a75bfb11c5497
-  - path: pathfinder/canvas_text.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: f8c6d9a5c9248821ed9aaa376bef05c3
-      - device: gl-panfrost-t860
-        checksum: 939038749a5204ec2b1448d3b9208fb3
-      - device: gl-panfrost-t760
-        checksum: 939038749a5204ec2b1448d3b9208fb3
-      - device: gl-radeonsi-stoney
-        checksum: 56d1398206ceea45562f80f8ea9d3814
-  - path: gputest/furmark.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 248ee9534a1f333b479e599646f56f63
-      - device: gl-virgl
-        checksum: 87ffd45be95f2d55f82325c86ce32f20
-      - device: gl-panfrost-t860
-        checksum: dc4ece101ed145228840d1f0654118c6
-      - device: gl-radeonsi-stoney
-        checksum: 1c569668d608c644f353caa177d577c6
-  - path: gputest/pixmark-piano.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: 022b43b7fff9e8623dcfcd91e6bbe7aa
-      - device: gl-virgl
-        checksum: 24eb95484e5b8288b3d5d65117c98641
-      - device: gl-radeonsi-stoney
-        checksum: 061226c3fd179c611b8d60acaa44474f
-  - path: gputest/triangle.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: c8848dec77ee0c55292417f54c0a1a49
-      - device: gl-virgl
-        checksum: 848436d1a2448bdc76fd6220382d8606
-      - device: gl-panfrost-t860
-        checksum: 6def0c34ade7d4ec930b45d0eef6e46a
-      - device: gl-panfrost-t760
-        checksum: 6def0c34ade7d4ec930b45d0eef6e46a
-      - device: gl-radeonsi-stoney
-        checksum: 2d0527e7288a0fc31099404546dadbfb
-  - path: humus/Portals.trace
-    expectations:
-      - device: gl-vmware-llvmpipe
-        checksum: d6eb6aee7a8a1c85d504a498cbf94659
-      - device: gl-virgl
-        checksum: 7caf9a1b50b7fc312a623be7c45553cb
-      - device: gl-panfrost-t860
-        checksum: 5415bbf2a69b605bb1052a0e0b0f7040
-      - device: gl-panfrost-t760
-        checksum: a41f53e9318cbd32c27b48d304df1ea6
-      - device: gl-radeonsi-stoney
-        checksum: b6f00f39566152c3c8462903b7a1f258
-  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: ee76b7ffb344d545ee22c1b83d61f893
-  - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=subdata.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 8f90923d9b9daf7b3708f10b3b019af8
-  - path: glmark2/buffer-columns=200:interleave=true:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: db55995d943f1284c39637a116ceb645
-  - path: glmark2/bump-bump-render=height.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: da75c0dfbcb27b44fbaed15b2f29509c
-  - path: glmark2/bump-bump-render=high-poly.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e2e83a59d4eb6763d2fe922932aa14b5
-  - path: glmark2/bump-bump-render=normals.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: b7beae443e41e229d34da46ab2047a98
-  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=0.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e95f9a5ce73727a92eeb4109d28caba4
-  - path: glmark2/conditionals-fragment-steps=0:vertex-steps=5.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e9ff7521f88eebd8a6770ab5eb28fad4
-  - path: glmark2/conditionals-fragment-steps=5:vertex-steps=0.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 0381a3eb918cfecec03a64d06158d1a3
-  - path: glmark2/desktop-effect=shadow:windows=4.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: c21cf8fe26107351eaa97725e6f9883f
-  - path: glmark2/effect2d-kernel=0,1,0;1,-4,1;0,1,0.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 2958ae3442ed26b681b6978e278ba10d
-  - path: glmark2/effect2d-kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 2d4384b59505215932dc2f01ae174379
-  - path: glmark2/function-fragment-complexity=low:fragment-steps=5.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: f84fc1a1ff1a8342678bca081f8a5c0d
-  - path: glmark2/function-fragment-complexity=medium:fragment-steps=5.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 4097ffd5e97bd56589dfab374574d116
-  - path: glmark2/glmark2-build-use-vbo-false.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: e344777696ef13adc2bd943dfd4199a2
-  - path: glmark2/glmark2-build-use-vbo-true.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 51da69c3490816c93c130e63686d2483
-  - path: glmark2/ideas-speed=duration.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 966191b52dc4885cfc56c0e7c80856b2
-  - path: glmark2/loop-fragment-loop=false:fragment-steps=5:vertex-steps=5.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 65cfa43254eaa0ca09ceb8792b4e4ee7
-  - path: glmark2/loop-fragment-steps=5:fragment-uniform=false:vertex-steps=5.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 716f1ebf84d9ab30a8c4261ecbed492b
-  - path: glmark2/loop-fragment-steps=5:fragment-uniform=true:vertex-steps=5.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 45061884dc857a9e0c31d0b0c02d4cbe
-  - path: glmark2/pulsar-light=false:quads=5:texture=false.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 605881a1cb0d8d59e28e19663b6f5eb0
-  - path: glmark2/refract.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: db300d3a8afb6cecc19ae8e38c7b87c6
-  - path: glmark2/shading-shading=blinn-phong-inf.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 36b193b33127144f8080aa60d582e65e
-  - path: glmark2/shading-shading=cel.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: faac1e367720e1ccd9820f2b78808294
-  - path: glmark2/shading-shading=gouraud.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 22bd04eb9862eb4ecff525ac83b2826d
-  - path: glmark2/shading-shading=phong.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: fda002d281d57b3eacb5c2c8f619a62d
-  - path: glmark2/shadow.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 4bf5ca9ce641de1031eb8125d80a3005
-  - path: glmark2/terrain.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 52f19a65bd77ae03b5f51ee0038a2982
-  - path: glmark2/texture-texture-filter=linear.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 992eb4af603d68a3920014f64f0973b1
-  - path: glmark2/texture-texture-filter=mipmap.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: c635b1741e4103cf48cd554882e15a4c
-  - path: glmark2/texture-texture-filter=nearest.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: bd00656bf6683dae40bfa26a6416061d
-  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 2ddcda6b1c136ce1448714a3ff8432eb
-  - path: gputest/gimark.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 98e742377cef049e98014300a34d7bba
-  - path: gputest/pixmark-julia-fp32.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: ad472cdef2a68ffaabcbf2a694c4aefe
-  - path: gputest/pixmark-julia-fp64.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: b181b0a910f5ae5b161df70f834c3d5f
-  - path: gputest/pixmark-piano.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 061226c3fd179c611b8d60acaa44474f
-  - path: gputest/pixmark-volplosion.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 2fba173643c014bcfa4b31eb55a514b9
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 799ce7b2d8050d6ba2e3ae595cf8729e
-  - path: gputest/tessmark.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: d6597f93caa383c492d8290036c60919
-  - path: humus/AmbientAperture.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 56291d097c4be9c079fb771c849c6a2e
-  - path: humus/CelShading.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 7d30dbe3470873c327464ea7ebe6bcf0
-  - path: humus/DynamicBranching3.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 0f02743d054c66f04da404add87d67dc
-  - path: humus/HDR.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: b44ce4cb377321f6423a5a62a9083794
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 4209605af96a1d7c20aa7324aa93839f
-  - path: humus/VolumetricFogging2.trace
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 12ad73ad05b01854da65eb0094612ebf
-  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 17f4039392a65ad23133cb2cac82dba4
-  - path: supertuxkart/supertuxkart-menu.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: bc851bb8808b311c2df9c36a6c289e6e
-  - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc
-    expectations:
-      - device: gl-radeonsi-stoney
-        checksum: 46f08af5c49d711b41d4082f8a5cf6d6

diff --git a/.gitlab-ci/tracie-runner-gl.sh b/.gitlab-ci/tracie-runner-gl.sh
index 246e79cef048273727db436f5718b58b84b135f5..da4ce3987b61578112b4744300b47a14527fa4ad 100755 (executable)
--- a/.gitlab-ci/tracie-runner-gl.sh
+++ b/.gitlab-ci/tracie-runner-gl.sh
@@ -54,4 +54,4 @@ fi
 MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')
 wflinfo --platform surfaceless_egl --api gles2 | grep "Mesa $MESA_VERSION\(\s\|$\)"
 
-python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces.yml" --device-name "$DEVICE_NAME"
+python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces-$DRIVER_NAME.yml" --device-name "$DEVICE_NAME"

diff --git a/.gitlab-ci/tracie-runner-vk.sh b/.gitlab-ci/tracie-runner-vk.sh
index f046b7c9b4052f571f6954708b5282e21dca3ba1..4ebab6d79f4c773291c0e15bcd60b93047d800c7 100755 (executable)
--- a/.gitlab-ci/tracie-runner-vk.sh
+++ b/.gitlab-ci/tracie-runner-vk.sh
@@ -34,4 +34,4 @@ vulkaninfo | grep "Mesa $MESA_VERSION\(\s\|$\)"
 # file:
 # https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section
 PATH="/gfxreconstruct/build/bin:$PATH" \
-    python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces.yml" --device-name "$DEVICE_NAME"
+    python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces-$DRIVER_NAME.yml" --device-name "$DEVICE_NAME"

diff --git a/.gitlab-ci/tracie/README.md b/.gitlab-ci/tracie/README.md
index b0526564b46a72fe6cd8113fd348c5dc091e462a..df0736f8c913eac73540375a9378de3248326044 100644 (file)
--- a/.gitlab-ci/tracie/README.md
+++ b/.gitlab-ci/tracie/README.md
@@ -52,13 +52,14 @@ To enable trace testing on a new device:
 
    1. If you mean to test GL traces, use the `.traces-test-gl`
       template jobs as a base, and make sure you set a unique value for the
-     `DEVICE_NAME` variable:
+     `DEVICE_NAME` variable and the name of the Mesa driver as `DRIVER_NAME`:
 
    ```yaml
    my-hardware-gl-traces:
      extends: .traces-test-gl
      variables:
        DEVICE_NAME: "gl-myhardware"
+       DRIVER_NAME: "mydriver"
    ```
 
    2. If you mean to test Vulkan traces, use the `.traces-test-vk`
@@ -71,12 +72,14 @@ To enable trace testing on a new device:
      variables:
        VK_DRIVER: "radeon"
        DEVICE_NAME: "vk-myhardware"
+       DRIVER_NAME: "radv"
    ```
 
-2. Update the .gitlab-ci/traces.yml file with expectations for the new device.
-   Ensure that the device name used in the expectations matches the one
-   set in the job. For more information, and tips about how to calculate
-   the checksums, see the section describing the trace definition files.
+2. Update the .gitlab-ci/traces-$DRIVER_NAME.yml file with expectations for
+   the new device. Ensure that the device name used in the expectations
+   matches the one set in the job. For more information, and tips about how to
+   calculate the checksums, see the section describing the trace definition
+   files.
 
 ### Trace files
 
@@ -102,7 +105,7 @@ against reference checksums.
 The high level script [tracie.py](.gitlab-ci/tracie/tracie.py) accepts
 a traces definition file and the name of the device to be tested:
 
-    tracie.py --file .gitlab-ci/traces.yml --device-name gl-vmware-llvmpipe
+    tracie.py --file .gitlab-ci/traces-llvmpipe.yml --device-name gl-vmware-llvmpipe
 
 tracie.py copies the produced artifacts to the `$CI_PROJECT_DIR/result`
 directory. By default, created images from traces are only stored in case of a