From 60cb47180561250939e37f0c1d0fdc6a981608f3 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Thu, 21 Oct 2021 13:36:46 -0700
Subject: [PATCH] ci/radeonsi: Use a deqp-runner suite suite for stoney.

This should make it easier to tune the runtime, and enable KHR-GL* tests
in the future.  (Not done currently because something in KHR-GL* causes
oomkiller).

This drops the redundant FDO_CI_CONCURRENT settings, since the default on
these boards is 4 anyway.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13504>
---
 .../radeonsi/ci/deqp-radeonsi-stoney.toml     | 31 +++++++++++++++++
 src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 33 ++-----------------
 2 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney.toml

diff --git a/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney.toml b/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney.toml
new file mode 100644
index 00000000000..c3dbe5b5bee
--- /dev/null
+++ b/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney.toml
@@ -0,0 +1,31 @@
+# Basic test set
+[[deqp]]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+version_check = "GL ES 3.2.*git"
+renderer_check = "STONEY"
+
+[[deqp]]
+deqp = "/deqp/modules/gles3/deqp-gles3"
+caselists = ["/deqp/mustpass/gles3-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+fraction = 2
+
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = ["/deqp/mustpass/gles31-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+fraction = 2
diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
index b2d396ff56e..c0e8b08d219 100644
--- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
@@ -15,40 +15,13 @@
   tags:
     - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
 
-.radeonsi-stoney-deqp:amd64:
+radeonsi-stoney-gl:amd64:
   extends:
     - .lava-test:amd64
     - .radeonsi-stoney-test:amd64
-
-radeonsi-stoney-gles2:amd64:
-  extends:
-    - .radeonsi-stoney-deqp:amd64
+  parallel: 5
   variables:
-    DEQP_VER: gles2
-
-# Run two jobs in parallel each running 1/4th of the test suite
-radeonsi-stoney-gles3:amd64:
-  extends:
-    - .radeonsi-stoney-deqp:amd64
-  parallel: 2
-  variables:
-    DEQP_VER: gles3
-    FDO_CI_CONCURRENT: 4
-    DEQP_EXPECTED_RENDERER: STONEY
-    DEQP_FRACTION: 2
-
-
-# Run two jobs in parallel each running 1/4th of the test suite
-radeonsi-stoney-gles31:amd64:
-  extends:
-    - .radeonsi-stoney-deqp:amd64
-  parallel: 2
-  variables:
-    DEQP_VER: gles31
-    FDO_CI_CONCURRENT: 4
-    DEQP_EXPECTED_RENDERER: STONEY
-    DEQP_FRACTION: 2
-
+    DEQP_SUITE: radeonsi-stoney
 
 radeonsi-stoney-traces:amd64:
   extends: