perf test: Add test workloads (v2)
Namhyung Kim
maintainercover perf test: Add test workloads (v2)
Hello,
In the shell tests, it needs to run a custom test workload to verify the behaviors. This requires a working compiler when it runs the tests. However it's not available in some test environments, making hard to run those tests.
changes in v2)
* use sig_atomic_t (Arnaldo)
* fix callgraph fp test (Leo)
* fix bulid in sqrtloop (German)
* add tags from Leo Yan
So I've added the test workload to the perf binary directly, so that we can run them simply like:
$ perf test -w noploop
And convert most of the shell tests need compilers with this workloads. The buildid test still requires a compiler since it needs to check different build options to generate different kind of build-IDs.
I've checked perf test result after the changes but could not verify architecture-specific ones (e.g. for arm64). It'd be nice if anyone can check it out.
You can find it in 'perf/test-workload-v2' branch in
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Thanks,
Namhyung
Namhyung Kim (12):
perf test: Add -w/--workload option
perf test: Replace pipe test workload with noploop perf test: Add 'thloop' test workload
perf test: Replace record test workload with thloop perf test: Add 'leafloop' test workload
perf test: Replace arm callgraph fp test workload with leafloop perf test: Add 'sqrtloop' test workload
perf test: Replace arm spe fork test workload with sqrtloop perf test: Add 'brstack' test workload
perf test: Replace brstack test workload
perf test: Add 'datasym' test workload
perf test: Replace data symbol test workload with datasym
tools/perf/tests/Build | 2 + tools/perf/tests/builtin-test.c | 29 ++++++++ tools/perf/tests/shell/pipe_test.sh | 55 +++------------- tools/perf/tests/shell/record.sh | 59 +---------------- .../perf/tests/shell/test_arm_callgraph_fp.sh | 34 +--------- tools/perf/tests/shell/test_arm_spe_fork.sh | 44 +------------ tools/perf/tests/shell/test_brstack.sh | 66 ++++--------------- tools/perf/tests/shell/test_data_symbol.sh | 29 +------- tools/perf/tests/tests.h | 27 ++++++++ tools/perf/tests/workloads/Build | 12 ++++ tools/perf/tests/workloads/brstack.c | 39 +++++++++++ tools/perf/tests/workloads/datasym.c | 24 +++++++ tools/perf/tests/workloads/leafloop.c | 34 ++++++++++ tools/perf/tests/workloads/noploop.c | 32 +++++++++ tools/perf/tests/workloads/sqrtloop.c | 45 +++++++++++++ tools/perf/tests/workloads/thloop.c | 53 +++++++++++++++ 16 files changed, 327 insertions(+), 257 deletions(-) create mode 100644 tools/perf/tests/workloads/Build create mode 100644 tools/perf/tests/workloads/brstack.c create mode 100644 tools/perf/tests/workloads/datasym.c create mode 100644 tools/perf/tests/workloads/leafloop.c create mode 100644 tools/perf/tests/workloads/noploop.c create mode 100644 tools/perf/tests/workloads/sqrtloop.c create mode 100644 tools/perf/tests/workloads/thloop.c
base-commit: 816815b852216f3aa3a43e2ce91c5510927cd61b
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Namhyung Kim
maintainerPATCH 1/12 perf test: Add -w/--workload option
The -w/--workload option is to run a simple workload used by testing. This adds a basic framework to run the workloads and 'noploop' workload as an example.
$ perf test -w noploop
The noploop does a loop doing nothing (NOP) for a second by default. It can have an optional argument to specify the time in seconds.
--- tools/perf/tests/Build | 2 ++ tools/perf/tests/builtin-test.c | 24 +++++++++++++++++++++ tools/perf/tests/tests.h | 22 +++++++++++++++++++ tools/perf/tests/workloads/Build | 3 +++ tools/perf/tests/workloads/noploop.c | 32 ++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+) create mode 100644 tools/perf/tests/workloads/Build create mode 100644 tools/perf/tests/workloads/noploop.c
tools/perf/tests/Build +2 -0
@@ -103,3 +103,5 @@ endif CFLAGS_attr.o += -DBINDIR="BUILD_STR($(bindir_SQ))" -DPYTHON="BUILD_STR($(PYTHON_WORD))" CFLAGS_python-use.o += -DPYTHONPATH="BUILD_STR($(OUTPUT)python)" -DPYTHON="BUILD_STR($(PYTHON_WORD))" CFLAGS_dwarf-unwind.o += -fno-optimize-sibling-calls + +perf-y += workloads/
tools/perf/tests/builtin-test.c +24 -0
@@ -118,6 +118,10 @@ static struct test_suite **tests[] = { arch_tests, }; +static struct test_workload *workloads[] = { + &workload__noploop, +}; +static int num_subtests (const struct test_suite *t) {int num;
@@ -475,6 +479,21 @@ static int perf_test__list(int argc, const char **argv)return 0 ; } +static int run_workload (const char *work,int argc,const char **argv) +{ +unsigned int i =0 ; +struct test_workload *twl; + +for (i =0 ; i <ARRAY_SIZE (workloads); i++) { + twl = workloads[i]; +if (!strcmp (twl->name, work)) +return twl->func (argc, argv); + } + +pr_info ("No workload found: %s\n" , work); +return -1 ; +} +int cmd_test (int argc,const char **argv) {const char *test_usage[] = {
@@ -482,12 +501,14 @@ int cmd_test(int argc, const char **argv) NULL, };const char *skip =NULL ; +const char *workload =NULL ;const struct option test_options[] = {OPT_STRING ('s' ,"skip" , &skip,"tests" ,"tests to skip" ),OPT_INCR ('v' ,"verbose" , &verbose,"be more verbose (show symbol address, etc)" ),OPT_BOOLEAN ('F' ,"dont-fork" , &dont_fork,"Do not fork for testcase" ), +OPT_STRING ('w' ,"workload" , &workload,"work" ,"workload to run for testing" ),OPT_END () };const char *const test_subcommands[] = {"list" ,NULL };
@@ -504,6 +525,9 @@ int cmd_test(int argc, const char **argv)if (argc >=1 && !strcmp (argv[0 ],"list" ))return perf_test__list (argc -1 , argv +1 ); +if (workload) +return run_workload (workload, argc, argv); + symbol_conf.priv_size =sizeof (int ); symbol_conf.sort_by_name = true; symbol_conf.try_vmlinux_path = true;
tools/perf/tests/tests.h +22 -0
@@ -180,4 +180,26 @@ int test__arch_unwind_sample(struct perf_sample *sample,DECLARE_SUITE (vectors_page);#endif +/* +* Define test workloads to be used in test suites. +*/ +typedef int (*workload_fnptr )(int argc,const char **argv); + +struct test_workload { +const char *name; +workload_fnptr func; +}; + +#define DECLARE_WORKLOAD (work) \ + extern struct test_workload workload__##work + +#define DEFINE_WORKLOAD (work) \ +struct test_workload workload__##work = { \ + .name = #work, \ + .func = work, \ +} + +/* The list of test workloads */ +DECLARE_WORKLOAD (noploop); +#endif /* TESTS_H */
tools/perf/tests/workloads/Build new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +perf-y += noploop.o
tools/perf/tests/workloads/noploop.c new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <stdlib.h> +#include <signal.h> +#include <unistd.h> +#include <linux/compiler.h> +#include "../tests.h" + +static volatile sig_atomic_t done; + +static void sighandler (int sig__maybe_unused ) +{ + done =1 ; +} + +static int noploop (int argc,const char **argv) +{ +int sec =1 ; + +if (argc >0 ) + sec =atoi (argv[0 ]); + +signal (SIGINT , sighandler); +signal (SIGALRM , sighandler); +alarm (sec); + +while (!done) +continue ; + +return 0 ; +} + +DEFINE_WORKLOAD (noploop);
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Namhyung Kim
maintainerPATCH 2/12 perf test: Replace pipe test workload with noploop
In reply to Namhyung KimSo that it can get rid of requirement of a compiler. Also define and use more local symbols to ease future changes.
$ sudo ./perf test -v pipe
87: perf pipe recording and injection test :
--- start ---
test child forked, pid 748003
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.000 MB - ]
748014 748014 -1 |perf
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.000 MB - ]
99.83% perf perf [.] noploop
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.000 MB - ]
99.85% perf perf [.] noploop
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.160 MB /tmp/perf.data.2XYPdw (4007 samples) ]
99.83% perf perf [.] noploop
test child finished with 0
---- end ----
perf pipe recording and injection test: Ok--- tools/perf/tests/shell/pipe_test.sh | 55 ++++++----------------------- 1 file changed, 10 insertions(+), 45 deletions(-)
tools/perf/tests/shell/pipe_test.sh +10 -45
@@ -2,68 +2,33 @@ # perf pipe recording and injection test # SPDX-License-Identifier: GPL-2.0 -# skip if there's no compiler -if ! [ -x "$(command -v cc)" ]; then - echo "failed: no compiler, install gcc" - exit 2 -fi - -file=$(mktemp /tmp/test.file.XXXXXX) data=$(mktemp /tmp/perf.data.XXXXXX) +prog="perf test -w noploop" +task="perf" +sym="noploop" -cat <<EOF | cc -o ${file} -x c - -#include <signal.h> -#include <stdlib.h> -#include <unistd.h> - -volatile int done; - -void sigalrm(int sig) { - done = 1; -} - -__attribute__((noinline)) void noploop(void) { - while (!done) - continue; -} - -int main(int argc, char *argv[]) { - int sec = 1; - - if (argc > 1) - sec = atoi(argv[1]); - - signal(SIGALRM, sigalrm); - alarm(sec); - - noploop(); - return 0; -} -EOF - - -if ! perf record -e task-clock:u -o - ${file} | perf report -i - --task | grep test.file; then +if ! perf record -e task-clock:u -o - ${prog} | perf report -i - --task | grep ${task}; then echo "cannot find the test file in the perf report" exit 1 fi -if ! perf record -e task-clock:u -o - ${file} | perf inject -b | perf report -i - | grep noploop; then +if ! perf record -e task-clock:u -o - ${prog} | perf inject -b | perf report -i - | grep ${sym}; then echo "cannot find noploop function in pipe #1" exit 1 fi -perf record -e task-clock:u -o - ${file} | perf inject -b -o ${data} -if ! perf report -i ${data} | grep noploop; then +perf record -e task-clock:u -o - ${prog} | perf inject -b -o ${data} +if ! perf report -i ${data} | grep ${sym}; then echo "cannot find noploop function in pipe #2" exit 1 fi -perf record -e task-clock:u -o ${data} ${file} -if ! perf inject -b -i ${data} | perf report -i - | grep noploop; then +perf record -e task-clock:u -o ${data} ${prog} +if ! perf inject -b -i ${data} | perf report -i - | grep ${sym}; then echo "cannot find noploop function in pipe #3" exit 1 fi -rm -f ${file} ${data} ${data}.old +rm -f ${data} ${data}.old exit 0
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Re: [PATCH 02/12] perf test: Replace pipe test workload with noploop
Quoted 23 lines · Namhyung Kim
So that it can get rid of requirement of a compiler. Also define and use more local symbols to ease future changes.
$ sudo ./perf test -v pipe 87: perf pipe recording and injection test : --- start --- test child forked, pid 748003 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.000 MB - ] 748014 748014 -1 |perf [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.000 MB - ] 99.83% perf perf [.] noploop [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.000 MB - ] 99.85% perf perf [.] noploop [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.160 MB /tmp/perf.data.2XYPdw (4007 samples) ] 99.83% perf perf [.] noploop test child finished with 0 ---- end ---- perf pipe recording and injection test: Ok
Quoted 1 line
Signed-off-by Namhyung Kim <[email protected]>
Quoted 87 lines
--- tools/perf/tests/shell/pipe_test.sh | 55 ++++++----------------------- 1 file changed, 10 insertions(+), 45 deletions(-)tools/perf/tests/shell/pipe_test.sh +10
-45@@ -2,68 +2,33 @@ # perf pipe recording and injection test # SPDX-License-Identifier: GPL-2.0 -# skip if there's no compiler -if ! [ -x "$(command -v cc)" ]; then - echo "failed: no compiler, install gcc" - exit 2 -fi - -file=$(mktemp /tmp/test.file.XXXXXX) data=$(mktemp /tmp/perf.data.XXXXXX) +prog="perf test -w noploop" +task="perf" +sym="noploop" -cat <<EOF | cc -o ${file} -x c - -#include <signal.h> -#include <stdlib.h> -#include <unistd.h> - -volatile int done; - -void sigalrm(int sig) { - done = 1; -} - -__attribute__((noinline)) void noploop(void) { - while (!done) - continue; -} - -int main(int argc, char *argv[]) { - int sec = 1; - - if (argc > 1) - sec = atoi(argv[1]); - - signal(SIGALRM, sigalrm); - alarm(sec); - - noploop(); - return 0; -} -EOF - - -if ! perf record -e task-clock:u -o - ${file} | perf report -i - --task | grep test.file; then +if ! perf record -e task-clock:u -o - ${prog} | perf report -i - --task | grep ${task}; then echo "cannot find the test file in the perf report" exit 1 fi -if ! perf record -e task-clock:u -o - ${file} | perf inject -b | perf report -i - | grep noploop; then +if ! perf record -e task-clock:u -o - ${prog} | perf inject -b | perf report -i - | grep ${sym}; then echo "cannot find noploop function in pipe #1" exit 1 fi -perf record -e task-clock:u -o - ${file} | perf inject -b -o ${data} -if ! perf report -i ${data} | grep noploop; then +perf record -e task-clock:u -o - ${prog} | perf inject -b -o ${data} +if ! perf report -i ${data} | grep ${sym}; then echo "cannot find noploop function in pipe #2" exit 1 fi -perf record -e task-clock:u -o ${data} ${file} -if ! perf inject -b -i ${data} | perf report -i - | grep noploop; then +perf record -e task-clock:u -o ${data} ${prog} +if ! perf inject -b -i ${data} | perf report -i - | grep ${sym}; then echo "cannot find noploop function in pipe #3" exit 1 fi -rm -f ${file} ${data} ${data}.old +rm -f ${data} ${data}.old exit 0
Namhyung Kim
maintainerPATCH 3/12 perf test: Add 'thloop' test workload
In reply to Namhyung KimThe thloop is similar to noploop but runs in two threads. This is needed to verify perf record --per-thread to handle multi-threaded programs properly.
$ perf test -w thloop
It also takes an optional argument to specify runtime in seconds (default: 1).
--- tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/workloads/Build | 1 + tools/perf/tests/workloads/thloop.c | 53 +++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 tools/perf/tests/workloads/thloop.c
tools/perf/tests/builtin-test.c +1 -0
@@ -120,6 +120,7 @@ static struct test_suite **tests[] = {static struct test_workload *workloads[] = { &workload__noploop, + &workload__thloop, };static int num_subtests (const struct test_suite *t)
tools/perf/tests/tests.h +1 -0
@@ -201,5 +201,6 @@ struct test_workload workload__##work = { \/* The list of test workloads */ DECLARE_WORKLOAD (noploop); +DECLARE_WORKLOAD (thloop);#endif /* TESTS_H */
tools/perf/tests/workloads/Build +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 perf-y += noploop.o +perf-y += thloop.o
tools/perf/tests/workloads/thloop.c new file +53 -0
53 lines not on this page · raw message
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Namhyung Kim
maintainerPATCH 4/12 perf test: Replace record test workload with thloop
In reply to Namhyung KimSo that it can get rid of requirements for a compiler.
$ sudo ./perf test -v 92 92: perf record tests : --- start --- test child forked, pid 740204 Basic --per-thread mode test Basic --per-thread mode test [Success] Register capture test Register capture test [Success] Basic --system-wide mode test Basic --system-wide mode test [Success] Basic target workload test Basic target workload test [Success] test child finished with 0 ---- end ---- perf record tests: Ok
--- tools/perf/tests/shell/record.sh | 59 ++------------------------------ 1 file changed, 3 insertions(+), 56 deletions(-)
tools/perf/tests/shell/record.sh +3 -56
@@ -9,17 +9,13 @@ shelldir=$(dirname "$0") err=0 perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX) -testprog=$(mktemp /tmp/__perf_test.prog.XXXXXX) +testprog="perf test -w thloop" testsym="test_loop" cleanup() { rm -rf "${perfdata}" rm -rf "${perfdata}".old - if [ "${testprog}" != "true" ]; then - rm -f "${testprog}" - fi - trap - EXIT TERM INT }
@@ -29,53 +25,6 @@ trap_cleanup() { } trap trap_cleanup EXIT TERM INT -build_test_program() { - if ! [ -x "$(command -v cc)" ]; then - # No CC found. Fall back to 'true' - testprog=true - testsym=true - return - fi - - echo "Build a test program" - cat <<EOF | cc -o ${testprog} -xc - -pthread -#include <stdio.h> -#include <stdlib.h> -#include <pthread.h> - -void test_loop(void) { - volatile int count = 1000000; - - while (count--) - continue; -} - -void *thfunc(void *arg) { - int forever = *(int *)arg; - - do { - test_loop(); - } while (forever); - - return NULL; -} - -int main(int argc, char *argv[]) { - pthread_t th; - int forever = 0; - - if (argc > 1) - forever = atoi(argv[1]); - - pthread_create(&th, NULL, thfunc, &forever); - test_loop(); - pthread_join(th, NULL); - - return 0; -} -EOF -} - test_per_thread() { echo "Basic --per-thread mode test" if ! perf record -o /dev/null --quiet ${testprog} 2> /dev/null
@@ -96,8 +45,8 @@ test_per_thread() { return fi - # run the test program in background (forever) - ${testprog} 1 & + # run the test program in background (for 30 seconds) + ${testprog} 30 & TESTPID=$! rm -f "${perfdata}"
@@ -205,8 +154,6 @@ test_workload() { echo "Basic target workload test [Success]" } -build_test_program - test_per_thread test_register_capture test_system_wide
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Re: [PATCH 04/12] perf test: Replace record test workload with thloop
Quoted 18 lines · Namhyung Kim
So that it can get rid of requirements for a compiler.
$ sudo ./perf test -v 92 92: perf record tests : --- start --- test child forked, pid 740204 Basic --per-thread mode test Basic --per-thread mode test [Success] Register capture test Register capture test [Success] Basic --system-wide mode test Basic --system-wide mode test [Success] Basic target workload test Basic target workload test [Success] test child finished with 0 ---- end ---- perf record tests: Ok
Quoted 4 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/record.sh | 59 ++------------------------------ 1 file changed, 3 insertions(+), 56 deletions(-)
Quoted 98 lines
tools/perf/tests/shell/record.sh +3
-56@@ -9,17 +9,13 @@ shelldir=$(dirname "$0") err=0 perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX) -testprog=$(mktemp /tmp/__perf_test.prog.XXXXXX) +testprog="perf test -w thloop" testsym="test_loop" cleanup() { rm -rf "${perfdata}" rm -rf "${perfdata}".old - if [ "${testprog}" != "true" ]; then - rm -f "${testprog}" - fi - trap - EXIT TERM INT }@@ -29,53 +25,6 @@ trap_cleanup() { } trap trap_cleanup EXIT TERM INT -build_test_program() { - if ! [ -x "$(command -v cc)" ]; then - # No CC found. Fall back to 'true' - testprog=true - testsym=true - return - fi - - echo "Build a test program" - cat <<EOF | cc -o ${testprog} -xc - -pthread -#include <stdio.h> -#include <stdlib.h> -#include <pthread.h> - -void test_loop(void) { - volatile int count = 1000000; - - while (count--) - continue; -} - -void *thfunc(void *arg) { - int forever = *(int *)arg; - - do { - test_loop(); - } while (forever); - - return NULL; -} - -int main(int argc, char *argv[]) { - pthread_t th; - int forever = 0; - - if (argc > 1) - forever = atoi(argv[1]); - - pthread_create(&th, NULL, thfunc, &forever); - test_loop(); - pthread_join(th, NULL); - - return 0; -} -EOF -} - test_per_thread() { echo "Basic --per-thread mode test" if ! perf record -o /dev/null --quiet ${testprog} 2> /dev/null@@ -96,8 +45,8 @@ test_per_thread() { return fi - # run the test program in background (forever) - ${testprog} 1 & + # run the test program in background (for 30 seconds) + ${testprog} 30 & TESTPID=$! rm -f "${perfdata}"@@ -205,8 +154,6 @@ test_workload() { echo "Basic target workload test [Success]" } -build_test_program - test_per_thread test_register_capture test_system_wide
Namhyung Kim
maintainerPATCH 5/12 perf test: Add 'leafloop' test workload
In reply to Namhyung KimThe leafloop workload is to run an infinite loop in the test_leaf function. This is needed for the ARM fp callgraph test to verify if it gets the correct callchains.
$ perf test -w leafloop
--- tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/workloads/Build | 3 +++ tools/perf/tests/workloads/leafloop.c | 34 +++++++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 tools/perf/tests/workloads/leafloop.c
tools/perf/tests/builtin-test.c +1 -0
@@ -121,6 +121,7 @@ static struct test_suite **tests[] = {static struct test_workload *workloads[] = { &workload__noploop, &workload__thloop, + &workload__leafloop, };static int num_subtests (const struct test_suite *t)
tools/perf/tests/tests.h +1 -0
@@ -202,5 +202,6 @@ struct test_workload workload__##work = { \/* The list of test workloads */ DECLARE_WORKLOAD (noploop);DECLARE_WORKLOAD (thloop); +DECLARE_WORKLOAD (leafloop);#endif /* TESTS_H */
tools/perf/tests/workloads/Build +3 -0
@@ -2,3 +2,6 @@ perf-y += noploop.o perf-y += thloop.o +perf-y += leafloop.o + +CFLAGS_leafloop.o = -g -O0 -fno-inline -fno-omit-frame-pointer
tools/perf/tests/workloads/leafloop.c new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <stdlib.h> +#include <linux/compiler.h> +#include "../tests.h" + +/* We want to check these symbols in perf script */ +noinline void leaf(volatile int b); +noinline void parent(volatile int b); + +static volatile int a; + +noinline void leaf(volatile int b) +{ +for (;;) + a += b; +} + +noinline void parent(volatile int b) +{ +leaf (b); +} + +static int leafloop (int argc,const char **argv) +{ +int c =1 ; + +if (argc >0 ) + c =atoi (argv[0 ]); + +parent (c); +return 0 ; +} + +DEFINE_WORKLOAD (leafloop);
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Namhyung Kim
maintainerPATCH 6/12 perf test: Replace arm callgraph fp test workload with leafloop
In reply to Namhyung KimSo that it can get rid of requirement of a compiler.
--- .../perf/tests/shell/test_arm_callgraph_fp.sh | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-)
tools/perf/tests/shell/test_arm_callgraph_fp.sh +3 -31
@@ -4,44 +4,16 @@ lscpu | grep -q "aarch64" || exit 2 -if ! [ -x "$(command -v cc)" ]; then - echo "failed: no compiler, install gcc" - exit 2 -fi - PERF_DATA=$(mktemp /tmp/__perf_test.perf.data.XXXXX) -TEST_PROGRAM_SOURCE=$(mktemp /tmp/test_program.XXXXX.c) -TEST_PROGRAM=$(mktemp /tmp/test_program.XXXXX) +TEST_PROGRAM="perf test -w leafloop" cleanup_files() { rm -f $PERF_DATA - rm -f $TEST_PROGRAM_SOURCE - rm -f $TEST_PROGRAM } trap cleanup_files exit term int -cat << EOF > $TEST_PROGRAM_SOURCE -int a = 0; -void leaf(void) { - for (;;) - a += a; -} -void parent(void) { - leaf(); -} -int main(void) { - parent(); - return 0; -} -EOF - -echo " + Compiling test program ($TEST_PROGRAM)..." - -CFLAGS="-g -O0 -fno-inline -fno-omit-frame-pointer" -cc $CFLAGS $TEST_PROGRAM_SOURCE -o $TEST_PROGRAM || exit 1 - # Add a 1 second delay to skip samples that are not in the leaf() function perf record -o $PERF_DATA --call-graph fp -e cycles//u -D 1000 --user-callchains -- $TEST_PROGRAM 2> /dev/null & PID=$!
@@ -58,11 +30,11 @@ wait $PID # program # 728 leaf # 753 parent -# 76c main +# 76c leafloop # ... perf script -i $PERF_DATA -F comm,ip,sym | head -n4 perf script -i $PERF_DATA -F comm,ip,sym | head -n4 | \ awk '{ if ($2 != "") sym[i++] = $2 } END { if (sym[0] != "leaf" || sym[1] != "parent" || - sym[2] != "main") exit 1 }' + sym[2] != "leafloop") exit 1 }'
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Re: [PATCH 06/12] perf test: Replace arm callgraph fp test workload with leafloop
Quoted 7 lines · Namhyung Kim
So that it can get rid of requirement of a compiler.
Reviewed-by Leo Yan <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- .../perf/tests/shell/test_arm_callgraph_fp.sh | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-)
Quoted 65 lines
tools/perf/tests/shell/test_arm_callgraph_fp.sh +3
-31@@ -4,44 +4,16 @@ lscpu | grep -q "aarch64" || exit 2 -if ! [ -x "$(command -v cc)" ]; then - echo "failed: no compiler, install gcc" - exit 2 -fi - PERF_DATA=$(mktemp /tmp/__perf_test.perf.data.XXXXX) -TEST_PROGRAM_SOURCE=$(mktemp /tmp/test_program.XXXXX.c) -TEST_PROGRAM=$(mktemp /tmp/test_program.XXXXX) +TEST_PROGRAM="perf test -w leafloop" cleanup_files() { rm -f $PERF_DATA - rm -f $TEST_PROGRAM_SOURCE - rm -f $TEST_PROGRAM } trap cleanup_files exit term int -cat << EOF > $TEST_PROGRAM_SOURCE -int a = 0; -void leaf(void) { - for (;;) - a += a; -} -void parent(void) { - leaf(); -} -int main(void) { - parent(); - return 0; -} -EOF - -echo " + Compiling test program ($TEST_PROGRAM)..." - -CFLAGS="-g -O0 -fno-inline -fno-omit-frame-pointer" -cc $CFLAGS $TEST_PROGRAM_SOURCE -o $TEST_PROGRAM || exit 1 - # Add a 1 second delay to skip samples that are not in the leaf() function perf record -o $PERF_DATA --call-graph fp -e cycles//u -D 1000 --user-callchains -- $TEST_PROGRAM 2> /dev/null & PID=$!@@ -58,11 +30,11 @@ wait $PID # program # 728 leaf # 753 parent -# 76c main +# 76c leafloop # ... perf script -i $PERF_DATA -F comm,ip,sym | head -n4 perf script -i $PERF_DATA -F comm,ip,sym | head -n4 | \ awk '{ if ($2 != "") sym[i++] = $2 } END { if (sym[0] != "leaf" || sym[1] != "parent" || - sym[2] != "main") exit 1 }' + sym[2] != "leafloop") exit 1 }'
Namhyung Kim
maintainerPATCH 7/12 perf test: Add 'sqrtloop' test workload
In reply to Namhyung KimThe sqrtloop creates a child process to run an infinite loop calling sqrt() with rand(). This is needed for ARM SPE fork test.
$ perf test -w sqrtloop
It can take an optional argument to specify how long it will run in seconds (default: 1).
--- tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/workloads/Build | 1 + tools/perf/tests/workloads/sqrtloop.c | 45 +++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 tools/perf/tests/workloads/sqrtloop.c
tools/perf/tests/builtin-test.c +1 -0
@@ -122,6 +122,7 @@ static struct test_workload *workloads[] = { &workload__noploop, &workload__thloop, &workload__leafloop, + &workload__sqrtloop, };static int num_subtests (const struct test_suite *t)
tools/perf/tests/tests.h +1 -0
@@ -203,5 +203,6 @@ struct test_workload workload__##work = { \DECLARE_WORKLOAD (noploop);DECLARE_WORKLOAD (thloop);DECLARE_WORKLOAD (leafloop); +DECLARE_WORKLOAD (sqrtloop);#endif /* TESTS_H */
tools/perf/tests/workloads/Build +1 -0
@@ -3,5 +3,6 @@ perf-y += noploop.o perf-y += thloop.o perf-y += leafloop.o +perf-y += sqrtloop.o CFLAGS_leafloop.o = -g -O0 -fno-inline -fno-omit-frame-pointer
tools/perf/tests/workloads/sqrtloop.c new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Namhyung Kim
maintainerPATCH 8/12 perf test: Replace arm spe fork test workload with sqrtloop
In reply to Namhyung KimSo that it can get rid of requirement of a compiler. I've also removed killall as it'll kill perf process now and run the test workload for 10 sec instead.
--- tools/perf/tests/shell/test_arm_spe_fork.sh | 44 +-------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
tools/perf/tests/shell/test_arm_spe_fork.sh +1 -43
@@ -11,14 +11,7 @@ skip_if_no_arm_spe_event() { skip_if_no_arm_spe_event || exit 2 -# skip if there's no compiler -if ! [ -x "$(command -v cc)" ]; then - echo "failed: no compiler, install gcc" - exit 2 -fi - -TEST_PROGRAM_SOURCE=$(mktemp /tmp/__perf_test.program.XXXXX.c) -TEST_PROGRAM=$(mktemp /tmp/__perf_test.program.XXXXX) +TEST_PROGRAM="perf test -w sqrtloop 10" PERF_DATA=$(mktemp /tmp/__perf_test.perf.data.XXXXX) PERF_RECORD_LOG=$(mktemp /tmp/__perf_test.log.XXXXX)
@@ -27,43 +20,10 @@ cleanup_files() echo "Cleaning up files..." rm -f ${PERF_RECORD_LOG} rm -f ${PERF_DATA} - rm -f ${TEST_PROGRAM_SOURCE} - rm -f ${TEST_PROGRAM} } trap cleanup_files exit term int -# compile test program -cat << EOF > $TEST_PROGRAM_SOURCE -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/wait.h> - -int workload() { - while (1) - sqrt(rand()); - return 0; -} - -int main() { - switch (fork()) { - case 0: - return workload(); - case -1: - return 1; - default: - wait(NULL); - } - return 0; -} -EOF - -echo "Compiling test program..." -CFLAGS="-lm" -cc $TEST_PROGRAM_SOURCE $CFLAGS -o $TEST_PROGRAM || exit 1 - echo "Recording workload..." perf record -o ${PERF_DATA} -e arm_spe/period=65536/ -vvv -- $TEST_PROGRAM > ${PERF_RECORD_LOG} 2>&1 & PERFPID=$!
@@ -78,8 +38,6 @@ echo Log lines after 1 second = $log1 kill $PERFPID wait $PERFPID -# test program may leave an orphan process running the workload -killall $(basename $TEST_PROGRAM) if [ "$log0" = "$log1" ]; then
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Re: [PATCH 08/12] perf test: Replace arm spe fork test workload with sqrtloop
Quoted 9 lines · Namhyung Kim
So that it can get rid of requirement of a compiler. I've also removed killall as it'll kill perf process now and run the test workload for 10 sec instead.
Tested-by Leo Yan <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/test_arm_spe_fork.sh | 44 +-------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
Quoted 74 lines
tools/perf/tests/shell/test_arm_spe_fork.sh +1
-43@@ -11,14 +11,7 @@ skip_if_no_arm_spe_event() { skip_if_no_arm_spe_event || exit 2 -# skip if there's no compiler -if ! [ -x "$(command -v cc)" ]; then - echo "failed: no compiler, install gcc" - exit 2 -fi - -TEST_PROGRAM_SOURCE=$(mktemp /tmp/__perf_test.program.XXXXX.c) -TEST_PROGRAM=$(mktemp /tmp/__perf_test.program.XXXXX) +TEST_PROGRAM="perf test -w sqrtloop 10" PERF_DATA=$(mktemp /tmp/__perf_test.perf.data.XXXXX) PERF_RECORD_LOG=$(mktemp /tmp/__perf_test.log.XXXXX)@@ -27,43 +20,10 @@ cleanup_files() echo "Cleaning up files..." rm -f ${PERF_RECORD_LOG} rm -f ${PERF_DATA} - rm -f ${TEST_PROGRAM_SOURCE} - rm -f ${TEST_PROGRAM} } trap cleanup_files exit term int -# compile test program -cat << EOF > $TEST_PROGRAM_SOURCE -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/wait.h> - -int workload() { - while (1) - sqrt(rand()); - return 0; -} - -int main() { - switch (fork()) { - case 0: - return workload(); - case -1: - return 1; - default: - wait(NULL); - } - return 0; -} -EOF - -echo "Compiling test program..." -CFLAGS="-lm" -cc $TEST_PROGRAM_SOURCE $CFLAGS -o $TEST_PROGRAM || exit 1 - echo "Recording workload..." perf record -o ${PERF_DATA} -e arm_spe/period=65536/ -vvv -- $TEST_PROGRAM > ${PERF_RECORD_LOG} 2>&1 & PERFPID=$!@@ -78,8 +38,6 @@ echo Log lines after 1 second = $log1 kill $PERFPID wait $PERFPID -# test program may leave an orphan process running the workload -killall $(basename $TEST_PROGRAM) if [ "$log0" = "$log1" ]; then
Namhyung Kim
maintainerPATCH 9/12 perf test: Add 'brstack' test workload
In reply to Namhyung KimThe brstack is to run different kinds of branches repeatedly. This is necessary for brstack test case to verify if it has correct branch info.
$ perf test -w brstack
I renamed the internal functions to have brstack_ prefix as it's too generic name.
--- tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/workloads/Build | 2 ++ tools/perf/tests/workloads/brstack.c | 39 ++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 tools/perf/tests/workloads/brstack.c
tools/perf/tests/builtin-test.c +1 -0
@@ -123,6 +123,7 @@ static struct test_workload *workloads[] = { &workload__thloop, &workload__leafloop, &workload__sqrtloop, + &workload__brstack, };static int num_subtests (const struct test_suite *t)
tools/perf/tests/tests.h +1 -0
@@ -204,5 +204,6 @@ DECLARE_WORKLOAD(noploop);DECLARE_WORKLOAD (thloop);DECLARE_WORKLOAD (leafloop);DECLARE_WORKLOAD (sqrtloop); +DECLARE_WORKLOAD (brstack);#endif /* TESTS_H */
tools/perf/tests/workloads/Build +2 -0
@@ -4,5 +4,7 @@ perf-y += noploop.o perf-y += thloop.o perf-y += leafloop.o perf-y += sqrtloop.o +perf-y += brstack.o CFLAGS_leafloop.o = -g -O0 -fno-inline -fno-omit-frame-pointer +CFLAGS_brstack.o = -g -O0 -fno-inline
tools/perf/tests/workloads/brstack.c new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <stdlib.h> +#include "../tests.h" + + +#define BENCH_RUNS 999999 + +static volatile int cnt; + +static void brstack_bar (void ) { +}/* return */ + +static void brstack_foo (void ) { +brstack_bar ();/* call */ +}/* return */ + +static void brstack_bench (void ) { +void (*brstack_foo_ind)(void ) = brstack_foo; + +if ((cnt++) %3 )/* branch (cond) */ +brstack_foo ();/* call */ +brstack_bar ();/* call */ +brstack_foo_ind ();/* call (ind) */ +} + +static int brstack (int argc,const char **argv) +{ +if (argc >0 ) + cnt =atoi (argv[0 ]); + +while (1 ) { +if ((cnt++) >BENCH_RUNS ) +break ; +brstack_bench ();/* call */ + }/* branch (uncond) */ +return 0 ; +} + +DEFINE_WORKLOAD (brstack);
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Re: [PATCH 09/12] perf test: Add 'brstack' test workload
On 10/11/2022 18:19, Namhyung Kim wrote:
[...]
Quoted 19 lines
tools/perf/tests/workloads/brstack.c new file +19
-0+ +#define BENCH_RUNS 999999 + +static volatile int cnt; + +static void brstack_bar (void ) { +}/* return */ + +static void brstack_foo (void ) { +brstack_bar ();/* call */ +}/* return */ + +static void brstack_bench (void ) { +void (*brstack_foo_ind)(void ) = brstack_foo; + +if ((cnt++) %3 )/* branch (cond) */ +brstack_foo ();/* call */ +brstack_bar ();/* call */ +brstack_foo_ind ();/* call (ind) */
tools/perf/tests/workloads/brstack.c line 33
Quoted 10 lines
tools/perf/tests/workloads/brstack.c new file +10
-0+} + +static int brstack (int argc,const char **argv) +{ +if (argc >0 ) + cnt =atoi (argv[0 ]); + +while (1 ) { +if ((cnt++) >BENCH_RUNS ) +break ;
Hi Namhyung,
I'm reading this as you can specify the number of loops as an argument.
In that case should it be more like this?
int num_loops = argc>0 ? atoi(argv[0]) : BENCH_RUNS; if ((cnt++) > num_loops) break;
Quoted 6 lines
tools/perf/tests/workloads/brstack.c new file +6
-0+brstack_bench ();/* call */ + }/* branch (uncond) */ +return 0 ; +} + +DEFINE_WORKLOAD (brstack);
Namhyung Kim
maintainerRe: [PATCH 09/12] perf test: Add 'brstack' test workload
Hi James,
Quoted 37 lines · James Clark
On 10/11/2022 18:19, Namhyung Kim wrote:
[...]Quoted 19 lines
tools/perf/tests/workloads/brstack.c new file +19
-0+ +#define BENCH_RUNS 999999 + +static volatile int cnt; + +static void brstack_bar (void ) { +}/* return */ + +static void brstack_foo (void ) { +brstack_bar ();/* call */ +}/* return */ + +static void brstack_bench (void ) { +void (*brstack_foo_ind)(void ) = brstack_foo; + +if ((cnt++) %3 )/* branch (cond) */ +brstack_foo ();/* call */ +brstack_bar ();/* call */ +brstack_foo_ind ();/* call (ind) */ tools/perf/tests/workloads/brstack.c line 33
Quoted 10 lines
tools/perf/tests/workloads/brstack.c new file +10
-0+} + +static int brstack (int argc,const char **argv) +{ +if (argc >0 ) + cnt =atoi (argv[0 ]); + +while (1 ) { +if ((cnt++) >BENCH_RUNS ) +break ;Hi Namhyung,
Quoted 8 lines
I'm reading this as you can specify the number of loops as an argument.
In that case should it be more like this?
int num_loops = argc>0 ? atoi(argv[0]) : BENCH_RUNS; if ((cnt++) > num_loops) break;
Yep, that's more intuitive. Will change!
Thanks,
Namhyung
Namhyung Kim
maintainerPATCH 10/12 perf test: Replace brstack test workload
In reply to Namhyung KimSo that it can get rid of requirement of a compiler. Also rename the symbols to match with the perf test workload.
--- tools/perf/tests/shell/test_brstack.sh | 66 +++++--------------------- 1 file changed, 12 insertions(+), 54 deletions(-)
tools/perf/tests/shell/test_brstack.sh +12 -54
@@ -4,18 +4,12 @@ # SPDX-License-Identifier: GPL-2.0 # German Gomez <[email protected]>, 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 perf record -b -o- -B --branch-filter any,save_type,u true > /dev/null 2>&1 || exit 2 TMPDIR=$(mktemp -d /tmp/__perf_test.program.XXXXX) +TESTPROG="perf test -w brstack" cleanup() { rm -rf $TMPDIR
@@ -23,57 +17,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\+[^ ]*/brstsack_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:
@@ -88,10 +49,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
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Re: [PATCH 10/12] perf test: Replace brstack test workload
Hi Namhyung, thanks for doing the refactor, it looks a lot cleaner
Quoted 86 lines · Namhyung Kim
So that it can get rid of requirement of a compiler. Also rename the symbols to match with the perf test workload.
Cc German Gomez <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/test_brstack.sh | 66 +++++--------------------- 1 file changed, 12 insertions(+), 54 deletions(-)tools/perf/tests/shell/test_brstack.sh +3
-46@@ -4,18 +4,12 @@ # SPDX-License-Identifier: GPL-2.0 # German Gomez <[email protected]>, 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 perf record -b -o- -B --branch-filter any,save_type,u true > /dev/null 2>&1 || exit 2 TMPDIR=$(mktemp -d /tmp/__perf_test.program.XXXXX) +TESTPROG="perf test -w brstack" cleanup() { rm -rf $TMPDIR@@ -23,57 +17,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
tools/perf/tests/shell/test_brstack.sh cleanup() { · line 35
Quoted 10 lines
tools/perf/tests/shell/test_brstack.sh +6
-4- 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\+[^ ]*/brstsack_bench\+[^ ]*/RET$" $TMPDIR/perf.script
Small typo here s/brstsack_bench/brstack_bench
I think James was doing some BRBE work here, so probably best if he also gives his review/test tag.
Quoted 17 lines
tools/perf/tests/shell/test_brstack.sh +3
-4+ 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:@@ -88,10 +49,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
Re: [PATCH 10/12] perf test: Replace brstack test workload
Quoted 20 lines · German Gomez
Hi Namhyung, thanks for doing the refactor, it looks a lot cleaner
Quoted 17 lines · Namhyung Kim
So that it can get rid of requirement of a compiler. Also rename the symbols to match with the perf test workload.
Cc German Gomez <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/test_brstack.sh | 66 +++++--------------------- 1 file changed, 12 insertions(+), 54 deletions(-)tools/perf/tests/shell/test_brstack.sh +0
-0@@ -4,18 +4,12 @@ # SPDX-License-Identifier: GPL-2.0 # German Gomez <[email protected]>, 2022
Quoted 10 lines
tools/perf/tests/shell/test_brstack.sh line 9
Quoted 10 lines
tools/perf/tests/shell/test_brstack.sh +0
-7-# 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 perf record -b -o- -B --branch-filter any,save_type,u true > /dev/null 2>&1 || exit 2
Hmm I was wondering why this command was failing for me and always skipping the test. Is the -b conflicting with the --branch-filter here?
Re: [PATCH 10/12] perf test: Replace brstack test workload
Quoted 22 lines · German Gomez
Quoted 20 lines · German Gomez
Hi Namhyung, thanks for doing the refactor, it looks a lot cleaner
Quoted 17 lines · Namhyung Kim
So that it can get rid of requirement of a compiler. Also rename the symbols to match with the perf test workload.
Cc German Gomez <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/test_brstack.sh | 66 +++++--------------------- 1 file changed, 12 insertions(+), 54 deletions(-)tools/perf/tests/shell/test_brstack.sh +0
-0@@ -4,18 +4,12 @@ # SPDX-License-Identifier: GPL-2.0 # German Gomez <[email protected]>, 2022
Quoted 13 lines
Quoted 10 lines
tools/perf/tests/shell/test_brstack.sh line 9
Quoted 10 lines
tools/perf/tests/shell/test_brstack.sh +0
-7-# 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 perf record -b -o- -B --branch-filter any,save_type,u true > /dev/null 2>&1 || exit 2Hmm I was wondering why this command was failing for me and always skipping the test. Is the -b conflicting with the --branch-filter here?
Yes, the fix is here [1], but I don't see it on git yet.
[1]:
https://lore.kernel.org/linux-perf-users/[email protected]/T/#t
Re: [PATCH 10/12] perf test: Replace brstack test workload
Quoted 39 lines · James Clark
Quoted 22 lines · German Gomez
Quoted 20 lines · German Gomez
Hi Namhyung, thanks for doing the refactor, it looks a lot cleaner
Quoted 17 lines · Namhyung Kim
So that it can get rid of requirement of a compiler. Also rename the symbols to match with the perf test workload.
Cc German Gomez <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/test_brstack.sh | 66 +++++--------------------- 1 file changed, 12 insertions(+), 54 deletions(-)tools/perf/tests/shell/test_brstack.sh +0
-0@@ -4,18 +4,12 @@ # SPDX-License-Identifier: GPL-2.0 # German Gomez <[email protected]>, 2022Quoted 13 lines
Quoted 10 lines
tools/perf/tests/shell/test_brstack.sh line 9
Quoted 10 lines
tools/perf/tests/shell/test_brstack.sh +0
-7-# 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 perf record -b -o- -B --branch-filter any,save_type,u true > /dev/null 2>&1 || exit 2Hmm I was wondering why this command was failing for me and always skipping the test. Is the -b conflicting with the --branch-filter here?
Quoted 1 line
Yes, the fix is here [1], but I don't see it on git yet.
Oh sorry it's on perf/urgent. I wasn't looking there.
Quoted 3 lines
[1]:
https://lore.kernel.org/linux-perf-users/[email protected]/T/#t
James Clark
Tested-byRe: [PATCH 10/12] perf test: Replace brstack test workload
In reply to German GomezQuoted 93 lines · German Gomez
Hi Namhyung, thanks for doing the refactor, it looks a lot cleaner
Quoted 90 lines · Namhyung Kim
So that it can get rid of requirement of a compiler. Also rename the symbols to match with the perf test workload.
Cc German Gomez <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/test_brstack.sh | 66 +++++--------------------- 1 file changed, 12 insertions(+), 54 deletions(-)tools/perf/tests/shell/test_brstack.sh +3
-50@@ -4,18 +4,12 @@ # SPDX-License-Identifier: GPL-2.0 # German Gomez <[email protected]>, 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 perf record -b -o- -B --branch-filter any,save_type,u true > /dev/null 2>&1 || exit 2 TMPDIR=$(mktemp -d /tmp/__perf_test.program.XXXXX) +TESTPROG="perf test -w brstack" cleanup() { rm -rf $TMPDIR@@ -23,57 +17,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
Quoted 8 lines
tools/perf/tests/shell/test_brstack.sh cleanup() { · line 35
Quoted 6 lines
tools/perf/tests/shell/test_brstack.sh +6
-0+ 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\+[^ ]*/brstsack_bench\+[^ ]*/RET$" $TMPDIR/perf.scriptSmall typo here s/brstsack_bench/brstack_bench
With this typo fixed and with the other "-b" fix mentioned:
Quoted 22 lines
I think James was doing some BRBE work here, so probably best if he also gives his review/test tag.
Acked-by German Gomez <[email protected]>Quoted 17 lines
tools/perf/tests/shell/test_brstack.sh +3
-4+ 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:@@ -88,10 +49,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
Namhyung Kim
maintainerPATCH 11/12 perf test: Add 'datasym' test workload
In reply to Namhyung KimThe datasym workload is to check if perf mem command gets the data addresses precisely. This is needed for data symbol test.
$ perf test -w datasym
I had to keep the buf1 in the data section, otherwise it could end up in the BSS and was mmaped as a separate //anon region, then it was not symbolized at all. It needs to be fixed separately.
--- tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/workloads/Build | 2 ++ tools/perf/tests/workloads/datasym.c | 24 ++++++++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 tools/perf/tests/workloads/datasym.c
tools/perf/tests/builtin-test.c +1 -0
@@ -124,6 +124,7 @@ static struct test_workload *workloads[] = { &workload__leafloop, &workload__sqrtloop, &workload__brstack, + &workload__datasym, };static int num_subtests (const struct test_suite *t)
tools/perf/tests/tests.h +1 -0
@@ -205,5 +205,6 @@ DECLARE_WORKLOAD(thloop);DECLARE_WORKLOAD (leafloop);DECLARE_WORKLOAD (sqrtloop);DECLARE_WORKLOAD (brstack); +DECLARE_WORKLOAD (datasym);#endif /* TESTS_H */
tools/perf/tests/workloads/Build +2 -0
@@ -5,6 +5,8 @@ perf-y += thloop.o perf-y += leafloop.o perf-y += sqrtloop.o perf-y += brstack.o +perf-y += datasym.o CFLAGS_leafloop.o = -g -O0 -fno-inline -fno-omit-frame-pointer CFLAGS_brstack.o = -g -O0 -fno-inline +CFLAGS_datasym.o = -g -O0 -fno-inline
tools/perf/tests/workloads/datasym.c new file +24 -0
@@ -0,0 +1,24 @@ +#include <linux/compiler.h> +#include "../tests.h" + +typedef struct _buf { +char data1; +char reserved[55 ]; +char data2; +}buf __attribute__((aligned (64 ))); + +static buf buf1 = { +/* to have this in the data section */ + .reserved[0 ] =1 , +}; + +static int datasym (int argc__maybe_unused ,const char **argv__maybe_unused ) +{ +for (;;) { + buf1.data1++; + buf1.data2 += buf1.data1; + } +return 0 ; +} + +DEFINE_WORKLOAD (datasym);
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Namhyung Kim
maintainerPATCH 12/12 perf test: Replace data symbol test workload with datasym
In reply to Namhyung KimSo that it can get rid of requirement of a compiler.
$ sudo ./perf test -v 109 109: Test data symbol : --- start --- test child forked, pid 844526 Recording workload... [ perf record: Woken up 2 times to write data ] [ perf record: Captured and wrote 0.354 MB /tmp/__perf_test.perf.data.GFeZO (4847 samples) ] Cleaning up files... test child finished with 0 ---- end ---- Test data symbol: Ok
--- tools/perf/tests/shell/test_data_symbol.sh | 29 +--------------------- 1 file changed, 1 insertion(+), 28 deletions(-)
tools/perf/tests/shell/test_data_symbol.sh +1 -28
@@ -11,13 +11,7 @@ skip_if_no_mem_event() { skip_if_no_mem_event || exit 2 -# skip if there's no compiler -if ! [ -x "$(command -v cc)" ]; then - echo "skip: no compiler, install gcc" - exit 2 -fi - -TEST_PROGRAM=$(mktemp /tmp/__perf_test.program.XXXXX) +TEST_PROGRAM="perf test -w datasym" PERF_DATA=$(mktemp /tmp/__perf_test.perf.data.XXXXX) check_result() {
@@ -45,31 +39,10 @@ cleanup_files() { echo "Cleaning up files..." rm -f ${PERF_DATA} - rm -f ${TEST_PROGRAM} } trap cleanup_files exit term int -# compile test program -echo "Compiling test program..." -cat << EOF | cc -o ${TEST_PROGRAM} -x c - -typedef struct _buf { - char data1; - char reserved[55]; - char data2; -} buf __attribute__((aligned(64))); - -static buf buf1; - -int main(void) { - for (;;) { - buf1.data1++; - buf1.data2 += buf1.data1; - } - return 0; -} -EOF - echo "Recording workload..." # perf mem/c2c internally uses IBS PMU on AMD CPU which doesn't support
Signature · 1 line
2.38.1.493.g58b659f92b-goog
Re: [PATCH 12/12] perf test: Replace data symbol test workload with datasym
Quoted 14 lines · Namhyung Kim
So that it can get rid of requirement of a compiler.
$ sudo ./perf test -v 109 109: Test data symbol : --- start --- test child forked, pid 844526 Recording workload... [ perf record: Woken up 2 times to write data ] [ perf record: Captured and wrote 0.354 MB /tmp/__perf_test.perf.data.GFeZO (4847 samples) ] Cleaning up files... test child finished with 0 ---- end ---- Test data symbol: Ok
Quoted 6 lines
Cc Leo Yan <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/shell/test_data_symbol.sh | 29 +--------------------- 1 file changed, 1 insertion(+), 28 deletions(-)
Quoted 51 lines
tools/perf/tests/shell/test_data_symbol.sh +1
-28@@ -11,13 +11,7 @@ skip_if_no_mem_event() { skip_if_no_mem_event || exit 2 -# skip if there's no compiler -if ! [ -x "$(command -v cc)" ]; then - echo "skip: no compiler, install gcc" - exit 2 -fi - -TEST_PROGRAM=$(mktemp /tmp/__perf_test.program.XXXXX) +TEST_PROGRAM="perf test -w datasym" PERF_DATA=$(mktemp /tmp/__perf_test.perf.data.XXXXX) check_result() {@@ -45,31 +39,10 @@ cleanup_files() { echo "Cleaning up files..." rm -f ${PERF_DATA} - rm -f ${TEST_PROGRAM} } trap cleanup_files exit term int -# compile test program -echo "Compiling test program..." -cat << EOF | cc -o ${TEST_PROGRAM} -x c - -typedef struct _buf { - char data1; - char reserved[55]; - char data2; -} buf __attribute__((aligned(64))); - -static buf buf1; - -int main(void) { - for (;;) { - buf1.data1++; - buf1.data2 += buf1.data1; - } - return 0; -} -EOF - echo "Recording workload..." # perf mem/c2c internally uses IBS PMU on AMD CPU which doesn't support