X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=38c699622186355c30072a0021c0e791488378ca;hb=b440c28b78fc5e6f319f988f21a7470254b00f06;hp=c9b7c3ee8da29afb6220e16245cd19ad27034529;hpb=7a794b1de40df87edc359a36d14e214daa1bfe60;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9b7c3ee8da..38c69962218 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,15 +1,25 @@ variables: FDO_UPSTREAM_REPO: mesa/mesa + CI_PRE_CLONE_SCRIPT: |- + set -o xtrace + /usr/bin/wget -q -O- ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | sh - + set +o xtrace include: - project: 'freedesktop/ci-templates' - ref: 4b2997287317808830e9cb4eb0f99b691787da88 + ref: &ci-templates-sha 52dd4a94044449c8481d18dcdc221a3c636366d2 file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *ci-templates-sha + file: '/templates/alpine.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' - local: '.gitlab-ci/test-source-dep.yml' stages: - - container + - container+docs + - container-2 + - git-archive + - deploy - meson-x86_64 - scons - meson-misc @@ -19,17 +29,68 @@ stages: - panfrost - radv - lima + - virgl + - radeonsi - success +# Generic rule to not run the job during scheduled pipelines +# ---------------------------------------------------------- +.scheduled_pipelines-rules: + rules: &ignore_scheduled_pipelines + if: '$CI_PIPELINE_SOURCE == "schedule"' + when: never + +.docs-base: + extends: .ci-run-policy + image: alpine + script: + - apk --no-cache add py3-pip graphviz + - pip3 install sphinx sphinx_rtd_theme + - sphinx-build -b html docs public + +pages: + extends: .docs-base + stage: deploy + artifacts: + paths: + - public + rules: + - *ignore_scheduled_pipelines + - if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == "master"' + changes: &docs-or-ci + - docs/**/* + - .gitlab-ci.yml + when: always + # Other cases default to never + +test-docs: + extends: .docs-base + # Cancel job if a newer commit is pushed to the same branch + interruptible: true + stage: container+docs + rules: + - *ignore_scheduled_pipelines + - if: '$CI_PROJECT_NAMESPACE == "mesa"' + when: never + - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: *docs-or-ci + when: on_success + - changes: *docs-or-ci + when: manual + # Other cases default to never # When to automatically run the CI .ci-run-policy: rules: + - *ignore_scheduled_pipelines # If any files affecting the pipeline are changed, build/test jobs run # automatically once all dependency jobs have passed - changes: &all_paths - VERSION - - bin/**/* + - bin/git_sha1_gen.py + - bin/install_megadrivers.py + - bin/meson_get_version.py + - bin/symbols-check.py # GitLab CI - .gitlab-ci.yml - .gitlab-ci/**/* @@ -51,17 +112,20 @@ stages: max: 2 when: - runner_system_failure - # Cancel CI run if a newer commit is pushed to the same branch - interruptible: true success: stage: success image: debian:stable-slim - only: - - merge_requests - except: - changes: - *all_paths + rules: + - *ignore_scheduled_pipelines + - if: '$CI_PROJECT_NAMESPACE == "mesa"' + when: never + - if: '$GITLAB_USER_LOGIN == "marge-bot"' + changes: *docs-or-ci + when: never + - changes: *all_paths + when: never + - when: on_success variables: GIT_STRATEGY: none script: @@ -96,24 +160,32 @@ success: # repository's registry will be used there as well. .container: - stage: container + stage: container+docs extends: - .ci-run-policy rules: + - *ignore_scheduled_pipelines + # Run pipeline by default in the main project if any CI pipeline + # configuration files were changed, to ensure docker images are up to date + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + changes: + - .gitlab-ci.yml + - .gitlab-ci/**/* + when: on_success # Run pipeline by default if it was triggered by Marge Bot, is for a - # merge request, and any files affecting it were changed + # merge request, and any files affecting the pipeline were changed - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' changes: *all_paths when: on_success - # Run pipeline by default in the main project if any files affecting it were - # changed - - if: '$CI_PROJECT_PATH == "mesa/mesa"' + # Run pipeline by default in the main project if it was not triggered by + # Marge Bot, and any files affecting the pipeline were changed + - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_PROJECT_PATH == "mesa/mesa"' changes: *all_paths when: on_success - # Allow triggering jobs manually for MRs or branches of forked projects if - # any files affecting the pipeline were changed + # Allow triggering jobs manually in other cases if any files affecting the + # pipeline were changed - changes: *all_paths when: manual @@ -122,17 +194,35 @@ success: variables: FDO_DISTRIBUTION_VERSION: buster-slim FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" - FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' + FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} 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: +# Debian 10 based x86 build image base +x86_build-base: extends: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-03-18-jflags" + FDO_DISTRIBUTION_TAG: &x86_build-base "2020-07-28-x86-2" + +.use-x86_build-base: + extends: + - x86_build-base + - .ci-run-policy + stage: container-2 + variables: + BASE_TAG: *x86_build-base + FDO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/x86_build-base:$BASE_TAG" + needs: + - x86_build-base + +# Debian 10 based x86 main build image +x86_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &x86_build "2020-08-08-glvnd" .use-x86_build: variables: @@ -141,23 +231,82 @@ x86_build: needs: - x86_build +# Debian 10 based i386 cross-build image +i386_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &i386_build "2020-07-28-x86-2" + +.use-i386_build: + variables: + TAG: *i386_build + image: "$CI_REGISTRY_IMAGE/debian/i386_build:$TAG" + needs: + - i386_build + +# Debian 10 based ppc64el cross-build image +ppc64el_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-28-x86-2" + +.use-ppc64el_build: + variables: + TAG: *ppc64el_build + image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:$TAG" + needs: + - ppc64el_build + +# Debian 10 based s390x cross-build image +s390x_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &s390x_build "2020-07-28-x86-2" + +.use-s390x_build: + variables: + TAG: *s390x_build + image: "$CI_REGISTRY_IMAGE/debian/s390x_build:$TAG" + needs: + - s390x_build + +# Debian 10 based x86 test image base +x86_test-base: + extends: x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &x86_test-base "2020-07-28-x86-2" + +.use-x86_test-base: + extends: + - x86_build-base + - .ci-run-policy + stage: container-2 + variables: + BASE_TAG: *x86_test-base + FDO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/x86_test-base:$BASE_TAG" + needs: + - x86_test-base + # Debian 10 based x86 test image for GL x86_test-gl: - extends: x86_build + extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-18-jflags" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-14-xcb-shm" # Debian 10 based x86 test image for VK x86_test-vk: - extends: x86_build + extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-04-09" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-28-x86-2" # Debian 9 based x86 build image (old LLVM) x86_build_old: - extends: x86_build + extends: x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build_old "2019-03-18-jflags" + FDO_DISTRIBUTION_TAG: &x86_build_old "2020-07-28-x86-2" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -173,7 +322,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-04-01-jflags" + FDO_DISTRIBUTION_TAG: &arm_build "2020-08-04-nfs-2" .use-arm_build: variables: @@ -182,22 +331,41 @@ arm_build: needs: - arm_build -# Debian 10 based ARM test image -arm_test: - extends: arm_build +# Debian 10 based x86 baremetal image base +arm_test-base: + extends: + - .fdo.container-build@debian + - .container variables: - FDO_DISTRIBUTION_TAG: &arm_test "2020-03-18-jflags" + FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-28-libdrm" -.use-arm_test: +.use-arm_test-base: + extends: + - arm_test-base + - .ci-run-policy + stage: container-2 variables: - TAG: *arm_test - image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG" + BASE_TAG: *arm_test-base + FDO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/arm_test-base:$BASE_TAG" needs: - - meson-arm64 - - arm_test + - arm_test-base + +# x86 image with ARM64 rootfs for baremetal testing. +arm64_test: + extends: + - .use-arm_test-base + variables: + FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-18" + +.use-arm64_test: + variables: + TAG: *arm64_test + image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG" + needs: + - arm64_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 @@ -210,7 +378,7 @@ arm_test: .windows-docker-vs2019: variables: - WINDOWS_TAG: "2020-03-24" + WINDOWS_TAG: "2020-05-05-llvm" WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG" WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG" @@ -218,9 +386,10 @@ arm_test: extends: - .container - .windows-docker-vs2019 - stage: container + stage: container+docs variables: GIT_STRATEGY: fetch # we do actually need the full repository though + timeout: 4h # LLVM takes ages tags: - windows - shell @@ -228,18 +397,61 @@ arm_test: - 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 + - windows_build_vs2019 + +git_archive: + extends: .fdo.container-build@alpine + stage: container+docs + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: always + variables: + FDO_REPO_SUFFIX: &git-archive-suffix "alpine/git_archive" + FDO_DISTRIBUTION_EXEC: 'pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366' + # no need to pull the whole repo to build the container image + GIT_STRATEGY: none + FDO_DISTRIBUTION_TAG: &git-archive-tag "2020-07-07" + FDO_DISTRIBUTION_PACKAGES: git py3-pip + + +# Git archive + +make git archive: + stage: git-archive + extends: .fdo.suffixed-image@alpine + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: on_success + # ensure we are running on packet + tags: + - packet.net + variables: + FDO_DISTRIBUTION_TAG: *git-archive-tag + FDO_REPO_SUFFIX: *git-archive-suffix + needs: + - git_archive + + script: + # compress the current folder + - tar -cvzf ../$CI_PROJECT_NAME.tar.gz . + + # login with the JWT token + - ci-fairy minio login $CI_JOB_JWT + - ci-fairy minio cp ../$CI_PROJECT_NAME.tar.gz minio://minio-packet.freedesktop.org/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz + # BUILD # Shared between windows and Linux .build-common: extends: .ci-run-policy + # Cancel job if a newer commit is pushed to the same branch + interruptible: true artifacts: name: "mesa_${CI_JOB_NAME}" when: always @@ -291,29 +503,29 @@ arm_test: - .build-linux - .use-x86_build stage: scons - variables: - SCONSFLAGS: "-j4" script: - - .gitlab-ci/scons-build.sh + - env SCONSFLAGS="-j${FDO_CI_CONCURRENT:-4}" .gitlab-ci/scons-build.sh meson-testing: extends: - .meson-build - .ci-deqp-artifacts variables: - UNWIND: "true" + UNWIND: "enabled" DRI_LOADERS: > -D glx=dri - -D gbm=true - -D egl=true - -D platforms=x11,drm,surfaceless + -D gbm=enabled + -D egl=enabled + -D platforms=x11 GALLIUM_ST: > - -D dri3=true - GALLIUM_DRIVERS: "swrast" + -D dri3=enabled + GALLIUM_DRIVERS: "swrast,virgl,radeonsi" VULKAN_DRIVERS: amd BUILDTYPE: "debugoptimized" EXTRA_OPTION: > -D werror=true + UPLOAD_FOR_LAVA: 1 + DEBIAN_ARCH: amd64 script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh @@ -321,63 +533,91 @@ meson-testing: meson-gallium: extends: .meson-build variables: - UNWIND: "true" + UNWIND: "enabled" DRI_LOADERS: > -D glx=dri - -D gbm=true - -D egl=true - -D platforms=x11,wayland,drm,surfaceless + -D gbm=enabled + -D egl=enabled + -D platforms=x11,wayland GALLIUM_ST: > - -D dri3=true + -D dri3=enabled -D gallium-extra-hud=true - -D gallium-vdpau=true - -D gallium-xvmc=true + -D gallium-vdpau=enabled + -D gallium-xvmc=enabled -D gallium-omx=bellagio - -D gallium-va=true - -D gallium-xa=true + -D gallium-va=enabled + -D gallium-xa=enabled -D gallium-nine=true -D gallium-opencl=disabled GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" + VULKAN_DRIVERS: swrast EXTRA_OPTION: > -D osmesa=gallium -D tools=all + -D werror=true script: - .gitlab-ci/meson-build.sh - .gitlab-ci/run-shader-db.sh + - src/freedreno/.gitlab-ci/run-fdtools.sh meson-classic: extends: .meson-build variables: - UNWIND: "true" + UNWIND: "enabled" DRI_LOADERS: > -D glx=dri - -D gbm=true - -D egl=true + -D gbm=enabled + -D egl=enabled -D platforms=x11,wayland,drm,surfaceless DRI_DRIVERS: "auto" EXTRA_OPTION: > -D osmesa=classic -D tools=all + -D werror=true + +meson-android: + extends: .meson-build + variables: + UNWIND: "disabled" + DRI_LOADERS: > + -D glx=disabled + -D gbm=disabled + -D egl=enabled + -D platforms=android + GALLIUM_DRIVERS: freedreno + VULKAN_DRIVERS: freedreno,intel,amd + EXTRA_OPTION: > + -D android-stub=true + -D werror=true + GALLIUM_ST: > + -D dri3=disabled + -D gallium-vdpau=disabled + -D gallium-xvmc=disabled + -D gallium-omx=disabled + -D gallium-va=disabled + -D gallium-xa=disabled + -D gallium-nine=false + -D gallium-opencl=disabled .meson-cross: extends: - .meson-build stage: meson-misc variables: - UNWIND: "false" + UNWIND: "disabled" DRI_LOADERS: > -D glx=disabled - -D gbm=false - -D egl=true - -D platforms=surfaceless + -D gbm=disabled + -D egl=enabled + -D platforms=[] -D osmesa=none GALLIUM_ST: > - -D dri3=false - -D gallium-vdpau=false - -D gallium-xvmc=false + -D dri3=disabled + -D gallium-vdpau=disabled + -D gallium-xvmc=disabled -D gallium-omx=disabled - -D gallium-va=false - -D gallium-xa=false + -D gallium-va=disabled + -D gallium-xa=disabled -D gallium-nine=false LLVM_VERSION: "8" @@ -400,7 +640,9 @@ meson-armhf: CROSS: armhf LLVM_VERSION: "7" EXTRA_OPTION: > - -D llvm=false + -D llvm=disabled + UPLOAD_FOR_LAVA: 1 + DEBIAN_ARCH: armhf script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh @@ -412,7 +654,9 @@ meson-arm64: variables: VULKAN_DRIVERS: "freedreno" EXTRA_OPTION: > - -D llvm=false + -D llvm=disabled + UPLOAD_FOR_LAVA: 1 + DEBIAN_ARCH: arm64 script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh @@ -423,13 +667,15 @@ meson-arm64-build-test: - .ci-deqp-artifacts variables: VULKAN_DRIVERS: "amd" + EXTRA_OPTION: > + -Dtools=panfrost script: - .gitlab-ci/meson-build.sh meson-clang: extends: .meson-build variables: - UNWIND: "true" + UNWIND: "enabled" DRI_LOADERS: > -D glvnd=true DRI_DRIVERS: "auto" @@ -456,62 +702,61 @@ scons-win64: meson-clover: extends: .meson-build variables: - UNWIND: "true" + UNWIND: "enabled" DRI_LOADERS: > -D glx=disabled - -D egl=false - -D gbm=false + -D egl=disabled + -D gbm=disabled + GALLIUM_DRIVERS: "r600,radeonsi" GALLIUM_ST: > - -D dri3=false - -D gallium-vdpau=false - -D gallium-xvmc=false + -D dri3=disabled + -D gallium-vdpau=disabled + -D gallium-xvmc=disabled -D gallium-omx=disabled - -D gallium-va=false - -D gallium-xa=false + -D gallium-va=disabled + -D gallium-xa=disabled -D gallium-nine=false -D gallium-opencl=icd script: - - export GALLIUM_DRIVERS="r600,radeonsi" - .gitlab-ci/meson-build.sh - LLVM_VERSION=8 .gitlab-ci/meson-build.sh - - export GALLIUM_DRIVERS="i915,r600" - - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh - - LLVM_VERSION=7 .gitlab-ci/meson-build.sh meson-clover-old-llvm: extends: - meson-clover - .use-x86_build_old variables: - UNWIND: "false" + UNWIND: "disabled" DRI_LOADERS: > -D glx=disabled - -D egl=false - -D gbm=false - -D platforms=drm,surfaceless + -D egl=disabled + -D gbm=disabled + -D platforms=[] GALLIUM_DRIVERS: "i915,r600" script: - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh - LLVM_VERSION=4.0 .gitlab-ci/meson-build.sh - LLVM_VERSION=5.0 .gitlab-ci/meson-build.sh + - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh + - LLVM_VERSION=7 .gitlab-ci/meson-build.sh meson-vulkan: extends: .meson-build variables: - UNWIND: "false" + UNWIND: "disabled" DRI_LOADERS: > -D glx=disabled - -D gbm=false - -D egl=false - -D platforms=x11,wayland,drm + -D gbm=disabled + -D egl=disabled + -D platforms=x11,wayland -D osmesa=none GALLIUM_ST: > - -D dri3=true - -D gallium-vdpau=false - -D gallium-xvmc=false + -D dri3=enabled + -D gallium-vdpau=disabled + -D gallium-xvmc=disabled -D gallium-omx=disabled - -D gallium-va=false - -D gallium-xa=false + -D gallium-va=disabled + -D gallium-xa=disabled -D gallium-nine=false -D gallium-opencl=disabled -D b_sanitize=undefined @@ -521,10 +766,13 @@ meson-vulkan: VULKAN_DRIVERS: intel,amd,freedreno EXTRA_OPTION: > -D vulkan-overlay-layer=true + -D build-aco-tests=true -D werror=true meson-i386: - extends: .meson-cross + extends: + - .meson-cross + - .use-i386_build variables: CROSS: i386 VULKAN_DRIVERS: intel,amd @@ -532,30 +780,26 @@ meson-i386: EXTRA_OPTION: > -D vulkan-overlay-layer=true -D werror=true - script: - - dpkg -i /var/cache/apt/archives/$CROSS/*.deb - - .gitlab-ci/meson-build.sh meson-s390x: extends: - .meson-cross + - .use-s390x_build tags: - kvm variables: CROSS: s390x + EXTRA_OPTION: > + -D werror=true 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 meson-ppc64el: extends: - meson-s390x + - .use-ppc64el_build variables: CROSS: ppc64el + EXTRA_OPTION: "" GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" VULKAN_DRIVERS: "amd" @@ -563,17 +807,19 @@ meson-mingw32-x86_64: extends: .meson-build stage: meson-misc variables: - UNWIND: "false" + UNWIND: "disabled" DRI_DRIVERS: "" GALLIUM_DRIVERS: "swrast" EXTRA_OPTION: > - -Dllvm=false + -Dllvm=disabled -Dosmesa=gallium --cross-file=.gitlab-ci/x86_64-w64-mingw32 .test: extends: - .ci-run-policy + # Cancel job if a newer commit is pushed to the same branch + interruptible: true variables: GIT_STRATEGY: none # testing doesn't build anything from source before_script: @@ -586,8 +832,6 @@ meson-mingw32-x86_64: name: "mesa_${CI_JOB_NAME}" paths: - results/ - dependencies: - - meson-testing .test-gl: extends: @@ -631,7 +875,6 @@ piglit-quick_gl: NIR_VALIDATE: 0 PIGLIT_OPTIONS: > --process-isolation false - -x arb_gpu_shader5 -x egl_ext_device_ -x egl_ext_platform_device -x ext_timer_query@time-elapsed @@ -677,17 +920,22 @@ piglit-quick_shader: extends: .test-vk script: - ./install/fossilize-runner.sh + artifacts: + when: on_failure + name: "mesa_${CI_JOB_NAME}" + paths: + - results/ llvmpipe-gles2: variables: DEQP_VER: gles2 - DEQP_PARALLEL: 4 NIR_VALIDATE: 0 - # Don't use threads inside llvmpipe, we've already got all 4 cores - # busy with DEQP_PARALLEL. + # Don't use threads inside llvmpipe, we've already got all cores + # busy at the deqp-runner level. LP_NUM_THREADS: 0 DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt LIBGL_ALWAYS_SOFTWARE: "true" + DEQP_EXPECTED_RENDERER: llvmpipe extends: - .deqp-test-gl - .llvmpipe-rules @@ -700,19 +948,67 @@ softpipe-gles2: DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt DEQP_SKIPS: deqp-softpipe-skips.txt GALLIUM_DRIVER: "softpipe" + DEQP_EXPECTED_RENDERER: softpipe softpipe-gles3: - parallel: 2 variables: DEQP_VER: gles3 extends: softpipe-gles2 softpipe-gles31: - parallel: 4 + parallel: 2 variables: DEQP_VER: gles31 extends: softpipe-gles2 +virgl-gles2-on-gl: + variables: + DEQP_VER: gles2 + NIR_VALIDATE: 0 + DEQP_NO_SAVE_RESULTS: 1 + DEQP_SKIPS: deqp-virgl-gl-skips.txt + # Don't use threads inside llvmpipe, we've already got all cores + # busy at the deqp-runner level. + LP_NUM_THREADS: 0 + DEQP_EXPECTED_FAILS: deqp-virgl-gl-fails.txt + DEQP_OPTIONS: "--deqp-log-images=disable" + LIBGL_ALWAYS_SOFTWARE: "true" + GALLIUM_DRIVER: "virpipe" + DEQP_EXPECTED_RENDERER: virgl + extends: + - .deqp-test-gl + - .virgl-rules + +virgl-gles3-on-gl: + variables: + DEQP_VER: gles3 + DEQP_RUNNER_OPTIONS: "--timeout 180" + extends: virgl-gles2-on-gl + +virgl-gles31-on-gl: + parallel: 2 + variables: + DEQP_VER: gles31 + MESA_GLES_VERSION_OVERRIDE: "3.1" + MESA_GLSL_VERSION_OVERRIDE: "310" + MESA_EXTENSION_OVERRIDE: "-GL_OES_tessellation_shader" + extends: virgl-gles3-on-gl + +virgl-gl30-on-gl: + variables: + DEQP_VER: gl30 + extends: virgl-gles2-on-gl + +virgl-gl31-on-gl: + variables: + DEQP_VER: gl31 + extends: virgl-gles2-on-gl + +virgl-gl32-on-gl: + variables: + DEQP_VER: gl32 + extends: virgl-gles2-on-gl + # 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 @@ -720,94 +1016,233 @@ softpipe-gles31: # to). .test-manual: rules: + - *ignore_scheduled_pipelines - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' changes: *all_paths when: manual - when: never +virgl-gles2-on-gles: + variables: + VIRGL_HOST_API: GLES + DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt + extends: + - virgl-gles2-on-gl + - .test-manual + +virgl-gles3-on-gles: + variables: + VIRGL_HOST_API: GLES + DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt + extends: + - virgl-gles3-on-gl + - .test-manual + +virgl-gles31-on-gles: + variables: + VIRGL_HOST_API: GLES + DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt + extends: + - virgl-gles31-on-gl + - .test-manual + arm64_a630_gles2: extends: - - .deqp-test-gl - - .use-arm_test - - .freedreno-rules + - arm64_a306_gles2 variables: - DEQP_VER: gles2 + BM_KERNEL: /lava-files/cheza-kernel + BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init" DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt DEQP_SKIPS: deqp-freedreno-a630-skips.txt - NIR_VALIDATE: 0 - DEQP_PARALLEL: 4 - FLAKES_CHANNEL: "#freedreno-ci" + GIT_STRATEGY: none + DEQP_EXPECTED_RENDERER: FD630 + DEQP_NO_SAVE_RESULTS: "" tags: - - mesa-cheza - dependencies: - - meson-arm64 + - google-freedreno-cheza + script: + - ./install/bare-metal/cros-servo.sh arm64_a630_gles31: extends: arm64_a630_gles2 variables: DEQP_VER: gles31 + # gles31 is about 12 minutes with validation enabled. + NIR_VALIDATE: 0 arm64_a630_gles3: extends: arm64_a630_gles2 variables: DEQP_VER: gles3 + # gles3 is about 15 minutes with validation enabled. + NIR_VALIDATE: 0 + +# We almost always manage to lower UBOs back to constant uploads in +# the test suite, so get a little testing for it here. +arm64_a630_noubo: + extends: arm64_a630_gles31 + variables: + DEQP_VER: gles31 + IR3_SHADER_DEBUG: nouboopt + DEQP_CASELIST_FILTER: "functional.*ubo" + +# The driver does some guessing as to whether to render using gmem +# or bypass, and some GLES3.1 features interact with either one. +# Do a little testing with gmem and bypass forced. +arm64_a630_bypass: + extends: arm64_a630_gles31 + variables: + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 5 + FD_MESA_DEBUG: nogmem + DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt + +arm64_a630_traces: + extends: + - arm64_a630_gles2 + variables: + BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh" + DEVICE_NAME: "freedreno-a630" + DRIVER_NAME: "freedreno" + TRACIE_NO_UNIT_TESTS: 1 + TRACIE_UPLOAD_TO_MINIO: 1 + # This lets us run several more traces which don't use any features we're + # missing. + MESA_GLSL_VERSION_OVERRIDE: "460" + MESA_GL_VERSION_OVERRIDE: "4.6" + +# Along with checking gmem path, check that we don't get obvious nir +# validation failures (though it's too expensive to have it on for the +# full CTS) +arm64_a630_gmem: + extends: arm64_a630_gles31 + variables: + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 5 + FD_MESA_DEBUG: nobypass + NIR_VALIDATE: 1 + +arm64_a630_vk: + extends: arm64_a630_gles2 + variables: + DEQP_VER: vk + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 50 + VK_DRIVER: freedreno + # Force binning in the main run, which makes sure we render at + # least 2 bins. This is the path that impacts the most different + # features. However, we end up with flaky results in + # dEQP-VK.binding_model.*.geometry and dEQP-VK.glsl.*_vertex. + TU_DEBUG: forcebin + +# Do a separate sysmem pass over the testcases that really affect sysmem +# rendering. This is currently very flaky, leave it as an option for devs +# to click play on in their branches. +arm64_a630_vk_sysmem: + extends: + - arm64_a630_vk + variables: + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 10 + DEQP_CASELIST_FILTER: "dEQP-VK.renderpass.*" + DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt + TU_DEBUG: sysmem .baremetal-test: extends: - .ci-run-policy + - .test + # Cancel job if a newer commit is pushed to the same branch + interruptible: true stage: test + artifacts: + when: always + name: "mesa_${CI_JOB_NAME}" + paths: + - results/ + - serial*.txt arm64_a306_gles2: extends: - .baremetal-test - - .use-arm_build + - .use-arm64_test - .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" + FLAKES_CHANNEL: "#freedreno-ci" + BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh" DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt DEQP_SKIPS: deqp-freedreno-a307-skips.txt DEQP_VER: gles2 DEQP_PARALLEL: 4 + DEQP_EXPECTED_RENDERER: FD307 + # Since we can't get artifacts back yet, skip making them. + DEQP_NO_SAVE_RESULTS: 1 + # NIR_VALIDATE=0 left intentionally unset as a3xx is fast enough at its small testsuite. script: - - .gitlab-ci/bare-metal/fastboot.sh + - ./install/bare-metal/fastboot.sh needs: + - arm64_test - meson-arm64 tags: - google-freedreno-db410c -# Disabled due to flaky results +# Fractional run, single threaded, due to flaky results arm64_a306_gles3: extends: - arm64_a306_gles2 - - .test-manual - parallel: 8 variables: DEQP_VER: gles3 + DEQP_PARALLEL: 1 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 25 + NIR_VALIDATE: 0 + +# Fractional runs with debug options. Note that since we're not +# hitting the iommu faults, we can run in parallel (derive from gles2, not gles3). +arm64_a306_gles3_options: + extends: arm64_a306_gles2 + variables: + DEQP_VER: gles3 + script: + # Check that the non-constbuf UBO case works. + - DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_CASELIST_FILTER="functional.*ubo" ./install/bare-metal/fastboot.sh 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" + # Disable SMP because only CPU 0 is at a freq higher than 19mhz on + # current upstream kernel. + BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 nosmp" DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt DEQP_SKIPS: deqp-freedreno-a530-skips.txt + DEQP_EXPECTED_RENDERER: FD530 + NIR_VALIDATE: 0 tags: - google-freedreno-db820c arm64_a530_gles3: extends: - arm64_a530_gles2 - - .test-manual - parallel: 6 variables: DEQP_VER: gles3 + DEQP_PARALLEL: 1 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 40 + +arm64_a530_gles31: + extends: + - arm64_a530_gles3 + variables: + DEQP_VER: gles31 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 10 # RADV CI .test-radv: @@ -815,15 +1250,7 @@ arm64_a530_gles3: stage: radv variables: VK_DRIVER: radeon - RADV_DEBUG: checkir - -.test-radv-fossilize: - extends: - - .fossilize-test - - .test-radv - script: - - ./install/fossilize-runner.sh - - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + ACO_DEBUG: validateir,validatera # Can only be triggered manually on personal branches because RADV is the only # driver that does Vulkan testing at the moment. @@ -842,18 +1269,24 @@ radv-fossils: - .fossilize-test - .test-radv script: - # Polaris10 + # Pitcairn (GFX6) + - export RADV_FORCE_FAMILY="pitcairn" + - ./install/fossilize-runner.sh + # Bonaire (GFX7) + - export RADV_FORCE_FAMILY="bonaire" + - ./install/fossilize-runner.sh + # Polaris10 (GFX8) - export RADV_FORCE_FAMILY="polaris10" - ./install/fossilize-runner.sh - - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh - # Vega10 + # Vega10 (GFX9) - export RADV_FORCE_FAMILY="gfx900" - ./install/fossilize-runner.sh - - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh - # Navi10 + # Navi10 (GFX10) - export RADV_FORCE_FAMILY="gfx1010" - ./install/fossilize-runner.sh - - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Sienna Cichlid (GFX10) + - export RADV_FORCE_FAMILY="gfx1030" + - ./install/fossilize-runner.sh # Traces CI .traces-test: @@ -861,6 +1294,8 @@ radv-fossils: key: ${CI_JOB_NAME} paths: - traces-db/ + variables: + TRACIE_UPLOAD_TO_MINIO: 1 .traces-test-gl: extends: @@ -884,6 +1319,7 @@ llvmpipe-traces: LIBGL_ALWAYS_SOFTWARE: "true" GALLIUM_DRIVER: "llvmpipe" DEVICE_NAME: "gl-vmware-llvmpipe" + DRIVER_NAME: "llvmpipe" radv-polaris10-traces: extends: @@ -892,5 +1328,29 @@ radv-polaris10-traces: - .test-manual variables: DEVICE_NAME: "vk-amd-polaris10" + DRIVER_NAME: "radv" tags: - polaris10 + +radv-raven-traces: + extends: + - .traces-test-vk + - .test-radv + - .test-manual + variables: + DEVICE_NAME: "vk-amd-raven" + DRIVER_NAME: "radv" + tags: + - raven + +virgl-traces: + extends: + - .traces-test-gl + - .virgl-rules + variables: + LIBGL_ALWAYS_SOFTWARE: "true" + GALLIUM_DRIVER: "virpipe" + DEVICE_NAME: "gl-virgl" + DRIVER_NAME: "virgl" + MESA_GLES_VERSION_OVERRIDE: "3.1" + MESA_GLSL_VERSION_OVERRIDE: "310"