X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=f5a9de33b76ba86001c44f2377e005cc52a703e8;hb=f931099270497d5ede856fe0cbc35b8b878011b0;hp=f8c45fe4196d17c14aae61729a5d29fb0b73fe9b;hpb=c964be0cd7ae7cded01430d3505edbbd803ddb3e;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8c45fe4196..f5a9de33b76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,9 @@ include: - local: '.gitlab-ci/test-source-dep.yml' stages: - - container + - container+docs - container-2 + - deploy - meson-x86_64 - scons - meson-misc @@ -23,6 +24,40 @@ stages: - virgl - success +.docs-base: + extends: .ci-run-policy + image: alpine + script: + - apk --no-cache add py3-pip + - pip3 install sphinx sphinx_rtd_theme + - sphinx-build -b html docs public + +pages: + extends: .docs-base + stage: deploy + artifacts: + paths: + - public + rules: + - 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 + stage: container+docs + rules: + - if: '$CI_PROJECT_NAMESPACE == "mesa"' + when: never + - if: '$GITLAB_USER_LOGIN == "marge-bot"' + 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: @@ -62,11 +97,15 @@ stages: success: stage: success image: debian:stable-slim - only: - - merge_requests - except: - changes: - *all_paths + rules: + - 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: @@ -101,24 +140,31 @@ success: # repository's registry will be used there as well. .container: - stage: container + stage: container+docs extends: - .ci-run-policy rules: + # 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 - - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + # merge request, 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 - # 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 @@ -131,30 +177,94 @@ success: # 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-05-31" + FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-12" + +.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-06-02" .use-x86_build: variables: TAG: *x86_build image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG" needs: + - x86_build-base - x86_build +# Debian 10 based i386 cross-build image +i386_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &i386_build "2020-06-02" + +.use-i386_build: + variables: + TAG: *i386_build + image: "$CI_REGISTRY_IMAGE/debian/i386_build:$TAG" + needs: + - x86_build-base + - i386_build + +# Debian 10 based ppc64el cross-build image +ppc64el_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-06-02" + +.use-ppc64el_build: + variables: + TAG: *ppc64el_build + image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:$TAG" + needs: + - x86_build-base + - ppc64el_build + +# Debian 10 based s390x cross-build image +s390x_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &s390x_build "2020-06-02" + +.use-s390x_build: + variables: + TAG: *s390x_build + image: "$CI_REGISTRY_IMAGE/debian/s390x_build:$TAG" + needs: + - x86_build-base + - s390x_build + # Debian 10 based x86 test image base x86_test-base: - extends: x86_build + extends: x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-01" + FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-02" .use-x86_test-base: extends: - - x86_build + - x86_build-base - .ci-run-policy stage: container-2 variables: @@ -167,19 +277,19 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-01" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-23-virgl" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-01" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-18-vkcts" # 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 "2020-06-02" + FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-12" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -195,7 +305,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-06-01" + FDO_DISTRIBUTION_TAG: &arm_build "2020-06-22-tracie" .use-arm_build: variables: @@ -204,18 +314,39 @@ arm_build: needs: - arm_build -# x86 image with ARM rootfses for baremetal testing. -arm_test: - extends: x86_build +# Debian 10 based x86 baremetal image base +arm_test-base: + extends: + - .fdo.container-build@debian + - .container + variables: + FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-22-tracie" + +.use-arm_test-base: + extends: + - arm_test-base + - .ci-run-policy + stage: container-2 + variables: + BASE_TAG: *arm_test-base + FDO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/arm_test-base:$BASE_TAG" + needs: + - arm_test-base + +# x86 image with ARM64 rootfs for baremetal testing. +arm64_test: + extends: + - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm_test "2020-06-01" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-25-kernelfix" -.use-arm_test: +.use-arm64_test: variables: - TAG: *arm_test - image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG" + TAG: *arm64_test + image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG" needs: - - arm_test + - arm_test-base + - arm64_test # Native Windows docker builds # @@ -235,11 +366,11 @@ arm_test: 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: +.windows_build_vs2019: 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 @@ -460,7 +591,7 @@ meson-clang: CC: "ccache clang-9" CXX: "ccache clang++-9" -meson-windows-vs2019: +.meson-windows-vs2019: extends: - .build-windows - .use-windows_build_vs2019 @@ -545,7 +676,9 @@ meson-vulkan: -D werror=true meson-i386: - extends: .meson-cross + extends: + - .meson-cross + - .use-i386_build variables: CROSS: i386 VULKAN_DRIVERS: intel,amd @@ -553,13 +686,11 @@ 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: @@ -567,17 +698,11 @@ meson-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 wine32-development - - apt-get autoremove -y --purge - - 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: "" @@ -611,8 +736,6 @@ meson-mingw32-x86_64: name: "mesa_${CI_JOB_NAME}" paths: - results/ - dependencies: - - meson-testing .test-gl: extends: @@ -621,10 +744,13 @@ meson-mingw32-x86_64: TAG: *x86_test-gl image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG" needs: + - x86_build-base - x86_build - meson-testing - x86_test-base - x86_test-gl + dependencies: + - meson-testing .test-vk: extends: @@ -633,10 +759,13 @@ meson-mingw32-x86_64: TAG: *x86_test-vk image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG" needs: + - x86_build-base - x86_build - meson-testing - x86_test-base - x86_test-vk + dependencies: + - meson-testing .piglit-test: extends: @@ -706,6 +835,11 @@ 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: @@ -744,7 +878,7 @@ softpipe-gles31: DEQP_VER: gles31 extends: softpipe-gles2 -virgl-gles2: +virgl-gles2-on-gl: variables: DEQP_VER: gles2 DEQP_PARALLEL: 4 @@ -753,7 +887,8 @@ virgl-gles2: # 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 + 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 @@ -761,24 +896,36 @@ virgl-gles2: - .deqp-test-gl - .virgl-rules -virgl-gles3: +virgl-gles3-on-gl: + parallel: 2 variables: DEQP_VER: gles3 - CI_NODE_INDEX: 1 - CI_NODE_TOTAL: 3 - DEQP_RUNNER_OPTIONS: "--timeout 120" - extends: virgl-gles2 + DEQP_RUNNER_OPTIONS: "--timeout 180" + extends: virgl-gles2-on-gl -virgl-gles31: +virgl-gles31-on-gl: + parallel: 4 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 + 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 @@ -793,6 +940,30 @@ virgl-gles31: 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: - arm64_a306_gles2 @@ -801,23 +972,27 @@ arm64_a630_gles2: 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 + GIT_STRATEGY: none DEQP_EXPECTED_RENDERER: FD630 DEQP_NO_SAVE_RESULTS: "" tags: - google-freedreno-cheza script: - - .gitlab-ci/bare-metal/cros-servo.sh + - ./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. @@ -827,7 +1002,6 @@ arm64_a630_noubo: 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. @@ -840,6 +1014,18 @@ arm64_a630_bypass: 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" + TRACIE_NO_UNIT_TESTS: 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) @@ -851,9 +1037,36 @@ arm64_a630_gmem: 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 stage: test artifacts: when: always @@ -865,7 +1078,7 @@ arm64_a630_gmem: arm64_a306_gles2: extends: - .baremetal-test - - .use-arm_test + - .use-arm64_test - .freedreno-rules variables: BM_KERNEL: /lava-files/Image.gz @@ -873,6 +1086,7 @@ arm64_a306_gles2: 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 @@ -882,9 +1096,10 @@ arm64_a306_gles2: 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: - - arm_test + - arm_test-base + - arm64_test - arm_build - meson-arm64 tags: @@ -909,7 +1124,7 @@ arm64_a306_gles3_options: 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 + - DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_CASELIST_FILTER="functional.*ubo" ./install/bare-metal/fastboot.sh arm64_a530_gles2: extends: @@ -950,7 +1165,6 @@ arm64_a530_gles31: stage: radv variables: VK_DRIVER: radeon - RADV_DEBUG: checkir ACO_DEBUG: validateir,validatera # Can only be triggered manually on personal branches because RADV is the only @@ -973,23 +1187,18 @@ radv-fossils: # 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: