ci/zink: Re-enable a630 zink-on-turnip traces job using gbm as the backend.

This is a workaround for #6753, without having to build and install a
custom xlib in our containers.  Maybe some day debian will have a
backport?

Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17549>

diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 3ed9545..9aaa570 100755 (executable)
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -111,6 +111,7 @@ for var in \
     SKQP_BACKENDS \
     TU_DEBUG \
     VIRGL_HOST_API \
+    WAFFLE_PLATFORM \
     VK_CPU \
     VK_DRIVER \
     VK_ICD_FILENAMES \

diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index 4ac3e03..4fd82b7 100644 (file)
--- a/src/freedreno/ci/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
@@ -27,8 +27,8 @@ traces:
         checksum: f7e6f426d7b9c82742f00baed830797f
       - device: freedreno-a630
         checksum: 14f7656971b98fdaaf00bf576ada7ccf
-      # ../src/mesa/main/renderbuffer.c:606:_mesa_update_renderbuffer_surface: Assertion `level <= resource->last_level' failed.
-      # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6744
+      # ../src/vulkan/runtime/vk_image.c:418: vk_image_view_init: Assertion `pCreateInfo->format == image->format' failed.
+      # turnip refuses to do mutable UNORM vs sRGB views of UBWC, but zink tries to do it anyway.
       # - device: zink-a630
       #   checksum: affab10e98c1415747b1dc38eb7f7d7d
   - path: valve/portal-2-v2.trace
@@ -42,10 +42,10 @@ traces:
       # Floor splatter rendering failure, probably the same alpha test issue.
       - device: freedreno-a630
         checksum: a3a9e158ccf7fa5ba978e045505a060e
-      # big white region compared to freedreno.
-      # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6240
-      - device: zink-a630
-        checksum: 373766698cc531aa52075a7e83086b0a
+      # ../src/vulkan/runtime/vk_image.c:418: vk_image_view_init: Assertion `pCreateInfo->format == image->format' failed.
+      # turnip refuses to do mutable UNORM vs sRGB views of UBWC, but zink tries to do it anyway.
+      # - device: zink-a630
+      #   checksum: cd427d434d54990bde533302c01e945f
   - path: valve/counterstrike-source-v2.trace
     expectations:
       # Skipped since it's slow even on a530.
@@ -56,8 +56,8 @@ traces:
         checksum: a00c5007c26daab3eccb778e68fb2730
       - device: freedreno-a630
         checksum: 339dce29ae08569652438116829510c7
-      # ../src/mesa/main/renderbuffer.c:606:_mesa_update_renderbuffer_surface: Assertion `level <= resource->last_level' failed.
-      # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6744
+      # ../src/vulkan/runtime/vk_image.c:418: vk_image_view_init: Assertion `pCreateInfo->format == image->format' failed.
+      # turnip refuses to do mutable UNORM vs sRGB views of UBWC, but zink tries to do it anyway.
       # - device: zink-a630
       #   checksum: dc9a01cfe6f2e542756b4892d80ef49c
   - path: xonotic/xonotic-keybench-high.trace
@@ -143,8 +143,10 @@ traces:
         checksum: 3a37faf7ec62d48dada63f157f30d876
       - device: freedreno-a630
         checksum: d25edb433abfcde517b626b3071906ff
-      - device: zink-a630
-        checksum: d25edb433abfcde517b626b3071906ff
+      # ../src/vulkan/runtime/vk_image.c:418: vk_image_view_init: Assertion `pCreateInfo->format == image->format' failed.
+      # turnip refuses to do mutable UNORM vs sRGB views of UBWC, but zink tries to do it anyway.
+      # - device: zink-a630
+      #   checksum: d25edb433abfcde517b626b3071906ff
   - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace
     expectations:
       - device: freedreno-a306
@@ -463,6 +465,9 @@ traces:
 #    expectations:
 #      - device: freedreno-a630
 #        checksum: 0
+      # intermittent "msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A630: hangcheck detected gpu lockup rb 0!"
+      #- device: zink-a630
+      #  checksum: 2ab33ccad9887ef6d09e8448217b359b
 # Intermittent GPU hangs on a630 result in test failures for this.
 #  - path: gputest/pixmark-piano.trace
 #    expectations:
@@ -627,57 +632,74 @@ traces:
         checksum: f6661ed4de9e0a444c6338ebd0cd3768
       - device: zink-a630
         checksum: f6661ed4de9e0a444c6338ebd0cd3768
-  #- path: ror/ror-default.trace
-  #  expectations:
+  - path: ror/ror-default.trace
+    expectations:
       # crash
       #- device: freedreno-a530
       #  checksum: 0
       # broken shadows
       #- device: freedreno-a630
       #  checksum: 0
