gitlab-ci: Run GLES3 tests in dEQP on Panfrost

We are able to run only 1/5th of the tests in around the same time that
dEQP-GLES2 takes, so do that for now while more DUTs are installed.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3876>

.gitlab-ci/deqp-panfrost-t760-skips.txt

@@ -8,3 +8,4 @@ dEQP-GLES[0-9]*.stress.*
 
 # These are really slow on tiling architectures (including llvmpipe).
 dEQP-GLES[0-9]*.functional.flush_finish.*
+

.gitlab-ci/deqp-panfrost-t860-skips.txt

@@ -11,3 +11,7 @@ dEQP-GLES[0-9]*.functional.flush_finish.*
 
 # XXX: Why does this flake?
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z
+
+# XXX: Causes irrecoverable GPU hangs when run in parallel with dEQP-GLES3.functional.transform_feedback.*
+dEQP-GLES3.functional.rasterizer_discard.*
+

.gitlab-ci/generate_lava.py

@@ -24,6 +24,8 @@ args = parser.parse_args()
 env = Environment(loader = FileSystemLoader(os.path.dirname(args.template)), trim_blocks=True, lstrip_blocks=True)
 template = env.get_template(os.path.basename(args.template))
 
+env_vars = "%s CI_NODE_INDEX=%s CI_NODE_TOTAL=%s" % (args.env_vars, args.ci_node_index, args.ci_node_total)
+
 values = {}
 values['pipeline_info'] = args.pipeline_info
 values['base_artifacts_url'] = args.base_artifacts_url
@@ -33,11 +35,9 @@ values['kernel_image_type'] = args.kernel_image_type
 values['gpu_version'] = args.gpu_version
 values['boot_method'] = args.boot_method
 values['tags'] = args.lava_tags
-values['env_vars'] = args.env_vars
+values['env_vars'] = env_vars
 values['deqp_version'] = args.deqp_version
 values['arch'] = args.arch
-values['ci_node_index'] = args.ci_node_index
-values['ci_node_total'] = args.ci_node_total
 
 f = open('lava-deqp.yml', "w")
 f.write(template.render(values))

.gitlab-ci/lava-deqp.yml.jinja2

@@ -1,4 +1,4 @@
-job_name: mesa-deqp-{{ gpu_version }} {{ pipeline_info }}
+job_name: mesa-deqp-{{ deqp_version }}-{{ gpu_version }} {{ pipeline_info }}
 device_type: {{ device_type }}
 timeouts:
   job:
@@ -70,8 +70,6 @@ actions:
           - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt
           - export DEQP_VER={{ deqp_version }}
           - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
-          - export CI_NODE_INDEX={{ ci_node_index }}
-          - export CI_NODE_TOTAL={{ ci_node_total }}
 
           # Put stuff where the runner script expects it
           - mkdir artifacts

.gitlab-ci/lava-gitlab-ci.yml

@@ -4,7 +4,8 @@
   stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
-    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
+    ENV_VARS: "DEQP_PARALLEL=6"
+    DEQP_VERSION: gles2
   script:
     - BUILD_JOB_ID=`cat artifacts/build_job_id.txt`
     - >
@@ -15,7 +16,7 @@
         --device-type ${DEVICE_TYPE} \
         --env-vars "${ENV_VARS}" \
         --arch ${ARCH} \
-        --deqp-version gles2 \
+        --deqp-version ${DEQP_VERSION} \
         --kernel-image-name ${KERNEL_IMAGE_NAME} \
         --kernel-image-type "${KERNEL_IMAGE_TYPE}" \
         --gpu-version ${GPU_VERSION} \
@@ -65,40 +66,58 @@
   needs:
     - meson-arm64
 
-panfrost-t720-test:arm64:
+panfrost-t720-gles2:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: sun50i-h6-pine-h64
     GPU_VERSION: panfrost-t720
+    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
   tags:
     - lava-sun50i-h6-pine-h64
 
-panfrost-t760-test:armhf:
+panfrost-t760-gles2:armhf:
   extends: .lava-test:armhf
   variables:
     DEVICE_TYPE: rk3288-veyron-jaq
     GPU_VERSION: panfrost-t760
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
+    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
   tags:
     - lava-rk3288-veyron-jaq
 
-panfrost-t860-test:arm64:
+panfrost-t860-gles2:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
+    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
   tags:
     - lava-rk3399-gru-kevin
 
-.panfrost-t820-test:arm64:
+panfrost-t860-gles3:arm64:
+  extends: .lava-test:arm64
+  variables:
+    DEVICE_TYPE: rk3399-gru-kevin
+    GPU_VERSION: panfrost-t860
+    BOOT_METHOD: depthcharge
+    KERNEL_IMAGE_TYPE: ""
+    DEQP_VERSION: gles3
+    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 MESA_GLSL_VERSION_OVERRIDE=300 PAN_MESA_DEBUG=deqp DEQP_PARALLEL=6"
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 5
+  tags:
+    - lava-rk3399-gru-kevin
+
+.panfrost-t820-gles2:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: meson-gxm-khadas-vim2
     GPU_VERSION: panfrost-t820
     LAVA_TAGS: panfrost
+    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
   tags:
     - lava-meson-gxm-khadas-vim2