X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=371c2560b78fbd27b2ed9d7cdb612d31a733db72;hb=c1cc79739a8745f2004917a2b170dba4124ef323;hp=3beed8d49827ee7b4e453e80d72ae2008f399666;hpb=cc9493f78ed3b366aaf1f4933c76984180a81a60;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3beed8d4982..371c2560b78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,12 @@ variables: - UPSTREAM_REPO: mesa/mesa + FDO_UPSTREAM_REPO: mesa/mesa include: - - project: 'wayland/ci-templates' - ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 + - project: 'freedesktop/ci-templates' + ref: 4b2997287317808830e9cb4eb0f99b691787da88 file: '/templates/debian.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' + - local: '.gitlab-ci/test-source-dep.yml' stages: - container @@ -16,7 +17,8 @@ stages: - softpipe - freedreno - panfrost - - misc-tests + - radv + - lima - success @@ -77,6 +79,7 @@ success: .ci-deqp-artifacts: artifacts: + name: "mesa_${CI_JOB_NAME}" when: always untracked: false paths: @@ -86,7 +89,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. @@ -106,19 +109,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: "debian/$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-build@debian - .container variables: - DEBIAN_TAG: &x86_build "2020-02-15" + FDO_DISTRIBUTION_TAG: &x86_build "2020-03-18-jflags" .use-x86_build: variables: @@ -131,32 +134,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-18-jflags" # Debian 10 based x86 test image for VK x86_test-vk: extends: x86_build variables: - DEBIAN_TAG: &x86_test-vk "2020-03-04" - # 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-04-01-jflags" # 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-03-18-jflags" + FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: variables: @@ -168,10 +159,10 @@ x86_build_old: # Debian 10 based ARM build image arm_build: extends: - - .debian@container-ifnot-exists@arm64v8 + - .fdo.container-build@debian@arm64v8 - .container variables: - DEBIAN_TAG: &arm_build "2020-02-26" + FDO_DISTRIBUTION_TAG: &arm_build "2020-04-01-jflags" .use-arm_build: variables: @@ -184,7 +175,7 @@ arm_build: arm_test: extends: arm_build variables: - DEBIAN_TAG: &arm_test "2020-01-30" + FDO_DISTRIBUTION_TAG: &arm_test "2020-03-18-jflags" .use-arm_test: variables: @@ -194,6 +185,44 @@ arm_test: - meson-arm64 - arm_test +# Native Windows docker builds +# +# Unlike the above Linux-based builds - including MinGW/SCons builds which +# cross-compile for Windows - which use the freedesktop ci-templates, we +# cannot use the same scheme here. As Windows lacks support for +# Docker-in-Docker, and Podman does not run natively on Windows, we have +# to open-code much of the same ourselves. +# +# This is achieved by first running in a native Windows shell instance +# (host PowerShell) in the container stage to build and push the image, +# then in the build stage by executing inside Docker. + +.windows-docker-vs2019: + variables: + WINDOWS_TAG: "2020-03-24" + WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG" + WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG" + +windows_build_vs2019: + extends: + - .container + - .windows-docker-vs2019 + stage: container + variables: + GIT_STRATEGY: fetch # we do actually need the full repository though + tags: + - windows + - shell + - "1809" + - mesa + script: + - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $WINDOWS_IMAGE $WINDOWS_UPSTREAM_IMAGE + +.use-windows_build_vs2019: + extends: .windows-docker-vs2019 + image: "$WINDOWS_IMAGE" + needs: + - windows_build_vs2019 # BUILD @@ -201,6 +230,7 @@ arm_test: .build-common: extends: .ci-run-policy artifacts: + name: "mesa_${CI_JOB_NAME}" when: always paths: - _build/meson-logs/*.txt @@ -226,7 +256,10 @@ arm_test: .build-windows: extends: .build-common tags: - - mesa-windows + - windows + - docker + - "1809" + - mesa cache: key: ${CI_JOB_NAME} paths: @@ -274,7 +307,7 @@ meson-testing: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh -meson-main: +meson-gallium: extends: .meson-build variables: UNWIND: "true" @@ -283,7 +316,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 @@ -302,6 +334,20 @@ 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 @@ -381,28 +427,20 @@ meson-clang: CC: "ccache clang-9" CXX: "ccache clang++-9" -.meson-windows: +meson-windows-vs2019: extends: - .build-windows + - .use-windows_build_vs2019 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" + - . .\.gitlab-ci\windows\mesa_build.ps1 scons-win64: extends: .scons-build variables: - SCONS_TARGET: platform=windows machine=x86_64 + SCONS_TARGET: platform=windows machine=x86_64 debug=1 SCONS_CHECK_COMMAND: "true" + allow_failure: true meson-clover: extends: .meson-build @@ -474,31 +512,31 @@ 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 + - kvm 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 @@ -522,22 +560,6 @@ meson-mingw32-x86_64: -Dosmesa=gallium --cross-file=.gitlab-ci/x86_64-w64-mingw32 -scons: - extends: .scons-build - variables: - SCONS_TARGET: "llvm=1" - SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 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 - -scons-old-llvm: - extends: - - scons - - .use-x86_build_old - script: - - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh - .test: extends: - .ci-run-policy @@ -550,7 +572,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: @@ -577,18 +599,19 @@ scons-old-llvm: - x86_test-vk .piglit-test: - extends: .test-gl - stage: llvmpipe + 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: LIBGL_ALWAYS_SOFTWARE: 1 PIGLIT_NO_WINDOW: 1 script: - - artifacts/piglit/run.sh + - install/piglit/run.sh piglit-quick_gl: extends: .piglit-test @@ -625,7 +648,7 @@ piglit-quick_shader: variables: DEQP_SKIPS: deqp-default-skips.txt script: - - ./artifacts/deqp-runner.sh + - ./install/deqp-runner.sh .deqp-test-gl: extends: @@ -639,6 +662,11 @@ piglit-quick_shader: variables: DEQP_VER: vk +.fossilize-test: + extends: .test-vk + script: + - ./install/fossilize-runner.sh + llvmpipe-gles2: variables: DEQP_VER: gles2 @@ -649,12 +677,14 @@ llvmpipe-gles2: LP_NUM_THREADS: 0 DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt LIBGL_ALWAYS_SOFTWARE: "true" - extends: .deqp-test-gl - stage: llvmpipe + extends: + - .deqp-test-gl + - .llvmpipe-rules softpipe-gles2: - extends: llvmpipe-gles2 - stage: softpipe + extends: + - llvmpipe-gles2 + - .softpipe-rules variables: DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt DEQP_SKIPS: deqp-softpipe-skips.txt @@ -672,11 +702,27 @@ softpipe-gles31: DEQP_VER: gles31 extends: softpipe-gles2 +# Rules for tests that should not be present in MRs or the main +# project's pipeline (don't block marge or report red on +# mesa/mesamaster) but should be present on pipelines in personal +# branches (so you can opt in to running the flaky test when you want +# to). +.test-manual: + rules: + # Never test in the main project. + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + when: never + # Never test in merge requests. + - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + when: never + # Otherwise, allow testing manually for personal branches. + - when: manual + arm64_a630_gles2: extends: - .deqp-test-gl - .use-arm_test - stage: freedreno + - .freedreno-rules variables: DEQP_VER: gles2 DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt @@ -699,67 +745,133 @@ 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 + - .test-manual + 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 + - .test-manual + parallel: 6 + variables: + DEQP_VER: gles3 # RADV CI .test-radv: - stage: misc-tests + extends: .radv-rules + stage: radv variables: VK_DRIVER: radeon RADV_DEBUG: checkir - # Can only be triggered manually on personal branches because RADV is the only - # driver that does Vulkan testing at the moment. - rules: - # Never test RADV by default in the main project. - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: never - # 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 +.test-radv-fossilize: + extends: + - .fossilize-test + - .test-radv + script: + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + +# Can only be triggered manually on personal branches because RADV is the only +# driver that does Vulkan testing at the moment. radv_polaris10_vkcts: extends: - .deqp-test-vk - .test-radv + - .test-manual variables: - DEQP_PARALLEL: 4 DEQP_SKIPS: deqp-radv-polaris10-skips.txt tags: - polaris10 +radv-fossils: + extends: + - .fossilize-test + - .test-radv + script: + # Polaris10 + - export RADV_FORCE_FAMILY="polaris10" + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Vega10 + - export RADV_FORCE_FAMILY="gfx900" + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Navi10 + - export RADV_FORCE_FAMILY="gfx1010" + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Traces CI .traces-test: - 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 + - ./install/tracie-runner-gl.sh .traces-test-vk: extends: - .test-vk - .traces-test script: - - ./artifacts/tracie-runner-vk.sh + - ./install/tracie-runner-vk.sh llvmpipe-traces: - extends: .traces-test-gl + extends: + - .traces-test-gl + - .llvmpipe-rules variables: LIBGL_ALWAYS_SOFTWARE: "true" GALLIUM_DRIVER: "llvmpipe" @@ -769,6 +881,7 @@ radv-polaris10-traces: extends: - .traces-test-vk - .test-radv + - .test-manual variables: DEVICE_NAME: "vk-amd-polaris10" tags: