tools/memory-model: Add scripts to check github litmus tests
The https://github.com/paulmckrcu/litmus repository contains a large
number of C-language litmus tests that include "Result:" comments
predicting the verification result. This commit adds a number of scripts
that run tests on these litmus tests:
checkghlitmus.sh:
Runs all litmus tests in the https://github.com/paulmckrcu/litmus
archive that are C-language and that have "Result:" comment lines
documenting expected results, comparing the actual results to
those expected. Clones the repository if it has not already
been cloned into the "tools/memory-model/litmus" directory.
initlitmushist.sh
Run all litmus tests having no more than the specified number
of processes given a specified timeout, recording the results in
.litmus.out files. Clones the repository if it has not already
been cloned into the "tools/memory-model/litmus" directory.
newlitmushist.sh
For all new or updated litmus tests having no more than the
specified number of processes given a specified timeout, run
and record the results in .litmus.out files.
checklitmushist.sh
Run all litmus tests having .litmus.out files from previous
initlitmushist.sh or newlitmushist.sh runs, comparing the
herd output to that of the original runs.
The above scripts will run litmus tests concurrently, by default with
one job per available CPU. Giving any of these scripts the --help
argument will cause them to print usage information.
This commit also adds a number of helper scripts that are not intended
to be invoked from the command line:
cmplitmushist.sh: Compare the output of two different runs of the same
litmus test.
judgelitmus.sh: Compare the output of a litmus test to its "Result:"
comment line.
parseargs.sh: Parse command-line arguments.
runlitmushist.sh: Run the litmus tests whose pathnames are provided one
per line on standard input.
While in the area, this commit also makes the existing checklitmus.sh
and checkalllitmus.sh scripts use parseargs.sh in order to provide a
bit of uniformity. In addition, per-litmus-test status output is directed
to stdout, while end-of-test summary information is directed to stderr.
Finally, the error flag standardizes on "!!!" to assist those familiar
with rcutorture output.
The defaults for the parseargs.sh arguments may be overridden by using
environment variables: LKMM_DESTDIR for --destdir, LKMM_HERD_OPTIONS
for --herdoptions, LKMM_JOBS for --jobs, LKMM_PROCS for --procs, and
LKMM_TIMEOUT for --timeout.
[ paulmck: History-check summary-line changes per Alan Stern feedback. ]
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akiyks@gmail.com
Cc: boqun.feng@gmail.com
Cc: dhowells@redhat.com
Cc: j.alglave@ucl.ac.uk
Cc: linux-arch@vger.kernel.org
Cc: luc.maranget@inria.fr
Cc: npiggin@gmail.com
Cc: parri.andrea@gmail.com
Cc: stern@rowland.harvard.edu
Cc: will.deacon@arm.com
Link: http://lkml.kernel.org/r/20181203230451.28921-2-paulmck@linux.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-12-03 23:04:50 +00:00
|
|
|
#!/bin/bash
|
|
|
|
# SPDX-License-Identifier: GPL-2.0+
|
|
|
|
#
|
|
|
|
# Runs the C-language litmus tests specified on standard input, using up
|
|
|
|
# to the specified number of CPUs (defaulting to all of them) and placing
|
|
|
|
# the results in the specified directory (defaulting to the same place
|
|
|
|
# the litmus test came from).
|
|
|
|
#
|
|
|
|
# sh runlitmushist.sh
|
|
|
|
#
|
|
|
|
# Run from the Linux kernel tools/memory-model directory.
|
|
|
|
# This script uses environment variables produced by parseargs.sh.
|
|
|
|
#
|
|
|
|
# Copyright IBM Corporation, 2018
|
|
|
|
#
|
|
|
|
# Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
|
|
|
|
|
|
|
|
T=/tmp/runlitmushist.sh.$$
|
|
|
|
trap 'rm -rf $T' 0
|
|
|
|
mkdir $T
|
|
|
|
|
|
|
|
if test -d litmus
|
|
|
|
then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
echo Directory \"litmus\" missing, aborting run.
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Prefixes for per-CPU scripts
|
|
|
|
for ((i=0;i<$LKMM_JOBS;i++))
|
|
|
|
do
|
|
|
|
echo dir="$LKMM_DESTDIR" > $T/$i.sh
|
|
|
|
echo T=$T >> $T/$i.sh
|
|
|
|
echo herdoptions=\"$LKMM_HERD_OPTIONS\" >> $T/$i.sh
|
|
|
|
cat << '___EOF___' >> $T/$i.sh
|
|
|
|
runtest () {
|
|
|
|
echo ' ... ' /usr/bin/time $LKMM_TIMEOUT_CMD herd7 $herdoptions $1 '>' $dir/$1.out '2>&1'
|
|
|
|
if /usr/bin/time $LKMM_TIMEOUT_CMD herd7 $herdoptions $1 > $dir/$1.out 2>&1
|
|
|
|
then
|
|
|
|
if ! grep -q '^Observation ' $dir/$1.out
|
|
|
|
then
|
|
|
|
echo ' !!! Herd failed, no Observation:' $1
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
exitcode=$?
|
|
|
|
if test "$exitcode" -eq 124
|
|
|
|
then
|
|
|
|
exitmsg="timed out"
|
|
|
|
else
|
|
|
|
exitmsg="failed, exit code $exitcode"
|
|
|
|
fi
|
|
|
|
echo ' !!! Herd' ${exitmsg}: $1
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
___EOF___
|
|
|
|
done
|
|
|
|
|
|
|
|
awk -v q="'" -v b='\\' '
|
|
|
|
{
|
|
|
|
print "echo `grep " q "^P[0-9]" b "+(" q " " $0 " | tail -1 | sed -e " q "s/^P" b "([0-9]" b "+" b ")(.*$/" b "1/" q "` " $0
|
|
|
|
}' | bash |
|
|
|
|
sort -k1n |
|
|
|
|
awk -v ncpu=$LKMM_JOBS -v t=$T '
|
|
|
|
{
|
|
|
|
print "runtest " $2 >> t "/" NR % ncpu ".sh";
|
|
|
|
}
|
|
|
|
|
|
|
|
END {
|
|
|
|
for (i = 0; i < ncpu; i++) {
|
|
|
|
print "sh " t "/" i ".sh > " t "/" i ".sh.out 2>&1 &";
|
|
|
|
close(t "/" i ".sh");
|
|
|
|
}
|
|
|
|
print "wait";
|
|
|
|
}' | sh
|
|
|
|
cat $T/*.sh.out
|
|
|
|
if grep -q '!!!' $T/*.sh.out
|
|
|
|
then
|
|
|
|
echo ' ---' Summary: 1>&2
|
|
|
|
grep '!!!' $T/*.sh.out 1>&2
|
|
|
|
nfail="`grep '!!!' $T/*.sh.out | wc -l`"
|
2019-02-19 22:55:23 +00:00
|
|
|
echo 'Number of failed herd7 runs (e.g., timeout): ' $nfail 1>&2
|
tools/memory-model: Add scripts to check github litmus tests
The https://github.com/paulmckrcu/litmus repository contains a large
number of C-language litmus tests that include "Result:" comments
predicting the verification result. This commit adds a number of scripts
that run tests on these litmus tests:
checkghlitmus.sh:
Runs all litmus tests in the https://github.com/paulmckrcu/litmus
archive that are C-language and that have "Result:" comment lines
documenting expected results, comparing the actual results to
those expected. Clones the repository if it has not already
been cloned into the "tools/memory-model/litmus" directory.
initlitmushist.sh
Run all litmus tests having no more than the specified number
of processes given a specified timeout, recording the results in
.litmus.out files. Clones the repository if it has not already
been cloned into the "tools/memory-model/litmus" directory.
newlitmushist.sh
For all new or updated litmus tests having no more than the
specified number of processes given a specified timeout, run
and record the results in .litmus.out files.
checklitmushist.sh
Run all litmus tests having .litmus.out files from previous
initlitmushist.sh or newlitmushist.sh runs, comparing the
herd output to that of the original runs.
The above scripts will run litmus tests concurrently, by default with
one job per available CPU. Giving any of these scripts the --help
argument will cause them to print usage information.
This commit also adds a number of helper scripts that are not intended
to be invoked from the command line:
cmplitmushist.sh: Compare the output of two different runs of the same
litmus test.
judgelitmus.sh: Compare the output of a litmus test to its "Result:"
comment line.
parseargs.sh: Parse command-line arguments.
runlitmushist.sh: Run the litmus tests whose pathnames are provided one
per line on standard input.
While in the area, this commit also makes the existing checklitmus.sh
and checkalllitmus.sh scripts use parseargs.sh in order to provide a
bit of uniformity. In addition, per-litmus-test status output is directed
to stdout, while end-of-test summary information is directed to stderr.
Finally, the error flag standardizes on "!!!" to assist those familiar
with rcutorture output.
The defaults for the parseargs.sh arguments may be overridden by using
environment variables: LKMM_DESTDIR for --destdir, LKMM_HERD_OPTIONS
for --herdoptions, LKMM_JOBS for --jobs, LKMM_PROCS for --procs, and
LKMM_TIMEOUT for --timeout.
[ paulmck: History-check summary-line changes per Alan Stern feedback. ]
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akiyks@gmail.com
Cc: boqun.feng@gmail.com
Cc: dhowells@redhat.com
Cc: j.alglave@ucl.ac.uk
Cc: linux-arch@vger.kernel.org
Cc: luc.maranget@inria.fr
Cc: npiggin@gmail.com
Cc: parri.andrea@gmail.com
Cc: stern@rowland.harvard.edu
Cc: will.deacon@arm.com
Link: http://lkml.kernel.org/r/20181203230451.28921-2-paulmck@linux.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-12-03 23:04:50 +00:00
|
|
|
exit 1
|
|
|
|
else
|
|
|
|
echo All runs completed successfully. 1>&2
|
|
|
|
exit 0
|
|
|
|
fi
|