lkml.org 
[lkml]   [2019]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC memory-model 12/31] tools/memory-model: Make judgelitmus.sh ransack .litmus.out files
    Date
    The judgelitmus.sh script currently relies solely on the "Result:"
    comment in the .litmus file. This is problematic when using the --hw
    argument, because it is necessary to check the hardware model against
    LKMM even in the absence of "Result:" comments.

    This commit therefore modifies judgelitmus.sh to check the observation
    in a .litmus.out file, in case one was generated by a previous LKMM run.

    Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
    ---
    tools/memory-model/scripts/judgelitmus.sh | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/tools/memory-model/scripts/judgelitmus.sh b/tools/memory-model/scripts/judgelitmus.sh
    index 6f3c60065c8b..fe9131f8eb96 100755
    --- a/tools/memory-model/scripts/judgelitmus.sh
    +++ b/tools/memory-model/scripts/judgelitmus.sh
    @@ -8,7 +8,9 @@
    # is provided, this is assumed to be a hardware test, and the output is
    # assumed to be in file.HW.litmus.out, where "HW" is the --hw argument.
    # In addition, non-Sometimes verification results will be noted, but
    -# forgiven.
    +# forgiven. Furthermore, if there is no "Result:" comment but there is
    +# an LKMM .litmus.out file, the observation in that file will be used
    +# to judge the assembly-language verification.
    #
    # Usage:
    # judgelitmus.sh file.litmus
    @@ -32,9 +34,11 @@ fi
    if test -z "$LKMM_HW_MAP_FILE"
    then
    litmusout=$litmus.out
    + lkmmout=
    else
    litmusout="`echo $litmus |
    sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'`.out"
    + lkmmout=$litmus.out
    fi
    if test -f "$LKMM_DESTDIR/$litmusout" -a -r "$LKMM_DESTDIR/$litmusout"
    then
    @@ -46,6 +50,9 @@ fi
    if grep -q '^ \* Result: ' $litmus
    then
    outcome=`grep -m 1 '^ \* Result: ' $litmus | awk '{ print $3 }'`
    +elif test -n "$LKMM_HW_MAP_FILE" && grep -q '^Observation' $LKMM_DESTDIR/$lkmmout > /dev/null 2>&1
    +then
    + outcome=`grep -m 1 '^Observation ' $LKMM_DESTDIR/$lkmmout | awk '{ print $3 }'`
    else
    outcome=specified
    fi
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-08-02 00:23    [W:4.737 / U:1.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site