From: Pavel Ondračka <pavel.ondracka@gmail.com>
Date: Mon, 2 May 2022 18:54:08 +0000 (+0200)
Subject: ci: improve run-shader-db and add r300 testing
X-Git-Tag: upstream/23.3.3~16845
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba9bdd5642aa933272708de380618dea74c98c60;p=platform%2Fupstream%2Fmesa.git

ci: improve run-shader-db and add r300 testing

Original author of r300 patch: Pavel Ondračka <pavel.ondracka@gmail.com>

Co-author: Pavel Ondračka <pavel.ondracka@gmail.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19692>
---

diff --git a/.gitlab-ci/run-shader-db.sh b/.gitlab-ci/run-shader-db.sh
index 901e630..2c6a626 100755
--- a/.gitlab-ci/run-shader-db.sh
+++ b/.gitlab-ci/run-shader-db.sh
@@ -1,27 +1,41 @@
+#!/usr/bin/env bash
 set -e
-set -v
 
-ARTIFACTSDIR=`pwd`/shader-db
-mkdir -p $ARTIFACTSDIR
+echo -e "\e[0Ksection_start:$(date +%s):shader-db-prepare[collapsed=true]\r\e[0KPreparing shader-db"
+ARTIFACTSDIR=$(pwd)/shader-db
+mkdir -p "$ARTIFACTSDIR"
 export DRM_SHIM_DEBUG=true
 
-LIBDIR=`pwd`/install/lib
+LIBDIR=$(pwd)/install/lib
 export LD_LIBRARY_PATH=$LIBDIR
 
 cd /usr/local/shader-db
+echo -e "\e[0Ksection_end:$(date +%s):shader-db-prepare\r\e[0K"
 
 for driver in freedreno intel v3d vc4; do
-    echo "Running drm-shim for $driver"
-    env LD_PRELOAD=$LIBDIR/lib${driver}_noop_drm_shim.so \
-        ./run -j${FDO_CI_CONCURRENT:-4} ./shaders \
-            > $ARTIFACTSDIR/${driver}-shader-db.txt
+    echo -e "\e[0Ksection_start:$(date +%s):shader-db-${driver}[collapsed=true]\r\e[0KRunning shader-db for $driver"
+    env LD_PRELOAD="$LIBDIR/lib${driver}_noop_drm_shim.so" \
+        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
+            > "$ARTIFACTSDIR/${driver}-shader-db.txt"
+    echo -e "\e[0Ksection_end:$(date +%s):shader-db-${driver}\r\e[0K"
 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 \
+    echo -e "\e[0Ksection_start:$(date +%s):shader-db-nouveau-${chipset}[collapsed=true]\r\e[0KRunning shader-db 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
+        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
+            > "$ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt"
+    echo -e "\e[0Ksection_end:$(date +%s):shader-db-nouveau-${chipset}\r\e[0K"
+done
+
+# Run shader-db for r300 (RV370 and RV515)
+for chipset in 0x5460 0x7140; do
+    echo -e "\e[0Ksection_start:$(date +%s):shader-db-r300-${chipset}[collapsed=true]\r\e[0KRunning shader-db for r300 - ${chipset}"
+    env LD_PRELOAD="$LIBDIR/libradeon_noop_drm_shim.so" \
+        RADEON_GPU_ID=${chipset} \
+        ./run -j"${FDO_CI_CONCURRENT:-4}" -o r300 ./shaders \
+            > "$ARTIFACTSDIR/r300-${chipset}-shader-db.txt"
+    echo -e "\e[0Ksection_end:$(date +%s):shader-db-r300-${chipset}\r\e[0K"
 done