From d909c23108589012c80e8df5788ada8ec33a3e36 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 23 Mar 2021 09:19:09 +0100 Subject: [PATCH 1/5] Revert "ci/panfrost: disable the rest of these jobs temporarily" Infrastructure should be more stable now. This reverts commit 806c612131f23255ad8235c90ba9845c1b235b11. Signed-off-by: Tomeu Vizoso --- src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml index 1c191c246bd7..2aeb0ed8c672 100644 --- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -1,4 +1,4 @@ -.panfrost-t720-gles2:arm64: +panfrost-t720-gles2:arm64: extends: - .lava-test:arm64 - .panfrost-rules @@ -85,14 +85,14 @@ tags: - mesa-ci-aarch64-lava-collabora -.panfrost-g52-gles2:arm64: +panfrost-g52-gles2:arm64: extends: - .lava-test:arm64 - .lava-meson-g12b-a311d-khadas-vim3 variables: ENV_VARS: "DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52" -.panfrost-g52-gles3:arm64: +panfrost-g52-gles3:arm64: extends: - .lava-test:arm64 - .lava-meson-g12b-a311d-khadas-vim3 -- GitLab From b12c80d612012bf8ee6872e2af8bf490f48dd55f Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 23 Mar 2021 09:19:24 +0100 Subject: [PATCH 2/5] Revert "ci/panfrost: Disable t860/radeonsi testing while the runners are struggling." Infrastructure should be more stable now. This reverts commit 0a1c533c6e5ede82f33ac269fcb6bba8e0777262. Signed-off-by: Tomeu Vizoso --- src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 6 +++--- src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml index 2aeb0ed8c672..d1ddc6f68e66 100644 --- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -52,14 +52,14 @@ panfrost-t720-gles2:arm64: tags: - mesa-ci-aarch64-lava-collabora -.panfrost-t860-gles2:arm64: +panfrost-t860-gles2:arm64: extends: - .lava-test:arm64 - .lava-rk3399-gru-kevin variables: ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" -.panfrost-t860-gles3:arm64: +panfrost-t860-gles3:arm64: parallel: 2 extends: - .lava-test:arm64 @@ -68,7 +68,7 @@ panfrost-t720-gles2:arm64: DEQP_VERSION: gles3 ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" -.panfrost-t860-traces:arm64: +panfrost-t860-traces:arm64: extends: - .lava-piglit-traces:arm64 - .lava-rk3399-gru-kevin diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml index b9bd2b547a1a..a17f4d46ab35 100644 --- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml +++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml @@ -22,7 +22,7 @@ tags: - mesa-ci-aarch64-lava-collabora -.radeonsi-stoney-gles31:amd64: +radeonsi-stoney-gles31:amd64: extends: - .radeonsi-stoney-gles2:amd64 variables: @@ -32,7 +32,7 @@ tags: - mesa-ci-aarch64-lava-collabora -.radeonsi-stoney-traces:amd64: +radeonsi-stoney-traces:amd64: extends: - .lava-piglit-traces:amd64 - .radeonsi-rules -- GitLab From 241243262b53ba64394b5868977f50ac2fbdf24f Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 23 Mar 2021 09:33:32 +0100 Subject: [PATCH 3/5] Revert "CI: Disable Panfrost T760" The machines should be stable now. This reverts commit fc2814417e9961883feb079e0eef3d4d1705d2d6. Signed-off-by: Tomeu Vizoso --- src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt | 1 + src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 4 ++-- src/gallium/drivers/panfrost/ci/traces-panfrost.yml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt new file mode 100644 index 000000000000..02aff76e16e9 --- /dev/null +++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-flakes.txt @@ -0,0 +1 @@ +dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16 diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml index d1ddc6f68e66..f4e946072052 100644 --- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -10,7 +10,7 @@ panfrost-t720-gles2:arm64: tags: - mesa-ci-aarch64-lava-collabora -.panfrost-t760-gles2:armhf: +panfrost-t760-gles2:armhf: extends: - .lava-test:armhf - .panfrost-rules @@ -24,7 +24,7 @@ panfrost-t720-gles2:arm64: tags: - mesa-ci-aarch64-lava-collabora -.panfrost-t760-traces:armhf: +panfrost-t760-traces:armhf: extends: - .lava-piglit-traces:armhf - .panfrost-rules diff --git a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml index d72f598e2995..daa4ab664b70 100644 --- a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml +++ b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml @@ -53,7 +53,8 @@ traces: - device: gl-panfrost-t860 checksum: f83da726bff354684a576effa74ef681 - device: gl-panfrost-t760 - checksum: a41f53e9318cbd32c27b48d304df1ea6 + # Wrong rendering, many elements are missing + checksum: 67db7302b28cb8e3e217cc79b672af79 - path: 0ad/0ad.trace expectations: - device: gl-panfrost-t860 -- GitLab From ae068984294d821108853ccbcdc998310b5b68f5 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 23 Mar 2021 09:35:17 +0100 Subject: [PATCH 4/5] ci: Fix visibility property of LAVA jobs LAVA expects a different syntax for this property: https://docs.lavasoftware.org/lava/glossary.html#term-visibility Signed-off-by: Tomeu Vizoso Fixes: 84f91dfea517 ("CI: Change LAVA job visibility") --- .gitlab-ci/lava-deqp.yml.jinja2 | 4 +++- .gitlab-ci/lava-piglit.yml.jinja2 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2 index d927d438a815..cf0c55187edb 100644 --- a/.gitlab-ci/lava-deqp.yml.jinja2 +++ b/.gitlab-ci/lava-deqp.yml.jinja2 @@ -11,7 +11,9 @@ timeouts: power-off: seconds: 30 priority: 75 -visibility: "Collabora+fdo" +visibility: + group: + - "Collabora+fdo" {% if tags %} {% set lavatags = tags.split(',') %} tags: diff --git a/.gitlab-ci/lava-piglit.yml.jinja2 b/.gitlab-ci/lava-piglit.yml.jinja2 index 3f12da5bc8b0..07ad5a7bc4a2 100644 --- a/.gitlab-ci/lava-piglit.yml.jinja2 +++ b/.gitlab-ci/lava-piglit.yml.jinja2 @@ -11,7 +11,9 @@ timeouts: power-off: seconds: 30 priority: 75 -visibility: "Collabora+fdo" +visibility: + group: + - "Collabora+fdo" {% if tags %} {% set lavatags = tags.split(',') %} tags: -- GitLab From 05c340c1a4168ab9db90fae588bf6ad1776599c4 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 7 Sep 2020 08:49:43 +0200 Subject: [PATCH 5/5] ci: Enable dEQP 3.1 tests on Mali T860 We have now enough machines in the lab for the extra job. Signed-off-by: Tomeu Vizoso --- src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml index f4e946072052..6a49e6c7fb13 100644 --- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -68,6 +68,15 @@ panfrost-t860-gles3:arm64: DEQP_VERSION: gles3 ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" +panfrost-t860-gles31:arm64: + extends: + - .lava-test:arm64 + - .lava-rk3399-gru-kevin + variables: + DEQP_VERSION: gles31 + DEQP_FRACTION: 4 + ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GLSL_VERSION_OVERRIDE=310 DEQP_PARALLEL=1 DEQP_EXPECTED_RENDERER=T860" + panfrost-t860-traces:arm64: extends: - .lava-piglit-traces:arm64 -- GitLab