-  #- path: nheko/nheko-colors.trace
-  #  expectations:
+      - device: zink-a630
+        checksum: 8533a3fd4dca0c68df6721f7eab75960
+  - path: nheko/nheko-colors.trace
+    expectations:
       # timeout
       #- device: freedreno-a530
       #  checksum: 0
       #- device: freedreno-a630
       #  checksum: cd908b6ee9e79472716976854fbbcb21
+      - device: zink-a630
+        checksum: fd1b9033e68c394a5564d8c4819a3012
   #- path: blender/blender-demo-cube_diorama.trace
   #  expectations:
       # needs GL 4.5
       #- device: freedreno-a530
       # crash
       #- device: freedreno-a630
+      # [  131.803669] msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A630: hangcheck detected gpu lockup rb 0!
+      #- device: zink-a630
+      #  checksum: a0000000000000000000000000000000
   #- path: blender/blender-demo-ellie_pose.trace
   #  expectations:
       # needs GL 4.5
       #- device: freedreno-a530
-      # crash
-      #- device: freedreno-a630
+      # Inconsistent rendering, but looks good.
+      #- device: zink-a630
+      #  checksum: 97075630172b755f5a551a542573e25e
   - path: freedoom/freedoom-phase2-gl-high.trace
     expectations:
       # needs GL 4.6
       #- device: freedreno-a530
       - device: freedreno-a630
         checksum: 2b96947d3eb3f623c4a387b2b7f80300
+      # ../src/gallium/drivers/zink/zink_context.c:541: update_descriptor_state_ubo: Assertion `ctx->di.ubos[shader][slot].range <= screen->info.props.limits.maxUniformBufferRange' failed.
+      #- device: zink-a630
+      #  checksum: 2b96947d3eb3f623c4a387b2b7f80300
   - path: unvanquished/unvanquished-lowest.trace
     expectations:
       # error: waffle_context_create failed
       #- device: freedreno-a530
       - device: freedreno-a630
         checksum: ae37867b1a9a94d2be9ff6c7e2009813
+      - device: zink-a630
+        checksum: ae37867b1a9a94d2be9ff6c7e2009813
   - path: unvanquished/unvanquished-ultra.trace
     expectations:
       # error: waffle_context_create failed
       #- device: freedreno-a530
       - device: freedreno-a630
         checksum: a71d1ad391162acef60cbb2804d0cf64
+      - device: zink-a630
+        checksum: 7d084f2cd05644b717cc591bd8e9dcce
   - path: warzone2100/warzone2100-default.trace
     expectations:
       # error: GLSL 1.50 is not supported.
       #- device: freedreno-a530
       - device: freedreno-a630
         checksum: 85c2d8129d761db4d9332790f694431a
+      - device: zink-a630
+        checksum: 8d450896439fe8b1b333e3ff61179f1b
 #  Throws "Invalid state in _mesa_program_state_string" and
 #  GL_INVALID_OPERATION in glBindTexture(target mismatch), fails to produce
 #  a .png at all.  Renders fine on radeonsi.
@@ -685,6 +707,8 @@ traces:
 #    expectations:
 #      - device: freedreno-a630
 #        checksum: a0000000000000000000000000000000
+#      - device: zink-a630
+#        checksum: a0000000000000000000000000000000
 # 21 seconds to render.  Renders nearly completely black, logs "warning:
 # 0:29(61): warning: `var_Position' used uninitialized".  Replays fine
 # on radeonsi.  Skip for now.
@@ -692,6 +716,8 @@ traces:
 #    expectations:
 #      #- device: freedreno-a630
 #      #  checksum: a0000000000000000000000000000000
+#      #- device: zink-a630
+#      #  checksum: a0000000000000000000000000000000
 # Throws errors on freedreno
 #  - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
 #    expectations:

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 1d6b800..e9a24c3 100644 (file)
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -36,10 +36,18 @@ zink-anv-tgl:
     HWCI_START_XORG: 1
     GPU_VERSION: zink-anv-tgl
 
-.zink-freedreno-a630-traces:
+zink-freedreno-a630-traces:
   extends:
     - a630-traces
     - .zink-turnip-rules
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "zink-a630"
     MESA_LOADER_DRIVER_OVERRIDE: zink
+    # The libX11 in the debian we use doesn't XInitThreads() by default (need
+    # 1.8.1 for that), and eglretrace's waffle GLX path doesn't call it either,
+    # which ends up causing trouble with kopper's X usage.  Use gbm for our
+    # trace replay, instead.
+    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6753
+    HWCI_START_XORG: ""
+    WAFFLE_PLATFORM: gbm
+    PIGLIT_PLATFORM: gbm