From 0fed8d4fab6e092019d14d0895239ad3826cadb6 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Tue, 17 Aug 2021 13:14:37 -0700 Subject: [PATCH] ci/iris: Switch GL/GLES testing to suites. Better board utilization, less fussy load-balancing of the boards, and being able to add KHR-GLES* and multisample testing without having to add more reboots. Reviewed-by: Tomeu Vizoso Acked-by: Daniel Stone Part-of: --- .../drivers/iris/ci/deqp-iris-amly-fails.txt | 8 +- .../drivers/iris/ci/deqp-iris-amly-skips.txt | 6 -- .../drivers/iris/ci/deqp-iris-amly.toml | 94 ++++++++++++++++ .../drivers/iris/ci/deqp-iris-apl-fails.txt | 8 +- .../drivers/iris/ci/deqp-iris-apl.toml | 96 +++++++++++++++++ .../drivers/iris/ci/deqp-iris-cml-fails.txt | 46 ++++++++ .../drivers/iris/ci/deqp-iris-cml.toml | 97 +++++++++++++++++ .../drivers/iris/ci/deqp-iris-glk-fails.txt | 18 ++++ .../drivers/iris/ci/deqp-iris-glk-skips.txt | 13 --- .../drivers/iris/ci/deqp-iris-glk.toml | 97 +++++++++++++++++ .../drivers/iris/ci/deqp-iris-kbl-fails.txt | 46 ++++++++ .../drivers/iris/ci/deqp-iris-kbl.toml | 94 ++++++++++++++++ ...iris-apl-skips.txt => deqp-iris-skips.txt} | 3 +- .../drivers/iris/ci/deqp-iris-whl-fails.txt | 53 +++++++++ .../drivers/iris/ci/deqp-iris-whl.toml | 97 +++++++++++++++++ src/gallium/drivers/iris/ci/gitlab-ci.yml | 102 ++++++------------ 16 files changed, 784 insertions(+), 94 deletions(-) delete mode 100644 src/gallium/drivers/iris/ci/deqp-iris-amly-skips.txt create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-amly.toml create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-apl.toml create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-cml-fails.txt create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-cml.toml delete mode 100644 src/gallium/drivers/iris/ci/deqp-iris-glk-skips.txt create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-glk.toml create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-kbl-fails.txt create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-kbl.toml rename src/gallium/drivers/iris/ci/{deqp-iris-apl-skips.txt => deqp-iris-skips.txt} (85%) create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt create mode 100644 src/gallium/drivers/iris/ci/deqp-iris-whl.toml diff --git a/src/gallium/drivers/iris/ci/deqp-iris-amly-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-amly-fails.txt index 4acd392174a..b586aa5e9ca 100644 --- a/src/gallium/drivers/iris/ci/deqp-iris-amly-fails.txt +++ b/src/gallium/drivers/iris/ci/deqp-iris-amly-fails.txt @@ -13,6 +13,12 @@ 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 +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4167 dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x10,Fail @@ -31,8 +37,6 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail KHR-GL46.get_texture_sub_image.errors_test,Fail KHR-GL46.get_texture_sub_image.functional_test,Fail -KHR-GL46.gl_spirv.spirv_glsl_to_spirv_builtin_functions_test,Fail -KHR-GL46.shader_image_load_store.basic-api-bind,Fail KHR-GL46.transform_feedback.capture_vertex_interleaved_test,Fail KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail KHR-GL46.transform_feedback.discard_vertex_test,Fail diff --git a/src/gallium/drivers/iris/ci/deqp-iris-amly-skips.txt b/src/gallium/drivers/iris/ci/deqp-iris-amly-skips.txt deleted file mode 100644 index b62e3f97f47..00000000000 --- a/src/gallium/drivers/iris/ci/deqp-iris-amly-skips.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Timeouts in CI -KHR-GL46.copy_image.functional -KHR-GL46.enhanced_layouts.uniform_block_member_align_non_power_of_2 -KHR-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive -KHR-GL46.texture_swizzle.smoke -KHR-GL46.enhanced_layouts.ssb_member_align_non_power_of_2 diff --git a/src/gallium/drivers/iris/ci/deqp-iris-amly.toml b/src/gallium/drivers/iris/ci/deqp-iris-amly.toml new file mode 100644 index 00000000000..d36d485e2f5 --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-amly.toml @@ -0,0 +1,94 @@ +# Basic test set +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +skips = ["/install/deqp-iris-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/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-master.txt"] +skips = ["/install/deqp-iris-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/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# Note that KHR-GL3* test sets include all tests from the previous +# version, so we only need to run one test list (unlike dEQP-GLES, +# where the test sets are separate). +[[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/mustpass/gl46-master.txt", +] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# 565-nozs +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +# multisample +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" diff --git a/src/gallium/drivers/iris/ci/deqp-iris-apl-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-apl-fails.txt index 7b4687eb3ef..a2ae27e2640 100644 --- a/src/gallium/drivers/iris/ci/deqp-iris-apl-fails.txt +++ b/src/gallium/drivers/iris/ci/deqp-iris-apl-fails.txt @@ -13,11 +13,15 @@ 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 +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail KHR-GL46.get_texture_sub_image.errors_test,Fail KHR-GL46.get_texture_sub_image.functional_test,Fail -KHR-GL46.gl_spirv.spirv_glsl_to_spirv_builtin_functions_test,Fail -KHR-GL46.shader_image_load_store.basic-api-bind,Fail KHR-GL46.transform_feedback.capture_vertex_interleaved_test,Fail KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail KHR-GL46.transform_feedback.discard_vertex_test,Fail diff --git a/src/gallium/drivers/iris/ci/deqp-iris-apl.toml b/src/gallium/drivers/iris/ci/deqp-iris-apl.toml new file mode 100644 index 00000000000..ac460804974 --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-apl.toml @@ -0,0 +1,96 @@ +# Basic test set +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +skips = ["/install/deqp-iris-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/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 3 + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 3 + +# Note that KHR-GL3* test sets include all tests from the previous +# version, so we only need to run one test list (unlike dEQP-GLES, +# where the test sets are separate). +[[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/mustpass/gl46-master.txt", +] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# 565-nozs +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +# multisample +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" diff --git a/src/gallium/drivers/iris/ci/deqp-iris-cml-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-cml-fails.txt new file mode 100644 index 00000000000..b586aa5e9ca --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-cml-fails.txt @@ -0,0 +1,46 @@ +# These line rasterization failures are waived in the CTS +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 +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail + +# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4167 +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x10,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x8,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.12x10,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.12x12,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.4x4,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.5x4,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail + +KHR-GL46.get_texture_sub_image.errors_test,Fail +KHR-GL46.get_texture_sub_image.functional_test,Fail +KHR-GL46.transform_feedback.capture_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail +KHR-GL46.transform_feedback.discard_vertex_test,Fail +KHR-GL46.transform_feedback.draw_xfb_instanced_test,Crash +KHR-GL46.transform_feedback.draw_xfb_stream_instanced_test,Crash +KHR-GL46.transform_feedback.query_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.query_vertex_separate_test,Fail diff --git a/src/gallium/drivers/iris/ci/deqp-iris-cml.toml b/src/gallium/drivers/iris/ci/deqp-iris-cml.toml new file mode 100644 index 00000000000..ee1b1721054 --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-cml.toml @@ -0,0 +1,97 @@ +# Basic test set +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 2 + +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 2 + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 2 + +# Note that KHR-GL3* test sets include all tests from the previous +# version, so we only need to run one test list (unlike dEQP-GLES, +# where the test sets are separate). +[[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/mustpass/gl46-master.txt", +] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# 565-nozs +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +# multisample +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt index b0cfc82d2e4..674cd301c15 100644 --- a/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt +++ b/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt @@ -13,3 +13,21 @@ 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 +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail + +KHR-GL46.get_texture_sub_image.errors_test,Fail +KHR-GL46.get_texture_sub_image.functional_test,Fail +KHR-GL46.texture_buffer.texture_buffer_atomic_functions,Fail +KHR-GL46.transform_feedback.capture_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail +KHR-GL46.transform_feedback.discard_vertex_test,Fail +KHR-GL46.transform_feedback.draw_xfb_instanced_test,Crash +KHR-GL46.transform_feedback.draw_xfb_stream_instanced_test,Crash +KHR-GL46.transform_feedback.query_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.query_vertex_separate_test,Fail +KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions,Fail diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk-skips.txt b/src/gallium/drivers/iris/ci/deqp-iris-glk-skips.txt deleted file mode 100644 index 421d8571acf..00000000000 --- a/src/gallium/drivers/iris/ci/deqp-iris-glk-skips.txt +++ /dev/null @@ -1,13 +0,0 @@ -# 60s timeout in CI -dEQP-GLES31.functional.ubo.random.all_per_block_buffers.20 -KHR-GL46.arrays_of_arrays_gl.ConstructorsAndUnsizedDeclConstructorSizing1 -KHR-GL46.arrays_of_arrays_gl.ConstructorsAndUnsizedDeclConstructors1 -KHR-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive -KHR-GL46.arrays_of_arrays_gl.SubroutineFunctionCalls2 -KHR-GL46.copy_image.functional -KHR-GL46.enhanced_layouts.uniform_block_member_align_non_power_of_2 -KHR-GL46.enhanced_layouts.uniform_block_member_invalid_offset_alignment -KHR-GL46.enhanced_layouts.ssb_member_align_non_power_of_2 -KHR-GL46.texture_swizzle.functional -KHR-GL46.texture_swizzle.smoke -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk.toml b/src/gallium/drivers/iris/ci/deqp-iris-glk.toml new file mode 100644 index 00000000000..3c5f538816a --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-glk.toml @@ -0,0 +1,97 @@ +# Basic test set +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 3 + +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 4 + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 4 + +# Note that KHR-GL3* test sets include all tests from the previous +# version, so we only need to run one test list (unlike dEQP-GLES, +# where the test sets are separate). +[[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/mustpass/gl46-master.txt", +] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# 565-nozs +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +# multisample +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" diff --git a/src/gallium/drivers/iris/ci/deqp-iris-kbl-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-kbl-fails.txt new file mode 100644 index 00000000000..b586aa5e9ca --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-kbl-fails.txt @@ -0,0 +1,46 @@ +# These line rasterization failures are waived in the CTS +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 +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail + +# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4167 +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x10,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x8,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.12x10,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.12x12,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.4x4,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.5x4,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail + +KHR-GL46.get_texture_sub_image.errors_test,Fail +KHR-GL46.get_texture_sub_image.functional_test,Fail +KHR-GL46.transform_feedback.capture_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail +KHR-GL46.transform_feedback.discard_vertex_test,Fail +KHR-GL46.transform_feedback.draw_xfb_instanced_test,Crash +KHR-GL46.transform_feedback.draw_xfb_stream_instanced_test,Crash +KHR-GL46.transform_feedback.query_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.query_vertex_separate_test,Fail diff --git a/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml b/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml new file mode 100644 index 00000000000..d36d485e2f5 --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml @@ -0,0 +1,94 @@ +# Basic test set +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +skips = ["/install/deqp-iris-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/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-master.txt"] +skips = ["/install/deqp-iris-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/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# Note that KHR-GL3* test sets include all tests from the previous +# version, so we only need to run one test list (unlike dEQP-GLES, +# where the test sets are separate). +[[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/mustpass/gl46-master.txt", +] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# 565-nozs +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +# multisample +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" diff --git a/src/gallium/drivers/iris/ci/deqp-iris-apl-skips.txt b/src/gallium/drivers/iris/ci/deqp-iris-skips.txt similarity index 85% rename from src/gallium/drivers/iris/ci/deqp-iris-apl-skips.txt rename to src/gallium/drivers/iris/ci/deqp-iris-skips.txt index 421d8571acf..4c45b676964 100644 --- a/src/gallium/drivers/iris/ci/deqp-iris-apl-skips.txt +++ b/src/gallium/drivers/iris/ci/deqp-iris-skips.txt @@ -8,6 +8,7 @@ KHR-GL46.copy_image.functional KHR-GL46.enhanced_layouts.uniform_block_member_align_non_power_of_2 KHR-GL46.enhanced_layouts.uniform_block_member_invalid_offset_alignment KHR-GL46.enhanced_layouts.ssb_member_align_non_power_of_2 +KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize KHR-GL46.texture_swizzle.functional KHR-GL46.texture_swizzle.smoke -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize +KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize diff --git a/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt new file mode 100644 index 00000000000..ec6b1daa468 --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt @@ -0,0 +1,53 @@ +# These line rasterization failures are waived in the CTS +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 +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail +565-nozs-dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail + +# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4167 +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x10,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.10x8,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.12x10,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.12x12,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.4x4,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.5x4,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.6x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail +dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail + +KHR-GL46.get_texture_sub_image.errors_test,Fail +KHR-GL46.get_texture_sub_image.functional_test,Fail + +# "Result is different than expected at index: 0 Expected value: 1606528 Result value: 0" +KHR-GL46.texture_buffer.texture_buffer_atomic_functions,Fail + +KHR-GL46.transform_feedback.capture_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail +KHR-GL46.transform_feedback.discard_vertex_test,Fail +KHR-GL46.transform_feedback.draw_xfb_instanced_test,Crash +KHR-GL46.transform_feedback.draw_xfb_stream_instanced_test,Crash +KHR-GL46.transform_feedback.query_vertex_interleaved_test,Fail +KHR-GL46.transform_feedback.query_vertex_separate_test,Fail + +# "Result is different than expected at index: 0 Expected value: 1606528 Result value: 0" +KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions,Fail diff --git a/src/gallium/drivers/iris/ci/deqp-iris-whl.toml b/src/gallium/drivers/iris/ci/deqp-iris-whl.toml new file mode 100644 index 00000000000..f0be5aa3edc --- /dev/null +++ b/src/gallium/drivers/iris/ci/deqp-iris-whl.toml @@ -0,0 +1,97 @@ +# Basic test set +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 5 + +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 8 + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-master.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +fraction = 8 + +# Note that KHR-GL3* test sets include all tests from the previous +# version, so we only need to run one test list (unlike dEQP-GLES, +# where the test sets are separate). +[[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/mustpass/gl46-master.txt", +] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] + +# 565-nozs +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgb565d0s0ms0", +] +prefix = "565-nozs-" + +# multisample +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" + +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-multisample.txt"] +skips = ["/install/deqp-iris-skips.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms4", +] +prefix = "multisample-" diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml index 0505e9bc58b..a351465b7a1 100644 --- a/src/gallium/drivers/iris/ci/gitlab-ci.yml +++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml @@ -10,6 +10,7 @@ FLAKES_CHANNEL: "#intel-ci" HWCI_FREQ_MAX: "true" +# 5 boards .iris-apl-test: extends: - .iris-test @@ -20,6 +21,7 @@ tags: - mesa-ci-x86-64-lava-asus-C523NA-A20057-coral +# 4 boards .iris-glk-test: extends: - .iris-test @@ -31,6 +33,7 @@ tags: - mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus +# 5 boards .iris-amly-test: extends: - .iris-test @@ -42,6 +45,7 @@ tags: - mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus +# 6 boards .iris-kbl-test: extends: - .iris-test @@ -53,6 +57,7 @@ tags: - mesa-ci-x86-64-lava-hp-x360-14-G1-sona +# 1 board .iris-whl-test: extends: - .iris-test @@ -64,6 +69,7 @@ tags: - mesa-ci-x86-64-lava-dell-latitude-5400-4305U-sarien +# 4 boards .iris-cml-test: extends: - .iris-test @@ -75,35 +81,13 @@ tags: - mesa-ci-x86-64-lava-asus-C436FA-flip-hatch -iris-apl-gles2: +iris-apl-deqp: extends: - .iris-apl-test variables: - DEQP_VER: gles2 - -iris-apl-gles3: - extends: - - .iris-apl-test - variables: - DEQP_VER: gles3 - DEQP_EXPECTED_RENDERER: APL - DEQP_FRACTION: 4 - -iris-apl-gles31: - extends: - - .iris-apl-test - variables: - DEQP_VER: gles31 - DEQP_EXPECTED_RENDERER: APL - DEQP_FRACTION: 6 - -# this appears to silently kill the board sometimes. Leave it as a manual job for debugging. -iris-apl-gl: - extends: - - .iris-apl-test - - .test-manual-mr - variables: - DEQP_VER: gl46 + DEQP_VER: gles2 # for the renderer check + DEQP_SUITE: iris-apl + parallel: 3 iris-apl-egl: extends: @@ -113,36 +97,13 @@ iris-apl-egl: HWCI_START_XORG: 1 DEQP_VER: egl -iris-glk-gles2: +iris-glk-deqp: extends: - .iris-glk-test variables: - DEQP_VER: gles2 - -iris-glk-gles3: - extends: - - .iris-glk-test - variables: - DEQP_VER: gles3 - DEQP_EXPECTED_RENDERER: GLK - DEQP_FRACTION: 8 - -iris-glk-gles31: - extends: - - .iris-glk-test - variables: - DEQP_VER: gles31 - DEQP_EXPECTED_RENDERER: GLK - DEQP_FRACTION: 8 - -# this appears to be just unusably slow, timed out at an hour. Needs debugging, -# so leave it as a manual job. -iris-glk-gl: - extends: - - .iris-glk-test - - .test-manual-mr - variables: - DEQP_VER: gl46 + DEQP_VER: gles2 # for the renderer check + DEQP_SUITE: iris-glk + parallel: 2 iris-glk-egl: extends: @@ -152,35 +113,36 @@ iris-glk-egl: HWCI_START_XORG: 1 DEQP_VER: egl -iris-amly-gles2: +iris-amly-deqp: extends: - .iris-amly-test variables: - DEQP_VER: gles2 + DEQP_VER: gles2 # for the renderer check + DEQP_SUITE: iris-amly + parallel: 3 -iris-amly-gles3: +iris-kbl-deqp: extends: - - .iris-amly-test - - .test-manual-mr + - .iris-kbl-test variables: - DEQP_VER: gles3 - DEQP_EXPECTED_RENDERER: AML - DEQP_FRACTION: 2 + DEQP_VER: gles2 # for the renderer check + DEQP_SUITE: iris-kbl + parallel: 3 -iris-amly-gles31: +iris-whl-deqp: extends: - - .iris-amly-test - - .test-manual-mr + - .iris-whl-test variables: - DEQP_VER: gles31 - DEQP_EXPECTED_RENDERER: AML - DEQP_FRACTION: 2 + DEQP_VER: gles2 # for the renderer check + DEQP_SUITE: iris-whl -iris-amly-gl: +iris-cml-deqp: extends: - - .iris-amly-test + - .iris-cml-test variables: - DEQP_VER: gl46 + DEQP_VER: gles2 # for the renderer check + DEQP_SUITE: iris-cml + parallel: 2 iris-amly-egl: extends: