From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
mingo@kernel.org
Cc: stern@rowland.harvard.edu, andrea.parri@amarulasolutions.com,
will.deacon@arm.com, peterz@infradead.org, boqun.feng@gmail.com,
npiggin@gmail.com, dhowells@redhat.com, j.alglave@ucl.ac.uk,
luc.maranget@inria.fr, akiyks@gmail.com,
"Paul E. McKenney" <paulmck@linux.ibm.com>
Subject: [PATCH tip/core/rcu 06/21] tools/memory-model: Make cmplitmushist.sh note timeouts
Date: Tue, 26 Mar 2019 16:41:18 -0700 [thread overview]
Message-ID: <20190326234133.24962-6-paulmck@linux.ibm.com> (raw)
In-Reply-To: <20190326234114.GA23843@linux.ibm.com>
Currently, cmplitmushist.sh treats timeouts (as in the "--timeout"
argument) as "Missing Observation line". This can be misleading because
it is quite possible that running the test longer would have produced
a verification. This commit therefore changes cmplitmushist.sh to check
for timeouts and to report them with "Timed out".
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
---
tools/memory-model/scripts/cmplitmushist.sh | 22 +++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/tools/memory-model/scripts/cmplitmushist.sh b/tools/memory-model/scripts/cmplitmushist.sh
index 0f498aeeccf5..b9c174dd8004 100755
--- a/tools/memory-model/scripts/cmplitmushist.sh
+++ b/tools/memory-model/scripts/cmplitmushist.sh
@@ -12,12 +12,30 @@ trap 'rm -rf $T' 0
mkdir $T
# comparetest oldpath newpath
+timedout=0
perfect=0
obsline=0
noobsline=0
obsresult=0
badcompare=0
comparetest () {
+ if grep -q '^Command exited with non-zero status 124' $1 ||
+ grep -q '^Command exited with non-zero status 124' $2
+ then
+ if grep -q '^Command exited with non-zero status 124' $1 &&
+ grep -q '^Command exited with non-zero status 124' $2
+ then
+ echo Both runs timed out: $2
+ elif grep -q '^Command exited with non-zero status 124' $1
+ then
+ echo Old run timed out: $2
+ elif grep -q '^Command exited with non-zero status 124' $2
+ then
+ echo New run timed out: $2
+ fi
+ timedout=`expr "$timedout" + 1`
+ return 0
+ fi
grep -v 'maxresident)k\|minor)pagefaults\|^Time' $1 > $T/oldout
grep -v 'maxresident)k\|minor)pagefaults\|^Time' $2 > $T/newout
if cmp -s $T/oldout $T/newout && grep -q '^Observation' $1
@@ -78,6 +96,10 @@ if test "$obsresult" -ne 0
then
echo Matching Observation Always/Sometimes/Never result: $obsresult 1>&2
fi
+if test "$timedout" -ne 0
+then
+ echo "!!!" Timed out: $timedout 1>&2
+fi
if test "$badcompare" -ne 0
then
echo "!!!" Result changed: $badcompare 1>&2
--
2.17.1
next prev parent reply other threads:[~2019-03-26 23:41 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 23:41 [PATCH RFC memory-model 0/21] LKMM updates for review Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 01/21] tools/memory-model: Make scripts be executable Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH RFC memory-model 0/21] LKMM updates for review Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 02/21] tools/memory-model: Fix comment in MP+poonceonces.litmus Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 03/21] tools/memory-model: Do not use "herd" to refer to "herd7" Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 04/21] docs/memory-barriers.txt: Rewrite "KERNEL I/O BARRIER EFFECTS" section Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-04-02 13:03 ` Will Deacon
2019-04-02 13:03 ` Will Deacon
2019-04-04 15:58 ` Akira Yokosawa
2019-04-04 15:58 ` Akira Yokosawa
2019-04-04 16:40 ` Will Deacon
2019-04-04 16:40 ` Will Deacon
2019-04-04 22:23 ` Akira Yokosawa
2019-04-04 22:23 ` Akira Yokosawa
2019-03-26 23:41 ` [PATCH tip/core/rcu 05/21] tools/memory-model: Make judgelitmus.sh note timeouts Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney [this message]
2019-03-26 23:41 ` [PATCH tip/core/rcu 06/21] tools/memory-model: Make cmplitmushist.sh " Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 07/21] tools/memory-model: Make judgelitmus.sh identify bad macros Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 08/21] tools/memory-model: Add support for synchronize_srcu_expedited() Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-04-02 14:49 ` Andrea Parri
2019-04-02 14:49 ` Andrea Parri
2019-04-04 20:50 ` Paul E. McKenney
2019-04-04 20:50 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 09/21] tools/memory-model: Make judgelitmus.sh detect hard deadlocks Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 10/21] tools/memory-model: Update parseargs.sh for hardware verification Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 11/21] tools/memory-model: Make judgelitmus.sh handle hardware verifications Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 12/21] tools/memory-model: Add simpletest.sh to check locking, RCU, and SRCU Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 13/21] tools/memory-model: Fix checkalllitmus.sh comment Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 14/21] tools/memory-model: Hardware checking for check{,all}litmus.sh Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 15/21] tools/memory-model: Make judgelitmus.sh ransack .litmus.out files Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 16/21] tools/memory-model: Split runlitmus.sh out of checklitmus.sh Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 17/21] tools/memory-model: Make runlitmus.sh generate .litmus.out for --hw Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 18/21] tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 19/21] tools/memory-model: Keep assembly-language litmus tests Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 20/21] tools/memory-model: Allow herd to deduce CPU type Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 21/21] tools/memory-model: Make runlitmus.sh check for jingle errors Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190326234133.24962-6-paulmck@linux.ibm.com \
--to=paulmck@linux.ibm.com \
--cc=akiyks@gmail.com \
--cc=andrea.parri@amarulasolutions.com \
--cc=boqun.feng@gmail.com \
--cc=dhowells@redhat.com \
--cc=j.alglave@ucl.ac.uk \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luc.maranget@inria.fr \
--cc=mingo@kernel.org \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=stern@rowland.harvard.edu \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).