X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=.gitlab-ci.yml;h=f91830fe3bafb49045bca00d67b9582440b4b7b3;hb=fb95a4693f05b8a64d61267409fcdce937dd3383;hp=079af449c8f68df85cada6b51e79a22b8bddf320;hpb=c1a362722f47c35da68754181797cd8f2487b1ea;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 079af449c8f..f91830fe3ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,23 +3,57 @@ variables: include: - project: 'wayland/ci-templates' - # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml - ref: 0a9bdd33a98f05af6761ab118b5074952242aab0 + ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 file: '/templates/debian.yml' - -include: - local: '.gitlab-ci/lava-gitlab-ci.yml' stages: - container - - build - - test + - meson-x86_64 + - scons + - meson-misc + - llvmpipe + - softpipe + - freedreno + - panfrost + - misc-tests + - success # When to automatically run the CI .ci-run-policy: rules: - - when: on_success + # Run pipeline by default for merge requests changing files affecting it + - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: &paths + - VERSION + - bin/**/* + # GitLab CI + - .gitlab-ci.yml + - .gitlab-ci/**/* + # Meson + - meson* + - build-support/**/* + - subprojects/**/* + # SCons + - SConstruct + - scons/**/* + - common.py + # Source code + - 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 + - when: never retry: max: 2 when: @@ -27,6 +61,20 @@ stages: # Cancel CI run if a newer commit is pushed to the same branch interruptible: true +success: + stage: success + image: debian:stable-slim + only: + - merge_requests + except: + changes: + *paths + variables: + GIT_STRATEGY: none + script: + - echo "Dummy job to make sure every merge request pipeline runs at least one job" + + .ci-deqp-artifacts: artifacts: when: always @@ -36,7 +84,7 @@ stages: # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521 - artifacts -# Build the "normal" (non-LAVA) CI docker images. +# Build the CI docker images. # # DEBIAN_TAG is the tag of the docker image used by later stage jobs. If the # image doesn't exist yet, the container stage job generates it. @@ -57,32 +105,6 @@ stages: stage: container extends: - .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: - - VERSION - - bin/**/* - # GitLab CI - - .gitlab-ci.yml - - .gitlab-ci/**/* - # Meson - - meson* - - build-support/**/* - - subprojects/**/* - # SCons - - SConstruct - - scons/**/* - - common.py - # Source code - - include/**/* - - src/**/* - when: on_success - # Always run pipeline by default in the main project - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: on_success - # Otherwise, allow triggering jobs manually - - when: manual variables: DEBIAN_VERSION: buster-slim REPO_SUFFIX: $CI_JOB_NAME @@ -96,7 +118,7 @@ x86_build: - .debian@container-ifnot-exists - .container variables: - DEBIAN_TAG: &x86_build "2019-11-13" + DEBIAN_TAG: &x86_build "2020-02-15" .use-x86_build: variables: @@ -109,25 +131,13 @@ x86_build: x86_test-gl: extends: x86_build variables: - DEBIAN_TAG: &x86_test-gl "2019-12-05" + DEBIAN_TAG: &x86_test-gl "2020-02-14" # Debian 10 based x86 test image for VK x86_test-vk: extends: x86_build variables: - DEBIAN_TAG: &x86_test-vk "2019-11-22" - # Can only be triggered manually on personal branches because RADV is the only - # driver that does Vulkan testing at the moment. - rules: - # Never build the test image for VK by default in the main project. - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: never - # Never build the test image for VK by default for merge requests. - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - when: never - # Otherwise, allow building it manually for personal branches. - - when: manual - + DEBIAN_TAG: &x86_test-vk "2020-03-05" # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -149,7 +159,7 @@ arm_build: - .debian@container-ifnot-exists@arm64v8 - .container variables: - DEBIAN_TAG: &arm_build "2019-11-13" + DEBIAN_TAG: &arm_build "2020-02-26" .use-arm_build: variables: @@ -162,7 +172,7 @@ arm_build: arm_test: extends: arm_build variables: - DEBIAN_TAG: &arm_test "2019-11-22" + DEBIAN_TAG: &arm_test "2020-01-30" .use-arm_test: variables: @@ -178,7 +188,6 @@ arm_test: # Shared between windows and Linux .build-common: extends: .ci-run-policy - stage: build artifacts: when: always paths: @@ -215,6 +224,9 @@ arm_test: extends: - .build-linux - .use-x86_build + stage: meson-x86_64 + variables: + LLVM_VERSION: 9 script: - .gitlab-ci/meson-build.sh @@ -222,6 +234,7 @@ arm_test: extends: - .build-linux - .use-x86_build + stage: scons variables: SCONSFLAGS: "-j4" script: @@ -243,6 +256,8 @@ meson-testing: GALLIUM_DRIVERS: "swrast" VULKAN_DRIVERS: amd BUILDTYPE: "debugoptimized" + EXTRA_OPTION: > + -D werror=true script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh @@ -268,7 +283,6 @@ meson-main: -D gallium-nine=true -D gallium-opencl=disabled GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" - LLVM_VERSION: "7" EXTRA_OPTION: > -D osmesa=gallium -D tools=all @@ -279,6 +293,7 @@ meson-main: .meson-cross: extends: - .meson-build + stage: meson-misc variables: UNWIND: "false" DRI_LOADERS: > @@ -295,6 +310,7 @@ meson-main: -D gallium-va=false -D gallium-xa=false -D gallium-nine=false + LLVM_VERSION: "8" .meson-arm: extends: @@ -303,28 +319,44 @@ meson-main: variables: VULKAN_DRIVERS: freedreno GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4" - EXTRA_OPTION: > - -D I-love-half-baked-turnips=true + BUILDTYPE: "debugoptimized" tags: - aarch64 meson-armhf: - extends: .meson-arm + extends: + - .meson-arm + - .ci-deqp-artifacts variables: CROSS: armhf LLVM_VERSION: "7" + EXTRA_OPTION: > + -D llvm=false + script: + - .gitlab-ci/meson-build.sh + - .gitlab-ci/prepare-artifacts.sh meson-arm64: extends: - .meson-arm - .ci-deqp-artifacts variables: - BUILDTYPE: "debugoptimized" - VULKAN_DRIVERS: "freedreno,amd" + VULKAN_DRIVERS: "freedreno" + EXTRA_OPTION: > + -D llvm=false script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh +meson-arm64-build-test: + extends: + - .meson-arm + - .ci-deqp-artifacts + variables: + VULKAN_DRIVERS: "amd" + script: + - .gitlab-ci/meson-build.sh + meson-clang: extends: .meson-build variables: @@ -334,12 +366,13 @@ meson-clang: DRI_DRIVERS: "auto" GALLIUM_DRIVERS: "auto" VULKAN_DRIVERS: intel,amd,freedreno - CC: "ccache clang-8" - CXX: "ccache clang++-8" + CC: "ccache clang-9" + CXX: "ccache clang++-9" .meson-windows: extends: - .build-windows + stage: meson-misc before_script: - $ENV:ARCH = "x86" - $ENV:VERSION = "2019\Community" @@ -425,9 +458,9 @@ meson-vulkan: -D cpp_args=-fno-sanitize-recover=all UBSAN_OPTIONS: "print_stacktrace=1" VULKAN_DRIVERS: intel,amd,freedreno - LLVM_VERSION: "8" EXTRA_OPTION: > -D vulkan-overlay-layer=true + -D werror=true # While the main point of this build is testing the i386 cross build, # we also use this one to test some other options that are exclusive @@ -443,9 +476,31 @@ meson-i386: -D vulkan-overlay-layer=true -D llvm=false -D osmesa=classic + -D werror=true + +meson-s390x: + extends: + - .meson-cross + tags: + - gstreamer + variables: + CROSS: s390x + GALLIUM_DRIVERS: "swrast" + script: + - dpkg -i /var/cache/apt/archives/$CROSS/*.deb + - .gitlab-ci/meson-build.sh + +meson-ppc64el: + extends: + - meson-s390x + variables: + CROSS: ppc64el + GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" + VULKAN_DRIVERS: "amd" meson-mingw32-x86_64: extends: .meson-build + stage: meson-misc variables: UNWIND: "false" DRI_DRIVERS: "" @@ -462,7 +517,7 @@ scons: SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check" script: - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh - - LLVM_VERSION=8 .gitlab-ci/scons-build.sh + - LLVM_VERSION=9 .gitlab-ci/scons-build.sh scons-old-llvm: extends: @@ -474,7 +529,6 @@ scons-old-llvm: .test: extends: - .ci-run-policy - stage: test variables: GIT_STRATEGY: none # testing doesn't build anything from source before_script: @@ -512,6 +566,7 @@ scons-old-llvm: .piglit-test: extends: .test-gl + stage: llvmpipe artifacts: when: on_failure name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" @@ -527,11 +582,13 @@ piglit-quick_gl: extends: .piglit-test variables: LP_NUM_THREADS: 0 + NIR_VALIDATE: 0 PIGLIT_OPTIONS: > --process-isolation false -x arb_gpu_shader5 -x egl_ext_device_ -x egl_ext_platform_device + -x ext_timer_query@time-elapsed -x glx-multithread-clearbuffer -x glx-multithread-shader-compile -x max-texture-size @@ -542,19 +599,14 @@ piglit-glslparser: extends: .piglit-test variables: LP_NUM_THREADS: 0 + NIR_VALIDATE: 0 PIGLIT_PROFILES: glslparser piglit-quick_shader: extends: .piglit-test variables: LP_NUM_THREADS: 1 - PIGLIT_OPTIONS: > - -x spec@arb_arrays_of_arrays@execution@ubo - -x spec@arb_gpu_shader_int64@execution$$ - -x spec@arb_separate_shader_objects@execution - -x spec@arb_separate_shader_objects@linker - -x spec@arb_shader_storage_buffer_object@execution - -x spec@glsl-1.50@execution@built-in-functions + NIR_VALIDATE: 0 PIGLIT_PROFILES: quick_shader .deqp-test: @@ -575,40 +627,49 @@ piglit-quick_shader: variables: DEQP_VER: vk -test-llvmpipe-gles2: +.fossilize-test: + extends: .test-vk + script: + - ./artifacts/fossilize-runner.sh + +llvmpipe-gles2: variables: DEQP_VER: gles2 DEQP_PARALLEL: 4 + NIR_VALIDATE: 0 # 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-llvmpipe-fails.txt LIBGL_ALWAYS_SOFTWARE: "true" extends: .deqp-test-gl + stage: llvmpipe -test-softpipe-gles2: - extends: test-llvmpipe-gles2 +softpipe-gles2: + extends: llvmpipe-gles2 + stage: softpipe variables: DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt DEQP_SKIPS: deqp-softpipe-skips.txt GALLIUM_DRIVER: "softpipe" -test-softpipe-gles3: +softpipe-gles3: parallel: 2 variables: DEQP_VER: gles3 - extends: test-softpipe-gles2 + extends: softpipe-gles2 -test-softpipe-gles31: +softpipe-gles31: parallel: 4 variables: DEQP_VER: gles31 - extends: test-softpipe-gles2 + extends: softpipe-gles2 arm64_a630_gles2: extends: - .deqp-test-gl - .use-arm_test + stage: freedreno variables: DEQP_VER: gles2 DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt @@ -641,8 +702,13 @@ arm64_a306_gles2: # RADV CI .test-radv: + stage: misc-tests variables: VK_DRIVER: radeon + RADV_DEBUG: checkir + +.test-radv-unsafe: + extends: .test-radv # Can only be triggered manually on personal branches because RADV is the only # driver that does Vulkan testing at the moment. rules: @@ -652,16 +718,63 @@ arm64_a306_gles2: # Never test RADV by default for merge requests. - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' when: never - # Otherwise, allow testing RADV if the test image for VK has been manually - # started. - - when: on_success + # Otherwise, allow testing RADV manually for personal branches. + - when: manual + +.test-radv-fossilize: + extends: + - .fossilize-test + - .test-radv radv_polaris10_vkcts: extends: - .deqp-test-vk - - .test-radv + - .test-radv-unsafe variables: DEQP_PARALLEL: 4 DEQP_SKIPS: deqp-radv-polaris10-skips.txt tags: - polaris10 + +radv-polaris10-fossils: + extends: .test-radv-fossilize + variables: + RADV_FORCE_FAMILY: "polaris10" # Force creating a null device + +# Traces CI +.traces-test: + stage: misc-tests + cache: + key: ${CI_JOB_NAME} + paths: + - .git-lfs-storage/ + +.traces-test-gl: + extends: + - .test-gl + - .traces-test + script: + - ./artifacts/tracie-runner-gl.sh + +.traces-test-vk: + extends: + - .test-vk + - .traces-test + script: + - ./artifacts/tracie-runner-vk.sh + +llvmpipe-traces: + extends: .traces-test-gl + variables: + LIBGL_ALWAYS_SOFTWARE: "true" + GALLIUM_DRIVER: "llvmpipe" + DEVICE_NAME: "gl-vmware-llvmpipe" + +radv-polaris10-traces: + extends: + - .traces-test-vk + - .test-radv-unsafe + variables: + DEVICE_NAME: "vk-amd-polaris10" + tags: + - polaris10