android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/memory-model: Do not use "herd" to refer to "herd7"

Browse Source 
Use "herd7" in each such reference.

Signed-off-by: Andrea Parri <andrea.parri@amarulasolutions.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Jade Alglave <j.alglave@ucl.ac.uk>
Cc: Luc Maranget <luc.maranget@inria.fr>
Cc: "Paul E. McKenney" <paulmck@linux.ibm.com>
Cc: Akira Yokosawa <akiyks@gmail.com>
Cc: Daniel Lustig <dlustig@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
This commit is contained in:
Andrea Parri 2019-02-19 23:55:23 +01:00 committed by Paul E. McKenney
parent 46f52b1fe7
commit 37c600a3cc
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/memory-model/litmus-tests/README
View File

@ -244,7 +244,7 @@ produce the name:
Adding the ".litmus" suffix: SB+rfionceonce-poonceonces.litmus Adding the ".litmus" suffix: SB+rfionceonce-poonceonces.litmus
The descriptors that describe connections between consecutive accesses The descriptors that describe connections between consecutive accesses
within the cycle through a given litmus test can be provided by the herd within the cycle through a given litmus test can be provided by the herd7
tool (Rfi, Po, Fre, and so on) or by the linux-kernel.bell file (Once, tool (Rfi, Po, Fre, and so on) or by the linux-kernel.bell file (Once,
Release, Acquire, and so on). Release, Acquire, and so on).

2
tools/memory-model/lock.cat
View File

@ -11,7 +11,7 @@
include "cross.cat" include "cross.cat"
(* (*
* The lock-related events generated by herd are as follows: * The lock-related events generated by herd7 are as follows:
* *
* LKR Lock-Read: the read part of a spin_lock() or successful * LKR Lock-Read: the read part of a spin_lock() or successful
* spin_trylock() read-modify-write event pair * spin_trylock() read-modify-write event pair

4
tools/memory-model/scripts/README
View File

@ -22,7 +22,7 @@ checklitmushist.sh
Run all litmus tests having .litmus.out files from previous Run all litmus tests having .litmus.out files from previous
initlitmushist.sh or newlitmushist.sh runs, comparing the initlitmushist.sh or newlitmushist.sh runs, comparing the
herd output to that of the original runs. herd7 output to that of the original runs.
checklitmus.sh checklitmus.sh
@ -43,7 +43,7 @@ initlitmushist.sh
judgelitmus.sh judgelitmus.sh
Given a .litmus file and its .litmus.out herd output, check the Given a .litmus file and its .litmus.out herd7 output, check the
.litmus.out file against the .litmus file's "Result:" comment to .litmus.out file against the .litmus file's "Result:" comment to
judge whether the test ran correctly. Not normally run manually, judge whether the test ran correctly. Not normally run manually,
provided instead for use by other scripts. provided instead for use by other scripts.

2
tools/memory-model/scripts/checkalllitmus.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# Run herd tests on all .litmus files in the litmus-tests directory # Run herd7 tests on all .litmus files in the litmus-tests directory
# and check each file's result against a "Result:" comment within that # and check each file's result against a "Result:" comment within that
# litmus test. If the verification result does not match that specified # litmus test. If the verification result does not match that specified
# in the litmus test, this script prints an error message prefixed with # in the litmus test, this script prints an error message prefixed with

2
tools/memory-model/scripts/checklitmus.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# Run a herd test and invokes judgelitmus.sh to check the result against # Run a herd7 test and invokes judgelitmus.sh to check the result against
# a "Result:" comment within the litmus test. It also outputs verification # a "Result:" comment within the litmus test. It also outputs verification
# results to a file whose name is that of the specified litmus test, but # results to a file whose name is that of the specified litmus test, but
# with ".out" appended. # with ".out" appended.

2
tools/memory-model/scripts/parseargs.sh
View File

@ -91,7 +91,7 @@ do
shift shift
;; ;;
--herdopts|--herdopt) --herdopts|--herdopt)
checkarg --destdir "(herd options)" "$#" "$2" '.*' '^--' checkarg --destdir "(herd7 options)" "$#" "$2" '.*' '^--'
LKMM_HERD_OPTIONS="$2" LKMM_HERD_OPTIONS="$2"
shift shift
;; ;;

2
tools/memory-model/scripts/runlitmushist.sh
View File

@ -79,7 +79,7 @@ then
echo ' ---' Summary: 1>&2 echo ' ---' Summary: 1>&2
grep '!!!' $T/*.sh.out 1>&2 grep '!!!' $T/*.sh.out 1>&2
nfail="`grep '!!!' $T/*.sh.out | wc -l`" nfail="`grep '!!!' $T/*.sh.out | wc -l`"
echo 'Number of failed herd runs (e.g., timeout): ' $nfail 1>&2 echo 'Number of failed herd7 runs (e.g., timeout): ' $nfail 1>&2
exit 1 exit 1
else else
echo All runs completed successfully. 1>&2 echo All runs completed successfully. 1>&2