mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 RFC memory-model 29/33] tools/memory-model: Make history-check scripts use mselect7
Date: Thu, 30 May 2019 07:42:21 -0700	[thread overview]
Message-ID: <20190530144225.27624-29-paulmck@linux.ibm.com> (raw)
In-Reply-To: <20190530144202.GA26201@linux.ibm.com>

The history-check scripts currently use grep to ignore non-C-language
litmus tests, which is a bit fragile.  This commit therefore enlists the
aid of "mselect7 -arch C", given Luc Maraget's recent modifications that
allow mselect7 to operate in filter mode.

This change requires herdtools 7.52-32-g1da3e0e50977 or later.

Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
---
 tools/memory-model/scripts/initlitmushist.sh | 2 +-
 tools/memory-model/scripts/newlitmushist.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/memory-model/scripts/initlitmushist.sh b/tools/memory-model/scripts/initlitmushist.sh
index 956b6957484d..31ea782955d3 100755
--- a/tools/memory-model/scripts/initlitmushist.sh
+++ b/tools/memory-model/scripts/initlitmushist.sh
@@ -60,7 +60,7 @@ fi
 
 # Create a list of the C-language litmus tests with no more than the
 # specified number of processes (per the --procs argument).
-find litmus -name '*.litmus' -exec grep -l -m 1 "^C " {} \; > $T/list-C
+find litmus -name '*.litmus' -print | mselect7 -arch C > $T/list-C
 xargs < $T/list-C -r grep -L "^P${LKMM_PROCS}" > $T/list-C-short
 
 scripts/runlitmushist.sh < $T/list-C-short
diff --git a/tools/memory-model/scripts/newlitmushist.sh b/tools/memory-model/scripts/newlitmushist.sh
index 3f4b06e29988..25235e2049cf 100755
--- a/tools/memory-model/scripts/newlitmushist.sh
+++ b/tools/memory-model/scripts/newlitmushist.sh
@@ -43,7 +43,7 @@ fi
 
 # Form full list of litmus tests with no more than the specified
 # number of processes (per the --procs argument).
-find litmus -name '*.litmus' -exec grep -l -m 1 "^C " {} \; > $T/list-C-all
+find litmus -name '*.litmus' -print | mselect7 -arch C > $T/list-C-all
 xargs < $T/list-C-all -r grep -L "^P${LKMM_PROCS}" > $T/list-C-short
 
 # Form list of new tests.  Note: This does not handle litmus-test deletion!
-- 
2.17.1


  parent reply	other threads:[~2019-05-30 14:43 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-30 14:42 [PATCH RFC memory-model 0/33] LKMM updates for review Paul E. McKenney
2019-05-30 14:41 ` [PATCH RFC memory-model 01/33] tools/memory-model: Prepare for data-race detection Paul E. McKenney
2019-05-30 14:41 ` [PATCH RFC memory-model 02/33] tools/memory-model: Add definitions of plain and marked accesses Paul E. McKenney
2019-05-30 14:41 ` [PATCH RFC memory-model 03/33] tools/memory-model: Add data-race detection Paul E. McKenney
2019-05-30 14:41 ` [PATCH RFC memory-model 04/33] tools/memory-model: Make scripts be executable Paul E. McKenney
2019-05-30 14:41 ` [PATCH RFC memory-model 05/33] Documentation: atomic_t.txt: Explain ordering provided by smp_mb__{before,after}_atomic() Paul E. McKenney
2019-05-30 14:41 ` [PATCH RFC memory-model 06/33] tools/memory-model: Fix comment in MP+poonceonces.litmus Paul E. McKenney
2019-05-30 14:41 ` [PATCH RFC memory-model 07/33] tools/memory-model: Do not use "herd" to refer to "herd7" Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 08/33] tools/memory-model: Make judgelitmus.sh note timeouts Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 09/33] tools/memory-model: Make cmplitmushist.sh " Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 10/33] tools/memory-model: Make judgelitmus.sh identify bad macros Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 11/33] tools/memory-model: Make judgelitmus.sh detect hard deadlocks Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 12/33] tools/memory-model: Fix paulmck email address on pre-existing scripts Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 13/33] tools/memory-model: Update parseargs.sh for hardware verification Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 14/33] tools/memory-model: Make judgelitmus.sh handle hardware verifications Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 15/33] tools/memory-model: Add simpletest.sh to check locking, RCU, and SRCU Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 16/33] tools/memory-model: Fix checkalllitmus.sh comment Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 17/33] tools/memory-model: Hardware checking for check{,all}litmus.sh Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 18/33] tools/memory-model: Make judgelitmus.sh ransack .litmus.out files Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 19/33] tools/memory-model: Split runlitmus.sh out of checklitmus.sh Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 20/33] tools/memory-model: Make runlitmus.sh generate .litmus.out for --hw Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 21/33] tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 22/33] tools/memory-model: Keep assembly-language litmus tests Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 23/33] tools/memory-model: Allow herd to deduce CPU type Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 24/33] tools/memory-model: Make runlitmus.sh check for jingle errors Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 25/33] tools/memory-model: Add -v flag to jingle7 runs Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 26/33] tools/memory-model: Implement --hw support for checkghlitmus.sh Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 27/33] tools/memory-model: Fix scripting --jobs argument Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 28/33] tools/memory-model: Make checkghlitmus.sh use mselect7 Paul E. McKenney
2019-05-30 14:42 ` Paul E. McKenney [this message]
2019-05-30 14:42 ` [PATCH RFC memory-model 30/33] tools/memory-model: Add "--" to parseargs.sh for additional arguments Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 31/33] tools/memory-model: Repair parseargs.sh header comment Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 32/33] tools/memory-model: Add checktheselitmus.sh to run specified litmus tests Paul E. McKenney
2019-05-30 14:42 ` [PATCH RFC memory-model 33/33] tools/memory-model: Add data-race capabilities to judgelitmus.sh 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=20190530144225.27624-29-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

Powered by JetHome