public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-7079] libstdc++: Support timeout and timeout-factor options
@ 2021-02-03 15:51 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2021-02-03 15:51 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:8f7ad986515580265f4315a6036ef3b49eb6be47
commit r11-7079-g8f7ad986515580265f4315a6036ef3b49eb6be47
Author: Matthias Kretz <kretz@kde.org>
Date: Wed Feb 3 15:49:30 2021 +0000
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.
Diff:
---
libstdc++-v3/testsuite/experimental/simd/driver.sh | 38 +++++++++++++++-------
.../testsuite/experimental/simd/tests/loadstore.cc | 1 +
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/libstdc++-v3/testsuite/experimental/simd/driver.sh b/libstdc++-v3/testsuite/experimental/simd/driver.sh
index 719e4db8e68..f2d31c70bd0 100755
--- a/libstdc++-v3/testsuite/experimental/simd/driver.sh
+++ b/libstdc++-v3/testsuite/experimental/simd/driver.sh
@@ -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}
diff --git a/libstdc++-v3/testsuite/experimental/simd/tests/loadstore.cc b/libstdc++-v3/testsuite/experimental/simd/tests/loadstore.cc
index 2c328368e44..451d3b8c2a5 100644
--- a/libstdc++-v3/testsuite/experimental/simd/tests/loadstore.cc
+++ b/libstdc++-v3/testsuite/experimental/simd/tests/loadstore.cc
@@ -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"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-03 15:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-03 15:51 [gcc r11-7079] libstdc++: Support timeout and timeout-factor options Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).