From 274e1d5a39e258ff64637f9113c36e0b10bf6a1c Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 15 Jan 2023 09:14:28 -0800 Subject: [PATCH] freedreno/ci: Add a618 egl/skqp/piglit jobs Clone the existing a630 jobs and expectations. This should give us a6xx coverage to make up for the offline a630 runners. Signed-off-by: Rob Clark Part-of: --- src/freedreno/ci/deqp-freedreno-a618-egl.toml | 21 ++++++++++++ .../ci/deqp-freedreno-a618-skqp.toml | 3 ++ src/freedreno/ci/freedreno-a618-fails.txt | 9 +++++ .../ci/freedreno-a618-premerge-skips.txt | 21 ------------ src/freedreno/ci/gitlab-ci.yml | 33 +++++++++++++++++++ 5 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 src/freedreno/ci/deqp-freedreno-a618-egl.toml create mode 100644 src/freedreno/ci/deqp-freedreno-a618-skqp.toml diff --git a/src/freedreno/ci/deqp-freedreno-a618-egl.toml b/src/freedreno/ci/deqp-freedreno-a618-egl.toml new file mode 100644 index 00000000000..b7f89eede06 --- /dev/null +++ b/src/freedreno/ci/deqp-freedreno-a618-egl.toml @@ -0,0 +1,21 @@ +# x11 +[[deqp]] +deqp = "/deqp/modules/egl/deqp-egl" +caselists = ["/deqp/mustpass/egl-master.txt"] +skips = ["install/freedreno-a618-premerge-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +[[deqp]] +deqp = "/deqp/modules/egl/deqp-egl-wayland" +caselists = ["/deqp/mustpass/egl-master.txt"] +skips = ["install/freedreno-a618-premerge-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +prefix = "wayland-" diff --git a/src/freedreno/ci/deqp-freedreno-a618-skqp.toml b/src/freedreno/ci/deqp-freedreno-a618-skqp.toml new file mode 100644 index 00000000000..c2921a1122b --- /dev/null +++ b/src/freedreno/ci/deqp-freedreno-a618-skqp.toml @@ -0,0 +1,3 @@ +[[skqp]] +skqp = "/skqp/skqp" +skqp_assets = "/skqp/assets" diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 38fe35aa913..fa5cb104daf 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -468,3 +468,12 @@ spill-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bool_required # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152 spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail + +# Failing (Color test failed) since wayland platform was enabled in arm builds +wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail +wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail + +# skqp failure: +# SRGBReadWritePixels FAILED (7 errors) +# ../../tests/SRGBReadWritePixelsTest.cpp:214 Could not create sRGB surface context. [OpenGL] +SRGBReadWritePixels,Fail diff --git a/src/freedreno/ci/freedreno-a618-premerge-skips.txt b/src/freedreno/ci/freedreno-a618-premerge-skips.txt index 3e7bf5f84a8..fb00244b78c 100644 --- a/src/freedreno/ci/freedreno-a618-premerge-skips.txt +++ b/src/freedreno/ci/freedreno-a618-premerge-skips.txt @@ -6,24 +6,3 @@ KHR-GL45.texture_swizzle.smoke KHR-GL45.gpu_shader_fp64.builtin.inverse_dmat4 KHR-GL45.gpu_shader_fp64.fp64.varyings - -# These generally take near 15 seconds. The time is spent inside dEQP. -dEQP-VK.tessellation.invariance.inner_triangle_set.quads_equal_spacing -dEQP-VK.tessellation.invariance.inner_triangle_set.triangles_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_edge_division.quads_equal_spacing -dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_odd_spacing -dEQP-VK.tessellation.invariance.outer_edge_symmetry.quads_fractional_even_spacing_cw -dEQP-VK.tessellation.invariance.outer_triangle_set.quads_equal_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_odd_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_equal_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_odd_spacing - -# Spends its time in nir_validate, timing out in CI sometimes. -dEQP-VK.spirv_assembly.instruction.*.spirv_ids_abuse.lots_ids.* - -# Spending all its time in nir_compare_deref_paths() (approximately 15 seconds) -# https://gitlab.freedesktop.org/mesa/mesa/-/issues/5152 -dEQP-VK.ubo.random.all_shared_buffer.48 diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 411c24d4a5f..6f0b1e0bea7 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -184,6 +184,39 @@ a618_gl: variables: DEQP_SUITE: freedreno-a618 +# Run dEQP EGL window system tests separately with the window systems available. +# X11 takes over the screen, wayland is run headless. +a618_egl: + extends: + - .a618-test-limozeen-nots-r5 + - .freedreno-rules + variables: + DEQP_VER: egl + HWCI_START_XORG: 1 + HWCI_START_WESTON: 1 + DEQP_SUITE: freedreno-a618-egl + +a618_skqp: + extends: + - .a618-test-limozeen-nots-r5 + - .freedreno-rules + # SKQP tests both the GL and VK drivers. + - .freedreno-turnip-rules + variables: + HWCI_START_XORG: 1 + DEQP_SUITE: freedreno-a618-skqp + +a618_piglit: + extends: + - .piglit-test + - .a618-test-limozeen-nots-r5 + - .freedreno-rules + # Note that piglit has GL+VK integration testing. + - .freedreno-turnip-rules + variables: + HWCI_START_XORG: 1 + PIGLIT_PROFILES: gpu + .a630-test: extends: - .freedreno-test