* [PATCH v2] perf test: Fix shadow stat test for non-bash shells
@ 2021-01-14 5:06 Namhyung Kim
2021-01-14 18:20 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 3+ messages in thread
From: Namhyung Kim @ 2021-01-14 5:06 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Jiri Olsa
Cc: Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin,
LKML, Stephane Eranian, Andi Kleen, Ian Rogers, David Laight,
Jin Yao
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] perf test: Fix shadow stat test for non-bash shells
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
2021-01-14 19:03 ` Jiri Olsa
0 siblings, 1 reply; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-01-14 18:20 UTC (permalink / raw)
To: Namhyung Kim
Cc: Jiri Olsa, Ingo Molnar, Peter Zijlstra, Mark Rutland,
Alexander Shishkin, LKML, Stephane Eranian, Andi Kleen,
Ian Rogers, David Laight, Jin Yao
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] perf test: Fix shadow stat test for non-bash shells
2021-01-14 18:20 ` Arnaldo Carvalho de Melo
@ 2021-01-14 19:03 ` Jiri Olsa
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Olsa @ 2021-01-14 19:03 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Namhyung Kim, Ingo Molnar, Peter Zijlstra, Mark Rutland,
Alexander Shishkin, LKML, Stephane Eranian, Andi Kleen,
Ian Rogers, David Laight, Jin Yao
On Thu, Jan 14, 2021 at 03:20:22PM -0300, Arnaldo Carvalho de Melo wrote:
> 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?
yep, v2 works for me
Acked-by: Jiri Olsa <jolsa@redhat.com>
jitka
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-14 19:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2021-01-14 19:03 ` Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).