X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=028054fe01286ff5e1da46479058d43a239b45a4;hb=31de10c4342bc5c21366d14a1266e942b95295a0;hp=fbe88ed1ed87650c785be4a8388d4a4bf8ac0f3a;hpb=f778c48869fb52c6afc757b307d95376aaabcf50;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbe88ed1ed8..028054fe012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,13 +3,14 @@ variables: include: - project: 'freedesktop/ci-templates' - ref: a1699326519fd28526485ce93464e33423bac564 + ref: 59de540b620c45739871d1a073d76d5521989d11 file: '/templates/debian.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' - local: '.gitlab-ci/test-source-dep.yml' stages: - container + - container-2 - meson-x86_64 - scons - meson-misc @@ -17,18 +18,23 @@ stages: - softpipe - freedreno - panfrost - - misc-tests + - radv + - lima + - virgl - success # When to automatically run the CI .ci-run-policy: rules: - # Run pipeline by default for merge requests changing files affecting it - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - changes: &paths + # 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/**/* @@ -44,16 +50,7 @@ stages: - include/**/* - src/**/* when: on_success - # Run pipeline by default in the main project if files affecting it were - # changed - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - changes: - *paths - when: on_success - # Allow triggering jobs manually on branches of forked projects - - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' - when: manual - # Otherwise, most jobs won't run + # Otherwise, build/test jobs won't run - when: never retry: max: 2 @@ -69,7 +66,7 @@ success: - merge_requests except: changes: - *paths + *all_paths variables: GIT_STRATEGY: none script: @@ -107,9 +104,29 @@ success: stage: container extends: - .ci-run-policy + rules: + # Run pipeline by default if it was triggered by Marge Bot, is for a + # merge request, and any files affecting it 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"' + 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 + - changes: + *all_paths + when: manual + # Otherwise, container jobs won't run + - when: never variables: FDO_DISTRIBUTION_VERSION: buster-slim - FDO_REPO_SUFFIX: $CI_JOB_NAME + 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 @@ -117,10 +134,10 @@ success: # Debian 10 based x86 build image x86_build: extends: - - .fdo.container-ifnot-exists@debian + - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-03-13" + FDO_DISTRIBUTION_TAG: &x86_build "2020-05-18-baremetal-2" .use-x86_build: variables: @@ -129,23 +146,40 @@ x86_build: needs: - x86_build +# Debian 10 based x86 test image base +x86_test-base: + extends: x86_build + variables: + FDO_DISTRIBUTION_TAG: &x86_test-base "2020-05-26" + +.use-x86_test-base: + extends: + - x86_build + - .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-13" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-26" # 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-03-16" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-26" # Debian 9 based x86 build image (old LLVM) x86_build_old: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_build_old "2019-09-18" + FDO_DISTRIBUTION_TAG: &x86_build_old "2019-03-18-jflags" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -158,10 +192,10 @@ x86_build_old: # Debian 10 based ARM build image arm_build: extends: - - .fdo.container-ifnot-exists@debian@arm64v8 + - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-03-17-db820c" + FDO_DISTRIBUTION_TAG: &arm_build "2020-05-28-cheza-2" .use-arm_build: variables: @@ -170,20 +204,58 @@ arm_build: needs: - arm_build -# Debian 10 based ARM test image +# x86 image with ARM rootfses for baremetal testing. arm_test: - extends: arm_build + extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &arm_test "2020-01-30" + FDO_DISTRIBUTION_TAG: &arm_test "2020-05-28-cheza-2" .use-arm_test: variables: TAG: *arm_test image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG" needs: - - 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-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" + +windows_build_vs2019: + extends: + - .container + - .windows-docker-vs2019 + stage: container + variables: + GIT_STRATEGY: fetch # we do actually need the full repository though + timeout: 4h # LLVM takes ages + 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 @@ -217,7 +289,10 @@ arm_test: .build-windows: extends: .build-common tags: - - mesa-windows + - windows + - docker + - "1809" + - mesa cache: key: ${CI_JOB_NAME} paths: @@ -256,7 +331,7 @@ meson-testing: -D platforms=x11,drm,surfaceless GALLIUM_ST: > -D dri3=true - GALLIUM_DRIVERS: "swrast" + GALLIUM_DRIVERS: "swrast,virgl" VULKAN_DRIVERS: amd BUILDTYPE: "debugoptimized" EXTRA_OPTION: > @@ -385,21 +460,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 + - . .\.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 @@ -487,13 +561,18 @@ meson-i386: meson-s390x: extends: - .meson-cross + 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 + - apt-get purge -y wine32 + - apt-get autoremove -y --purge - dpkg -i /var/cache/apt/archives/$CROSS/*.deb - .gitlab-ci/meson-build.sh @@ -502,6 +581,7 @@ meson-ppc64el: - meson-s390x variables: CROSS: ppc64el + EXTRA_OPTION: "" GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" VULKAN_DRIVERS: "amd" @@ -517,22 +597,6 @@ meson-mingw32-x86_64: -Dosmesa=gallium --cross-file=.gitlab-ci/x86_64-w64-mingw32 -scons: - extends: .scons-build - variables: - 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 - -scons-old-llvm: - extends: - - scons - - .use-x86_build_old - script: - - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh - .test: extends: - .ci-run-policy @@ -558,7 +622,9 @@ scons-old-llvm: TAG: *x86_test-gl image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG" needs: + - x86_build - meson-testing + - x86_test-base - x86_test-gl .test-vk: @@ -568,7 +634,9 @@ scons-old-llvm: TAG: *x86_test-vk image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG" needs: + - x86_build - meson-testing + - x86_test-base - x86_test-vk .piglit-test: @@ -584,7 +652,7 @@ scons-old-llvm: LIBGL_ALWAYS_SOFTWARE: 1 PIGLIT_NO_WINDOW: 1 script: - - artifacts/piglit/run.sh + - install/piglit/run.sh piglit-quick_gl: extends: .piglit-test @@ -621,7 +689,7 @@ piglit-quick_shader: variables: DEQP_SKIPS: deqp-default-skips.txt script: - - ./artifacts/deqp-runner.sh + - ./install/deqp-runner.sh .deqp-test-gl: extends: @@ -638,7 +706,7 @@ piglit-quick_shader: .fossilize-test: extends: .test-vk script: - - ./artifacts/fossilize-runner.sh + - ./install/fossilize-runner.sh llvmpipe-gles2: variables: @@ -650,6 +718,7 @@ llvmpipe-gles2: 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 @@ -662,6 +731,7 @@ 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 @@ -675,22 +745,70 @@ softpipe-gles31: DEQP_VER: gles31 extends: softpipe-gles2 -arm64_a630_gles2: +virgl-gles2: + variables: + DEQP_VER: gles2 + DEQP_PARALLEL: 4 + NIR_VALIDATE: 0 + DEQP_NO_SAVE_RESULTS: 1 + # Don't use threads inside llvmpipe, we've already got all 4 cores + # busy with DEQP_PARALLEL. + LP_NUM_THREADS: 0 + DEQP_EXPECTED_FAILS: deqp-virgl-fails.txt + LIBGL_ALWAYS_SOFTWARE: "true" + GALLIUM_DRIVER: "virpipe" + DEQP_EXPECTED_RENDERER: virgl extends: - .deqp-test-gl - - .use-arm_test - - .freedreno-rules + - .virgl-rules + +virgl-gles3: variables: - DEQP_VER: gles2 + DEQP_VER: gles3 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 3 + DEQP_RUNNER_OPTIONS: "--timeout 120" + extends: virgl-gles2 + +virgl-gles31: + variables: + DEQP_VER: gles31 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 10 + DEQP_OPTIONS: "--deqp-log-images=disable" + DEQP_RUNNER_OPTIONS: "--timeout 120" + MESA_GLES_VERSION_OVERRIDE: "3.1" + MESA_GLSL_VERSION_OVERRIDE: "310" + extends: virgl-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: + - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' + changes: + *all_paths + when: manual + - when: never + +arm64_a630_gles2: + extends: + - arm64_a306_gles2 + variables: + 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" + DEQP_EXPECTED_RENDERER: FD630 + DEQP_NO_SAVE_RESULTS: "" tags: - - mesa-cheza - dependencies: - - meson-arm64 + - google-freedreno-cheza + script: + - .gitlab-ci/bare-metal/cros-servo.sh arm64_a630_gles31: extends: arm64_a630_gles2 @@ -702,104 +820,180 @@ arm64_a630_gles3: variables: DEQP_VER: gles3 +# 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" + DEQP_EXPECTED_FAILS: deqp-freedreno-a630-noubo-fails.txt + +# 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 + +# 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 + .baremetal-test: extends: - .ci-run-policy stage: test + artifacts: + when: always + name: "mesa_${CI_JOB_NAME}" + paths: + - results/ + - serial*.txt arm64_a306_gles2: extends: - .baremetal-test - - .use-arm_build + - .use-arm_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" 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 needs: + - arm_test + - arm_build - meson-arm64 tags: - google-freedreno-db410c -# Disabled due to flaky results -.arm64_a306_gles3: +# Fractional run, single threaded, due to flaky results +arm64_a306_gles3: extends: - arm64_a306_gles2 - 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" .gitlab-ci/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 - 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: extends: .radv-rules - stage: misc-tests + stage: radv variables: VK_DRIVER: radeon RADV_DEBUG: checkir + ACO_DEBUG: validateir,validatera -.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: - # 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 manually for personal branches. - - when: manual - -.test-radv-fossilize: - extends: - - .fossilize-test - - .test-radv - +# 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-unsafe + - .test-radv + - .test-manual variables: 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 +radv-fossils: + extends: + - .fossilize-test + - .test-radv + script: + # Pitcairn (GFX6) + - export RADV_FORCE_FAMILY="pitcairn" + - ./install/fossilize-runner.sh + - RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Bonaire (GFX7) + - export RADV_FORCE_FAMILY="bonaire" + - ./install/fossilize-runner.sh + - RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Polaris10 (GFX8) + - export RADV_FORCE_FAMILY="polaris10" + - ./install/fossilize-runner.sh + - RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Vega10 (GFX9) + - export RADV_FORCE_FAMILY="gfx900" + - ./install/fossilize-runner.sh + - RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Navi10 (GFX10) + - export RADV_FORCE_FAMILY="gfx1010" + - ./install/fossilize-runner.sh + - RADV_PERFTEST=aco ./install/fossilize-runner.sh # Traces CI .traces-test: - stage: misc-tests cache: key: ${CI_JOB_NAME} paths: @@ -810,14 +1004,14 @@ radv-polaris10-fossils: - .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: @@ -831,8 +1025,20 @@ llvmpipe-traces: radv-polaris10-traces: extends: - .traces-test-vk - - .test-radv-unsafe + - .test-radv + - .test-manual variables: DEVICE_NAME: "vk-amd-polaris10" tags: - polaris10 + +virgl-traces: + extends: + - .traces-test-gl + - .virgl-rules + variables: + LIBGL_ALWAYS_SOFTWARE: "true" + GALLIUM_DRIVER: "virpipe" + DEVICE_NAME: "gl-virgl" + MESA_GLES_VERSION_OVERRIDE: "3.1" + MESA_GLSL_VERSION_OVERRIDE: "310"