X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=17bb3c7afaaeaac91efd58b37612dd38e65238f1;hb=55da8bcede40ebaf3bb28b381b815ebfe9c4c3b8;hp=371c2560b78fbd27b2ed9d7cdb612d31a733db72;hpb=c1e7e83d52d912b9a1ba5009e8f84d737c1e0d21;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 371c2560b78..17bb3c7afaa 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' @@ -19,17 +19,21 @@ stages: - panfrost - 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/**/* @@ -45,16 +49,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 @@ -70,7 +65,7 @@ success: - merge_requests except: changes: - *paths + *all_paths variables: GIT_STRATEGY: none script: @@ -108,6 +103,26 @@ 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: "debian/$CI_JOB_NAME" @@ -121,7 +136,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: @@ -134,13 +149,13 @@ x86_build: x86_test-gl: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-18-jflags" + 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-01-jflags" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-18" # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -162,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: @@ -171,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 @@ -199,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" @@ -210,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 @@ -298,7 +328,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: > @@ -536,7 +566,8 @@ meson-s390x: 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 @@ -677,6 +708,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 @@ -689,6 +721,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 @@ -702,6 +735,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 @@ -709,14 +778,11 @@ softpipe-gles31: # to). .test-manual: rules: - # Never test in the main project. - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: never - # Never test in merge requests. - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - when: never - # Otherwise, allow testing manually for personal branches. - - when: manual + - 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: @@ -730,6 +796,7 @@ arm64_a630_gles2: NIR_VALIDATE: 0 DEQP_PARALLEL: 4 FLAKES_CHANNEL: "#freedreno-ci" + DEQP_EXPECTED_RENDERER: FD630 tags: - mesa-cheza dependencies: @@ -745,6 +812,22 @@ 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" ./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 + .baremetal-test: extends: - .ci-run-policy @@ -753,20 +836,24 @@ 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 script: - .gitlab-ci/bare-metal/fastboot.sh needs: + - x86_cross_arm_test + - arm_build - meson-arm64 tags: - google-freedreno-db410c @@ -775,31 +862,43 @@ arm64_a306_gles2: 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: 50 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 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: @@ -808,14 +907,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. @@ -834,18 +926,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: @@ -886,3 +986,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"