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

tools/memory-model: Allow herd to deduce CPU type

Currently, the scripts specify the CPU's .cat file to herd. But this is
pointless because herd will select a good and sufficient .cat file from
the assembly-language litmus test itself. This commit therefore removes
the -model argument to herd, allowing herd to figure the CPU family out
itself.

Note that the user can override herd's choice using the "--herdopts"
argument to the scripts.

Suggested-by: Luc Maranget <luc.maranget@inria.fr>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

+1 -2
+1 -2
tools/memory-model/scripts/runlitmus.sh
··· 53 53 mkdir $T 54 54 55 55 # Generate filenames 56 - catfile="`echo $LKMM_HW_MAP_FILE | tr '[A-Z]' '[a-z]'`.cat" 57 56 mapfile="Linux2${LKMM_HW_MAP_FILE}.map" 58 57 themefile="$T/${LKMM_HW_MAP_FILE}.theme" 59 58 herdoptions="-model $LKMM_HW_CAT_FILE" ··· 69 70 # Generate the assembly code and run herd7 on it. 70 71 gen_theme7 -n 10 -map $mapfile -call Linux.call > $themefile 71 72 jingle7 -theme $themefile $litmus > $LKMM_DESTDIR/$hwlitmus 2> $T/$hwlitmusfile.jingle7.out 72 - /usr/bin/time $LKMM_TIMEOUT_CMD herd7 -model $catfile $LKMM_DESTDIR/$hwlitmus > $LKMM_DESTDIR/$hwlitmus.out 2>&1 73 + /usr/bin/time $LKMM_TIMEOUT_CMD herd7 $LKMM_DESTDIR/$hwlitmus > $LKMM_DESTDIR/$hwlitmus.out 2>&1 73 74 74 75 exit $?