public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Stephane Eranian <eranian@google.com>,
	Ian Rogers <irogers@google.com>,
	Jin Yao <yao.jin@linux.intel.com>
Subject: Re: [PATCH] perf test: Fix shadow stat test for non-bash shells
Date: Tue, 12 Jan 2021 10:30:16 +0100	[thread overview]
Message-ID: <20210112093016.GB1252618@krava> (raw)
In-Reply-To: <20210108074712.947223-1-namhyung@kernel.org>

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.jin@linux.intel.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>

Acked-by: Jiri Olsa <jolsa@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	other threads:[~2021-01-12  9:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-08  7:47 [PATCH] perf test: Fix shadow stat test for non-bash shells Namhyung Kim
2021-01-12  9:30 ` Jiri Olsa [this message]
2021-01-12 11:17   ` David Laight
2021-01-14  3:19     ` Namhyung Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210112093016.GB1252618@krava \
    --to=jolsa@redhat.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=eranian@google.com \
    --cc=irogers@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=yao.jin@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox