X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=f91830fe3bafb49045bca00d67b9582440b4b7b3;hb=acf24df2017598eb23c57599e39738e0ec059438;hp=b3888d55baa46b7677ace19730b79167e4ae0ac7;hpb=530d3b29007f3bf5e8c91a6c34fdc666b9aa726f;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3888d55baa..f91830fe3ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,27 +3,29 @@ variables:
 
 include:
   - project: 'wayland/ci-templates'
-    # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml
-    ref: f69acac60d5dde0410124fd5674764600821b7a6
+    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:
-  only:
-    refs:
-      - branches@mesa/mesa
-      - merge_requests
-      - /^ci([-/].*)?$/
-    changes:
+  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
       - VERSION
       - bin/**/*
       # GitLab CI
@@ -40,6 +42,18 @@ stages:
       # 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:
@@ -47,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
@@ -56,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.
@@ -90,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:
@@ -99,11 +127,17 @@ x86_build:
   needs:
     - x86_build
 
-# Debian 10 based x86 test image
-x86_test:
+# Debian 10 based x86 test image for GL
+x86_test-gl:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test "2019-11-20-2"
+    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 "2020-03-05"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -125,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:
@@ -138,7 +172,7 @@ arm_build:
 arm_test:
   extends: arm_build
   variables:
-    DEBIAN_TAG: &arm_test "2019-11-12"
+    DEBIAN_TAG: &arm_test "2020-01-30"
 
 .use-arm_test:
   variables:
@@ -154,7 +188,6 @@ arm_test:
 # Shared between windows and Linux
 .build-common:
   extends: .ci-run-policy
-  stage: build
   artifacts:
     when: always
     paths:
@@ -166,22 +199,16 @@ arm_test:
 # Just Linux
 .build-linux:
   extends: .build-common
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - ccache
   variables:
     CCACHE_COMPILERCHECK: "content"
+    CCACHE_COMPRESS: "true"
+    CCACHE_DIR: /cache/mesa/ccache
   # Use ccache transparently, and print stats before/after
   before_script:
     - export PATH="/usr/lib/ccache:$PATH"
     - export CCACHE_BASEDIR="$PWD"
-    - export CCACHE_DIR="$PWD/ccache"
-    - ccache --max-size=1500M
-    - ccache --zero-stats || true
-    - ccache --show-stats || true
+    - ccache --show-stats
   after_script:
-    - export CCACHE_DIR="$PWD/ccache"
     - ccache --show-stats
 
 .build-windows:
@@ -197,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
 
@@ -204,15 +234,36 @@ arm_test:
   extends:
     - .build-linux
     - .use-x86_build
+  stage: scons
   variables:
     SCONSFLAGS: "-j4"
   script:
     - .gitlab-ci/scons-build.sh
 
-meson-main:
+meson-testing:
   extends:
     - .meson-build
     - .ci-deqp-artifacts
+  variables:
+    UNWIND: "true"
+    DRI_LOADERS: >
+      -D glx=dri
+      -D gbm=true
+      -D egl=true
+      -D platforms=x11,drm,surfaceless
+    GALLIUM_ST: >
+      -D dri3=true
+    GALLIUM_DRIVERS: "swrast"
+    VULKAN_DRIVERS: amd
+    BUILDTYPE: "debugoptimized"
+    EXTRA_OPTION: >
+      -D werror=true
+  script:
+    - .gitlab-ci/meson-build.sh
+    - .gitlab-ci/prepare-artifacts.sh
+
+meson-main:
+  extends: .meson-build
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
@@ -231,20 +282,18 @@ meson-main:
       -D gallium-xa=true
       -D gallium-nine=true
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
-    LLVM_VERSION: "7"
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
     EXTRA_OPTION: >
       -D osmesa=gallium
       -D tools=all
-    BUILDTYPE: "debugoptimized"
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/run-shader-db.sh
-    - .gitlab-ci/prepare-artifacts.sh
 
 .meson-cross:
   extends:
     - .meson-build
+  stage: meson-misc
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -261,6 +310,7 @@ meson-main:
       -D gallium-va=false
       -D gallium-xa=false
       -D gallium-nine=false
+    LLVM_VERSION: "8"
 
 .meson-arm:
   extends:
@@ -269,66 +319,60 @@ 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
 
