Skip to content

Commit

Permalink
tools/memory-model: Make history-check scripts use mselect7
Browse files Browse the repository at this point in the history
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@kernel.org>
  • Loading branch information
Paul E. McKenney committed Mar 24, 2023
1 parent 2ac8cbe commit 75eee92
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/memory-model/scripts/initlitmushist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/memory-model/scripts/newlitmushist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down

0 comments on commit 75eee92

Please sign in to comment.