X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci%2Fdeqp-runner.sh;h=48d95b2bedd03f1a76aaae1b462f98aa6de4973e;hb=c9ab73296c1c80796b6a3e8cfc1affb486e4dd81;hp=4e2b911624cbe419c29f2bbb5fc449179db5a095;hpb=994e258122663fd4d869b583cb9f4e0e2f36a0aa;p=mesa.git
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 4e2b911624c..48d95b2bedd 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -2,7 +2,7 @@
set -ex
-DEQP_OPTIONS="--deqp-surface-width=256 --deqp-surface-height=256"
+DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=256 --deqp-surface-height=256"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=pbuffer"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=rgba8888d24s8ms0"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden"
@@ -31,7 +31,7 @@ if [ -z "$DEQP_SKIPS" ]; then
exit 1
fi
-ARTIFACTS=`pwd`/artifacts
+INSTALL=`pwd`/install
# Set up the driver environment.
export LD_LIBRARY_PATH=`pwd`/install/lib/
@@ -60,17 +60,25 @@ if [ -n "$CI_NODE_INDEX" ]; then
sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
fi
+if [ -n "$DEQP_CASELIST_FILTER" ]; then
+ sed -i "/$DEQP_CASELIST_FILTER/p" /tmp/case-list.txt
+fi
+
if [ ! -s /tmp/case-list.txt ]; then
echo "Caselist generation failed"
exit 1
fi
if [ -n "$DEQP_EXPECTED_FAILS" ]; then
- XFAIL="--xfail-list $ARTIFACTS/$DEQP_EXPECTED_FAILS"
+ XFAIL="--xfail-list $INSTALL/$DEQP_EXPECTED_FAILS"
fi
set +e
+if [ -n "$DEQP_PARALLEL" ]; then
+ JOB="--job $DEQP_PARALLEL"
+fi
+
run_cts() {
deqp=$1
caselist=$2
@@ -79,9 +87,10 @@ run_cts() {
--deqp $deqp \
--output $output \
--caselist $caselist \
- --exclude-list $ARTIFACTS/$DEQP_SKIPS \
+ --exclude-list $INSTALL/$DEQP_SKIPS \
+ --compact-display false \
$XFAIL \
- --job ${DEQP_PARALLEL:-1} \
+ $JOB \
--allow-flakes true \
$DEQP_RUNNER_OPTIONS \
-- \
@@ -130,7 +139,7 @@ extract_xml_result() {
if [ "$line" = "#endTestCaseResult" ]; then
echo $line >> $dst
echo "#endSession" >> $dst
- /deqp/executor/testlog-to-xml $dst "$RESULTS/$testcase.xml"
+ /deqp/executor/testlog-to-xml $dst "$RESULTS/$testcase$DEQP_RUN_SUFFIX.xml"
# copy the stylesheets here so they only end up in artifacts
# if we have one or more result xml in artifacts
cp /deqp/testlog.css "$RESULTS/"
@@ -178,6 +187,28 @@ generate_junit() {
echo ""
}
+parse_renderer() {
+ RENDERER=`grep -A1 TestCaseResult.\*info.renderer $RESULTS/deqp-info.qpa | grep '||g' | sed 's|||g'`
+ VERSION=`grep -A1 TestCaseResult.\*info.version $RESULTS/deqp-info.qpa | grep '||g' | sed 's|||g'`
+ echo "Renderer: $RENDERER"
+ echo "Version: $VERSION "
+
+ if ! echo $RENDERER | grep -q $DEQP_EXPECTED_RENDERER; then
+ echo "Expected GL_RENDERER $DEQP_EXPECTED_RENDERER"
+ exit 1
+ fi
+}
+
+check_renderer() {
+ echo "Capturing renderer info for driver sanity checks"
+ # If you're having trouble loading your driver, uncommenting this may help
+ # debug.
+ # export EGL_LOG_LEVEL=debug
+ VERSION=`echo $DEQP_VER | tr '[a-z]' '[A-Z]'`
+ $DEQP $DEQP_OPTIONS --deqp-case=dEQP-$VERSION.info.\* --deqp-log-filename=$RESULTS/deqp-info.qpa
+ parse_renderer
+}
+
# wrapper to supress +x to avoid spamming the log
quiet() {
set +x
@@ -185,56 +216,72 @@ quiet() {
set -x
}
-run_cts $DEQP /tmp/case-list.txt $RESULTS/cts-runner-results.txt
+if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
+ # deqp 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
+
+if [ $DEQP_VER != vk ]; then
+ quiet check_renderer
+fi
+
+RESULTSFILE=$RESULTS/cts-runner-results$DEQP_RUN_SUFFIX.txt
+UNEXPECTED_RESULTSFILE=$RESULTS/cts-runner-unexpected-results$DEQP_RUN_SUFFIX.txt
+FLAKESFILE=$RESULTS/cts-runner-flakes$DEQP_RUN_SUFFIX.txt
+
+run_cts $DEQP /tmp/case-list.txt $RESULTSFILE
DEQP_EXITCODE=$?
-quiet generate_junit $RESULTS/cts-runner-results.txt > $RESULTS/results.xml
+# junit is disabled, because it overloads gitlab.freedesktop.org to parse it.
+#quiet generate_junit $RESULTSFILE > $RESULTS/results.xml
if [ $DEQP_EXITCODE -ne 0 ]; then
# preserve caselist files in case of failures:
cp /tmp/deqp_runner.*.txt $RESULTS/
- cat $RESULTS/cts-runner-results.txt | \
- grep -v ",Pass" | \
- grep -v ",Skip" | \
- grep -v ",ExpectedFail" > \
- $RESULTS/cts-runner-unexpected-results.txt
+ egrep -v ",Pass|,Skip|,ExpectedFail" $RESULTSFILE > $UNEXPECTED_RESULTSFILE.txt
if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):"
- head -n 50 $RESULTS/cts-runner-unexpected-results.txt
+ head -n 50 $UNEXPECTED_RESULTSFILE.txt
# Save the logs for up to the first 50 unexpected results:
- head -n 50 $RESULTS/cts-runner-unexpected-results.txt | quiet extract_xml_results /tmp/*.qpa
+ head -n 50 $UNEXPECTED_RESULTSFILE.txt | quiet extract_xml_results /tmp/*.qpa
else
echo "Unexpected results found:"
- cat $RESULTS/cts-runner-unexpected-results.txt
+ cat $UNEXPECTED_RESULTSFILE.txt
fi
- count=`cat $RESULTS/cts-runner-unexpected-results.txt | wc -l`
+ count=`cat $UNEXPECTED_RESULTSFILE.txt | wc -l`
# Re-run fails to detect flakes. But use a small threshold, if
# something was fundamentally broken, we don't want to re-run
# the entire caselist
else
- cat $RESULTS/cts-runner-results.txt | \
- grep ",Flake" > \
- $RESULTS/cts-runner-flakes.txt
+ grep ",Flake" $RESULTSFILE > $FLAKESFILE
- count=`cat $RESULTS/cts-runner-flakes.txt | wc -l`
+ count=`cat $FLAKESFILE | wc -l`
if [ $count -gt 0 ]; then
echo "Some flakes found (see cts-runner-flakes.txt in artifacts for full results):"
- head -n 50 $RESULTS/cts-runner-flakes.txt
+ head -n 50 $FLAKESFILE
if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
# Save the logs for up to the first 50 flakes:
- head -n 50 $RESULTS/cts-runner-flakes.txt | quiet extract_xml_results /tmp/*.qpa
+ head -n 50 $FLAKESFILE | quiet extract_xml_results /tmp/*.qpa
fi
# Report the flakes to IRC channel for monitoring (if configured):
- quiet report_flakes $RESULTS/cts-runner-flakes.txt
+ quiet report_flakes $FLAKESFILE
else
# no flakes, so clean-up:
- rm $RESULTS/cts-runner-flakes.txt
+ rm $FLAKESFILE
fi
fi