X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=30a370c112a107fbc91a84f0a3e6272a36feb3ca;hb=2af7511ed2771d45c595518e746fa2f9031ba77a;hp=579afee96f6981bae4e809eed70eb02a90a801b7;hpb=e536446b609b07b655d35fba6957c5c4eb16065a;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 579afee96f6..30a370c112a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,17 @@
-# This is the tag of the docker image used for the build jobs. If the
-# image doesn't exist yet, the containers stage generates it.
-#
-# In order to generate a new image, one should generally change the tag.
-# While removing the image from the registry would also work, that's not
-# recommended except for ephemeral images during development: Replacing
-# an image after a significant amount of time might pull in newer
-# versions of gcc/clang or other packages, which might break the build
-# with older commits using the same tag.
-#
-# After merging a change resulting in generating a new image to the
-# main repository, it's recommended to remove the image from the source
-# repository's container registry, so that the image from the main
-# repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-09-11"
-  DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
-  DEBIAN_VERSION: stretch-slim
-  DEBIAN_ARM64_VERSION: buster-slim
-  DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
-  DEBIAN_ARM64_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_ARM64_VERSION:$DEBIAN_ARM64_TAG"
 
 include:
   - project: 'wayland/ci-templates'
-    ref: 1f7f57c6
+    # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml
+    ref: f69acac60d5dde0410124fd5674764600821b7a6
     file: '/templates/debian.yml'
 
+include:
+  - local: '.gitlab-ci/lava-gitlab-ci.yml'
+
 stages:
-  - containers
+  - container
   - build
   - test
 
@@ -35,13 +19,33 @@ stages:
 # When to automatically run the CI
 .ci-run-policy:
   only:
-    - branches@mesa/mesa
-    - merge_requests
-    - /^ci([-/].*)?$/
+    refs:
+      - branches@mesa/mesa
+      - merge_requests
+      - /^ci([-/].*)?$/
+    changes:
+      - VERSION
+      - bin/**/*
+      # GitLab CI
+      - .gitlab-ci.yml
+      - .gitlab-ci/**/*
+      # Meson
+      - meson*
+      - build-support/**/*
+      - subprojects/**/*
+      # SCons
+      - SConstruct
+      - scons/**/*
+      - common.py
+      # Source code
+      - include/**/*
+      - src/**/*
   retry:
     max: 2
     when:
       - runner_system_failure
+  # Cancel CI run if a newer commit is pushed to the same branch
+  interruptible: true
 
 .ci-deqp-artifacts:
   artifacts:
@@ -52,37 +56,105 @@ stages:
       # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521
       - artifacts
 
-# Builds the normal CI native and cross-build docker image.
-debian:
+# Build the "normal" (non-LAVA) 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.
+#
+# In order to generate a new image, one should generally change the tag.
+# While removing the image from the registry would also work, that's not
+# recommended except for ephemeral images during development: Replacing
+# an image after a significant amount of time might pull in newer
+# versions of gcc/clang or other packages, which might break the build
+# with older commits using the same tag.
+#
+# After merging a change resulting in generating a new image to the
+# main repository, it's recommended to remove the image from the source
+# repository's container registry, so that the image from the main
+# repository's registry will be used there as well.
+
+.container:
+  stage: container
   extends:
-    - .debian@container-ifnot-exists
     - .ci-run-policy
-  stage: containers
   variables:
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
+    DEBIAN_VERSION: buster-slim
+    REPO_SUFFIX: $CI_JOB_NAME
+    DEBIAN_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
+    # no need to pull the whole repo to build the container image
+    GIT_STRATEGY: none
+
+# Debian 10 based x86 build image
+x86_build:
+  extends:
+    - .debian@container-ifnot-exists
+    - .container
+  variables:
+    DEBIAN_TAG: &x86_build "2019-11-13"
+
+.use-x86_build:
+  variables:
+    TAG: *x86_build
+  image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG"
+  needs:
+    - x86_build
+
+# Debian 10 based x86 test image
+x86_test:
+  extends: x86_build
+  variables:
+    DEBIAN_TAG: &x86_test "2019-11-15"
 
