X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=fbe88ed1ed87650c785be4a8388d4a4bf8ac0f3a;hb=951c6acb074b18da0e595825fe05c77a0fbee96d;hp=e6891997e5136a3554728edb3d434c9109eaf457;hpb=1d75595da4a72c2ca0eb2b9b88db09a05a873e67;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6891997e51..fbe88ed1ed8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,23 @@ variables: - UPSTREAM_REPO: mesa/mesa + FDO_UPSTREAM_REPO: mesa/mesa include: - - project: 'wayland/ci-templates' - ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 + - project: 'freedesktop/ci-templates' + ref: a1699326519fd28526485ce93464e33423bac564 file: '/templates/debian.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' + - local: '.gitlab-ci/test-source-dep.yml' stages: - container - - build - - test + - meson-x86_64 + - scons + - meson-misc + - llvmpipe + - softpipe + - freedreno + - panfrost + - misc-tests - success @@ -71,6 +78,7 @@ success: .ci-deqp-artifacts: artifacts: + name: "mesa_${CI_JOB_NAME}" when: always untracked: false paths: @@ -80,7 +88,7 @@ success: # Build the CI docker images. # -# DEBIAN_TAG is the tag of the docker image used by later stage jobs. If the +# FDO_DISTRIBUTION_TAG is the tag of the docker image used by later stage jobs. If the # image doesn't exist yet, the container stage job generates it. # # In order to generate a new image, one should generally change the tag. @@ -100,19 +108,19 @@ success: extends: - .ci-run-policy variables: - DEBIAN_VERSION: buster-slim - REPO_SUFFIX: $CI_JOB_NAME - DEBIAN_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' + FDO_DISTRIBUTION_VERSION: buster-slim + FDO_REPO_SUFFIX: $CI_JOB_NAME + FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image GIT_STRATEGY: none # Debian 10 based x86 build image x86_build: extends: - - .debian@container-ifnot-exists + - .fdo.container-ifnot-exists@debian - .container variables: - DEBIAN_TAG: &x86_build "2020-02-15" + FDO_DISTRIBUTION_TAG: &x86_build "2020-03-13" .use-x86_build: variables: @@ -125,32 +133,20 @@ x86_build: x86_test-gl: extends: x86_build variables: - DEBIAN_TAG: &x86_test-gl "2020-02-14" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-13" # Debian 10 based x86 test image for VK x86_test-vk: extends: x86_build variables: - DEBIAN_TAG: &x86_test-vk "2020-02-03" - # Can only be triggered manually on personal branches because RADV is the only - # driver that does Vulkan testing at the moment. - rules: - # Never build the test image for VK by default in the main project. - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: never - # Never build the test image for VK by default for merge requests. - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - when: never - # Otherwise, allow building it manually for personal branches. - - when: manual - + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-16" # Debian 9 based x86 build image (old LLVM) x86_build_old: extends: x86_build variables: - DEBIAN_TAG: &x86_build_old "2019-09-18" - DEBIAN_VERSION: stretch-slim + FDO_DISTRIBUTION_TAG: &x86_build_old "2019-09-18" + FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: variables: @@ -162,10 +158,10 @@ x86_build_old: # Debian 10 based ARM build image arm_build: extends: - - .debian@container-ifnot-exists@arm64v8 + - .fdo.container-ifnot-exists@debian@arm64v8 - .container variables: - DEBIAN_TAG: &arm_build "2020-02-26" + FDO_DISTRIBUTION_TAG: &arm_build "2020-03-17-db820c" .use-arm_build: variables: @@ -178,7 +174,7 @@ arm_build: arm_test: extends: arm_build variables: - DEBIAN_TAG: &arm_test "2020-01-30" + FDO_DISTRIBUTION_TAG: &arm_test "2020-01-30" .use-arm_test: variables: @@ -194,8 +190,8 @@ arm_test: # Shared between windows and Linux .build-common: extends: .ci-run-policy - stage: build artifacts: + name: "mesa_${CI_JOB_NAME}" when: always paths: - _build/meson-logs/*.txt @@ -231,6 +227,7 @@ arm_test: extends: - .build-linux - .use-x86_build + stage: meson-x86_64 variables: LLVM_VERSION: 9 script: @@ -240,6 +237,7 @@ arm_test: extends: - .build-linux - .use-x86_build + stage: scons variables: SCONSFLAGS: "-j4" script: @@ -267,7 +265,7 @@ meson-testing: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh -meson-main: +meson-gallium: extends: .meson-build variables: UNWIND: "true" @@ -276,7 +274,6 @@ meson-main: -D gbm=true -D egl=true -D platforms=x11,wayland,drm,surfaceless - DRI_DRIVERS: "i915,i965,r100,r200,nouveau" GALLIUM_ST: > -D dri3=true -D gallium-extra-hud=true @@ -295,9 +292,24 @@ meson-main: - .gitlab-ci/meson-build.sh - .gitlab-ci/run-shader-db.sh +meson-classic: + extends: .meson-build + variables: + UNWIND: "true" + DRI_LOADERS: > + -D glx=dri + -D gbm=true + -D egl=true + -D platforms=x11,wayland,drm,surfaceless + DRI_DRIVERS: "auto" + EXTRA_OPTION: > + -D osmesa=classic + -D tools=all + .meson-cross: extends: - .meson-build + stage: meson-misc variables: UNWIND: "false" DRI_LOADERS: > @@ -376,19 +388,13 @@ meson-clang: .meson-windows: extends: - .build-windows + stage: meson-misc before_script: - $ENV:ARCH = "x86" - $ENV:VERSION = "2019\Community" script: - cmd /C .gitlab-ci\meson-build.bat -scons-swr: - extends: .scons-build - variables: - SCONS_TARGET: "swr=1" - SCONS_CHECK_COMMAND: "true" - LLVM_VERSION: "6.0" - scons-win64: extends: .scons-build variables: @@ -465,31 +471,29 @@ meson-vulkan: -D vulkan-overlay-layer=true -D werror=true -# While the main point of this build is testing the i386 cross build, -# we also use this one to test some other options that are exclusive -# with meson-main's choices (classic swrast and osmesa) meson-i386: extends: .meson-cross variables: CROSS: i386 - VULKAN_DRIVERS: intel - DRI_DRIVERS: "swrast" - GALLIUM_DRIVERS: "iris" + VULKAN_DRIVERS: intel,amd + GALLIUM_DRIVERS: "iris,r300,radeonsi,swrast,virgl" EXTRA_OPTION: > -D vulkan-overlay-layer=true - -D llvm=false - -D osmesa=classic -D werror=true + script: + - dpkg -i /var/cache/apt/archives/$CROSS/*.deb + - .gitlab-ci/meson-build.sh meson-s390x: extends: - .meson-cross - tags: - - gstreamer variables: CROSS: s390x GALLIUM_DRIVERS: "swrast" script: + # For unknown reasons "too many" installed i386 libraries cause qemu to + # crash while executing llvm-config for s390x. + - apt-get remove -y libglib2.0-0:i386 - dpkg -i /var/cache/apt/archives/$CROSS/*.deb - .gitlab-ci/meson-build.sh @@ -503,6 +507,7 @@ meson-ppc64el: meson-mingw32-x86_64: extends: .meson-build + stage: meson-misc variables: UNWIND: "false" DRI_DRIVERS: "" @@ -515,8 +520,8 @@ meson-mingw32-x86_64: scons: extends: .scons-build variables: - SCONS_TARGET: "llvm=1" - SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check" + SCONS_TARGET: "llvm=1 swr=1" + SCONS_CHECK_COMMAND: "scons force_scons=1 ${SCONS_TARGET} check" script: - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh - LLVM_VERSION=9 .gitlab-ci/scons-build.sh @@ -531,7 +536,6 @@ scons-old-llvm: .test: extends: - .ci-run-policy - stage: test variables: GIT_STRATEGY: none # testing doesn't build anything from source before_script: @@ -541,7 +545,7 @@ scons-old-llvm: - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \; artifacts: when: always - name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + name: "mesa_${CI_JOB_NAME}" paths: - results/ dependencies: @@ -568,10 +572,12 @@ scons-old-llvm: - x86_test-vk .piglit-test: - extends: .test-gl + extends: + - .test-gl + - .llvmpipe-rules artifacts: when: on_failure - name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + name: "mesa_${CI_JOB_NAME}" paths: - summary/ variables: @@ -629,7 +635,12 @@ piglit-quick_shader: variables: DEQP_VER: vk -test-llvmpipe-gles2: +.fossilize-test: + extends: .test-vk + script: + - ./artifacts/fossilize-runner.sh + +llvmpipe-gles2: variables: DEQP_VER: gles2 DEQP_PARALLEL: 4 @@ -639,31 +650,36 @@ test-llvmpipe-gles2: LP_NUM_THREADS: 0 DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt LIBGL_ALWAYS_SOFTWARE: "true" - extends: .deqp-test-gl + extends: + - .deqp-test-gl + - .llvmpipe-rules -test-softpipe-gles2: - extends: test-llvmpipe-gles2 +softpipe-gles2: + extends: + - llvmpipe-gles2 + - .softpipe-rules variables: DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt DEQP_SKIPS: deqp-softpipe-skips.txt GALLIUM_DRIVER: "softpipe" -test-softpipe-gles3: +softpipe-gles3: parallel: 2 variables: DEQP_VER: gles3 - extends: test-softpipe-gles2 + extends: softpipe-gles2 -test-softpipe-gles31: +softpipe-gles31: parallel: 4 variables: DEQP_VER: gles31 - extends: test-softpipe-gles2 + extends: softpipe-gles2 arm64_a630_gles2: extends: - .deqp-test-gl - .use-arm_test + - .freedreno-rules variables: DEQP_VER: gles2 DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt @@ -686,19 +702,70 @@ arm64_a630_gles3: variables: DEQP_VER: gles3 +.baremetal-test: + extends: + - .ci-run-policy + stage: test + arm64_a306_gles2: - extends: arm64_a630_gles2 + extends: + - .baremetal-test + - .use-arm_build + - .freedreno-rules variables: + BM_KERNEL: /lava-files/Image.gz + BM_DTB: /lava-files/apq8016-sbc.dtb + BM_ROOTFS: /lava-files/rootfs-arm64 + BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8" DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt - DEQP_SKIPS: deqp-default-skips.txt + DEQP_SKIPS: deqp-freedreno-a307-skips.txt + DEQP_VER: gles2 + DEQP_PARALLEL: 4 + script: + - .gitlab-ci/bare-metal/fastboot.sh + needs: + - meson-arm64 + tags: + - google-freedreno-db410c + +# Disabled due to flaky results +.arm64_a306_gles3: + extends: + - arm64_a306_gles2 + parallel: 8 + variables: + DEQP_VER: gles3 + +arm64_a530_gles2: + extends: + - arm64_a306_gles2 + stage: freedreno + variables: + BM_KERNEL: /lava-files/db820c-kernel + BM_DTB: /lava-files/db820c.dtb + BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8" + DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt + DEQP_SKIPS: deqp-freedreno-a530-skips.txt tags: - - db410c + - google-freedreno-db820c + +arm64_a530_gles3: + extends: + - arm64_a530_gles2 + parallel: 6 + variables: + DEQP_VER: gles3 # RADV CI .test-radv: + extends: .radv-rules + stage: misc-tests variables: VK_DRIVER: radeon RADV_DEBUG: checkir + +.test-radv-unsafe: + extends: .test-radv # Can only be triggered manually on personal branches because RADV is the only # driver that does Vulkan testing at the moment. rules: @@ -708,33 +775,64 @@ arm64_a306_gles2: # Never test RADV by default for merge requests. - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' when: never - # Otherwise, allow testing RADV if the test image for VK has been manually - # started. - - when: on_success + # Otherwise, allow testing RADV manually for personal branches. + - when: manual + +.test-radv-fossilize: + extends: + - .fossilize-test + - .test-radv radv_polaris10_vkcts: extends: - .deqp-test-vk - - .test-radv + - .test-radv-unsafe variables: - DEQP_PARALLEL: 4 DEQP_SKIPS: deqp-radv-polaris10-skips.txt tags: - polaris10 +radv-polaris10-fossils: + extends: .test-radv-fossilize + variables: + RADV_FORCE_FAMILY: "polaris10" # Force creating a null device + +# Traces CI .traces-test: - extends: - - .test-gl + stage: misc-tests cache: key: ${CI_JOB_NAME} paths: - - .git-lfs-storage/ + - traces-db/ + +.traces-test-gl: + extends: + - .test-gl + - .traces-test + script: + - ./artifacts/tracie-runner-gl.sh + +.traces-test-vk: + extends: + - .test-vk + - .traces-test script: - - ./artifacts/tracie-runner.sh + - ./artifacts/tracie-runner-vk.sh llvmpipe-traces: + extends: + - .traces-test-gl + - .llvmpipe-rules variables: LIBGL_ALWAYS_SOFTWARE: "true" GALLIUM_DRIVER: "llvmpipe" DEVICE_NAME: "gl-vmware-llvmpipe" - extends: .traces-test + +radv-polaris10-traces: + extends: + - .traces-test-vk + - .test-radv-unsafe + variables: + DEVICE_NAME: "vk-amd-polaris10" + tags: + - polaris10