Mesa (main): ci/crocus: Add manual CI for the new HSW box I have at home.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Dec 30 01:10:20 UTC 2021 

Module: Mesa
Branch: main
Commit: d1a59c4077f7416ea9af9b6a8ba8bbf138f9f68b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1a59c4077f7416ea9af9b6a8ba8bbf138f9f68b

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Dec 23 07:15:28 2021 -0800

ci/crocus: Add manual CI for the new HSW box I have at home.

Also extend the set of traces being tested and add more notes about them,
as well as add some g41 flakes since I did more runs.

Acked-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14300>

---

 .../drivers/crocus/ci/crocus-g41-flakes.txt        |  13 ++
 src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt | 196 +++++++++++++++++++++
 .../drivers/crocus/ci/crocus-hsw-flakes.txt        |   0
 src/gallium/drivers/crocus/ci/crocus-hsw-skips.txt |   2 +
 src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml |  53 ++++++
 src/gallium/drivers/crocus/ci/gitlab-ci.yml        |  45 ++++-
 .../drivers/crocus/ci/traces-crocus-g41.yml        |  52 ------
 src/gallium/drivers/crocus/ci/traces-crocus.yml    | 178 +++++++++++++++++++
 8 files changed, 483 insertions(+), 56 deletions(-)

diff --git a/src/gallium/drivers/crocus/ci/crocus-g41-flakes.txt b/src/gallium/drivers/crocus/ci/crocus-g41-flakes.txt
index a2bba3bdd5d..6fa87cb7cf7 100644
--- a/src/gallium/drivers/crocus/ci/crocus-g41-flakes.txt
+++ b/src/gallium/drivers/crocus/ci/crocus-g41-flakes.txt
@@ -7,5 +7,18 @@ dEQP-GLES2.functional.shaders.loops.for_dynamic_iterations.nested_sequence_fragm
 dEQP-GLES2.functional.shaders.loops.for_uniform_iterations.basic_mediump_int_fragment
 dEQP-GLES2.functional.shaders.loops.for_uniform_iterations.nested_sequence_fragment
 
+spec@!opengl 2.0 at attribs
+
+spec at arb_map_buffer_range@copybuffersubdata increment-offset
+spec at arb_vertex_buffer_object@vbo-subdata-many drawelements
 spec at arb_vertex_buffer_object@vbo-subdata-many drawrangeelements
 spec at arb_vertex_type_2_10_10_10_rev@attribs
