X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=.gitlab-ci.yml;h=028054fe01286ff5e1da46479058d43a239b45a4;hb=b9967ab6da8a1c383939752611ad564aee271cb7;hp=eb21ecddc06a968ad937310491c32997d6336720;hpb=588ea3184ceb928cbc11e99ba3a7cfae2aa61773;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb21ecddc06..028054fe012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ include: stages: - container + - container-2 - meson-x86_64 - scons - meson-misc @@ -145,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-05-18" + 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-05-18" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-26" # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -177,7 +195,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-3" + FDO_DISTRIBUTION_TAG: &arm_build "2020-05-28-cheza-2" .use-arm_build: variables: @@ -186,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 @@ -548,6 +565,8 @@ 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 @@ -562,6 +581,7 @@ meson-ppc64el: - meson-s390x variables: CROSS: ppc64el + EXTRA_OPTION: "" GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" VULKAN_DRIVERS: "amd" @@ -602,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: @@ -612,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: @@ -772,21 +796,19 @@ virgl-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 @@ -798,31 +820,53 @@ arm64_a630_gles3: variables: DEQP_VER: gles3 -arm64_a630_gles31_options: - extends: arm64_a630_gles2 +# 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 - 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" ./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 + 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 @@ -835,14 +879,19 @@ arm64_a306_gles2: 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 @@ -850,7 +899,18 @@ arm64_a306_gles3: DEQP_VER: gles3 DEQP_PARALLEL: 1 CI_NODE_INDEX: 1 - CI_NODE_TOTAL: 50 + 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: @@ -858,10 +918,13 @@ 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 @@ -872,13 +935,15 @@ arm64_a530_gles3: DEQP_VER: gles3 DEQP_PARALLEL: 1 CI_NODE_INDEX: 1 - CI_NODE_TOTAL: 100 + 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: