X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=409ed8ef60938726fbc316b7fd38b4544930de11;hb=2efa76f795cb2b2bf00b317c580aeeeddd1e9bc2;hp=6a4cad8b40ab687f3b1a0da03621f56e2a6788d7;hpb=05a3b49308606fbf8c30688ece3177ad6eb17515;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a4cad8b40a..409ed8ef609 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: include: - project: 'freedesktop/ci-templates' - ref: a1699326519fd28526485ce93464e33423bac564 + ref: 4b2997287317808830e9cb4eb0f99b691787da88 file: '/templates/debian.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' - local: '.gitlab-ci/test-source-dep.yml' @@ -19,15 +19,16 @@ 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/**/* # GitLab CI @@ -45,16 +46,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 +62,7 @@ success: - merge_requests except: changes: - *paths + *all_paths variables: GIT_STRATEGY: none script: @@ -108,9 +100,29 @@ 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: $CI_JOB_NAME + FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image GIT_STRATEGY: none @@ -118,10 +130,10 @@ success: # Debian 10 based x86 build image x86_build: extends: - - .fdo.container-ifnot-exists@debian + - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-03-13" + FDO_DISTRIBUTION_TAG: &x86_build "2020-04-22-winehq" .use-x86_build: variables: @@ -134,19 +146,19 @@ x86_build: x86_test-gl: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-13" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-04-21" # Debian 10 based x86 test image for VK x86_test-vk: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-25" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-04-09" # Debian 9 based x86 build image (old LLVM) x86_build_old: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_build_old "2019-09-18" + FDO_DISTRIBUTION_TAG: &x86_build_old "2019-03-18-jflags" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -159,10 +171,10 @@ x86_build_old: # Debian 10 based ARM build image arm_build: extends: - - .fdo.container-ifnot-exists@debian@arm64v8 + - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-03-24" + FDO_DISTRIBUTION_TAG: &arm_build "2020-04-01-jflags" .use-arm_build: variables: @@ -175,7 +187,7 @@ arm_build: arm_test: extends: arm_build variables: - FDO_DISTRIBUTION_TAG: &arm_test "2020-01-30" + FDO_DISTRIBUTION_TAG: &arm_test "2020-03-18-jflags" .use-arm_test: variables: @@ -214,6 +226,7 @@ windows_build_vs2019: - windows - shell - "1809" + - mesa script: - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $WINDOWS_IMAGE $WINDOWS_UPSTREAM_IMAGE @@ -258,6 +271,7 @@ windows_build_vs2019: - windows - docker - "1809" + - mesa cache: key: ${CI_JOB_NAME} paths: @@ -296,7 +310,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: > @@ -436,8 +450,9 @@ meson-windows-vs2019: scons-win64: extends: .scons-build variables: - SCONS_TARGET: platform=windows machine=x86_64 + SCONS_TARGET: platform=windows machine=x86_64 debug=1 SCONS_CHECK_COMMAND: "true" + allow_failure: true meson-clover: extends: .meson-build @@ -533,7 +548,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 winehq-stable + - apt-get autoremove -y --purge - dpkg -i /var/cache/apt/archives/$CROSS/*.deb - .gitlab-ci/meson-build.sh @@ -557,22 +573,6 @@ meson-mingw32-x86_64: -Dosmesa=gallium --cross-file=.gitlab-ci/x86_64-w64-mingw32 -scons: - extends: .scons-build - variables: - SCONS_TARGET: "llvm=1 swr=1" - SCONS_CHECK_COMMAND: "scons force_scons=1 ${SCONS_TARGET} check" - script: - - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh - - LLVM_VERSION=9 .gitlab-ci/scons-build.sh - -scons-old-llvm: - extends: - - scons - - .use-x86_build_old - script: - - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh - .test: extends: - .ci-run-policy @@ -690,6 +690,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 +703,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 @@ -715,6 +717,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 @@ -722,14 +760,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: @@ -743,6 +778,7 @@ arm64_a630_gles2: NIR_VALIDATE: 0 DEQP_PARALLEL: 4 FLAKES_CHANNEL: "#freedreno-ci" + DEQP_EXPECTED_RENDERER: FD630 tags: - mesa-cheza dependencies: @@ -758,6 +794,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_EXPECTED_FAILS=deqp-freedreno-a630-noubo-fails.txt 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 @@ -777,6 +829,7 @@ arm64_a306_gles2: 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: @@ -788,31 +841,39 @@ 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" 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: 100 + +arm64_a530_gles31: + extends: + - arm64_a530_gles3 + variables: + DEQP_VER: gles31 # RADV CI .test-radv: @@ -899,3 +960,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"