X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=d4508f82a2d0bad90cd31b7cb749899c7746b36a;hb=5fe58271b290ae747b2517bd223ebe9b682769ee;hp=9934293b2df4093d5f1129e7d6c824300b180b4c;hpb=41797a1fed5ed9b7dafeeb064e47f1a364a4e981;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9934293b2df..d4508f82a2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,11 +105,29 @@ 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-12-02"
+    DEBIAN_TAG: &x86_test-gl "2019-12-05"
+
+# 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 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -223,7 +241,7 @@ meson-testing:
     GALLIUM_ST: >
       -D dri3=true
     GALLIUM_DRIVERS: "swrast"
-    LLVM_VERSION: "7"
+    VULKAN_DRIVERS: amd
     BUILDTYPE: "debugoptimized"
   script:
     - .gitlab-ci/meson-build.sh
@@ -459,8 +477,6 @@ scons-old-llvm:
   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
@@ -473,12 +489,29 @@ scons-old-llvm:
       - results/
   dependencies:
     - meson-testing
+
+.test-gl:
+  extends:
+    - .test
+  variables:
+    TAG: *x86_test-gl
+  image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
+  needs:
+    - 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
+    - x86_test-vk
 
 .piglit-test:
-  extends: .test
+  extends: .test-gl
   artifacts:
     when: on_failure
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
@@ -494,6 +527,7 @@ piglit-quick_gl:
   extends: .piglit-test
   variables:
     LP_NUM_THREADS: 0
+    NIR_VALIDATE: 0
     PIGLIT_OPTIONS: >
       --process-isolation false
       -x arb_gpu_shader5
@@ -509,38 +543,45 @@ 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:
-  extends: .test
   variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     - ./artifacts/deqp-runner.sh
 
+.deqp-test-gl:
+  extends:
+    - .test-gl
+    - .deqp-test
+
+.deqp-test-vk:
+  extends:
+    - .test-vk
+    - .deqp-test
+  variables:
+    DEQP_VER: vk
+
 test-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
 
 test-softpipe-gles2:
   extends: test-llvmpipe-gles2
@@ -563,7 +604,7 @@ test-softpipe-gles31:
 
 arm64_a630_gles2:
   extends:
-    - .deqp-test
+    - .deqp-test-gl
     - .use-arm_test
   variables:
     DEQP_VER: gles2
@@ -594,3 +635,31 @@ arm64_a306_gles2:
     DEQP_SKIPS: deqp-default-skips.txt
   tags:
     - db410c
+
+# RADV CI
+.test-radv:
+  variables:
+    VK_DRIVER: radeon
+    RADV_DEBUG: checkir
+  # 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 if the test image for VK has been manually
+    # started.
+    - when: on_success
+
+radv_polaris10_vkcts:
+  extends:
+    - .deqp-test-vk
+    - .test-radv
+  variables:
+    DEQP_PARALLEL: 4
+    DEQP_SKIPS: deqp-radv-polaris10-skips.txt
+  tags:
+    - polaris10