On Fri, Jan 08, 2021 at 04:47:12PM +0900, Namhyung Kim wrote:
> It was using some bash-specific features and failed to parse when
> running with a different shell like below:
> 
>   root@kbl-ppc:~/kbl-ws/perf-dev/lck-9077/acme.tmp/tools/perf# ./perf test 83 
> -vv
>   83: perf stat metrics (shadow stat) test                            :
>   --- start ---
>   test child forked, pid 3922
>   ./tests/shell/stat+shadow_stat.sh: 19: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   ./tests/shell/stat+shadow_stat.sh: 24: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   ./tests/shell/stat+shadow_stat.sh: 30: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   (standard_in) 2: syntax error
>   ./tests/shell/stat+shadow_stat.sh: 36: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   ./tests/shell/stat+shadow_stat.sh: 19: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   ./tests/shell/stat+shadow_stat.sh: 24: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   ./tests/shell/stat+shadow_stat.sh: 30: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   (standard_in) 2: syntax error
>   ./tests/shell/stat+shadow_stat.sh: 36: ./tests/shell/stat+shadow_stat.sh: 
> [[: not found
>   ./tests/shell/stat+shadow_stat.sh: 45: ./tests/shell/stat+shadow_stat.sh: 
> declare: not found
>   test child finished with -1
>   ---- end ----
>   perf stat metrics (shadow stat) test: FAILED!
> 
> Reported-by: Jin Yao <yao....@linux.intel.com>
> Signed-off-by: Namhyung Kim <namhy...@kernel.org>

Acked-by: Jiri Olsa <jo...@redhat.com>

thanks,
jirka

> ---
>  tools/perf/tests/shell/stat+shadow_stat.sh | 24 ++++++++++++----------
>  1 file changed, 13 insertions(+), 11 deletions(-)
> 
> diff --git a/tools/perf/tests/shell/stat+shadow_stat.sh 
> b/tools/perf/tests/shell/stat+shadow_stat.sh
> index 249dfe48cf6a..e2c7ac4ed91d 100755
> --- a/tools/perf/tests/shell/stat+shadow_stat.sh
> +++ b/tools/perf/tests/shell/stat+shadow_stat.sh
> @@ -16,24 +16,24 @@ test_global_aggr()
>       while read num evt hash ipc rest
>       do
>               # skip not counted events
> -             if [[ $num == "<not" ]]; then
> +             if [ "$num" = "<not" ]; then
>                       continue
>               fi
>  
>               # save cycles count
> -             if [[ $evt == "cycles" ]]; then
> +             if [ "$evt" = "cycles" ]; then
>                       cyc=$num
>                       continue
>               fi
>  
>               # skip if no cycles
> -             if [[ -z $cyc ]]; then
> +             if [ -z "$cyc" ]; then
>                       continue
>               fi
>  
>               # use printf for rounding and a leading zero
>               local res=`printf "%.2f" $(echo "scale=6; $num / $cyc" | bc -q)`
> -             if [[ $ipc != $res ]]; then
> +             if [ "$ipc" != "$res" ]; then
>                       echo "IPC is different: $res != $ipc  ($num / $cyc)"
>                       exit 1
>               fi
> @@ -42,36 +42,38 @@ test_global_aggr()
>  
>  test_no_aggr()
>  {
> -     declare -A results
> +     results=$(mktemp /tmp/perf-test-shadow-stat-XXXXXX)
>  
>       perf stat -a -A --no-big-num -e cycles,instructions sleep 1  2>&1 | \
>       grep ^CPU | \
>       while read cpu num evt hash ipc rest
>       do
>               # skip not counted events
> -             if [[ $num == "<not" ]]; then
> +             if [ "$num" = "<not" ]; then
>                       continue
>               fi
>  
>               # save cycles count
> -             if [[ $evt == "cycles" ]]; then
> -                     results[$cpu]=$num
> +             if [ "$evt" = "cycles" ]; then
> +                     echo $cpu $num >> $results
>                       continue
>               fi
>  
>               # skip if no cycles
> -             local cyc=${results[$cpu]}
> -             if [[ -z $cyc ]]; then
> +             local cyc=$(grep $cpu $results | cut -d' ' -f2)
> +             if [ -z "$cyc" ]; then
>                       continue
>               fi
>  
>               # use printf for rounding and a leading zero
>               local res=`printf "%.2f" $(echo "scale=6; $num / $cyc" | bc -q)`
> -             if [[ $ipc != $res ]]; then
> +             if [ "$ipc" != "$res" ]; then
>                       echo "IPC is different for $cpu: $res != $ipc  ($num / 
> $cyc)"
> +                     rm -f $results
>                       exit 1
>               fi
>       done
> +     rm -f $results
>  }
>  
>  test_global_aggr
> -- 
> 2.30.0.284.gd98b1dd5eaa7-goog
> 

Reply via email to