X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci%2Fdeqp-runner.sh;h=2c36a303db2d27d4dc0ce7b726639ca3f9476419;hb=bfee35b45cc9fdf84ac7a613cf180d3c681cbb46;hp=0a32207ba4a8483a172fc8ba09257024a99c6d81;hpb=ff1183648a69f8d082a3fa0b067ccc66b5a78c23;p=mesa.git diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 0a32207ba4a..2c36a303db2 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -2,17 +2,15 @@ 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" -# It would be nice to be able to enable the watchdog, so that hangs in a test -# don't need to wait the full hour for the run to time out. However, some -# shaders end up taking long enough to compile -# (dEQP-GLES31.functional.ubo.random.all_per_block_buffers.20 for example) -# that they'll sporadically trigger the watchdog. -#DEQP_OPTIONS="$DEQP_OPTIONS --deqp-watchdog=enable" +# deqp's shader cache (for vulkan) is not multiprocess safe for a common +# filename, see: +# https://gitlab.freedesktop.org/mesa/parallel-deqp-runner/-/merge_requests/13 +DEQP_OPTIONS="$DEQP_OPTIONS --deqp-shadercache=disable" if [ -z "$DEQP_VER" ]; then echo 'DEQP_VER must be set to something like "gles2", "gles31" or "vk" for the test run' @@ -31,12 +29,12 @@ 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/ export EGL_PLATFORM=surfaceless -export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.x86_64.json +export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.`uname -m`.json # the runner was failing to look for libkms in /usr/local/lib for some reason # I never figured out. @@ -49,9 +47,14 @@ mkdir -p $RESULTS if [ "$DEQP_VER" = "vk" ]; then cp /deqp/mustpass/vk-master.txt /tmp/case-list.txt DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk -else +elif [ "$DEQP_VER" = "gles2" -o "$DEQP_VER" = "gles3" -o "$DEQP_VER" = "gles31" ]; then cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER + SUITE=dEQP +else + cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt + DEQP=/deqp/external/openglcts/modules/glcts + SUITE=KHR fi # If the job is parallel, take the corresponding fraction of the caselist. @@ -60,17 +63,29 @@ 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 -ni "/$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" +elif [ -n "$FDO_CI_CONCURRENT" ]; then + JOB="--job $FDO_CI_CONCURRENT" +else + JOB="--job 4" +fi + run_cts() { deqp=$1 caselist=$2 @@ -79,9 +94,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 \ -- \ @@ -93,7 +109,16 @@ report_flakes() { return 0 fi flakes=$1 - bot="$CI_RUNNER_DESCRIPTION-$CI_PIPELINE_ID" + # The nick needs to be something unique so that multiple runners + # connecting at the same time don't race for one nick and get blocked. + # freenode has a 16-char limit on nicks (9 is the IETF standard, but + # various servers extend that). So, trim off the common prefixes of the + # runner name, and append the job ID so that software runners with more + # than one concurrent job (think swrast) don't collide. For freedreno, + # that gives us a nick as long as db410c-N-JJJJJJJJ, and it'll be a while + # before we make it to 9-digit jobs (we're at 7 so far). + runner=`echo $CI_RUNNER_DESCRIPTION | sed 's|mesa-||' | sed 's|google-freedreno-||g'` + bot="$runner-$CI_JOB_ID" channel="$FLAKES_CHANNEL" ( echo NICK $bot @@ -102,8 +127,10 @@ report_flakes() { echo "JOIN $channel" sleep 1 desc="Flakes detected in job: $CI_JOB_URL on $CI_RUNNER_DESCRIPTION" - if [ -n "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then + if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then desc="$desc on branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_MERGE_REQUEST_TITLE)" + elif [ -n "$CI_COMMIT_BRANCH" ]; then + desc="$desc on branch $CI_COMMIT_BRANCH ($CI_COMMIT_TITLE)" fi echo "PRIVMSG $channel :$desc" for flake in `cat $flakes`; do @@ -120,29 +147,35 @@ extract_xml_result() { shift 1 qpas=$* start="#beginTestCaseResult $testcase" - for qpa in $qpas; do + + # Pick the first QPA mentioning our testcase + qpa=`grep -l "$start" $qpas | head -n 1` + + # If we found one, go extract just that testcase's contents from the QPA + # to a new QPA, then do testlog-to-xml on that. + if [ -n "$qpa" ]; then while IFS= read -r line; do if [ "$line" = "$start" ]; then dst="$testcase.qpa" echo "#beginSession" > $dst - echo $line >> $dst + echo "$line" >> $dst while IFS= read -r line; do if [ "$line" = "#endTestCaseResult" ]; then - echo $line >> $dst + 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/" cp /deqp/testlog.xsl "$RESULTS/" return 0 fi - echo $line >> $dst + echo "$line" >> $dst done return 1 fi done < $qpa - done + fi } extract_xml_results() { @@ -183,17 +216,34 @@ parse_renderer() { 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" + echo "Capturing renderer info for GLES driver sanity checks" # If you're having trouble loading your driver, uncommenting this may help # debug. # export EGL_LOG_LEVEL=debug - $DEQP $DEQP_OPTIONS --deqp-case=dEQP-GLES2.info.\* --deqp-log-filename=$RESULTS/deqp-info.qpa + VERSION=`echo $DEQP_VER | tr '[a-z]' '[A-Z]'` + $DEQP $DEQP_OPTIONS --deqp-case=$SUITE-$VERSION.info.\* --deqp-log-filename=$RESULTS/deqp-info.qpa parse_renderer } +check_vk_device_name() { + echo "Capturing device info for VK driver sanity checks" + $DEQP $DEQP_OPTIONS --deqp-case=dEQP-VK.info.device --deqp-log-filename=$RESULTS/deqp-info.qpa + DEVICENAME=`grep deviceName $RESULTS/deqp-info.qpa | sed 's|deviceName: ||g'` + echo "deviceName: $DEVICENAME" + if [ -n "$DEQP_EXPECTED_RENDERER" -a $DEVICENAME != "$DEQP_EXPECTED_RENDERER" ]; then + echo "Expected deviceName $DEQP_EXPECTED_RENDERER" + exit 1 + fi +} + # wrapper to supress +x to avoid spamming the log quiet() { set +x @@ -201,61 +251,80 @@ quiet() { set -x } -if [ $DEQP_VER != vk ]; then +if [ "$GALLIUM_DRIVER" = "virpipe" ]; then + # deqp is to use virpipe, and virgl_test_server llvmpipe + export GALLIUM_DRIVER="$GALLIUM_DRIVER" + + VTEST_ARGS="--use-egl-surfaceless" + if [ "$VIRGL_HOST_API" = "GLES" ]; then + VTEST_ARGS="$VTEST_ARGS --use-gles" + fi + + GALLIUM_DRIVER=llvmpipe \ + GALLIVM_PERF="nopt,no_filter_hacks" \ + virgl_test_server $VTEST_ARGS >$RESULTS/vtest-log.txt 2>&1 & + + sleep 1 +fi + +if [ $DEQP_VER = vk ]; then + quiet check_vk_device_name +else quiet check_renderer fi -run_cts $DEQP /tmp/case-list.txt $RESULTS/cts-runner-results.txt +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=$? +echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)" +echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)" + # junit is disabled, because it overloads gitlab.freedesktop.org to parse it. -#quiet generate_junit $RESULTS/cts-runner-results.txt > $RESULTS/results.xml +#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 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 # 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 | quiet extract_xml_results /tmp/*.qpa else echo "Unexpected results found:" - cat $RESULTS/cts-runner-unexpected-results.txt + cat $UNEXPECTED_RESULTSFILE fi - count=`cat $RESULTS/cts-runner-unexpected-results.txt | wc -l` + count=`cat $UNEXPECTED_RESULTSFILE | 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