variables:
UPSTREAM_REPO: mesa/mesa
DEBIAN_TAG: "amd64-2019-11-13-2"
- DEBIAN_TEST_TAG: "amd64-test-2019-11-12"
+ DEBIAN_TEST_TAG: "amd64-test-2019-11-12-2"
DEBIAN_ARM64_TAG: "arm64v8-2019-11-06"
- DEBIAN_ARM64_TEST_TAG: "arm64v8-test-2019-11-12"
+ DEBIAN_ARM64_TEST_TAG: "arm64v8-test-2019-11-12-2"
STRETCH_TAG: "2019-09-18"
DEBIAN_VERSION: buster-slim
STRETCH_VERSION: stretch-slim
- ./artifacts/deqp-runner.sh
test-llvmpipe-gles2:
- parallel: 4
variables:
DEQP_VER: gles2
+ DEQP_PARALLEL: 4
+ # Don't use threads inside llvmpipe, we've already got all 4 cores
+ # busy with DEQP_PARALLEL.
+ LP_NUM_THREADS: 0
DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
LIBGL_ALWAYS_SOFTWARE: "true"
- DEQP_RENDERER_MATCH: "llvmpipe"
extends: .deqp-test
test-softpipe-gles2:
extends: test-llvmpipe-gles2
variables:
DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
- DEQP_RENDERER_MATCH: "softpipe"
+ DEQP_SKIPS: deqp-softpipe-skips.txt
GALLIUM_DRIVER: "softpipe"
# The GLES2 CTS run takes about 8 minutes of CPU time, while GLES3 is
test-softpipe-gles3-limited:
variables:
DEQP_VER: gles3
+ DEQP_PARALLEL: 4
DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
LIBGL_ALWAYS_SOFTWARE: "true"
- DEQP_RENDERER_MATCH: "softpipe"
GALLIUM_DRIVER: "softpipe"
CI_NODE_INDEX: 1
CI_NODE_TOTAL: 10
image: $DEBIAN_ARM64_TEST_IMAGE
variables:
DEQP_VER: gles2
- DEQP_RENDERER_MATCH: "FD630"
DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
DEQP_SKIPS: deqp-freedreno-a630-skips.txt
NIR_VALIDATE: 0
variables:
DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
DEQP_SKIPS: deqp-default-skips.txt
- DEQP_RENDERER_MATCH: "FD307"
tags:
- db410c
DEQP_OPTIONS+=(--deqp-surface-type=pbuffer)
DEQP_OPTIONS+=(--deqp-gl-config-name=rgba8888d24s8ms0)
DEQP_OPTIONS+=(--deqp-visibility=hidden)
-DEQP_OPTIONS+=(--deqp-log-images=disable)
-DEQP_OPTIONS+=(--deqp-crashhandler=enable)
# 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
exit 1
fi
-# Prep the expected failure list
-if [ -n "$DEQP_EXPECTED_FAILS" ]; then
- export DEQP_EXPECTED_FAILS=`pwd`/artifacts/$DEQP_EXPECTED_FAILS
-else
- export DEQP_EXPECTED_FAILS=/tmp/expect-no-failures.txt
- touch $DEQP_EXPECTED_FAILS
-fi
-sort < $DEQP_EXPECTED_FAILS > /tmp/expected-fails.txt
-
-# Fix relative paths on inputs.
-export DEQP_SKIPS=`pwd`/artifacts/$DEQP_SKIPS
-
-# Be a good citizen on the shared runners.
-export LP_NUM_THREADS=4
+ARTIFACTS=`pwd`/artifacts
# Set up the driver environment.
export LD_LIBRARY_PATH=`pwd`/install/lib/
RESULTS=`pwd`/results
mkdir -p $RESULTS
-cd /deqp/modules/$DEQP_VER
-
# Generate test case list file
cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt
-# Note: not using sorted input and comm, becuase I want to run the tests in
-# the same order that dEQP would.
-while read -r line; do
- if echo "$line" | grep -q '^[^#]'; then
- sed -i "/$line/d" /tmp/case-list.txt
- fi
-done < $DEQP_SKIPS
-
# If the job is parallel, take the corresponding fraction of the caselist.
# Note: N~M is a gnu sed extension to match every nth line (first line is #1).
if [ -n "$CI_NODE_INDEX" ]; then
exit 1
fi
-# Cannot use tee because dash doesn't have pipefail
-touch /tmp/result.txt
-tail -f /tmp/result.txt &
-
-./deqp-$DEQP_VER "${DEQP_OPTIONS[@]}" --deqp-log-filename=$RESULTS/results.qpa --deqp-caselist-file=/tmp/case-list.txt >> /tmp/result.txt
-DEQP_EXITCODE=$?
-
-sed -ne \
- '/StatusCode="Fail"/{x;p}; s/#beginTestCaseResult //; T; h' \
- $RESULTS/results.qpa \
- > /tmp/unsorted-fails.txt
-
-# Scrape out the renderer that the test run used, so we can validate that the
-# right driver was used.
-if grep -q "dEQP-.*.info.renderer" /tmp/case-list.txt; then
- # This is an ugly dependency on the .qpa format: Print 3 lines after the
- # match, which happens to contain the result.
- RENDERER=`sed -n '/#beginTestCaseResult dEQP-.*.info.renderer/{n;n;n;p}' $RESULTS/results.qpa | sed -n -E "s|<Text>(.*)</Text>|\1|p"`
-
- echo "GL_RENDERER for this test run: $RENDERER"
-
- if [ -n "$DEQP_RENDERER_MATCH" ]; then
- echo $RENDERER | grep -q $DEQP_RENDERER_MATCH > /dev/null
- fi
+if [ -n "$DEQP_EXPECTED_FAILS" ]; then
+ XFAIL="--xfail-list $ARTIFACTS/$DEQP_EXPECTED_FAILS"
fi
-if grep -q "dEQP-.*.info.version" /tmp/case-list.txt; then
- # This is an ugly dependency on the .qpa format: Print 3 lines after the
- # match, which happens to contain the result.
- VERSION=`sed -n '/#beginTestCaseResult dEQP-.*.info.version/{n;n;n;p}' $RESULTS/results.qpa | sed -n -E "s|<Text>(.*)</Text>|\1|p"`
- echo "Driver version tested: $VERSION"
-fi
+set +e
+
+vulkan-cts-runner \
+ --deqp /deqp/modules/$DEQP_VER/deqp-$DEQP_VER \
+ --output $RESULTS/cts-runner-results.txt \
+ --caselist /tmp/case-list.txt \
+ --exclude-list $ARTIFACTS/$DEQP_SKIPS \
+ $XFAIL \
+ --job ${DEQP_PARALLEL:-1} \
+ -- \
+ "${DEQP_OPTIONS[@]}"
+DEQP_EXITCODE=$?
if [ $DEQP_EXITCODE -ne 0 ]; then
- exit $DEQP_EXITCODE
-fi
-
-sort < /tmp/unsorted-fails.txt > $RESULTS/fails.txt
-
-comm -23 $RESULTS/fails.txt /tmp/expected-fails.txt > /tmp/new-fails.txt
-if [ -s /tmp/new-fails.txt ]; then
- echo "Unexpected failures:"
- cat /tmp/new-fails.txt
- exit 1
-else
- echo "No new failures"
-fi
-
-sort /tmp/case-list.txt > /tmp/sorted-case-list.txt
-comm -12 /tmp/sorted-case-list.txt /tmp/expected-fails.txt > /tmp/expected-fails-in-caselist.txt
-comm -13 $RESULTS/fails.txt /tmp/expected-fails-in-caselist.txt > /tmp/new-passes.txt
-if [ -s /tmp/new-passes.txt ]; then
- echo "Unexpected passes, please update $DEQP_EXPECTED_FAILS (or add flaky tests to $DEQP_SKIPS):"
- cat /tmp/new-passes.txt
- exit 1
-else
- echo "No new passes"
+ echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):"
+ cat $RESULTS/cts-runner-results.txt | \
+ grep -v ",Pass" | \
+ grep -v ",Skip" | \
+ grep -v ",ExpectedFail" | \
+ head -n 50
+ exit $DEQP_EXITCODE
fi
projects / mesa.git / commitdiff