X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=85c390de996b8863b1e08ee19b4a24fe9714f6b9;hb=1679efe92755871d48f81d6b3f45158f36c6f711;hp=6c6ff6a358c7b923c6689f2f674c32501ef6a979;hpb=c259b3ea128405d2e6cf9c831061298959abeb79;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c6ff6a358c..85c390de996 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ 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' @@ -30,7 +30,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/**/* @@ -133,7 +136,7 @@ x86_build: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-04-22-winehq" + FDO_DISTRIBUTION_TAG: &x86_build "2020-05-18-baremetal-2" .use-x86_build: variables: @@ -146,13 +149,13 @@ x86_build: x86_test-gl: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-04-21" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-18" # Debian 10 based x86 test image for VK x86_test-vk: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-04-09" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-18" # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -174,7 +177,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-14-baremetal-5" .use-arm_build: variables: @@ -183,6 +186,20 @@ arm_build: needs: - arm_build +# x86 image with ARM rootfses for baremetal testing. +x86_cross_arm_test: + extends: x86_build + variables: + FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-13" + +.use-x86_cross_arm_test: + variables: + TAG: *x86_cross_arm_test + image: "$CI_REGISTRY_IMAGE/debian/x86_cross_arm_test:$TAG" + needs: + - x86_cross_arm_test + + # Debian 10 based ARM test image arm_test: extends: arm_build @@ -211,7 +228,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" @@ -222,6 +239,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 @@ -544,11 +562,13 @@ 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 purge -y winehq-stable + - apt-get purge -y wine32 - apt-get autoremove -y --purge - dpkg -i /var/cache/apt/archives/$CROSS/*.deb - .gitlab-ci/meson-build.sh @@ -558,6 +578,7 @@ meson-ppc64el: - meson-s390x variables: CROSS: ppc64el + EXTRA_OPTION: "" GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" VULKAN_DRIVERS: "amd" @@ -690,6 +711,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 @@ -702,6 +724,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 @@ -721,13 +744,13 @@ virgl-gles2: DEQP_PARALLEL: 4 NIR_VALIDATE: 0 DEQP_NO_SAVE_RESULTS: 1 - DEQP_RUNNER_OPTIONS: "--compact-display false" # 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 @@ -737,7 +760,7 @@ virgl-gles3: DEQP_VER: gles3 CI_NODE_INDEX: 1 CI_NODE_TOTAL: 3 - DEQP_RUNNER_OPTIONS: "--compact-display false --timeout 120" + DEQP_RUNNER_OPTIONS: "--timeout 120" extends: virgl-gles2 virgl-gles31: @@ -746,7 +769,7 @@ virgl-gles31: CI_NODE_INDEX: 1 CI_NODE_TOTAL: 10 DEQP_OPTIONS: "--deqp-log-images=disable" - DEQP_RUNNER_OPTIONS: "--compact-display false --timeout 120" + DEQP_RUNNER_OPTIONS: "--timeout 120" MESA_GLES_VERSION_OVERRIDE: "3.1" MESA_GLSL_VERSION_OVERRIDE: "310" extends: virgl-gles2 @@ -776,6 +799,7 @@ arm64_a630_gles2: NIR_VALIDATE: 0 DEQP_PARALLEL: 4 FLAKES_CHANNEL: "#freedreno-ci" + DEQP_EXPECTED_RENDERER: FD630 tags: - mesa-cheza dependencies: @@ -791,6 +815,24 @@ arm64_a630_gles3: variables: DEQP_VER: gles3 +arm64_a630_gles31_options: + extends: arm64_a630_gles2 + variables: + DEQP_VER: gles31 + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 5 + script: + # We almost always manage to lower UBOs back to constant uploads in + # the test suite, so get a little testing for it here. + - DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_CASELIST_FILTER="functional.*ubo" DEQP_EXPECTED_FAILS=deqp-freedreno-a630-noubo-fails.txt CI_NODE_INDEX= ./install/deqp-runner.sh + # 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. + - DEQP_RUN_SUFFIX=-bypass FD_MESA_DEBUG=nogmem DEQP_EXPECTED_FAILS=deqp-freedreno-a630-bypass-fails.txt ./install/deqp-runner.sh + - DEQP_RUN_SUFFIX=-gmem FD_MESA_DEBUG=nobypass ./install/deqp-runner.sh + # Check that we don't get obvious nir validation failures (though it's too expensive to run for the full CTS) + - DEQP_RUN_SUFFIX=-validate NIR_VALIDATE=1 ./install/deqp-runner.sh + .baremetal-test: extends: - .ci-run-policy @@ -799,32 +841,49 @@ arm64_a630_gles3: arm64_a306_gles2: extends: - .baremetal-test - - .use-arm_build + - .use-x86_cross_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 + # NIR_VALIDATE=0 left intentionally unset as a3xx is fast enough at its small testsuite. script: - .gitlab-ci/bare-metal/fastboot.sh needs: + - x86_cross_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: @@ -832,19 +891,32 @@ arm64_a530_gles2: 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: @@ -853,14 +925,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. @@ -879,18 +944,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: