libstdc++: Support timeout and timeout-factor options

libstdc++-v3/ChangeLog:

	* testsuite/experimental/simd/driver.sh: Abstract reading test
	options into read_src_option function. Read skip, only,
	expensive, and xfail via read_src_option. Add timeout and
	timeout-factor options and adjust timeout variable accordingly.
	* testsuite/experimental/simd/tests/loadstore.cc: Set
	timeout-factor 2.
This commit is contained in:
Matthias Kretz 2021-02-03 15:49:30 +00:00 committed by Jonathan Wakely
parent ec384c5690
commit 8f7ad98651
2 changed files with 27 additions and 12 deletions

View File

@ -214,35 +214,43 @@ trap "rm -f '$log' '$sum' $exe; exit" INT
rm -f "$log" "$sum"
touch "$log" "$sum"
skip="$(head -n25 "$src" | grep '^//\s*skip: ')"
if [ -n "$skip" ]; then
skip="$(echo "$skip" | sed -e 's/^.*:\s*//' -e 's/ \+/ /g')"
read_src_option() {
local key tmp var
key="$1"
var="$2"
[ -z "$var" ] && var="$1"
local tmp="$(head -n25 "$src" | grep "^//\\s*${key}: ")"
if [ -n "$tmp" ]; then
tmp="$(echo "${tmp#//*${key}: }" | sed -e 's/ \+/ /g' -e 's/^ //' -e 's/$//')"
eval "$var=\"$tmp\""
else
return 1
fi
}
if read_src_option skip; then
if test_selector "$skip"; then
# silently skip this test
exit 0
fi
fi
only="$(head -n25 "$src" | grep '^//\s*only: ')"
if [ -n "$only" ]; then
only="$(echo "$only" | sed -e 's/^.*:\s*//' -e 's/ \+/ /g')"
if read_src_option only; then
if ! test_selector "$only"; then
# silently skip this test
exit 0
fi
fi
if ! $run_expensive; then
expensive="$(head -n25 "$src" | grep '^//\s*expensive: ')"
if [ -n "$expensive" ]; then
expensive="$(echo "$expensive" | sed -e 's/^.*:\s*//' -e 's/ \+/ /g')"
if read_src_option expensive; then
if test_selector "$expensive"; then
unsupported "skip expensive tests"
exit 0
fi
fi
fi
xfail="$(head -n25 "$src" | grep '^//\s*xfail: ')"
if [ -n "$xfail" ]; then
xfail="$(echo "$xfail" | sed -e 's/^.*:\s*//' -e 's/ \+/ /g')"
if read_src_option xfail; then
if test_selector "${xfail#* }"; then
xfail="${xfail%% *}"
else
@ -250,6 +258,12 @@ if [ -n "$xfail" ]; then
fi
fi
read_src_option timeout
if read_src_option timeout-factor factor; then
timeout=$(awk "BEGIN { print int($timeout * $factor) }")
fi
log_output() {
if $verbose; then
maxcol=${1:-1024}

View File

@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// expensive: * [1-9] * *
// timeout-factor: 2
#include "bits/verify.h"
#include "bits/make_vec.h"
#include "bits/conversions.h"