[v1,02/13] ci: Rework use of software renderer

Submitted by Robert Foss on Nov. 21, 2018, 3:12 p.m.

Details

Message ID 20181121151240.17259-3-robert.foss@collabora.com
State New
Headers show
Series "ci: Clean up ci build system" ( rev: 1 ) in Virgil 3D

Not browsing as part of any series.

Commit Message

Robert Foss Nov. 21, 2018, 3:12 p.m.
From: Gert Wollny <gert.wollny@collabora.com>

- rename options
- switch to softpipe since it supports up to GLES 3.1
- force host GL version 4.4 because otherwise we don't get GLES 3.1 in the
  guest

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
---
 ci/run-deqp.sh  | 21 ++++++++++++++-------
 ci/run-tests.sh |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/ci/run-deqp.sh b/ci/run-deqp.sh
index 913503f..615f6ba 100755
--- a/ci/run-deqp.sh
+++ b/ci/run-deqp.sh
@@ -13,8 +13,8 @@  do
         --host-gl)
             HOST_GL=1
             ;;
-        --only-gles2)
-            ONLY_GLES2=yes
+        --only-softpipe)
+            ONLY_SOFTPIPE_PASS=yes
             ;;
         *)
             echo "Unknown argument"
@@ -47,10 +47,16 @@  if [[ -n "$LIBGL_ALWAYS_SOFTWARE" ]]; then
 fi
 
 if [[ -n "$WITH_VTEST" ]]; then
-   if [[ -n "$HOST_GL" ]]; then
-       VTEST_USE_EGL_SURFACELESS=1 nohup /virglrenderer/vtest/virgl_test_server 2> /dev/null &
+    if [[ -n "$HOST_GL" ]]; then
+        if [[ -n "$ONLY_SOFTPIPE_PASS" ]]; then
+            # Softpipe only supports GL 3.3, but for guest GLES 3.1
+            # one GL 4.4 property is needed
+            MESA_GL_VERSION_OVERRIDE=4.4 VTEST_USE_EGL_SURFACELESS=1 nohup /virglrenderer/vtest/virgl_test_server >$RESULTS_DIR/vtest_gl.log 2>&1  &
+        else
+            VTEST_USE_EGL_SURFACELESS=1 nohup /virglrenderer/vtest/virgl_test_server >$RESULTS_DIR/vtest_gl.log  2>&1 &
+        fi 
    else
-       VTEST_USE_EGL_SURFACELESS=1 VTEST_USE_GLES=1 nohup /virglrenderer/vtest/virgl_test_server 2> /dev/null &
+       VTEST_USE_EGL_SURFACELESS=1 VTEST_USE_GLES=1 nohup /virglrenderer/vtest/virgl_test_server >$RESULTS_DIR/vtest_gles.log 2>&1  &
    fi
 
    sleep 1
@@ -78,8 +84,9 @@  cp TestResults.qpa /virglrenderer/results/.
 exit
 '
 
-if [[ "x$ONLY_GLES2"="xyes" ]] ; then
+if [[ "x$ONLY_SOFTPIPE_PASS"="xyes" ]] ; then
     export HOST_GALLIUM_DRIVER="-${GALLIUM_DRIVER}"
+    NUM_JOBS=$(nproc)
     time deqp --threads=$NUM_JOBS \
      --cts-build-dir=/usr/local/VK-GL-CTS/ \
      --test-names-file=/virglrenderer/ci/deqp-gles2-list.txt \
@@ -130,7 +137,7 @@  if [ $? -ne 0 ]; then
 fi
 
 
-if [[ "x$ONLY_GLES2" != "xyes" ]] ; then
+if [[ "x$ONLY_SOFTPIPE_PASS" != "xyes" ]] ; then
     
     PIGLIT_TESTS="-x glx"
     if [[ -z "$HOST_GL" ]]; then
diff --git a/ci/run-tests.sh b/ci/run-tests.sh
index 1ef0e77..536b463 100755
--- a/ci/run-tests.sh
+++ b/ci/run-tests.sh
@@ -18,8 +18,8 @@  ccache -s
 if [[ ! -c /dev/dri/renderD128 ]]; then
     export LIBGL_ALWAYS_SOFTWARE=1
     export GALLIVM_PERF=no_filter_hacks
-    export GALLIUM_DRIVER=llvmpipe
-    LIMIT_TESTSET=--only-gles2
+    export GALLIUM_DRIVER=softpipe
+    LIMIT_TESTSET=--only-softpipe
 fi
 
 cd /virglrenderer