From 9f03ee77734527307a857b537e21c0c36b7ba2ae Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 1 Mar 2021 12:50:51 -0800 Subject: [PATCH] ci/lava: Move the per-driver gitlab-ci.yml to each driver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up to !9139, will cause less testing of other drivers when changing the CI configuration for a single driver. Reviewed-by: Michel Dänzer Part-of: --- .gitlab-ci.yml | 4 + .gitlab-ci/lava-gitlab-ci.yml | 227 ------------------ src/gallium/drivers/iris/ci/gitlab-ci.yml | 34 +++ src/gallium/drivers/lima/ci/gitlab-ci.yml | 24 ++ src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 117 +++++++++ src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 48 ++++ 6 files changed, 227 insertions(+), 227 deletions(-) create mode 100644 src/gallium/drivers/iris/ci/gitlab-ci.yml create mode 100644 src/gallium/drivers/lima/ci/gitlab-ci.yml create mode 100644 src/gallium/drivers/panfrost/ci/gitlab-ci.yml create mode 100644 src/gallium/drivers/radeonsi/ci/gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4468b9fdc7b..0f0a7a79698 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,11 @@ include: - local: 'src/amd/ci/gitlab-ci.yml' - local: 'src/broadcom/ci/gitlab-ci.yml' - local: 'src/freedreno/ci/gitlab-ci.yml' + - local: 'src/gallium/drivers/iris/ci/gitlab-ci.yml' + - local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml' + - local: 'src/gallium/drivers/panfrost/ci/gitlab-ci.yml' + - local: 'src/gallium/drivers/radeonsi/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml' - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml' diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 449ace3ed46..56ca35fcfa6 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -169,230 +169,3 @@ kernel+rootfs_armhf: - .lava-test:arm64 - .lava-piglit - .lava-traces-base - -panfrost-t720-gles2:arm64: - extends: - - .lava-test:arm64 - - .panfrost-rules - variables: - DEVICE_TYPE: sun50i-h6-pine-h64 - DTB: ${DEVICE_TYPE} - GPU_VERSION: panfrost-t720 - ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T720" - tags: - - mesa-ci-aarch64-lava-collabora - -.panfrost-t760-gles2:armhf: - extends: - - .lava-test:armhf - - .panfrost-rules - variables: - DEVICE_TYPE: rk3288-veyron-jaq - DTB: ${DEVICE_TYPE} - GPU_VERSION: panfrost-t760 - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T760" - tags: - - mesa-ci-aarch64-lava-collabora - -.panfrost-t760-traces:armhf: - extends: - - .lava-piglit-traces:armhf - - .panfrost-rules - variables: - DEVICE_TYPE: rk3288-veyron-jaq - DTB: ${DEVICE_TYPE} - GPU_VERSION: panfrost-t760 - DRIVER_NAME: panfrost - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" - tags: - - mesa-ci-aarch64-lava-collabora - -.lava-rk3399-gru-kevin: - extends: - - .panfrost-rules - variables: - DEVICE_TYPE: rk3399-gru-kevin - DTB: ${DEVICE_TYPE} - GPU_VERSION: panfrost-t860 - DRIVER_NAME: panfrost - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - tags: - - mesa-ci-aarch64-lava-collabora - -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: - parallel: 2 - extends: - - .lava-test:arm64 - - .lava-rk3399-gru-kevin - variables: - DEQP_VERSION: gles3 - ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" - -panfrost-t860-traces:arm64: - extends: - - .lava-piglit-traces:arm64 - - .lava-rk3399-gru-kevin - variables: - ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" - -.lava-meson-g12b-a311d-khadas-vim3: - extends: - - .panfrost-rules - variables: - DEVICE_TYPE: meson-g12b-a311d-khadas-vim3 - DTB: ${DEVICE_TYPE} - GPU_VERSION: panfrost-g52 - tags: - - mesa-ci-aarch64-lava-collabora - -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: - extends: - - .lava-test:arm64 - - .lava-meson-g12b-a311d-khadas-vim3 - variables: - # We don't have enough VIM3s to run the full GLES3 testsuite yet - CI_NODE_INDEX: 1 - CI_NODE_TOTAL: 2 - DEQP_VERSION: gles3 - ENV_VARS: "PAN_MESA_DEBUG=deqp DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52" - -.panfrost-t820-gles2:arm64: - extends: - - .lava-test:arm64 - - .panfrost-rules - variables: - DEVICE_TYPE: meson-gxm-khadas-vim2 - DTB: ${DEVICE_TYPE} - GPU_VERSION: panfrost-t820 - LAVA_TAGS: panfrost - ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T820" - tags: - - mesa-ci-aarch64-lava-baylibre - -.lima-mali400-test:armhf: - parallel: 2 - extends: - - .lava-test:armhf - - .lima-rules - variables: - DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc - DTB: ${DEVICE_TYPE} - GPU_VERSION: lima - ENV_VARS: "DEQP_PARALLEL=3 DEQP_EXPECTED_RENDERER=Mali400" - tags: - - mesa-ci-aarch64-lava-baylibre - -.lima-mali450-test:arm64: - extends: - - .lava-test:arm64 - - .lima-rules - variables: - DEVICE_TYPE: meson-gxl-s905x-libretech-cc - DTB: ${DEVICE_TYPE} - GPU_VERSION: lima - ENV_VARS: "DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=Mali450" - tags: - - mesa-ci-aarch64-lava-baylibre - -.radeonsi-stoney-gles2:amd64: - extends: - - .lava-test:amd64 - - .radeonsi-rules - variables: - DEVICE_TYPE: hp-11A-G6-EE-grunt - DTB: "" - GPU_VERSION: radeonsi-stoney - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY" - tags: - - mesa-ci-aarch64-lava-collabora - -.radeonsi-stoney-gles3:amd64: - extends: - - .radeonsi-stoney-gles2:amd64 - variables: - DEQP_VERSION: gles3 - CI_NODE_INDEX: 1 - CI_NODE_TOTAL: 4 - tags: - - mesa-ci-aarch64-lava-collabora - -radeonsi-stoney-gles31:amd64: - extends: - - .radeonsi-stoney-gles2:amd64 - variables: - DEQP_VERSION: gles31 - CI_NODE_INDEX: 1 - CI_NODE_TOTAL: 5 - tags: - - mesa-ci-aarch64-lava-collabora - -radeonsi-stoney-traces:amd64: - extends: - - .lava-piglit-traces:amd64 - - .radeonsi-rules - variables: - DEVICE_TYPE: hp-11A-G6-EE-grunt - DTB: "" - GPU_VERSION: radeonsi-stoney - DRIVER_NAME: radeonsi - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" - tags: - - mesa-ci-aarch64-lava-collabora - -.iris-traces:amd64: - extends: - - .lava-piglit-traces:amd64 - - .iris-rules - variables: - ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" - -iris-apl-traces:amd64: - extends: - - .iris-traces:amd64 - - .test-manual - variables: - DEVICE_TYPE: asus-C523NA-A20057-coral - DTB: "" - GPU_VERSION: intel-apl - DRIVER_NAME: iris - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - tags: - - mesa-ci-aarch64-lava-collabora - -iris-glk-traces:amd64: - extends: - - .iris-traces:amd64 - - .test-manual - variables: - DEVICE_TYPE: hp-x360-12b-n4000-octopus - DTB: "" - GPU_VERSION: intel-glk - DRIVER_NAME: iris - BOOT_METHOD: depthcharge - KERNEL_IMAGE_TYPE: "" - tags: - - mesa-ci-aarch64-lava-collabora diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml new file mode 100644 index 00000000000..c4981edcb66 --- /dev/null +++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml @@ -0,0 +1,34 @@ +.iris-traces:amd64: + extends: + - .lava-piglit-traces:amd64 + - .iris-rules + variables: + ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" + +iris-apl-traces:amd64: + extends: + - .iris-traces:amd64 + - .test-manual + variables: + DEVICE_TYPE: asus-C523NA-A20057-coral + DTB: "" + GPU_VERSION: intel-apl + DRIVER_NAME: iris + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + tags: + - mesa-ci-aarch64-lava-collabora + +iris-glk-traces:amd64: + extends: + - .iris-traces:amd64 + - .test-manual + variables: + DEVICE_TYPE: hp-x360-12b-n4000-octopus + DTB: "" + GPU_VERSION: intel-glk + DRIVER_NAME: iris + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + tags: + - mesa-ci-aarch64-lava-collabora diff --git a/src/gallium/drivers/lima/ci/gitlab-ci.yml b/src/gallium/drivers/lima/ci/gitlab-ci.yml new file mode 100644 index 00000000000..f981b738052 --- /dev/null +++ b/src/gallium/drivers/lima/ci/gitlab-ci.yml @@ -0,0 +1,24 @@ +.lima-mali400-test:armhf: + parallel: 2 + extends: + - .lava-test:armhf + - .lima-rules + variables: + DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc + DTB: ${DEVICE_TYPE} + GPU_VERSION: lima + ENV_VARS: "DEQP_PARALLEL=3 DEQP_EXPECTED_RENDERER=Mali400" + tags: + - mesa-ci-aarch64-lava-baylibre + +.lima-mali450-test:arm64: + extends: + - .lava-test:arm64 + - .lima-rules + variables: + DEVICE_TYPE: meson-gxl-s905x-libretech-cc + DTB: ${DEVICE_TYPE} + GPU_VERSION: lima + ENV_VARS: "DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=Mali450" + tags: + - mesa-ci-aarch64-lava-baylibre diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml new file mode 100644 index 00000000000..d1ddc6f68e6 --- /dev/null +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -0,0 +1,117 @@ +panfrost-t720-gles2:arm64: + extends: + - .lava-test:arm64 + - .panfrost-rules + variables: + DEVICE_TYPE: sun50i-h6-pine-h64 + DTB: ${DEVICE_TYPE} + GPU_VERSION: panfrost-t720 + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T720" + tags: + - mesa-ci-aarch64-lava-collabora + +.panfrost-t760-gles2:armhf: + extends: + - .lava-test:armhf + - .panfrost-rules + variables: + DEVICE_TYPE: rk3288-veyron-jaq + DTB: ${DEVICE_TYPE} + GPU_VERSION: panfrost-t760 + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T760" + tags: + - mesa-ci-aarch64-lava-collabora + +.panfrost-t760-traces:armhf: + extends: + - .lava-piglit-traces:armhf + - .panfrost-rules + variables: + DEVICE_TYPE: rk3288-veyron-jaq + DTB: ${DEVICE_TYPE} + GPU_VERSION: panfrost-t760 + DRIVER_NAME: panfrost + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" + tags: + - mesa-ci-aarch64-lava-collabora + +.lava-rk3399-gru-kevin: + extends: + - .panfrost-rules + variables: + DEVICE_TYPE: rk3399-gru-kevin + DTB: ${DEVICE_TYPE} + GPU_VERSION: panfrost-t860 + DRIVER_NAME: panfrost + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + tags: + - mesa-ci-aarch64-lava-collabora + +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: + parallel: 2 + extends: + - .lava-test:arm64 + - .lava-rk3399-gru-kevin + variables: + DEQP_VERSION: gles3 + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" + +panfrost-t860-traces:arm64: + extends: + - .lava-piglit-traces:arm64 + - .lava-rk3399-gru-kevin + variables: + ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" + +.lava-meson-g12b-a311d-khadas-vim3: + extends: + - .panfrost-rules + variables: + DEVICE_TYPE: meson-g12b-a311d-khadas-vim3 + DTB: ${DEVICE_TYPE} + GPU_VERSION: panfrost-g52 + tags: + - mesa-ci-aarch64-lava-collabora + +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: + extends: + - .lava-test:arm64 + - .lava-meson-g12b-a311d-khadas-vim3 + variables: + # We don't have enough VIM3s to run the full GLES3 testsuite yet + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 2 + DEQP_VERSION: gles3 + ENV_VARS: "PAN_MESA_DEBUG=deqp DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=G52" + +.panfrost-t820-gles2:arm64: + extends: + - .lava-test:arm64 + - .panfrost-rules + variables: + DEVICE_TYPE: meson-gxm-khadas-vim2 + DTB: ${DEVICE_TYPE} + GPU_VERSION: panfrost-t820 + LAVA_TAGS: panfrost + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T820" + tags: + - mesa-ci-aarch64-lava-baylibre diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml new file mode 100644 index 00000000000..a17f4d46ab3 --- /dev/null +++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml @@ -0,0 +1,48 @@ +.radeonsi-stoney-gles2:amd64: + extends: + - .lava-test:amd64 + - .radeonsi-rules + variables: + DEVICE_TYPE: hp-11A-G6-EE-grunt + DTB: "" + GPU_VERSION: radeonsi-stoney + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY" + tags: + - mesa-ci-aarch64-lava-collabora + +.radeonsi-stoney-gles3:amd64: + extends: + - .radeonsi-stoney-gles2:amd64 + variables: + DEQP_VERSION: gles3 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 4 + tags: + - mesa-ci-aarch64-lava-collabora + +radeonsi-stoney-gles31:amd64: + extends: + - .radeonsi-stoney-gles2:amd64 + variables: + DEQP_VERSION: gles31 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 5 + tags: + - mesa-ci-aarch64-lava-collabora + +radeonsi-stoney-traces:amd64: + extends: + - .lava-piglit-traces:amd64 + - .radeonsi-rules + variables: + DEVICE_TYPE: hp-11A-G6-EE-grunt + DTB: "" + GPU_VERSION: radeonsi-stoney + DRIVER_NAME: radeonsi + BOOT_METHOD: depthcharge + KERNEL_IMAGE_TYPE: "" + ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" + tags: + - mesa-ci-aarch64-lava-collabora