perf test: Replace brstack test workload
authorNamhyung Kim <namhyung@kernel.org>
Wed, 16 Nov 2022 23:38:52 +0000 (15:38 -0800)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 23 Nov 2022 13:28:31 +0000 (10:28 -0300)
So that it can get rid of requirement of a compiler.  Also rename the
symbols to match with the perf test workload.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: James Clark <james.clark@arm.com>
Acked-by: German Gomez <german.gomez@arm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Zhengjun Xing <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20221116233854.1596378-11-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/shell/test_brstack.sh

index d7ff5c4..5856639 100755 (executable)
@@ -4,13 +4,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # German Gomez <german.gomez@arm.com>, 2022
 
-# we need a C compiler to build the test programs
-# so bail if none is found
-if ! [ -x "$(command -v cc)" ]; then
-       echo "failed: no compiler, install gcc"
-       exit 2
-fi
-
 # skip the test if the hardware doesn't support branch stack sampling
 # and if the architecture doesn't support filter types: any,save_type,u
 if ! perf record -o- --no-buildid --branch-filter any,save_type,u -- true > /dev/null 2>&1 ; then
@@ -19,6 +12,7 @@ if ! perf record -o- --no-buildid --branch-filter any,save_type,u -- true > /dev
 fi
 
 TMPDIR=$(mktemp -d /tmp/__perf_test.program.XXXXX)
+TESTPROG="perf test -w brstack"
 
 cleanup() {
        rm -rf $TMPDIR
@@ -26,57 +20,24 @@ cleanup() {
 
 trap cleanup exit term int
 
-gen_test_program() {
-       # generate test program
-       cat << EOF > $1
-#define BENCH_RUNS 999999
-int cnt;
-void bar(void) {
-}                      /* return */
-void foo(void) {
-       bar();          /* call */
-}                      /* return */
-void bench(void) {
-  void (*foo_ind)(void) = foo;
-  if ((cnt++) % 3)     /* branch (cond) */
-    foo();             /* call */
-  bar();               /* call */
-  foo_ind();           /* call (ind) */
-}
-int main(void)
-{
-  int cnt = 0;
-  while (1) {
-    if ((cnt++) > BENCH_RUNS)
-      break;
-    bench();           /* call */
-  }                    /* branch (uncond) */
-  return 0;
-}
-EOF
-}
-
 test_user_branches() {
        echo "Testing user branch stack sampling"
 
-       gen_test_program "$TEMPDIR/program.c"
-       cc -fno-inline -g "$TEMPDIR/program.c" -o $TMPDIR/a.out
-
-       perf record -o $TMPDIR/perf.data --branch-filter any,save_type,u -- $TMPDIR/a.out > /dev/null 2>&1
+       perf record -o $TMPDIR/perf.data --branch-filter any,save_type,u -- ${TESTPROG} > /dev/null 2>&1
        perf script -i $TMPDIR/perf.data --fields brstacksym | xargs -n1 > $TMPDIR/perf.script
 
        # example of branch entries:
-       #       foo+0x14/bar+0x40/P/-/-/0/CALL
+       #       brstack_foo+0x14/brstack_bar+0x40/P/-/-/0/CALL
 
        set -x
-       egrep -m1 "^bench\+[^ ]*/foo\+[^ ]*/IND_CALL$"  $TMPDIR/perf.script
-       egrep -m1 "^foo\+[^ ]*/bar\+[^ ]*/CALL$"        $TMPDIR/perf.script
-       egrep -m1 "^bench\+[^ ]*/foo\+[^ ]*/CALL$"      $TMPDIR/perf.script
-       egrep -m1 "^bench\+[^ ]*/bar\+[^ ]*/CALL$"      $TMPDIR/perf.script
-       egrep -m1 "^bar\+[^ ]*/foo\+[^ ]*/RET$"         $TMPDIR/perf.script
-       egrep -m1 "^foo\+[^ ]*/bench\+[^ ]*/RET$"       $TMPDIR/perf.script
-       egrep -m1 "^bench\+[^ ]*/bench\+[^ ]*/COND$"    $TMPDIR/perf.script
-       egrep -m1 "^main\+[^ ]*/main\+[^ ]*/UNCOND$"    $TMPDIR/perf.script
+       egrep -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL$"  $TMPDIR/perf.script
+       egrep -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL$"        $TMPDIR/perf.script
+       egrep -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL$"      $TMPDIR/perf.script
+       egrep -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL$"      $TMPDIR/perf.script
+       egrep -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET$"         $TMPDIR/perf.script
+       egrep -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET$"       $TMPDIR/perf.script
+       egrep -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND$"    $TMPDIR/perf.script
+       egrep -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND$"              $TMPDIR/perf.script
        set +x
 
        # some branch types are still not being tested:
@@ -91,10 +52,7 @@ test_filter() {
 
        echo "Testing branch stack filtering permutation ($filter,$expect)"
 
-       gen_test_program "$TEMPDIR/program.c"
-       cc -fno-inline -g "$TEMPDIR/program.c" -o $TMPDIR/a.out
-
-       perf record -o $TMPDIR/perf.data --branch-filter $filter,save_type,u -- $TMPDIR/a.out > /dev/null 2>&1
+       perf record -o $TMPDIR/perf.data --branch-filter $filter,save_type,u -- ${TESTPROG} > /dev/null 2>&1
        perf script -i $TMPDIR/perf.data --fields brstack | xargs -n1 > $TMPDIR/perf.script
 
        # fail if we find any branch type that doesn't match any of the expected ones