-# Builds a Docker image with the native environment and VK-GL-CTS for testing.
-test-container:arm64:
+# Debian 9 based x86 build image (old LLVM)
+x86_build_old:
+  extends: x86_build
+  variables:
+    DEBIAN_TAG: &x86_build_old "2019-09-18"
+    DEBIAN_VERSION: stretch-slim
+
+.use-x86_build_old:
+  variables:
+    TAG: *x86_build_old
+  image: "$CI_REGISTRY_IMAGE/debian/x86_build_old:$TAG"
+  needs:
+    - x86_build_old
+
+# Debian 10 based ARM build image
+arm_build:
   extends:
     - .debian@container-ifnot-exists@arm64v8
-    - .ci-run-policy
-  stage: containers
+    - .container
   variables:
-    DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
-    DEBIAN_VERSION: "$DEBIAN_ARM64_VERSION"
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh'
+    DEBIAN_TAG: &arm_build "2019-11-13"
+
+.use-arm_build:
+  variables:
+    TAG: *arm_build
+  image: "$CI_REGISTRY_IMAGE/debian/arm_build:$TAG"
+  needs:
+    - arm_build
+
+# Debian 10 based ARM test image
+arm_test:
+  extends: arm_build
+  variables:
+    DEBIAN_TAG: &arm_test "2019-11-12"
+
+.use-arm_test:
+  variables:
+    TAG: *arm_test
+  image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG"
+  needs:
+    - meson-arm64
+    - arm_test
+
 
 # BUILD
 
-.build:
+# Shared between windows and Linux
+.build-common:
   extends: .ci-run-policy
-  image: $DEBIAN_IMAGE
   stage: build
-  cache:
-    paths:
-      - ccache
   artifacts:
     when: always
     paths:
