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

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>

diff --git a/tools/memory-model/litmus-tests/README b/tools/memory-model/litmus-tests/README
index 5ee08f129094e8498af2c0f1cee8c8b79d643efb..681f9067fa9edeae3e438eeb94438d8eb868aad3 100644 (file)
--- a/tools/memory-model/litmus-tests/README
+++ b/tools/memory-model/litmus-tests/README
@@ -244,7 +244,7 @@ produce the name:
 Adding the ".litmus" suffix: SB+rfionceonce-poonceonces.litmus
 
 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,
 Release, Acquire, and so on).
 

diff --git a/tools/memory-model/lock.cat b/tools/memory-model/lock.cat
index a059d1a6d8a296abed33d50e919c7b92bb67091a..6b52f365d73ac4ab99fe1270871f308a51ad2d76 100644 (file)
--- a/tools/memory-model/lock.cat
+++ b/tools/memory-model/lock.cat
@@ -11,7 +11,7 @@
 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
  *                     spin_trylock() read-modify-write event pair

diff --git a/tools/memory-model/scripts/README b/tools/memory-model/scripts/README
index 29375a1fbbfa1b82ba9ca6388bd0ca05a404d681..095c7eb36f9f90a38c2acf50a49ec276fa02f097 100644 (file)
--- a/tools/memory-model/scripts/README
+++ b/tools/memory-model/scripts/README
@@ -22,7 +22,7 @@ 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.
+       herd7 output to that of the original runs.
 
 checklitmus.sh
 
@@ -43,7 +43,7 @@ initlitmushist.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
        judge whether the test ran correctly.  Not normally run manually,
        provided instead for use by other scripts.

diff --git a/tools/memory-model/scripts/checkalllitmus.sh b/tools/memory-model/scripts/checkalllitmus.sh
index b35fcd61ecf6d0aede97cdd3da70cac06058b1f1..3c0c7fbbd223b77d173a070d167553edd350daec 100755 (executable)
--- a/tools/memory-model/scripts/checkalllitmus.sh
+++ b/tools/memory-model/scripts/checkalllitmus.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # 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
 # litmus test.  If the verification result does not match that specified
 # in the litmus test, this script prints an error message prefixed with

diff --git a/tools/memory-model/scripts/checklitmus.sh b/tools/memory-model/scripts/checklitmus.sh
index dd08801a30b0511b029cadb7bfdbe99a6089f78c..11461ed40b5e456be0145e45d2ef4464895fed15 100755 (executable)
--- a/tools/memory-model/scripts/checklitmus.sh
+++ b/tools/memory-model/scripts/checklitmus.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # 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
 # results to a file whose name is that of the specified litmus test, but
 # with ".out" appended.

diff --git a/tools/memory-model/scripts/parseargs.sh b/tools/memory-model/scripts/parseargs.sh
index 859e1d581e0511ff01fd1a5f6170a80d02c5fbbd..40f52080fdbd6eb9d82bc3f3bb647fe1da46ffb8 100644 (file)
--- a/tools/memory-model/scripts/parseargs.sh
+++ b/tools/memory-model/scripts/parseargs.sh
@@ -91,7 +91,7 @@ do
                shift
                ;;
        --herdopts|--herdopt)
-               checkarg --destdir "(herd options)" "$#" "$2" '.*' '^--'
+               checkarg --destdir "(herd7 options)" "$#" "$2" '.*' '^--'
                LKMM_HERD_OPTIONS="$2"
                shift
                ;;

diff --git a/tools/memory-model/scripts/runlitmushist.sh b/tools/memory-model/scripts/runlitmushist.sh
index e507f5f933d5315eefc6689ab37843d2400803df..6ed376f495bb4eadc72504c66ba5f1ac9a2f9c2f 100644 (file)
--- a/tools/memory-model/scripts/runlitmushist.sh
+++ b/tools/memory-model/scripts/runlitmushist.sh
@@ -79,7 +79,7 @@ then
        echo ' ---' Summary: 1>&2
        grep '!!!' $T/*.sh.out 1>&2
        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
 else
        echo All runs completed successfully. 1>&2