| Message ID | 20210617184216.2075588-3-irogers@google.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/4] perf test: Fix non-bash issue with stat bpf counters | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Em Thu, Jun 17, 2021 at 11:42:15AM -0700, Ian Rogers escreveu: > Provide additional context for when the stat bpf counters test skips. Thanks, applied. - Arnaldo > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/tests/shell/stat_bpf_counters.sh | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/tests/shell/stat_bpf_counters.sh b/tools/perf/tests/shell/stat_bpf_counters.sh > index 2f9948b3d943..81d61b6e1208 100755 > --- a/tools/perf/tests/shell/stat_bpf_counters.sh > +++ b/tools/perf/tests/shell/stat_bpf_counters.sh > @@ -22,7 +22,13 @@ compare_number() > } > > # skip if --bpf-counters is not supported > -perf stat --bpf-counters true > /dev/null 2>&1 || exit 2 > +if ! perf stat --bpf-counters true > /dev/null 2>&1; then > + if [ "$1" == "-v" ]; then > + echo "Skipping: --bpf-counters not supported" > + perf --no-pager stat --bpf-counters true || true > + fi > + exit 2 > +fi > > base_cycles=$(perf stat --no-big-num -e cycles -- perf bench sched messaging -g 1 -l 100 -t 2>&1 | awk '/cycles/ {print $1}') > bpf_cycles=$(perf stat --no-big-num --bpf-counters -e cycles -- perf bench sched messaging -g 1 -l 100 -t 2>&1 | awk '/cycles/ {print $1}') > -- > 2.32.0.288.g62a8d224e6-goog >
diff --git a/tools/perf/tests/shell/stat_bpf_counters.sh b/tools/perf/tests/shell/stat_bpf_counters.sh index 2f9948b3d943..81d61b6e1208 100755 --- a/tools/perf/tests/shell/stat_bpf_counters.sh +++ b/tools/perf/tests/shell/stat_bpf_counters.sh @@ -22,7 +22,13 @@ compare_number() } # skip if --bpf-counters is not supported -perf stat --bpf-counters true > /dev/null 2>&1 || exit 2 +if ! perf stat --bpf-counters true > /dev/null 2>&1; then + if [ "$1" == "-v" ]; then + echo "Skipping: --bpf-counters not supported" + perf --no-pager stat --bpf-counters true || true + fi + exit 2 +fi base_cycles=$(perf stat --no-big-num -e cycles -- perf bench sched messaging -g 1 -l 100 -t 2>&1 | awk '/cycles/ {print $1}') bpf_cycles=$(perf stat --no-big-num --bpf-counters -e cycles -- perf bench sched messaging -g 1 -l 100 -t 2>&1 | awk '/cycles/ {print $1}')
Provide additional context for when the stat bpf counters test skips. Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/tests/shell/stat_bpf_counters.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)