-# NOTE: Building SWR is 2x (yes two) times slower than all the other
-# gallium drivers combined.
-# Start this early so that it doesn't limit the total run time.
-#
-# We also stick the glvnd build here, since we want non-glvnd in
-# meson-main for actual driver CI.
-meson-swr-glvnd:
-  extends: .meson-build
+meson-arm64-build-test:
+  extends:
+    - .meson-arm
+    - .ci-deqp-artifacts
   variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glvnd=true
-      -D egl=true
-    GALLIUM_ST: >
-      -D dri3=true
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "swr,iris"
-    LLVM_VERSION: "6.0"
+    VULKAN_DRIVERS: "amd"
+  script:
+    - .gitlab-ci/meson-build.sh
 
 meson-clang:
   extends: .meson-build
   variables:
     UNWIND: "true"
+    DRI_LOADERS: >
+      -D glvnd=true
     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"
@@ -414,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
@@ -432,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: ""
@@ -451,9 +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=6.0 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=7 .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:
@@ -461,38 +525,53 @@ scons-old-llvm:
     - .use-x86_build_old
   script:
     - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
 
 .test:
   extends:
     - .ci-run-policy
-  stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
-    TAG: *x86_test
-  image: "$CI_REGISTRY_IMAGE/debian/x86_test:$TAG"
   before_script:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
     - rm -rf install
     - tar -xf artifacts/install.tar
-    - LD_LIBRARY_PATH=install/lib ldd install/lib/{*,dri/swrast_dri}.so
+    - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
   artifacts:
-    when: on_failure
+    when: always
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
     paths:
       - results/
   dependencies:
-    - meson-main
+    - meson-testing
+
+.test-gl:
+  extends:
+    - .test
+  variables:
+    TAG: *x86_test-gl
+  image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
   needs:
-    - meson-main
-    - x86_test
+    - meson-testing
+    - x86_test-gl
+
+.test-vk:
+  extends:
+    - .test
+  variables:
+    TAG: *x86_test-vk
+  image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG"
+  needs:
+    - meson-testing
+    - x86_test-vk
 
 .piglit-test:
-  extends: .test
+  extends: .test-gl
+  stage: llvmpipe
   artifacts:
-    reports:
-      junit: results/results.xml
+    when: on_failure
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    paths:
+      - summary/
   variables:
     LIBGL_ALWAYS_SOFTWARE: 1
     PIGLIT_NO_WINDOW: 1
@@ -503,74 +582,101 @@ 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
       -x maxsize
     PIGLIT_PROFILES: quick_gl
 
-piglit-glslparser+quick_shader:
+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
-    PIGLIT_PROFILES: "glslparser quick_shader"
-    PIGLIT_RESULTS: "glslparser+quick_shader"
+    NIR_VALIDATE: 0
+    PIGLIT_PROFILES: quick_shader
 
 .deqp-test:
-  extends: .test
   variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     - ./artifacts/deqp-runner.sh
 
-test-llvmpipe-gles2:
+.deqp-test-gl:
+  extends:
+    - .test-gl
+    - .deqp-test
+
+.deqp-test-vk:
+  extends:
+    - .test-vk
+    - .deqp-test
+  variables:
+    DEQP_VER: vk
+
+.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
+  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
+    - .deqp-test-gl
     - .use-arm_test
+  stage: freedreno
   variables:
     DEQP_VER: gles2
     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"
   tags:
     - mesa-cheza
   dependencies:
@@ -578,21 +684,97 @@ arm64_a630_gles2:
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2
-  parallel: 4
   variables:
     DEQP_VER: gles31
 
 arm64_a630_gles3:
-  parallel: 6
   extends: arm64_a630_gles2
   variables:
     DEQP_VER: gles3
 
 arm64_a306_gles2:
-  parallel: 4
   extends: arm64_a630_gles2
   variables:
     DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
     DEQP_SKIPS: deqp-default-skips.txt
   tags:
     - db410c
+
+# 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:
+    # Never test RADV by default in the main project.
+    - if: '$CI_PROJECT_PATH == "mesa/mesa"'
+      when: never
+    # 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 manually for personal branches.
+    - when: manual
+
+.test-radv-fossilize:
+  extends:
+    - .fossilize-test
+    - .test-radv
+
+radv_polaris10_vkcts:
+  extends:
+    - .deqp-test-vk
+    - .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