nir/scheduler: Add an option to specify what stages share memory for I/O

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3339cea12f81c8bc7dd70783322360f91d27363b..cc369a924ec427e01245df8111f17de0e929f7b5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ include:
   - local: '.gitlab-ci/test-source-dep.yml'
 
 stages:
+  - deploy
   - container
   - container-2
   - meson-x86_64
@@ -23,6 +24,18 @@ stages:
   - virgl
   - success
 
+pages:
+  image: alpine
+  stage: deploy
+  script:
+  - apk --no-cache add py3-pip
+  - pip3 install sphinx sphinx_rtd_theme
+  - sphinx-build -b html docs public
+  artifacts:
+    paths:
+    - public
+  only:
+  - master
 
 # When to automatically run the CI
 .ci-run-policy:
@@ -237,7 +250,7 @@ x86_test-gl:
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-02-gles"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-18-vkcts"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -292,13 +305,14 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-09-rsync"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-18-vkcts"
 
 .use-arm64_test:
   variables:
     TAG: *arm64_test
   image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG"
   needs:
+    - arm_test-base
     - arm64_test
 
 # Native Windows docker builds
@@ -544,7 +558,7 @@ meson-clang:
     CC: "ccache clang-9"
     CXX: "ccache clang++-9"
 
-meson-windows-vs2019:
+.meson-windows-vs2019:
   extends:
     - .build-windows
     - .use-windows_build_vs2019
@@ -689,8 +703,6 @@ meson-mingw32-x86_64:
     name: "mesa_${CI_JOB_NAME}"
     paths:
       - results/
-  dependencies:
-    - meson-testing
 
 .test-gl:
   extends:
@@ -704,6 +716,8 @@ meson-mingw32-x86_64:
     - meson-testing
     - x86_test-base
     - x86_test-gl
+  dependencies:
+    - meson-testing
 
 .test-vk:
   extends:
@@ -717,6 +731,8 @@ meson-mingw32-x86_64:
     - meson-testing
     - x86_test-base
     - x86_test-vk
+  dependencies:
+    - meson-testing
 
 .piglit-test:
   extends:
@@ -882,23 +898,27 @@ arm64_a630_gles2:
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init"
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
     DEQP_SKIPS: deqp-freedreno-a630-skips.txt
-    NIR_VALIDATE: 0
+    GIT_STRATEGY: none
     DEQP_EXPECTED_RENDERER: FD630
     DEQP_NO_SAVE_RESULTS: ""
   tags:
     - google-freedreno-cheza
   script:
-    - .gitlab-ci/bare-metal/cros-servo.sh
+    - ./install/bare-metal/cros-servo.sh
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2
   variables:
     DEQP_VER: gles31
+    # gles31 is about 12 minutes with validation enabled.
+    NIR_VALIDATE: 0
 
 arm64_a630_gles3:
   extends: arm64_a630_gles2
   variables:
     DEQP_VER: gles3
+    # gles3 is about 15 minutes with validation enabled.
+    NIR_VALIDATE: 0
 
 # We almost always manage to lower UBOs back to constant uploads in
 # the test suite, so get a little testing for it here.
@@ -960,6 +980,7 @@ arm64_a630_vk_sysmem:
 .baremetal-test:
   extends:
     - .ci-run-policy
+    - .test
   stage: test
   artifacts:
     when: always
@@ -979,6 +1000,7 @@ arm64_a306_gles2:
     BM_ROOTFS: /lava-files/rootfs-arm64
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
     FLAKES_CHANNEL: "#freedreno-ci"
+    BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
     DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
     DEQP_SKIPS: deqp-freedreno-a307-skips.txt
     DEQP_VER: gles2
@@ -988,8 +1010,9 @@ arm64_a306_gles2:
     DEQP_NO_SAVE_RESULTS: 1
     # NIR_VALIDATE=0 left intentionally unset as a3xx is fast enough at its small testsuite.
   script:
-    - .gitlab-ci/bare-metal/fastboot.sh
+    - ./install/bare-metal/fastboot.sh
   needs:
+    - arm_test-base
     - arm64_test
     - arm_build
     - meson-arm64
@@ -1015,7 +1038,7 @@ arm64_a306_gles3_options:
     DEQP_VER: gles3
   script:
     # Check that the non-constbuf UBO case works.
-    - DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_CASELIST_FILTER="functional.*ubo" .gitlab-ci/bare-metal/fastboot.sh
+    - DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_CASELIST_FILTER="functional.*ubo" ./install/bare-metal/fastboot.sh
 
 arm64_a530_gles2:
   extends: