X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=028054fe01286ff5e1da46479058d43a239b45a4;hb=31de10c4342bc5c21366d14a1266e942b95295a0;hp=c221a9ca34f968a6474ea4d570e955a52d86e6df;hpb=6a8e5dde6684c477edddb044a38a6618bf38d014;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c221a9ca34f..028054fe012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,13 +3,14 @@ variables: include: - project: 'freedesktop/ci-templates' - ref: 4b2997287317808830e9cb4eb0f99b691787da88 + 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 @@ -19,6 +20,7 @@ stages: - panfrost - radv - lima + - virgl - success @@ -29,7 +31,10 @@ stages: # 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/**/* @@ -132,7 +137,7 @@ x86_build: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-03-18-jflags" + FDO_DISTRIBUTION_TAG: &x86_build "2020-05-18-baremetal-2" .use-x86_build: variables: @@ -141,17 +146,34 @@ 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-18-jflags" + 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-04-01-jflags" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-26" # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -173,7 +195,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-05-28-cheza-2" .use-arm_build: variables: @@ -182,18 +204,17 @@ 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-03-18-jflags" + 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 @@ -210,7 +231,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" @@ -221,6 +242,7 @@ windows_build_vs2019: stage: container variables: GIT_STRATEGY: fetch # we do actually need the full repository though + timeout: 4h # LLVM takes ages tags: - windows - shell @@ -309,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: > @@ -543,11 +565,14 @@ meson-s390x: - 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 @@ -556,6 +581,7 @@ meson-ppc64el: - meson-s390x variables: CROSS: ppc64el + EXTRA_OPTION: "" GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" VULKAN_DRIVERS: "amd" @@ -596,7 +622,9 @@ meson-mingw32-x86_64: 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: @@ -606,7 +634,9 @@ meson-mingw32-x86_64: 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: @@ -688,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 @@ -700,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 @@ -713,6 +745,42 @@ softpipe-gles31: DEQP_VER: gles31 extends: softpipe-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 + - .virgl-rules + +virgl-gles3: + variables: + 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 @@ -728,20 +796,19 @@ softpipe-gles31: 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" + 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 @@ -753,61 +820,130 @@ 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 +# 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" .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 - - .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: @@ -816,14 +952,7 @@ arm64_a530_gles3: 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 +971,26 @@ radv-fossils: - .fossilize-test - .test-radv script: - # Polaris10 + # 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 - - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh - # Vega10 + - RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Vega10 (GFX9) - export RADV_FORCE_FAMILY="gfx900" - ./install/fossilize-runner.sh - - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh - # Navi10 + - RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Navi10 (GFX10) - export RADV_FORCE_FAMILY="gfx1010" - ./install/fossilize-runner.sh - - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + - RADV_PERFTEST=aco ./install/fossilize-runner.sh # Traces CI .traces-test: @@ -894,3 +1031,14 @@ radv-polaris10-traces: 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"