Mesa (master): ci: Build deqp-egl targeting x11_egl_glx

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c49daac1cdac3dfbd4f51ad1b9e90b0a81388d84
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c49daac1cdac3dfbd4f51ad1b9e90b0a81388d84

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Apr  2 10:31:28 2021 -0700

ci: Build deqp-egl targeting x11_egl_glx

This will be used to test llvmpipe against Xvfb and freedreno against
Xorg.  We keep the core deqp testing on surfaceless because
--deqp-surface-type=pbuffer fails on x11_egl_glx, =fbo has never worked in
VK-GL-CTS, and =window would increase test runtime for all the
swapbuffers.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10240>

---

 .gitlab-ci.yml                     |  6 +++---
 .gitlab-ci/container/build-deqp.sh | 16 +++++++++++++++-
 .gitlab-ci/deqp-runner.sh          |  2 +-
 .gitlab-ci/lava-gitlab-ci.yml      |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16734a56a7b..b16859de8db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -413,13 +413,13 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-cargo"
+    MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-deqp-egl"
 
 # Debian 11 based x86 test image for VK
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-cargo"
+    MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-deqp-egl"
 
 # Debian 11 based ARM build image
 arm_build:
@@ -450,7 +450,7 @@ kernel+rootfs_arm64-baremetal:
   variables:
     DEBIAN_ARCH: "arm64"
     KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-04-01-5.11.tar.gz"
-    MESA_ROOTFS_TAG: &arm-baremetal "2021-04-15-nfsroot"
+    MESA_ROOTFS_TAG: &arm-baremetal "2021-04-19-deqp-egl"
     MINIO_SUFFIX: "baremetal"
 
 # Kernel & rootfs for armhf baremetal testing
diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 3e6883ff969..eb741c1f45d 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -23,12 +23,24 @@ cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp
 popd
 
 pushd /deqp
+# When including EGL/X11 testing, do that build first and save off its
+# deqp-egl binary.
+cmake -S /VK-GL-CTS -B . -G Ninja \
+      -DDEQP_TARGET=x11_egl_glx \
+      -DCMAKE_BUILD_TYPE=Release \
+      $EXTRA_CMAKE_ARGS
+ninja modules/egl/deqp-egl
+cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
+
+
 cmake -S /VK-GL-CTS -B . -G Ninja \
       -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
       -DCMAKE_BUILD_TYPE=Release \
       $EXTRA_CMAKE_ARGS
 ninja
 
+mv /deqp/modules/egl/deqp-egl-x11 /deqp/modules/egl/deqp-egl
+
 # Copy out the mustpass lists we want.
 mkdir /deqp/mustpass
 cp /VK-GL-CTS/external/vulkancts/mustpass/master/vk-default.txt \
@@ -37,6 +49,9 @@ cp /VK-GL-CTS/external/vulkancts/mustpass/master/vk-default.txt \
 cp \
     /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
     /deqp/mustpass/.
+cp \
+    /deqp/external/openglcts/modules/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt \
+    /deqp/mustpass/.
 cp \
     /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \
     /deqp/mustpass/.
@@ -52,7 +67,6 @@ rm -rf /deqp/external/openglcts/modules/gl_cts/data/mustpass
 rm -rf /deqp/external/openglcts/modules/cts-runner
 rm -rf /deqp/modules/internal
 rm -rf /deqp/execserver
-rm -rf /deqp/modules/egl
 rm -rf /deqp/framework
 find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf
 ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 2641dea4543..d489863658f 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -8,7 +8,7 @@ DEQP_CONFIG=${DEQP_CONFIG:-rgba8888d24s8ms0}
 DEQP_VARIANT=${DEQP_VARIANT:-master}
 
 DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=$DEQP_WIDTH --deqp-surface-height=$DEQP_HEIGHT"
-DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=pbuffer"
+DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}"
 DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=$DEQP_CONFIG"
 DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden"
 
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 0a384d74da4..7ab3c16d609 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -14,7 +14,7 @@
   variables:
     KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
     INSTALL_KERNEL_MODULES: 1
-    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-15-nfsroot"
+    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-19-deqp-egl"
     MINIO_SUFFIX: "lava"
     PIGLIT_BUILD_TARGETS: "piglit_replayer"