diff options
| author | Tomeu Vizoso <[email protected]> | 2020-04-21 15:44:03 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-24 05:37:06 +0000 |
| commit | 8cba1a13fa6baa6fd55a80b5bd1fce6cbb4b12f8 (patch) | |
| tree | ae7b78eb54d7985238bfe27046e655cd46e0a2fe | |
| parent | 5a5316ee1bc2cdc8515819d575418cdc70cb58c5 (diff) | |
gitlab-ci: Test Virgl with traces
Signed-off-by: Tomeu Vizoso <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4659>
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | .gitlab-ci/traces.yml | 6 | ||||
| -rwxr-xr-x | .gitlab-ci/tracie-runner-gl.sh | 16 |
3 files changed, 33 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8dd5e6e40a6..1087a734e4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -931,3 +931,14 @@ radv-polaris10-traces: DEVICE_NAME: "vk-amd-polaris10" tags: - polaris10 + +virgl-traces: + extends: + - .traces-test-gl + - .virgl-rules + variables: + LIBGL_ALWAYS_SOFTWARE: "true" + GALLIUM_DRIVER: "virpipe" + DEVICE_NAME: "gl-virgl" + MESA_GLES_VERSION_OVERRIDE: "3.1" + MESA_GLSL_VERSION_OVERRIDE: "310" diff --git a/.gitlab-ci/traces.yml b/.gitlab-ci/traces.yml index 70a7d1a1bb0..0f756899f1a 100644 --- a/.gitlab-ci/traces.yml +++ b/.gitlab-ci/traces.yml @@ -7,14 +7,20 @@ traces: expectations: - device: gl-vmware-llvmpipe checksum: 8867f3a41f180626d0d4b7661ff5c0f4 + - device: gl-virgl + checksum: 8867f3a41f180626d0d4b7661ff5c0f4 - path: glmark2/jellyfish.rdc expectations: - device: gl-vmware-llvmpipe checksum: e0fe979fee129c0ed42a3059d1a4e1c9 + - device: gl-virgl + checksum: e0fe979fee129c0ed42a3059d1a4e1c9 - path: glxgears/glxgears.trace expectations: - device: gl-vmware-llvmpipe checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd + - device: gl-virgl + checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd - path: KhronosGroup-Vulkan-Tools/vkcube.gfxr expectations: - device: vk-amd-polaris10 diff --git a/.gitlab-ci/tracie-runner-gl.sh b/.gitlab-ci/tracie-runner-gl.sh index 1c329c9cbe0..a8dc8206d05 100755 --- a/.gitlab-ci/tracie-runner-gl.sh +++ b/.gitlab-ci/tracie-runner-gl.sh @@ -22,9 +22,25 @@ export EGL_PLATFORM="surfaceless" export DISPLAY= export WAFFLE_PLATFORM="surfaceless_egl" +RESULTS=`pwd`/results +mkdir -p $RESULTS + # Perform a self-test to ensure tracie is working properly. "$INSTALL/tracie/tests/test.sh" +if [ "$GALLIUM_DRIVER" = "virpipe" ]; then + # tracie is to use virpipe, and virgl_test_server llvmpipe + export GALLIUM_DRIVER="$GALLIUM_DRIVER" + + GALLIUM_DRIVER=llvmpipe \ + GALLIVM_PERF="nopt,no_filter_hacks" \ + VTEST_USE_EGL_SURFACELESS=1 \ + VTEST_USE_GLES=1 \ + virgl_test_server >$RESULTS/vtest-log.txt 2>&1 & + + sleep 1 +fi + # Sanity check to ensure that our environment is sufficient to make our tests # run against the Mesa built by CI, rather than any installed distro version. MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g') |