All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, 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>,
	Andi Kleen <ak@linux.intel.com>, Ian Rogers <irogers@google.com>,
	David Laight <David.Laight@aculab.com>,
	Jin Yao <yao.jin@linux.intel.com>
Subject: Re: [PATCH v2] perf test: Fix shadow stat test for non-bash shells
Date: Thu, 14 Jan 2021 15:20:22 -0300	[thread overview]
Message-ID: <20210114182022.GA307547@kernel.org> (raw)
In-Reply-To: <20210114050609.1258820-1-namhyung@kernel.org>

Em Thu, Jan 14, 2021 at 02:06:09PM +0900, Namhyung Kim escreveu:
> 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!

Jiri provided an Acked-by for v1, Jiri, can I keep it for this v2?

- Arnaldo
 
> Reported-by: Jin Yao <yao.jin@linux.intel.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  tools/perf/tests/shell/stat+shadow_stat.sh | 30 ++++++++++------------
>  1 file changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/tools/perf/tests/shell/stat+shadow_stat.sh b/tools/perf/tests/shell/stat+shadow_stat.sh
> index 249dfe48cf6a..ebebd3596cf9 100755
> --- a/tools/perf/tests/shell/stat+shadow_stat.sh
> +++ b/tools/perf/tests/shell/stat+shadow_stat.sh
> @@ -9,31 +9,29 @@ perf stat -a true > /dev/null 2>&1 || exit 2
>  
>  test_global_aggr()
>  {
> -	local cyc
> -
>  	perf stat -a --no-big-num -e cycles,instructions sleep 1  2>&1 | \
>  	grep -e cycles -e instructions | \
>  	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
> +		res=`printf "%.2f" $(echo "scale=6; $num / $cyc" | bc -q)`
> +		if [ "$ipc" != "$res" ]; then
>  			echo "IPC is different: $res != $ipc  ($num / $cyc)"
>  			exit 1
>  		fi
> @@ -42,32 +40,32 @@ test_global_aggr()
>  
>  test_no_aggr()
>  {
> -	declare -A results
> -
>  	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
> +			results="$results $cpu:$num"
>  			continue
>  		fi
>  
> +		cyc=${results##* $cpu:}
> +		cyc=${cyc%% *}
> +
>  		# skip if no cycles
> -		local cyc=${results[$cpu]}
> -		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
> +		res=`printf "%.2f" $(echo "scale=6; $num / $cyc" | bc -q)`
> +		if [ "$ipc" != "$res" ]; then
>  			echo "IPC is different for $cpu: $res != $ipc  ($num / $cyc)"
>  			exit 1
>  		fi
> -- 
> 2.30.0.284.gd98b1dd5eaa7-goog
> 

-- 

- Arnaldo

  reply	other threads:[~2021-01-14 18:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-14  5:06 [PATCH v2] perf test: Fix shadow stat test for non-bash shells Namhyung Kim
2021-01-14 18:20 ` Arnaldo Carvalho de Melo [this message]
2021-01-14 19:03   ` Jiri Olsa

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=20210114182022.GA307547@kernel.org \
    --to=acme@kernel.org \
    --cc=David.Laight@aculab.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=eranian@google.com \
    --cc=irogers@google.com \
    --cc=jolsa@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.