aco: fix 64-bit p_extract_vector on 32-bit p_create_vector

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7506129b9249146d8dd47263f4bda48a7b871034..d534345a4d386c793c43664276fb64b503d2c4e8 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-09-18"
-  DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
+  DEBIAN_TAG: "2019-10-22"
+  DEBIAN_ARM64_TAG: "arm64v8-2019-10-22"
   STRETCH_TAG: "2019-09-18"
   DEBIAN_VERSION: buster-slim
   STRETCH_VERSION: stretch-slim
@@ -28,8 +28,11 @@ include:
     ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
     file: '/templates/debian.yml'
 
+include:
+  - local: '/.gitlab-ci/lava-gitlab-ci.yml'
+
 stages:
-  - containers
+  - container
   - build
   - test
 
@@ -56,46 +59,55 @@ stages:
 
 # Build the normal CI native and cross-build docker images.
 
-debian-10:
+.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
+    # no need to pull the whole repo to build the container image
+    GIT_STRATEGY: none
+
+debian-10:amd64:
+  extends:
+    - .debian@container-ifnot-exists
+    - .container
+  variables:
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
 
-debian-9:
-  extends: debian-10
+.use-debian-10:amd64:
+  image: $DEBIAN_IMAGE
+  needs:
+    - debian-10:amd64
+
+debian-9:amd64:
+  extends: debian-10:amd64
   variables:
     DEBIAN_TAG: $STRETCH_TAG
     DEBIAN_VERSION: $STRETCH_VERSION
     DEBIAN_IMAGE: $STRETCH_IMAGE
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh'
 
-.use-debian-9:
+.use-debian-9:amd64:
   image: $STRETCH_IMAGE
   needs:
-    - debian-9
+    - debian-9:amd64
 
-# Builds a Docker image with the native environment and VK-GL-CTS for testing.
-test-container:arm64:
+debian-10:arm64:
   extends:
     - .debian@container-ifnot-exists@arm64v8
-    - .ci-run-policy
-  stage: containers
+    - .container
   variables:
     DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh'
+    DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-install.sh'
+
 
 # BUILD
 
 .build:
   extends: .ci-run-policy
-  image: $DEBIAN_IMAGE
   stage: build
   cache:
+    key: ${CI_JOB_NAME}
     paths:
       - ccache
   artifacts:
@@ -112,6 +124,7 @@ 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:
@@ -125,12 +138,16 @@ test-container:arm64:
     - ccache --show-stats
 
 .meson-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10:amd64
   script:
     - .gitlab-ci/meson-build.sh
 
 .scons-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10:amd64
   variables:
     SCONSFLAGS: "-j4"
   script:
@@ -169,7 +186,6 @@ meson-main:
 .meson-cross:
   extends:
     - .meson-build
-    - .ci-deqp-artifacts
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -186,26 +202,31 @@ 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:
+.meson-arm:
   extends: .meson-cross
+  image: $DEBIAN_ARM64_IMAGE
   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
+  needs:
+    - debian-10:arm64
+  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"
 
 # NOTE: Building SWR is 2x (yes two) times slower than all the other
@@ -284,7 +305,7 @@ meson-clover:
 meson-clover-old-llvm:
   extends:
     - meson-clover
-    - .use-debian-9
+    - .use-debian-9:amd64
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -337,6 +358,17 @@ meson-i386:
       -D llvm=false
       -D osmesa=classic
 
+meson-mingw32-x86_64:
+  extends: .meson-build
+  variables:
+    UNWIND: "false"
+    DRI_DRIVERS: ""
+    GALLIUM_DRIVERS: "swrast"
+    EXTRA_OPTION: >
+      -Dllvm=false
+      -Dosmesa=gallium
+      --cross-file=.gitlab-ci/x86_64-w64-mingw32
+
 scons:
   extends: .scons-build
   variables:
@@ -351,18 +383,23 @@ scons:
 scons-old-llvm:
   extends:
     - scons
-    - .use-debian-9
+    - .use-debian-9:amd64
   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
 
-.deqp-test:
+.test:
   extends: .ci-run-policy
   stage: test
-  image: $DEBIAN_IMAGE
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
+
+.deqp-test:
+  extends:
+    - .test
+    - .use-debian-10:amd64
+  variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
@@ -376,7 +413,9 @@ scons-old-llvm:
       - results/
   dependencies:
     - meson-main
-  needs: [meson-main]
+  needs:
+    - meson-main
+    - debian-10:amd64
 
 test-llvmpipe-gles2:
   parallel: 4
@@ -421,7 +460,9 @@ arm64_a630_gles2:
     - mesa-cheza
   dependencies:
     - meson-arm64
-  needs: [ meson-arm64 ]
+  needs:
+    - meson-arm64
+    - debian-10:arm64
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2