Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andrea Parri and committed by
Paul E. McKenney
37c600a3 46f52b1f

+8 -8
+1 -1
tools/memory-model/litmus-tests/README
··· 244 244 Adding the ".litmus" suffix: SB+rfionceonce-poonceonces.litmus 245 245 246 246 The descriptors that describe connections between consecutive accesses 247 - within the cycle through a given litmus test can be provided by the herd 247 + within the cycle through a given litmus test can be provided by the herd7 248 248 tool (Rfi, Po, Fre, and so on) or by the linux-kernel.bell file (Once, 249 249 Release, Acquire, and so on). 250 250
+1 -1
tools/memory-model/lock.cat
··· 11 11 include "cross.cat" 12 12 13 13 (* 14 - * The lock-related events generated by herd are as follows: 14 + * The lock-related events generated by herd7 are as follows: 15 15 * 16 16 * LKR Lock-Read: the read part of a spin_lock() or successful 17 17 * spin_trylock() read-modify-write event pair
+2 -2
tools/memory-model/scripts/README
··· 22 22 23 23 Run all litmus tests having .litmus.out files from previous 24 24 initlitmushist.sh or newlitmushist.sh runs, comparing the 25 - herd output to that of the original runs. 25 + herd7 output to that of the original runs. 26 26 27 27 checklitmus.sh 28 28 ··· 43 43 44 44 judgelitmus.sh 45 45 46 - Given a .litmus file and its .litmus.out herd output, check the 46 + Given a .litmus file and its .litmus.out herd7 output, check the 47 47 .litmus.out file against the .litmus file's "Result:" comment to 48 48 judge whether the test ran correctly. Not normally run manually, 49 49 provided instead for use by other scripts.
+1 -1
tools/memory-model/scripts/checkalllitmus.sh
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0+ 3 3 # 4 - # Run herd tests on all .litmus files in the litmus-tests directory 4 + # Run herd7 tests on all .litmus files in the litmus-tests directory 5 5 # and check each file's result against a "Result:" comment within that 6 6 # litmus test. If the verification result does not match that specified 7 7 # in the litmus test, this script prints an error message prefixed with
+1 -1
tools/memory-model/scripts/checklitmus.sh
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0+ 3 3 # 4 - # Run a herd test and invokes judgelitmus.sh to check the result against 4 + # Run a herd7 test and invokes judgelitmus.sh to check the result against 5 5 # a "Result:" comment within the litmus test. It also outputs verification 6 6 # results to a file whose name is that of the specified litmus test, but 7 7 # with ".out" appended.
+1 -1
tools/memory-model/scripts/parseargs.sh
··· 91 91 shift 92 92 ;; 93 93 --herdopts|--herdopt) 94 - checkarg --destdir "(herd options)" "$#" "$2" '.*' '^--' 94 + checkarg --destdir "(herd7 options)" "$#" "$2" '.*' '^--' 95 95 LKMM_HERD_OPTIONS="$2" 96 96 shift 97 97 ;;
+1 -1
tools/memory-model/scripts/runlitmushist.sh
··· 79 79 echo ' ---' Summary: 1>&2 80 80 grep '!!!' $T/*.sh.out 1>&2 81 81 nfail="`grep '!!!' $T/*.sh.out | wc -l`" 82 - echo 'Number of failed herd runs (e.g., timeout): ' $nfail 1>&2 82 + echo 'Number of failed herd7 runs (e.g., timeout): ' $nfail 1>&2 83 83 exit 1 84 84 else 85 85 echo All runs completed successfully. 1>&2