diff --git a/src/intel/ci/deqp-iris-jsl.toml b/src/intel/ci/deqp-iris-jsl.toml new file mode 100644 index 00000000000..019026c7987 --- /dev/null +++ b/src/intel/ci/deqp-iris-jsl.toml @@ -0,0 +1,98 @@ +# Basic test set +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +skips = ["/install/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", +] +version_check = "GL ES 3.2.*git" +renderer_check = "JSL" + +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-master.txt"] +skips = ["/install/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/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", + "/deqp/mustpass/gl46-khr-single.txt", +] +skips = ["/install/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", +] +timeout = 90.0 # Some tests take a bit over 60 seconds + +# 565-nozs +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] +skips = ["/install/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/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/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/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/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index 877798f2622..faca89adf29 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -103,6 +103,15 @@ anv-tgl-vk: GPU_VERSION: iris-cml RUNNER_TAG: mesa-ci-x86-64-lava-asus-C436FA-flip-hatch +# 8 boards +.iris-jsl-test: + extends: + - .iris-test + variables: + DEVICE_TYPE: acer-cb317-1h-c3z6-dedede + GPU_VERSION: iris-jsl + RUNNER_TAG: mesa-ci-x86-64-lava-acer-cb317-1h-c3z6-dedede + iris-apl-deqp: extends: - .iris-apl-test @@ -162,6 +171,13 @@ iris-cml-deqp: DEQP_SUITE: iris-cml parallel: 4 +iris-jsl-deqp: + extends: + - .iris-jsl-test + variables: + DEQP_SUITE: iris-jsl + parallel: 8 + iris-amly-egl: extends: - .iris-amly-test diff --git a/src/intel/ci/iris-jsl-skips.txt b/src/intel/ci/iris-jsl-skips.txt new file mode 100644 index 00000000000..33ce41144c9 --- /dev/null +++ b/src/intel/ci/iris-jsl-skips.txt @@ -0,0 +1,5 @@ +# Randomly time out, even after 90 seconds +KHR-GL46.gpu_shader_fp64.fp64.varyings +KHR-GL46.gpu_shader_fp64.builtin.inverse_dmat4 +KHR-Single-GL46.enhanced_layouts.xfb_global_buffer +KHR-Single-GL46.enhanced_layouts.xfb_override_qualifiers_with_api diff --git a/src/intel/ci/iris-skips.txt b/src/intel/ci/iris-skips.txt index 1b4144de06c..91b85f1a812 100644 --- a/src/intel/ci/iris-skips.txt +++ b/src/intel/ci/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.enhanced_layouts.ssb_member_invalid_offset_alignment KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize KHR-GL46.texture_swizzle.functional KHR-GL46.texture_swizzle.smoke @@ -21,4 +22,5 @@ KHR-Single-GL46.arrays_of_arrays_gl.SubroutineArgumentAliasing2 KHR-Single-GL46.arrays_of_arrays_gl.SubroutineArgumentAliasing4 KHR-Single-GL46.enhanced_layouts.ssb_member_align_non_power_of_2 KHR-Single-GL46.enhanced_layouts.ssb_member_invalid_offset_alignment +KHR-Single-GL46.enhanced_layouts.uniform_block_member_align_non_power_of_2 KHR-Single-GL46.enhanced_layouts.uniform_block_member_invalid_offset_alignment