+
+spec at ext_framebuffer_multisample@accuracy all_samples depth_resolve small depthstencil
+
+# GL_MAX_VARYING_FLOATS = 64
+# Probe color at (2,2)
+#   Expected: 0 255 0
+#   Observed: 255 255 255
+#   Failure with 1 vec4 varyings used in varying index 0
+shaders at glsl-max-varyings,Fail
diff --git a/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt b/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
new file mode 100644
index 00000000000..6d4fb1a24c6
--- /dev/null
+++ b/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
@@ -0,0 +1,196 @@
+dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide,Fail
+dEQP-GLES2.functional.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide,Fail
+dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide,Fail
+dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide,Fail
+dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.interpolation.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.fbo.texture_2d.interpolation.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail
+KHR-GLES31.core.compressed_format.api.invalid_teximage_with_compressed_format,Fail
+KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.data_pass_through,Fail
+KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize,Fail
+
+# frontbuffer reading failures?
+spec@!opengl 1.1 at read-front,Fail
+spec@!opengl 1.1 at read-front clear-front-first,Fail
+spec@!opengl 1.1 at read-front clear-front-first samples=2,Fail
+spec@!opengl 1.1 at read-front clear-front-first samples=4,Fail
+spec@!opengl 1.1 at read-front clear-front-first samples=6,Fail
+spec@!opengl 1.1 at read-front clear-front-first samples=8,Fail
+spec@!opengl 1.1 at read-front samples=2,Fail
+spec@!opengl 1.1 at read-front samples=4,Fail
+spec@!opengl 1.1 at read-front samples=6,Fail
+spec@!opengl 1.1 at read-front samples=8,Fail
+spec@!opengl 1.1 at windowoverlap,Fail
+
+fast_color_clear at fcc-write-after-clear,Fail
+
+spec@!opengl 1.0 at gl-1.0-swapbuffers-behavior,Fail
+
+spec@!opengl 1.1 at linestipple,Fail
+spec@!opengl 1.1 at linestipple@Factor 2x,Fail
+spec@!opengl 1.1 at linestipple@Factor 3x,Fail
+spec@!opengl 1.1 at linestipple@Line loop,Fail
+spec@!opengl 1.1 at linestipple@Line strip,Fail
+
+# max-texture-size: ../src/gallium/drivers/crocus/crocus_resource.c:693: crocus_resource_create_with_modifiers: Assertion `isl_surf_created_successfully' failed.
+spec@!opengl 1.1 at max-texture-size,Crash
+
+spec@!opengl 3.0 at clearbuffer-bug,Fail
+
+# "../src/mesa/state_tracker/st_cb_texture.c:1164:st_get_blit_mask: Assertion `0' failed."
+spec at arb_direct_state_access@gettextureimage-formats,Crash
+spec at arb_direct_state_access@gettextureimage-formats init-by-rendering,Fail
+
+spec at amd_performance_monitor@measure,Crash
+
+spec at arb_gpu_shader_fp64@execution at arb_gpu_shader_fp64-vs-non-uniform-control-flow-ssbo,Fail
+
+spec at arb_indirect_parameters@conditional-render,Fail
+spec at arb_indirect_parameters@conditional-render at Query result: Fail. Inverted mode: No.  Points drawn: 6,Fail
+spec at arb_indirect_parameters@conditional-render at Query result: Pass. Inverted mode: Yes.  Points drawn: 6,Fail
+spec at arb_indirect_parameters@conditional-render at Query result: Fail. Inverted mode: Yes.  Points drawn: 0,Fail
+spec at arb_indirect_parameters@conditional-render at Query result: Pass. Inverted mode: No.  Points drawn: 0,Fail
+
+spec at arb_program_interface_query@arb_program_interface_query-getprogramresourceindex,Fail
+spec at arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT,Fail
+
+spec at arb_query_buffer_object@qbo,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIMESTAMP-ASYNC_CPU_READ_BEFORE-GL_INT,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIMESTAMP-ASYNC_CPU_READ_BEFORE-GL_UNSIGNED_INT,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIMESTAMP-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_INT,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIMESTAMP-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIMESTAMP-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT64_ARB,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIME_ELAPSED-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_INT,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIME_ELAPSED-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT,Fail
+spec at arb_query_buffer_object@qbo at query-GL_TIME_ELAPSED-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT64_ARB,Fail
+
+spec at arb_sample_shading@samplemask 2,Fail
+spec at arb_sample_shading@samplemask 2 all,Fail
+spec at arb_sample_shading@samplemask 2 all at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 all at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 all at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 all at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 all at sample mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 2 at sample mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4,Fail
+spec at arb_sample_shading@samplemask 4 all,Fail
+spec at arb_sample_shading@samplemask 4 all at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 all at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 all at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 all at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 all at sample mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 4 at sample mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6,Fail
+spec at arb_sample_shading@samplemask 6 all,Fail
+spec at arb_sample_shading@samplemask 6 all at 0.125000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 all at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 all at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 all at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 all at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 all at sample mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 at 0.125000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 6 at sample mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8,Fail
+spec at arb_sample_shading@samplemask 8 all,Fail
+spec at arb_sample_shading@samplemask 8 all at 0.125000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 all at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 all at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 all at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 all at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 all at sample mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 at 0.125000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 at 0.250000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 at 0.500000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 at 1.000000 mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 at noms mask_in_one,Fail
+spec at arb_sample_shading@samplemask 8 at sample mask_in_one,Fail
+
+spec at arb_shader_image_load_store@early-z,Fail
+spec at arb_shader_image_load_store@early-z at occlusion query test/early-z pass,Fail
+
+spec at arb_tessellation_shader@execution at tcs-input@tcs-input-gl_pointsize,Fail
+spec at arb_tessellation_shader@execution at tes-input@tes-input-gl_pointsize,Fail
+
+spec at arb_shader_texture_lod@execution at arb_shader_texture_lod-texgradcube,Fail
+
+spec at arb_texture_buffer_object@formats (fs- arb),Crash
+spec at arb_texture_buffer_object@formats (vs- arb),Crash
+
+spec at arb_texture_view@rendering-formats,Fail
+spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32F,Fail
+spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16F,Fail
+spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16I,Fail
+spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16_SNORM,Fail
+spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8I,Fail
+spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8_SNORM,Fail
+
+spec at egl_ext_protected_content@conformance,Fail
+
+spec at egl 1.4 at eglterminate then unbind context,Fail
+
+spec at egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail
+
+# "eglInitialize() failed"
+spec at egl_khr_surfaceless_context@viewport,Fail
+
+spec at ext_external_objects@vk-semaphores,Fail
+
+spec at ext_framebuffer_blit@fbo-blit-check-limits,Fail
+
+spec at ext_image_dma_buf_import@ext_image_dma_buf_import-export-tex,Fail
+# "Testing GL_LUMINANCE8_SNORM
+#  Expected: (1, 1, 1, 0)
+#  Actual: (1, 1, 1, 1)"
+spec at ext_packed_float@query-rgba-signed-components,Fail
+
+spec at ext_texture_integer@fbo-integer,Fail
+
+spec at ext_transform_feedback@tessellation triangle_fan flat_first,Fail
+spec at ext_transform_feedback@builtin-varyings gl_pointsize,Fail
+
+spec at glsl-1.50@execution at geometry@primitive-types gl_line_loop,Fail
+
+spec at intel_performance_query@intel_performance_query-issue_2235,Fail
+
+spec at glsl-1.50@execution at gs-redeclares-both-pervertex-blocks,Fail
+spec at glsl-1.50@execution at gs-redeclares-pervertex-out-only,Fail
+
+spec at khr_texture_compression_astc@miptree-gl srgb-fp,Fail
+spec at khr_texture_compression_astc@miptree-gl srgb-fp at sRGB decode full precision,Fail
+spec at khr_texture_compression_astc@miptree-gles srgb-fp,Fail
+spec at khr_texture_compression_astc@miptree-gles srgb-fp at sRGB decode full precision,Fail
+spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail
+spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp at sRGB decode full precision,Fail
+spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
+spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp at sRGB decode full precision,Fail
+
+spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail
+spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3 at oes_egl_image_external_essl3_imageLoad,Fail
+spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3 at oes_egl_image_external_essl3_imageStore,Fail
+
+spec at oes_texture_view@rendering-formats,Fail
+spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32F,Fail
+spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16F,Fail
+spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16I,Fail
+spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16_SNORM,Fail
+spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8I,Fail
+spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8_SNORM,Fail
diff --git a/src/gallium/drivers/crocus/ci/crocus-hsw-flakes.txt b/src/gallium/drivers/crocus/ci/crocus-hsw-flakes.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/gallium/drivers/crocus/ci/crocus-hsw-skips.txt b/src/gallium/drivers/crocus/ci/crocus-hsw-skips.txt
new file mode 100644
index 00000000000..0cf07a21a8e
--- /dev/null
+++ b/src/gallium/drivers/crocus/ci/crocus-hsw-skips.txt
@@ -0,0 +1,2 @@
+# We aren't running an X server.
+glx.*
diff --git a/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
new file mode 100644
index 00000000000..7e3722306c2
--- /dev/null
+++ b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
@@ -0,0 +1,53 @@
+[[deqp]]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+version_check = "GL ES 3.2.*git"
+renderer_check = "Intel.*HSW GT2"
+
+[[deqp]]
+deqp = "/deqp/modules/gles3/deqp-gles3"
+caselists = ["/deqp/mustpass/gles3-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+version_check = "GL ES 3.2.*git"
+renderer_check = "Intel.*HSW GT2"
+
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = ["/deqp/mustpass/gles31-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+version_check = "GL ES 3.2.*git"
+renderer_check = "Intel.*HSW GT2"
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+        "/deqp/mustpass/gles2-khr-master.txt",
+        "/deqp/mustpass/gles3-khr-master.txt",
+        "/deqp/mustpass/gles31-khr-master.txt"
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
diff --git a/src/gallium/drivers/crocus/ci/gitlab-ci.yml b/src/gallium/drivers/crocus/ci/gitlab-ci.yml
index 5dceb3e628a..a5f2ad14d63 100644
--- a/src/gallium/drivers/crocus/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/crocus/ci/gitlab-ci.yml
@@ -9,6 +9,18 @@
   variables:
     GPU_VERSION: crocus-g41
 
+# Manual test rules for using anholt's shared hsw.
+.anholt-hsw-test:
+  extends:
+    - .crocus-rules
+    - .test-gl
+    - .test-manual-mr
+  tags:
+    - anholt-hsw
+  variables:
+    GPU_VERSION: crocus-hsw
+    FDO_CI_CONCURRENT: 12
+
 crocus-g41-deqp:
   extends:
     - .anholt-g41-test
@@ -16,10 +28,14 @@ crocus-g41-deqp:
   variables:
     DEQP_SUITE: crocus-g41
 
-crocus-g41-piglit:
+crocus-hsw-deqp:
   extends:
-    - .anholt-g41-test
-    - .piglit-test
+    - .anholt-hsw-test
+    - .deqp-test
+  variables:
+    DEQP_SUITE: crocus-hsw
+
+.crocus-piglit-test:
   variables:
     PIGLIT_PROFILES: gpu
     PIGLIT_PLATFORM: gbm
@@ -31,11 +47,32 @@ crocus-g41-piglit:
   script:
     - install/piglit/piglit-runner.sh
 
+crocus-g41-piglit:
+  extends:
+    - .anholt-g41-test
+    - .piglit-test
+    - .crocus-piglit-test
+
+crocus-hsw-piglit:
+  extends:
+    - .anholt-hsw-test
+    - .piglit-test
+    - .crocus-piglit-test
+
 crocus-g41-traces:
   extends:
     - .anholt-g41-test
     - .piglit-traces-test
   variables:
     EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-crocus-g41.yml"
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-crocus.yml"
     PIGLIT_REPLAY_DEVICE_NAME: "crocus-g41"
+
+crocus-hsw-traces:
+  extends:
+    - .anholt-hsw-test
+    - .piglit-traces-test
+  variables:
+    EGL_PLATFORM: "surfaceless"
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-crocus.yml"
+    PIGLIT_REPLAY_DEVICE_NAME: "crocus-hsw"
diff --git a/src/gallium/drivers/crocus/ci/traces-crocus-g41.yml b/src/gallium/drivers/crocus/ci/traces-crocus-g41.yml
deleted file mode 100644
index ec3a0a32f3d..00000000000
--- a/src/gallium/drivers/crocus/ci/traces-crocus-g41.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-traces-db:
-  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
-
-traces:
-  - path: glxgears/glxgears-2.trace
-    expectations:
-      - device: crocus-g41
-        checksum: 18455018dcfa97f69c967f118551ae30
-  - path: gputest/plot3d.trace
-    expectations:
-      - device: crocus-g41
-        checksum: 1527e6c60462e633dd421104f27c91c5
-  # Requires GLSL 1.30
-  #- path: humus/AmbientAperture.trace
-  #  expectations:
-  #    - device: crocus-g41
-  #      checksum: 8d4c52f0af9c09710d358f24c73fae3c
-  - path: humus/CelShading.trace
-    expectations:
-      - device: crocus-g41
-        checksum: 9b6e185ac8e8e67fc13d84f0ad6c3e3b
-  # Requires GLSL 1.30
-  #- path: humus/DynamicBranching3.trace
-  #  expectations:
-  #    - device: crocus-g41
-  #      checksum: 765fa742b87e411763921c6f988b2573
-  # Requires GLSL 1.30
-  #- path: humus/HDR.trace
-  #  expectations:
-  #    - device: crocus-g41
-  #      checksum: 80b164e85e96a413568d18ce308caae3
-  - path: humus/Portals.trace
-    expectations:
-      - device: crocus-g41
-        checksum: b090e734ed332e259664851576925d7b
-  - path: humus/RaytracedShadows.trace
-    expectations:
-      - device: crocus-g41
-        checksum: dbef340424f4f85eb8dc053ad3a56ae1
-  # Requires GLSL 1.30
-  #- path: humus/VolumetricFogging2.trace
-  #  expectations:
-  #    - device: crocus-g41
-  #      checksum: aec880cec7ba460f3144b789bc517891
-  - path: neverball/neverball.trace
-    expectations:
-      - device: crocus-g41
-        checksum: 0f14a88f511cd886c920238c80017e5d
-  - path: valve/counterstrike-v2.trace
-    expectations:
-      - device: crocus-g41
-        checksum: 90c01e73b3544cb477ac6109bc61bef1
diff --git a/src/gallium/drivers/crocus/ci/traces-crocus.yml b/src/gallium/drivers/crocus/ci/traces-crocus.yml
new file mode 100644
index 00000000000..9d45a17132a
--- /dev/null
+++ b/src/gallium/drivers/crocus/ci/traces-crocus.yml
@@ -0,0 +1,178 @@
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
+
+traces:
+  - path: 0ad/0ad.trace
+    expectations:
+      - device: crocus-g41
+        checksum: f4f723a73fde41b8a00a2a6518190adf
+      - device: crocus-hsw
+        checksum: 6567807570543c2875fc6912f00687e5
+  - path: behdad-glyphy/glyphy.trace
+    expectations:
+      # glyphs unintelligible on g41
+      - device: crocus-g41
+        checksum: 9d1db810d33f1ab30570bd710476429c
+      - device: crocus-hsw
+        checksum: 49c62d99a21de18a3e184a57bf655849
+  - path: glxgears/glxgears-2.trace
+    expectations:
+      - device: crocus-g41
+        checksum: 18455018dcfa97f69c967f118551ae30
+      - device: crocus-hsw
+        checksum: f53ac20e17da91c0359c31f2fa3f401e
+  - path: gputest/furmark.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
+  #  expectations:
+      # Needs GL3.3.
+      # - device: crocus-g41
+      #    checksum: dd8fb768033d09f6edc98b4cfff02c6f
+      # lighting comes in from a different direction than on freedreno?
+      # Inconsistent checksums, disabled
+      # - device: crocus-hsw
+      #   checksum: 96d35bcf6b05593754e20823982457f8
+  - path: gputest/pixmark-julia-fp32.trace
+    expectations:
+      - device: crocus-g41
+        checksum: 03776a063ee7049256acd414239a7f13
+      - device: crocus-hsw
+        checksum: dea71222007af1669cff54ce5e0b8c8d
+  - path: gputest/pixmark-julia-fp64.trace
+    expectations:
+      # Requires GL4, not for G41.
+      - device: crocus-hsw
+        checksum: 7e4948c361528a7873dad9712f629770
+  - path: gputest/pixmark-piano.trace
+    expectations:
+      # Looks like it probably triggers hangcheck on g41
+      # - device: crocus-g41
+      #   checksum: 346bae885d95f419b750a601e028378b
+      - device: crocus-hsw
+        checksum: 898b89c720f9bddd714633f46553e7a7
+  - path: gputest/pixmark-volplosion.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
+    expectations:
+      # Needs GLSL 130
+      # - device: crocus-g41
+      #   checksum: 13732b80b207dbf8c69a418e3b1f6c35
+      - device: crocus-hsw
+        checksum: 5686175a74f9ef6a3b13d30f1bd32b16
+  - path: humus/CelShading.trace
+    expectations:
+      - device: crocus-g41
+        checksum: 9b6e185ac8e8e67fc13d84f0ad6c3e3b
+      - device: crocus-hsw
+        checksum: 0f03835fd89b615542ece4bbb4712e48
+  - path: humus/DynamicBranching3.trace
+    expectations:
+      # Needs GLSL 130
+      # - device: crocus-g41
+      #   checksum: 8a06b8d08a8a01f02f4f0e9c37d4f6ff
+      - device: crocus-hsw
+        checksum: 16e3458485d1ba75fe80f61f59d124be
+  - path: humus/HDR.trace
+    expectations:
+      # Needs GLSL 130
+      # - device: crocus-g41
+      #   checksum: f3a0ed7fe057f3010d2129d33203d656
+      - device: crocus-hsw
+        checksum: 0dfbc65adca38721831ffddf0ede2af6
+  - path: humus/Portals.trace
+    expectations:
+      - device: crocus-g41
+        checksum: b090e734ed332e259664851576925d7b
+      - device: crocus-hsw
+        checksum: 61ea77324581e86cf8d313fe3fb27270
+  - path: humus/RaytracedShadows.trace
+    expectations:
+      - device: crocus-g41
+        checksum: dbef340424f4f85eb8dc053ad3a56ae1
+      - device: crocus-hsw
+        checksum: bac350df35b9262efca6722faf5c4eaa
+  - path: humus/VolumetricFogging2.trace
+    expectations:
+      # Needs GLSL 130
+      # - device: crocus-g41
+      #   checksum: 05cd8687f80642137986fe9b2e677e39
+      - device: crocus-hsw
+        checksum: a4f444b6ca337901ae080d8f2af812b4
+  - path: neverball/neverball.trace
+    expectations:
+      - device: crocus-g41
+        checksum: 0f14a88f511cd886c920238c80017e5d
+      - device: crocus-hsw
+        checksum: ec6b2615ab12db73126e06e6b20663ec
+  - path: pathfinder/canvas_moire.trace
+    expectations:
+      - device: crocus-hsw
+        checksum: 21bccd42f2deb6416cf6591cd6a99258
+  - path: pathfinder/canvas_text_v2.trace
+    expectations:
+      - device: crocus-hsw
+        checksum: 448886e3b24f6408e013ea13f7c96d28
+  - path: pathfinder/demo.trace
+    expectations:
+      - device: crocus-hsw
+        checksum: d9b33f0a2efe17c21b7933242afd9ec7
+  # Fails to run / times out.
+  # - path: pioneer/pioneer.trace
+  #   expectations:
+  #- path: thedarkmod/thedarkmod.trace
+  #  expectations:
+  # context create fail
+  #    - device: crocus-g41
+  #      checksum: a0000000000000000000000000000000
+  # Reasonable looking rendering, but inconsistent checksums
+  #    - device: crocus-hsw
+  #      checksum: 26bab35cd52c38010b617eb115e6713c
+  - path: supertuxkart/supertuxkart-mansion-egl-gles.trace
+    expectations:
+      # Different lighting from freedreno
+      - device: crocus-hsw
+        checksum: 8f1224abf2fab07f7dc31ae26312c948
+  - path: valve/counterstrike-v2.trace
+    expectations:
+    # very aliased palm fronds compared to freedreno?
+      - device: crocus-g41
+        checksum: 90c01e73b3544cb477ac6109bc61bef1
+      - device: crocus-hsw
+        checksum: 0e1e52aaccd94a261cf9d8675039c41c
+  - path: valve/counterstrike-source-v2.trace
+    expectations:
+      - device: crocus-g41
+        checksum: c51e21aada8e79fada36048e7d8de74a
+      - device: crocus-hsw
+        checksum: a78be6d590dd6c48bc6ad6090d88d9b3
+  - path: valve/half-life-2-v2.trace
+    expectations:
+      - device: crocus-g41
+        checksum: c67b47eeefb2b7a3b6667844758d4a95
+      - device: crocus-hsw
+        checksum: 96dcdfa2fc7e64b8bd2da0ea7b854f6c
+  - path: valve/portal-2-v2.trace
+    expectations:
+      # A bunch of stuff incorrectly rendered white.
+      - device: crocus-g41
+        checksum: d1e3bb943aa32a3fc9d2681106c4a087
+      - device: crocus-hsw
+        checksum: 98eeb4c504b0f03b136d5fd89edd6d5c
+  #- path: xonotic/xonotic-keybench-high.trace
+  #  expectations:
+    # Requires GLSL 140
+    #  - device: crocus-g41
+    #    checksum: 0efd30250af93d0b5f03eeabd079e8ee
+    # good rendering, but intermittent timeouts
+    #  - device: crocus-hsw
+    #    checksum: 008556add75ea5bb022eb99e0b52099b

More information about the mesa-commit mailing list