glthread: declare marshal and unmarshal functions as non-static

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db5fcc6f924b06af639a62a05b6bf48afa9be871..2f9cc15a70d00301c40d1ef1e19b6436a494911a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@ stages:
   - softpipe
   - freedreno
   - panfrost
-  - misc-tests
+  - radv
+  - lima
   - success
 
 
@@ -139,7 +140,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-16"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-23"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -161,7 +162,7 @@ arm_build:
     - .fdo.container-ifnot-exists@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-03-13"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-03-17-db820c"
 
 .use-arm_build:
   variables:
@@ -487,6 +488,8 @@ meson-i386:
 meson-s390x:
   extends:
     - .meson-cross
+  tags:
+    - kvm
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast"
@@ -675,6 +678,22 @@ softpipe-gles31:
     DEQP_VER: gles31
   extends: softpipe-gles2
 
+# Rules for tests that should not be present in MRs or the main
+# project's pipeline (don't block marge or report red on
+# mesa/mesamaster) but should be present on pipelines in personal
+# branches (so you can opt in to running the flaky test when you want
+# to).
+.test-manual:
+  rules:
+    # Never test in the main project.
+    - if: '$CI_PROJECT_PATH == "mesa/mesa"'
+      when: never
+    # Never test in merge requests.
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
+      when: never
+    # Otherwise, allow testing manually for personal branches.
+    - when: manual
+
 arm64_a630_gles2:
   extends:
     - .deqp-test-gl
@@ -711,9 +730,9 @@ arm64_a306_gles2:
   extends:
     - .baremetal-test
     - .use-arm_build
-  stage: freedreno
+    - .freedreno-rules
   variables:
-    BM_KERNEL: /lava-files/Image
+    BM_KERNEL: /lava-files/Image.gz
     BM_DTB: /lava-files/apq8016-sbc.dtb
     BM_ROOTFS: /lava-files/rootfs-arm64
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
@@ -729,57 +748,83 @@ arm64_a306_gles2:
     - google-freedreno-db410c
 
 # Disabled due to flaky results
-.arm64_a306_gles3:
+arm64_a306_gles3:
   extends:
     - arm64_a306_gles2
+    - .test-manual
   parallel: 8
   variables:
     DEQP_VER: gles3
 
+arm64_a530_gles2:
+  extends:
+    - arm64_a306_gles2
+  stage: freedreno
+  variables:
+    BM_KERNEL: /lava-files/db820c-kernel
+    BM_DTB: /lava-files/db820c.dtb
+    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
+    DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt
+    DEQP_SKIPS: deqp-freedreno-a530-skips.txt
+  tags:
+    - google-freedreno-db820c
+
+arm64_a530_gles3:
+  extends:
+    - arm64_a530_gles2
+    - .test-manual
+  parallel: 6
+  variables:
+    DEQP_VER: gles3
+
 # RADV CI
 .test-radv:
   extends: .radv-rules
-  stage: misc-tests
+  stage: radv
   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
+  script:
+    - ./artifacts/fossilize-runner.sh
+    - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
 
+# Can only be triggered manually on personal branches because RADV is the only
+# driver that does Vulkan testing at the moment.
 radv_polaris10_vkcts:
   extends:
     - .deqp-test-vk
-    - .test-radv-unsafe
+    - .test-radv
+    - .test-manual
   variables:
     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
+radv-fossils:
+  extends:
+    - .fossilize-test
+    - .test-radv
+  script:
+    # Polaris10
+    - export RADV_FORCE_FAMILY="polaris10"
+    - ./artifacts/fossilize-runner.sh
+    - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
+    # Vega10
+    - export RADV_FORCE_FAMILY="gfx900"
+    - ./artifacts/fossilize-runner.sh
+    - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
+    # Navi10
+    - export RADV_FORCE_FAMILY="gfx1010"
+    - ./artifacts/fossilize-runner.sh
+    - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./artifacts/fossilize-runner.sh
 
 # Traces CI
 .traces-test:
-  stage: misc-tests
   cache:
     key: ${CI_JOB_NAME}
     paths:
@@ -811,7 +856,8 @@ llvmpipe-traces:
 radv-polaris10-traces:
   extends:
     - .traces-test-vk
-    - .test-radv-unsafe
+    - .test-radv
+    - .test-manual
   variables:
     DEVICE_NAME: "vk-amd-polaris10"
   tags: