lkml.org 
[lkml]   [2019]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 20/21] tools/memory-model: Allow herd to deduce CPU type
    Date
    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@linux.ibm.com>
    ---
    tools/memory-model/scripts/runlitmus.sh | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/tools/memory-model/scripts/runlitmus.sh b/tools/memory-model/scripts/runlitmus.sh
    index 71d13bb0c764..482ed7a08951 100755
    --- a/tools/memory-model/scripts/runlitmus.sh
    +++ b/tools/memory-model/scripts/runlitmus.sh
    @@ -53,7 +53,6 @@ trap 'rm -rf $T' 0 2
    mkdir $T

    # Generate filenames
    -catfile="`echo $LKMM_HW_MAP_FILE | tr '[A-Z]' '[a-z]'`.cat"
    mapfile="Linux2${LKMM_HW_MAP_FILE}.map"
    themefile="$T/${LKMM_HW_MAP_FILE}.theme"
    herdoptions="-model $LKMM_HW_CAT_FILE"
    @@ -70,6 +69,6 @@ fi
    # Generate the assembly code and run herd on it.
    gen_theme7 -n 10 -map $mapfile -call Linux.call > $themefile
    jingle7 -theme $themefile $litmus > $LKMM_DESTDIR/$hwlitmus 2> $T/$hwlitmusfile.jingle7.out
    -/usr/bin/time $LKMM_TIMEOUT_CMD herd7 -model $catfile $LKMM_DESTDIR/$hwlitmus > $LKMM_DESTDIR/$hwlitmus.out 2>&1
    +/usr/bin/time $LKMM_TIMEOUT_CMD herd7 $LKMM_DESTDIR/$hwlitmus > $LKMM_DESTDIR/$hwlitmus.out 2>&1

    exit $?
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-03-27 00:43    [W:4.082 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site