Mesa (main): Revert "ci: remove nouveau from shader-db runs"

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5a3aee78cbb70918b413cdd40dffcae7c9e97d8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a3aee78cbb70918b413cdd40dffcae7c9e97d8c

Author: Emma Anholt <emma at anholt.net>
Date:   Mon Apr 25 21:11:38 2022 -0700

Revert "ci: remove nouveau from shader-db runs"

This reverts commit 0464117ad9bd47f079175058771220e8dad4f00b.  Now that
the shim back-channel communicates with nouveau that the "GPU" is always
idle, we can get the nouveau compiler back into the CI path.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16150>

---

 .gitlab-ci/run-shader-db.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci/run-shader-db.sh b/.gitlab-ci/run-shader-db.sh
index d475bb3c76e..e7b50c26e23 100755
--- a/.gitlab-ci/run-shader-db.sh
+++ b/.gitlab-ci/run-shader-db.sh
@@ -16,3 +16,12 @@ for driver in freedreno intel v3d; do
         ./run -j${FDO_CI_CONCURRENT:-4} ./shaders \
             > $ARTIFACTSDIR/${driver}-shader-db.txt
 done
+
+# Run shader-db over a number of supported chipsets for nouveau
+for chipset in 40 a3 c0 e4 f0 134 162; do
+    echo "Running drm-shim for nouveau - $chipset"
+    env LD_PRELOAD=$LIBDIR/libnouveau_noop_drm_shim.so \
+        NOUVEAU_CHIPSET=${chipset} \
+        ./run -j${FDO_CI_CONCURRENT:-4} ./shaders \
+            > $ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt
+done