From 14279087fb37b2869e6abfbc571ecc69184b5fe1 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 21 Mar 2024 10:54:05 +0000 Subject: [PATCH] ci/deqp-runner: split gl & gles groups to use the correct binary Now that these can come from different releases, with different sets of patches backported to them, it matters that we use the correct one. Fixes: 78ea3bb43dc37013c3ab ("ci/deqp: use the proper gl/gles releases for deqp-gl*, deqp-gles*, deqp-egl") Part-of: --- src/amd/ci/deqp-radeonsi-vangogh.toml | 50 ++++++++++++++-- src/broadcom/ci/deqp-broadcom-rpi3.toml | 19 ++++-- src/broadcom/ci/deqp-broadcom-rpi4.toml | 60 +++++++++++++++---- src/freedreno/ci/deqp-freedreno-a618.toml | 17 +++++- src/freedreno/ci/deqp-freedreno-a630.toml | 17 +++++- src/freedreno/ci/deqp-freedreno-a660.toml | 17 +++++- .../drivers/llvmpipe/ci/deqp-llvmpipe.toml | 18 +++++- .../drivers/r300/ci/deqp-r300-rv380.toml | 23 ++++--- .../drivers/softpipe/ci/deqp-softpipe.toml | 18 +++++- .../zink/ci/deqp-zink-anv-tgl-full.toml | 17 +++++- .../zink/ci/deqp-zink-freedreno-a618.toml | 3 - .../drivers/zink/ci/deqp-zink-radv.toml | 14 +++++ src/intel/ci/deqp-anv-jsl-angle-full.toml | 3 - src/intel/ci/deqp-anv-jsl-angle.toml | 3 - src/intel/ci/deqp-anv-tgl-angle-full.toml | 3 - src/intel/ci/deqp-anv-tgl-angle.toml | 3 - src/intel/ci/deqp-iris-amly.toml | 17 +++++- src/intel/ci/deqp-iris-apl.toml | 17 +++++- src/intel/ci/deqp-iris-cml.toml | 17 +++++- src/intel/ci/deqp-iris-glk.toml | 18 +++++- src/intel/ci/deqp-iris-jsl.toml | 18 +++++- src/intel/ci/deqp-iris-kbl.toml | 17 +++++- src/intel/ci/deqp-iris-whl.toml | 17 +++++- 23 files changed, 325 insertions(+), 81 deletions(-) diff --git a/src/amd/ci/deqp-radeonsi-vangogh.toml b/src/amd/ci/deqp-radeonsi-vangogh.toml index ee404b20db5..10648d1ace1 100644 --- a/src/amd/ci/deqp-radeonsi-vangogh.toml +++ b/src/amd/ci/deqp-radeonsi-vangogh.toml @@ -1,14 +1,54 @@ +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = [ + "/deqp/mustpass/gles31-main.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-main.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/gles2/deqp-gles2" +caselists = [ + "/deqp/mustpass/gles2-main.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/external/openglcts/modules/glcts" caselists = [ - # The GL* tests include the tests for the previous versions, but the GLES* - # tests don't. - "/deqp/mustpass/gles2-main.txt", - "/deqp/mustpass/gles3-main.txt", - "/deqp/mustpass/gles31-main.txt", + # The GLES* tests don't include the tests for the previous versions. "/deqp/mustpass/gles2-khr-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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/external/openglcts/modules/glcts" +caselists = [ + # The GL* tests include the tests for the previous versions. "/deqp/mustpass/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] diff --git a/src/broadcom/ci/deqp-broadcom-rpi3.toml b/src/broadcom/ci/deqp-broadcom-rpi3.toml index e47503f4221..1b7293b7c5c 100644 --- a/src/broadcom/ci/deqp-broadcom-rpi3.toml +++ b/src/broadcom/ci/deqp-broadcom-rpi3.toml @@ -1,9 +1,6 @@ [[deqp]] -deqp = "/deqp/external/openglcts/modules/glcts" -caselists = [ - "/deqp/mustpass/gles2-main.txt", - "/deqp/mustpass/gles2-khr-main.txt", -] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-main.txt"] tests_per_group = 250 deqp_args = [ "--deqp-gl-config-name=rgba8888d24s8ms0", @@ -15,6 +12,18 @@ deqp_args = [ version_check = "GL ES 2.0.*git" renderer_check = "VC4" +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = ["/deqp/mustpass/gles2-khr-main.txt"] +tests_per_group = 250 +deqp_args = [ + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-surface-width=256", + "--deqp-visibility=hidden", +] + # We are getting frequent GPU hangs with piglit, but still haven't identified # the cause. So let's disable it for now. # [[piglit]] diff --git a/src/broadcom/ci/deqp-broadcom-rpi4.toml b/src/broadcom/ci/deqp-broadcom-rpi4.toml index c61fdbf2bce..930077f31f2 100644 --- a/src/broadcom/ci/deqp-broadcom-rpi4.toml +++ b/src/broadcom/ci/deqp-broadcom-rpi4.toml @@ -1,14 +1,6 @@ [[deqp]] -deqp = "/deqp/external/openglcts/modules/glcts" -caselists = [ - "/deqp/mustpass/gles31-main.txt", - "/deqp/mustpass/gles3-main.txt", - "/deqp/mustpass/gles2-main.txt", - "/deqp/mustpass/gles31-khr-main.txt", - "/deqp/mustpass/gles3-khr-main.txt", - "/deqp/mustpass/gles2-khr-main.txt", - "/deqp/mustpass/gl31-main.txt", -] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-main.txt"] deqp_args = [ "--deqp-gl-config-name=rgba8888d24s8ms0", "--deqp-surface-height=256", @@ -19,6 +11,54 @@ deqp_args = [ version_check = "GL ES 3.1.*git" renderer_check = "V3D" +[[deqp]] +deqp = "/deqp/modules/gles3/deqp-gles3" +caselists = ["/deqp/mustpass/gles3-main.txt"] +deqp_args = [ + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-surface-width=256", + "--deqp-visibility=hidden", +] + +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-main.txt"] +deqp_args = [ + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-surface-width=256", + "--deqp-visibility=hidden", +] + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = [ + "/deqp/mustpass/gles31-khr-main.txt", + "/deqp/mustpass/gles3-khr-main.txt", + "/deqp/mustpass/gles2-khr-main.txt", +] +deqp_args = [ + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-surface-width=256", + "--deqp-visibility=hidden", +] + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = ["/deqp/mustpass/gl31-main.txt"] +deqp_args = [ + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-surface-width=256", + "--deqp-visibility=hidden", +] + [[piglit]] piglit_folder = "/piglit" profile = "gpu" diff --git a/src/freedreno/ci/deqp-freedreno-a618.toml b/src/freedreno/ci/deqp-freedreno-a618.toml index 3c65cf6afdf..e26c5a11844 100644 --- a/src/freedreno/ci/deqp-freedreno-a618.toml +++ b/src/freedreno/ci/deqp-freedreno-a618.toml @@ -31,15 +31,26 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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", +] + +# 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/gl46-main.txt", ] skips = ["install/freedreno-a618-premerge-skips.txt"] diff --git a/src/freedreno/ci/deqp-freedreno-a630.toml b/src/freedreno/ci/deqp-freedreno-a630.toml index 22cbb52fb36..7a11b2d103a 100644 --- a/src/freedreno/ci/deqp-freedreno-a630.toml +++ b/src/freedreno/ci/deqp-freedreno-a630.toml @@ -31,15 +31,26 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", +] +skips = ["install/freedreno-a630-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", +] + +# 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/gl46-main.txt", ] skips = ["install/freedreno-a630-premerge-skips.txt"] diff --git a/src/freedreno/ci/deqp-freedreno-a660.toml b/src/freedreno/ci/deqp-freedreno-a660.toml index fda131bc8c9..ff2290d4dd0 100644 --- a/src/freedreno/ci/deqp-freedreno-a660.toml +++ b/src/freedreno/ci/deqp-freedreno-a660.toml @@ -31,15 +31,26 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", +] +skips = ["install/freedreno-a660-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/gl46-main.txt", ] skips = ["install/freedreno-a660-skips.txt"] diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml index cbf76f58474..7fd3eb976e6 100644 --- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml +++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml @@ -37,15 +37,27 @@ deqp_args = [ # Costs about 30% extra runtime. NIR_DEBUG="clone,serialize" -# 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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", +] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] + +# 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/gl45-main.txt", "/deqp/mustpass/gl45-khr-single.txt", ] diff --git a/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml b/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml index 049e5dcc849..d1613b02333 100644 --- a/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml +++ b/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml @@ -1,12 +1,19 @@ -version_check = "GL ES 2.0.*git" -renderer_check = "RV370" - [[deqp]] -deqp = "/deqp/external/openglcts/modules/glcts" -caselists = [ - "/deqp/mustpass/gles2-khr-main.txt", - "/deqp/mustpass/gles2-main.txt", -] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-main.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 2.0.*git" +renderer_check = "RV370" + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = ["/deqp/mustpass/gles2-khr-main.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml b/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml index 78e68d6a9fc..13fe4dd3095 100644 --- a/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml +++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe.toml @@ -33,15 +33,27 @@ deqp_args = [ "--deqp-visibility=hidden" ] -# 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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", +] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] + +# 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/gl33-main.txt", ] deqp_args = [ diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml index 9799c2da7cb..fae5431fde2 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml @@ -39,8 +39,6 @@ timeout = 180.0 [[deqp]] deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ - "/deqp/mustpass/gl46-main.txt", - "/deqp/mustpass/gl46-khr-single.txt", "/deqp/mustpass/gles2-khr-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", @@ -54,6 +52,21 @@ deqp_args = [ ] timeout = 180.0 +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = [ + "/deqp/mustpass/gl46-main.txt", + "/deqp/mustpass/gl46-khr-single.txt", +] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] +timeout = 180.0 + # 565-nozs [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" diff --git a/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml b/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml index 1f2e01dfe78..742c0155360 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml @@ -28,9 +28,6 @@ deqp_args = [ "--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 = [ diff --git a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml index e113afe8a95..b05b6c4f599 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml @@ -4,6 +4,20 @@ caselists = [ "/deqp/mustpass/gles2-main.txt", "/deqp/mustpass/gles3-main.txt", "/deqp/mustpass/gles31-main.txt", +] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] +timeout = 180.0 +renderer_check = "zink.*RADV" + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = [ "/deqp/mustpass/gl46-main.txt", ] deqp_args = [ diff --git a/src/intel/ci/deqp-anv-jsl-angle-full.toml b/src/intel/ci/deqp-anv-jsl-angle-full.toml index bfefea8666f..98e4c88813f 100644 --- a/src/intel/ci/deqp-anv-jsl-angle-full.toml +++ b/src/intel/ci/deqp-anv-jsl-angle-full.toml @@ -28,9 +28,6 @@ deqp_args = [ "--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 = [ diff --git a/src/intel/ci/deqp-anv-jsl-angle.toml b/src/intel/ci/deqp-anv-jsl-angle.toml index 5b2c7666a6d..6377d443e68 100644 --- a/src/intel/ci/deqp-anv-jsl-angle.toml +++ b/src/intel/ci/deqp-anv-jsl-angle.toml @@ -31,9 +31,6 @@ deqp_args = [ ] fraction = 6 -# 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 = [ diff --git a/src/intel/ci/deqp-anv-tgl-angle-full.toml b/src/intel/ci/deqp-anv-tgl-angle-full.toml index a3381abd65d..6977c645035 100644 --- a/src/intel/ci/deqp-anv-tgl-angle-full.toml +++ b/src/intel/ci/deqp-anv-tgl-angle-full.toml @@ -28,9 +28,6 @@ deqp_args = [ "--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 = [ diff --git a/src/intel/ci/deqp-anv-tgl-angle.toml b/src/intel/ci/deqp-anv-tgl-angle.toml index 2a6c1bec89c..0d7386e8266 100644 --- a/src/intel/ci/deqp-anv-tgl-angle.toml +++ b/src/intel/ci/deqp-anv-tgl-angle.toml @@ -30,9 +30,6 @@ deqp_args = [ ] 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 = [ diff --git a/src/intel/ci/deqp-iris-amly.toml b/src/intel/ci/deqp-iris-amly.toml index f919628935d..4d2231f0ce9 100644 --- a/src/intel/ci/deqp-iris-amly.toml +++ b/src/intel/ci/deqp-iris-amly.toml @@ -31,15 +31,26 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] diff --git a/src/intel/ci/deqp-iris-apl.toml b/src/intel/ci/deqp-iris-apl.toml index 42dc5753c21..34733432cb9 100644 --- a/src/intel/ci/deqp-iris-apl.toml +++ b/src/intel/ci/deqp-iris-apl.toml @@ -33,15 +33,26 @@ deqp_args = [ ] 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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] diff --git a/src/intel/ci/deqp-iris-cml.toml b/src/intel/ci/deqp-iris-cml.toml index 471af878ee3..8e89b935a29 100644 --- a/src/intel/ci/deqp-iris-cml.toml +++ b/src/intel/ci/deqp-iris-cml.toml @@ -31,15 +31,26 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] diff --git a/src/intel/ci/deqp-iris-glk.toml b/src/intel/ci/deqp-iris-glk.toml index f6b0832b804..5d33f924115 100644 --- a/src/intel/ci/deqp-iris-glk.toml +++ b/src/intel/ci/deqp-iris-glk.toml @@ -34,15 +34,27 @@ deqp_args = [ ] 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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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", +] +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/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] diff --git a/src/intel/ci/deqp-iris-jsl.toml b/src/intel/ci/deqp-iris-jsl.toml index 163c33efe59..a24d1a9f81e 100644 --- a/src/intel/ci/deqp-iris-jsl.toml +++ b/src/intel/ci/deqp-iris-jsl.toml @@ -31,15 +31,27 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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 + +# 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/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] diff --git a/src/intel/ci/deqp-iris-kbl.toml b/src/intel/ci/deqp-iris-kbl.toml index 442c4169239..d5b6a83caae 100644 --- a/src/intel/ci/deqp-iris-kbl.toml +++ b/src/intel/ci/deqp-iris-kbl.toml @@ -31,15 +31,26 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ] diff --git a/src/intel/ci/deqp-iris-whl.toml b/src/intel/ci/deqp-iris-whl.toml index 17191acebe0..f1ae2909c7b 100644 --- a/src/intel/ci/deqp-iris-whl.toml +++ b/src/intel/ci/deqp-iris-whl.toml @@ -31,15 +31,26 @@ deqp_args = [ "--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-main.txt", "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.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/gl46-main.txt", "/deqp/mustpass/gl46-khr-single.txt", ]