@@ -90,6 +162,14 @@ test-container:arm64:
       # scons:
       - build/*/config.log
       - shader-db
+
+# Just Linux
+.build-linux:
+  extends: .build-common
+  cache:
+    key: ${CI_JOB_NAME}
+    paths:
+      - ccache
   variables:
     CCACHE_COMPILERCHECK: "content"
   # Use ccache transparently, and print stats before/after
@@ -97,33 +177,37 @@ test-container:arm64:
     - 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
   after_script:
-    # In case the install dir is being saved as artifacts, tar it up
-    # so that symlinks and hardlinks aren't each packed separately in
-    # the zip file.
-    - if [ -d install ]; then
-        tar -cf artifacts/install.tar install;
-      fi
     - export CCACHE_DIR="$PWD/ccache"
     - ccache --show-stats
 
+.build-windows:
+  extends: .build-common
+  tags:
+    - mesa-windows
+  cache:
+    key: ${CI_JOB_NAME}
+    paths:
+      - subprojects/packagecache
+
 .meson-build:
-  extends: .build
+  extends:
+    - .build-linux
+    - .use-x86_build
   script:
     - .gitlab-ci/meson-build.sh
 
 .scons-build:
-  extends: .build
+  extends:
+    - .build-linux
+    - .use-x86_build
   variables:
     SCONSFLAGS: "-j4"
   script:
-    - if test -n "$LLVM_VERSION"; then
-        export LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
-      fi
-    - scons $SCONS_TARGET
-    - eval $SCONS_CHECK_COMMAND
+    - .gitlab-ci/scons-build.sh
 
 meson-main:
   extends:
@@ -147,18 +231,20 @@ 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"
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
     LLVM_VERSION: "7"
     EXTRA_OPTION: >
       -D osmesa=gallium
       -D tools=all
-    MESON_SHADERDB: "true"
     BUILDTYPE: "debugoptimized"
+  script:
+    - .gitlab-ci/meson-build.sh
+    - .gitlab-ci/run-shader-db.sh
+    - .gitlab-ci/prepare-artifacts.sh
 
 .meson-cross:
   extends:
     - .meson-build
-    - .ci-deqp-artifacts
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -175,27 +261,35 @@ meson-main:
       -D gallium-va=false
       -D gallium-xa=false
       -D gallium-nine=false
-      -D llvm=false
-  script:
-    - .gitlab-ci/meson-build.sh
 
-meson-armhf:
-  extends: .meson-cross
+.meson-arm:
+  extends:
+    - .meson-cross
+    - .use-arm_build
   variables:
-    CROSS: armhf
     VULKAN_DRIVERS: freedreno
-    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
-    # Disable the tests since we're cross compiling.
+    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
     EXTRA_OPTION: >
-      -D build-tests=false
       -D I-love-half-baked-turnips=true
-      -D vulkan-overlay-layer=true
+  tags:
+    - aarch64
+
+meson-armhf:
+  extends: .meson-arm
+  variables:
+    CROSS: armhf
+    LLVM_VERSION: "7"
 
 meson-arm64:
-  extends: meson-armhf
+  extends:
+    - .meson-arm
+    - .ci-deqp-artifacts
   variables:
-    CROSS: arm64
     BUILDTYPE: "debugoptimized"
+    VULKAN_DRIVERS: "freedreno,amd"
+  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.
@@ -231,11 +325,15 @@ meson-clang:
     VULKAN_DRIVERS: intel,amd,freedreno
     CC: "ccache clang-8"
     CXX: "ccache clang++-8"
+
+.meson-windows:
+  extends:
+    - .build-windows
   before_script:
-    - export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache"
-    - ccache --zero-stats --show-stats || true
-     # clang++ breaks if it picks up the GCC 8 directory without libstdc++.so
-    - apt-get remove -y libgcc-8-dev
+    - $ENV:ARCH = "x86"
+    - $ENV:VERSION = "2019\Community"
+  script:
+    - cmd /C .gitlab-ci\meson-build.bat
 
 scons-swr:
   extends: .scons-build
@@ -272,11 +370,25 @@ meson-clover:
     - .gitlab-ci/meson-build.sh
     - LLVM_VERSION=8 .gitlab-ci/meson-build.sh
     - export GALLIUM_DRIVERS="i915,r600"
+    - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh
+    - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
+
+meson-clover-old-llvm:
+  extends:
+    - meson-clover
+    - .use-x86_build_old
+  variables:
+    UNWIND: "false"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D egl=false
+      -D gbm=false
+      -D platforms=drm,surfaceless
+    GALLIUM_DRIVERS: "i915,r600"
+  script:
     - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh
     - LLVM_VERSION=4.0 .gitlab-ci/meson-build.sh
     - LLVM_VERSION=5.0 .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
 
 meson-vulkan:
   extends: .meson-build
@@ -297,6 +409,10 @@ meson-vulkan:
       -D gallium-xa=false
       -D gallium-nine=false
       -D gallium-opencl=disabled
+      -D b_sanitize=undefined
+      -D c_args=-fno-sanitize-recover=all
+      -D cpp_args=-fno-sanitize-recover=all
+    UBSAN_OPTIONS: "print_stacktrace=1"
     VULKAN_DRIVERS: intel,amd,freedreno
     LLVM_VERSION: "8"
     EXTRA_OPTION: >
@@ -312,39 +428,55 @@ meson-i386:
     VULKAN_DRIVERS: intel
     DRI_DRIVERS: "swrast"
     GALLIUM_DRIVERS: "iris"
-    # Disable i386 tests, because u_format_tests gets precision
-    # failures in dxtn unpacking
     EXTRA_OPTION: >
-      -D build-tests=false
       -D vulkan-overlay-layer=true
       -D llvm=false
       -D osmesa=classic
 
-scons-nollvm:
-  extends: .scons-build
+meson-mingw32-x86_64:
+  extends: .meson-build
   variables:
-    SCONS_TARGET: "llvm=0"
-    SCONS_CHECK_COMMAND: "scons llvm=0 check"
+    UNWIND: "false"
+    DRI_DRIVERS: ""
+    GALLIUM_DRIVERS: "swrast"
+    EXTRA_OPTION: >
+      -Dllvm=false
+      -Dosmesa=gallium
+      --cross-file=.gitlab-ci/x86_64-w64-mingw32
 
-scons-llvm:
+scons:
   extends: .scons-build
   variables:
     SCONS_TARGET: "llvm=1"
-    SCONS_CHECK_COMMAND: "scons llvm=1 check"
-    LLVM_VERSION: "3.9"
+    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
 
-.deqp-test:
-  extends: .ci-run-policy
+scons-old-llvm:
+  extends:
+    - scons
+    - .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
-  image: $DEBIAN_IMAGE
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
-    DEQP_SKIPS: deqp-default-skips.txt
-  script:
+    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
-    - ./artifacts/deqp-runner.sh
+    - LD_LIBRARY_PATH=install/lib ldd install/lib/{*,dri/swrast_dri}.so
   artifacts:
     when: on_failure
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
@@ -352,44 +484,90 @@ scons-llvm:
       - results/
   dependencies:
     - meson-main
-  needs: [meson-main]
+  needs:
+    - meson-main
+    - x86_test
+
+.piglit-test:
+  extends: .test
+  artifacts:
+    reports:
+      junit: results/results.xml
+  variables:
+    LIBGL_ALWAYS_SOFTWARE: 1
+    PIGLIT_NO_WINDOW: 1
+  script:
+    - artifacts/piglit/run.sh
+
+piglit-quick_gl:
+  extends: .piglit-test
+  variables:
+    LP_NUM_THREADS: 0
+    PIGLIT_OPTIONS: >
+      -x arb_gpu_shader5
+      -x glx-multithread-clearbuffer
+      -x glx-multithread-shader-compile
+      -x max-texture-size
+      -x maxsize
+    PIGLIT_PROFILES: quick_gl
+
+piglit-glslparser+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"
+
+.deqp-test:
+  extends: .test
+  variables:
+    DEQP_SKIPS: deqp-default-skips.txt
+  script:
+    - ./artifacts/deqp-runner.sh
 
 test-llvmpipe-gles2:
-  parallel: 4
   variables:
     DEQP_VER: gles2
+    DEQP_PARALLEL: 4
+    # 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"
-    DEQP_RENDERER_MATCH: "llvmpipe"
   extends: .deqp-test
 
 test-softpipe-gles2:
   extends: test-llvmpipe-gles2
   variables:
     DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
-    DEQP_RENDERER_MATCH: "softpipe"
+    DEQP_SKIPS: deqp-softpipe-skips.txt
     GALLIUM_DRIVER: "softpipe"
 
-# The GLES2 CTS run takes about 8 minutes of CPU time, while GLES3 is
-# 25 minutes.  Until we can get its runtime down, just do a partial
-# (every 10 tests) run.
-test-softpipe-gles3-limited:
+test-softpipe-gles3:
+  parallel: 2
   variables:
     DEQP_VER: gles3
-    DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
-    LIBGL_ALWAYS_SOFTWARE: "true"
-    DEQP_RENDERER_MATCH: "softpipe"
-    GALLIUM_DRIVER: "softpipe"
-    CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 10
-  extends: .deqp-test
+  extends: test-softpipe-gles2
+
+test-softpipe-gles31:
+  parallel: 4
+  variables:
+    DEQP_VER: gles31
+  extends: test-softpipe-gles2
 
 arm64_a630_gles2:
-  extends: .deqp-test
-  image: $DEBIAN_ARM64_IMAGE
+  extends:
+    - .deqp-test
+    - .use-arm_test
   variables:
     DEQP_VER: gles2
-    DEQP_RENDERER_MATCH: "FD630"
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
     DEQP_SKIPS: deqp-freedreno-a630-skips.txt
     NIR_VALIDATE: 0
@@ -397,7 +575,6 @@ arm64_a630_gles2:
     - mesa-cheza
   dependencies:
     - meson-arm64
-  needs: [ meson-arm64 ]
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2
@@ -417,6 +594,5 @@ arm64_a306_gles2:
   variables:
     DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
     DEQP_SKIPS: deqp-default-skips.txt
-    DEQP_RENDERER_MATCH: "FD307"
   tags:
     - db410c