intel/eu: Set the right subnr for ALIGN16 destinations

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f6164c30886406a46a51636abca07de20acb2c6..fd895e44c013fbc6f4d3a4d45dbd5266a747cc05 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,7 +244,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-04"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-23-virgl"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -840,7 +840,7 @@ softpipe-gles31:
     DEQP_VER: gles31
   extends: softpipe-gles2
 
-virgl-gles2:
+virgl-gles2-on-gl:
   variables:
     DEQP_VER: gles2
     DEQP_PARALLEL: 4
@@ -849,7 +849,8 @@ virgl-gles2:
     # 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-virgl-fails.txt
+    DEQP_EXPECTED_FAILS: deqp-virgl-gl-fails.txt
+    DEQP_OPTIONS: "--deqp-log-images=disable"
     LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "virpipe"
     DEQP_EXPECTED_RENDERER: virgl
@@ -857,23 +858,36 @@ virgl-gles2:
     - .deqp-test-gl
     - .virgl-rules
 
-virgl-gles3:
+virgl-gles3-on-gl:
   parallel: 2
   variables:
     DEQP_VER: gles3
-    DEQP_RUNNER_OPTIONS: "--timeout 120"
-  extends: virgl-gles2
+    DEQP_RUNNER_OPTIONS: "--timeout 180"
+  extends: virgl-gles2-on-gl
 
-virgl-gles31:
+virgl-gles31-on-gl:
   parallel: 4
   variables:
     DEQP_VER: gles31
-    DEQP_OPTIONS: "--deqp-log-images=disable"
-    DEQP_RUNNER_OPTIONS: "--timeout 120"
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
     MESA_EXTENSION_OVERRIDE: "-GL_OES_tessellation_shader"
-  extends: virgl-gles2
+  extends: virgl-gles3-on-gl
+
+virgl-gl30-on-gl:
+  variables:
+    DEQP_VER: gl30
+  extends: virgl-gles2-on-gl
+
+virgl-gl31-on-gl:
+  variables:
+    DEQP_VER: gl31
+  extends: virgl-gles2-on-gl
+
+virgl-gl32-on-gl:
+  variables:
+    DEQP_VER: gl32
+  extends: virgl-gles2-on-gl
 
 # Rules for tests that should not be present in MRs or the main
 # project's pipeline (don't block marge or report red on
@@ -888,6 +902,30 @@ virgl-gles31:
       when: manual
     - when: never
 
+virgl-gles2-on-gles:
+  variables:
+    VIRGL_HOST_API: GLES
+    DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt
+  extends:
+    - virgl-gles2-on-gl
+    - .test-manual
+
+virgl-gles3-on-gles:
+  variables:
+    VIRGL_HOST_API: GLES
+    DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt
+  extends:
+    - virgl-gles3-on-gl
+    - .test-manual
+
+virgl-gles31-on-gles:
+  variables:
+    VIRGL_HOST_API: GLES
+    DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt
+  extends:
+    - virgl-gles31-on-gl
+    - .test-manual
+
 arm64_a630_gles2:
   extends:
     - arm64_a306_gles2
@@ -1077,8 +1115,8 @@ arm64_a530_gles31:
   stage: radv
   variables:
     VK_DRIVER: radeon
-    RADV_DEBUG: checkir
     ACO_DEBUG: validateir,validatera
+    RADV_PERFTEST: aco
 
 # Can only be triggered manually on personal branches because RADV is the only
 # driver that does Vulkan testing at the moment.
@@ -1100,23 +1138,18 @@ radv-fossils:
     # Pitcairn (GFX6)
     - export RADV_FORCE_FAMILY="pitcairn"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Bonaire (GFX7)
     - export RADV_FORCE_FAMILY="bonaire"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Polaris10 (GFX8)
     - export RADV_FORCE_FAMILY="polaris10"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Vega10 (GFX9)
     - export RADV_FORCE_FAMILY="gfx900"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Navi10 (GFX10)
     - export RADV_FORCE_FAMILY="gfx1010"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
 
 # Traces CI
 .traces-test: