perf tests: Factor out fake_setup_machine()
Namhyung Kim
maintainerPATCH 1/2 perf tests: Factor out fake_setup_machine()
The fake_setup_machine() is for setting up a environment for testing various hists operations. As it'll be used for other test cases it'd better factoring it out.
--- tools/perf/Makefile.perf | 1 + tools/perf/tests/hists_common.c | 148 ++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/hists_common.h | 44 ++++++++++++ tools/perf/tests/hists_link.c | 141 +------------------------------------- 4 files changed, 195 insertions(+), 139 deletions(-) create mode 100644 tools/perf/tests/hists_common.c create mode 100644 tools/perf/tests/hists_common.h
tools/perf/Makefile.perf +1 -0
@@ -396,6 +396,7 @@ LIB_OBJS += $(OUTPUT)tests/rdpmc.o LIB_OBJS += $(OUTPUT)tests/evsel-roundtrip-name.o LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o LIB_OBJS += $(OUTPUT)tests/pmu.o +LIB_OBJS += $(OUTPUT)tests/hists_common.o LIB_OBJS += $(OUTPUT)tests/hists_link.o LIB_OBJS += $(OUTPUT)tests/python-use.o LIB_OBJS += $(OUTPUT)tests/bp_signal.o
tools/perf/tests/hists_common.c new file +148 -0
148 lines not on this page · raw message
tools/perf/tests/hists_common.h new file +44 -0
44 lines not on this page · raw message
tools/perf/tests/hists_link.c +2 -139
153 lines not on this page · raw message
Signature · 1 line
1.9.2
Namhyung Kim
maintainerPATCH 2/2 perf tests: Add a test case for hists filtering
Now we have changed how hists stats are accounted especially when filter(s) applied. So add a test case to verify it.
--- tools/perf/Makefile.perf | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/hists_filter.c | 315 ++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 4 files changed, 321 insertions(+) create mode 100644 tools/perf/tests/hists_filter.c
tools/perf/Makefile.perf +1 -0
@@ -398,6 +398,7 @@ LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o LIB_OBJS += $(OUTPUT)tests/pmu.o LIB_OBJS += $(OUTPUT)tests/hists_common.o LIB_OBJS += $(OUTPUT)tests/hists_link.o +LIB_OBJS += $(OUTPUT)tests/hists_filter.o LIB_OBJS += $(OUTPUT)tests/python-use.o LIB_OBJS += $(OUTPUT)tests/bp_signal.o LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o
tools/perf/tests/builtin-test.c +4 -0
@@ -124,6 +124,10 @@ static struct test {#endif #endif { + .desc = "Test filtering hist entries", + .func = test__hists_filter, + }, + { .func = NULL, }, };
tools/perf/tests/hists_filter.c new file +315 -0
315 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -41,6 +41,7 @@ int test__sample_parsing(void);int test__keep_tracking (void );int test__parse_no_sample_id_all (void );int test__dwarf_unwind (void ); +int test__hists_filter (void );#if defined(__x86_64__) || defined(__i386__)#ifdef HAVE_DWARF_UNWIND_SUPPORT
Signature · 1 line
1.9.2
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tests: Add a test case for hists filtering
perf tests: Add a test case for hists filtering
Commit-ID: 3c3cfd99c8988e568a5243f38c600a6a03d1b148 Gitweb: http://git.kernel.org/tip/3c3cfd99c8988e568a5243f38c600a6a03d1b148 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 25 Apr 2014 12:28:14 +0900 Committer: Jiri Olsa <[email protected]> CommitDate: Mon, 28 Apr 2014 13:42:45 +0200
perf tests: Add a test case for hists filtering
Now we have changed how hists stats are accounted especially when filter(s) applied. So add a test case to verify it.
--- tools/perf/Makefile.perf | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/hists_filter.c | 315 ++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 4 files changed, 321 insertions(+)
tools/perf/Makefile.perf +1 -0
@@ -399,6 +399,7 @@ LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o LIB_OBJS += $(OUTPUT)tests/pmu.o LIB_OBJS += $(OUTPUT)tests/hists_common.o LIB_OBJS += $(OUTPUT)tests/hists_link.o +LIB_OBJS += $(OUTPUT)tests/hists_filter.o LIB_OBJS += $(OUTPUT)tests/python-use.o LIB_OBJS += $(OUTPUT)tests/bp_signal.o LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o
tools/perf/tests/builtin-test.c +4 -0
@@ -124,6 +124,10 @@ static struct test {#endif #endif { + .desc = "Test filtering hist entries", + .func = test__hists_filter, + }, + { .func = NULL, }, };
tools/perf/tests/hists_filter.c new file +315 -0
315 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -41,6 +41,7 @@ int test__sample_parsing(void);int test__keep_tracking (void );int test__parse_no_sample_id_all (void );int test__dwarf_unwind (void ); +int test__hists_filter (void );#if defined(__x86_64__) || defined(__i386__)#ifdef HAVE_DWARF_UNWIND_SUPPORT
Quoted 3 lines · Namhyung Kim
The
fake_setup_machine()is for setting up a environment for testing various hists operations. As it'll be used for other test cases it'd better factoring it out.
looks like print_hists could be in hists_common.c as well.. within another update ;-)
nice!
for patchset
thanks,
jirka
Quoted 389 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/Makefile.perf | 1 + tools/perf/tests/hists_common.c | 148 ++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/hists_common.h | 44 ++++++++++++ tools/perf/tests/hists_link.c | 141 +------------------------------------- 4 files changed, 195 insertions(+), 139 deletions(-) create mode 100644 tools/perf/tests/hists_common.c create mode 100644 tools/perf/tests/hists_common.htools/perf/Makefile.perf +1
-0@@ -396,6 +396,7 @@ LIB_OBJS += $(OUTPUT)tests/rdpmc.o LIB_OBJS += $(OUTPUT)tests/evsel-roundtrip-name.o LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o LIB_OBJS += $(OUTPUT)tests/pmu.o +LIB_OBJS += $(OUTPUT)tests/hists_common.o LIB_OBJS += $(OUTPUT)tests/hists_link.o LIB_OBJS += $(OUTPUT)tests/python-use.o LIB_OBJS += $(OUTPUT)tests/bp_signal.otools/perf/tests/hists_common.c new file +148
-0@@ -0,0 +1,148 @@ +#include "perf.h" +#include "util/debug.h" +#include "util/symbol.h" +#include "util/sort.h" +#include "util/evsel.h" +#include "util/evlist.h" +#include "util/machine.h" +#include "util/thread.h" +#include "tests/hists_common.h" + +static struct { +u32 pid; +const char *comm; +} fake_threads[] = { + {100 ,"perf" }, + {200 ,"perf" }, + {300 ,"bash" }, +}; + +static struct { +u32 pid; +u64 start; +const char *filename; +} fake_mmap_info[] = { + {100 ,0x40000 ,"perf" }, + {100 ,0x50000 ,"libc" }, + {100 ,0xf0000 ,"[kernel]" }, + {200 ,0x40000 ,"perf" }, + {200 ,0x50000 ,"libc" }, + {200 ,0xf0000 ,"[kernel]" }, + {300 ,0x40000 ,"bash" }, + {300 ,0x50000 ,"libc" }, + {300 ,0xf0000 ,"[kernel]" }, +}; + +struct fake_sym { +u64 start; +u64 length; +const char *name; +}; + +static struct fake_sym perf_syms[] = { + {700 ,100 ,"main" }, + {800 ,100 ,"run_command" }, + {900 ,100 ,"cmd_record" }, +}; + +static struct fake_sym bash_syms[] = { + {700 ,100 ,"main" }, + {800 ,100 ,"xmalloc" }, + {900 ,100 ,"xfree" }, +}; + +static struct fake_sym libc_syms[] = { + {700 ,100 ,"malloc" }, + {800 ,100 ,"free" }, + {900 ,100 ,"realloc" }, +}; + +static struct fake_sym kernel_syms[] = { + {700 ,100 ,"schedule" }, + {800 ,100 ,"page_fault" }, + {900 ,100 ,"sys_perf_event_open" }, +}; + +static struct { +const char *dso_name; +struct fake_sym *syms; +size_t nr_syms; +} fake_symbols[] = { + {"perf" , perf_syms,ARRAY_SIZE (perf_syms) }, + {"bash" , bash_syms,ARRAY_SIZE (bash_syms) }, + {"libc" , libc_syms,ARRAY_SIZE (libc_syms) }, + {"[kernel]" , kernel_syms,ARRAY_SIZE (kernel_syms) }, +}; + +struct machine *setup_fake_machine (struct machines *machines) +{ +struct machine *machine =machines__find (machines,HOST_KERNEL_ID ); +size_t i; + +if (machine ==NULL ) { +pr_debug ("Not enough memory for machine setup\n" ); +return NULL ; + } + +for (i =0 ; i <ARRAY_SIZE (fake_threads); i++) { +struct thread *thread; + + thread =machine__findnew_thread (machine, fake_threads[i].pid, + fake_threads[i].pid); +if (thread ==NULL ) + goto out; + +thread__set_comm (thread, fake_threads[i].comm,0 ); + } + +for (i =0 ; i <ARRAY_SIZE (fake_mmap_info); i++) { +union perf_event fake_mmap_event = { + .mmap = { + .header = { .misc =PERF_RECORD_MISC_USER , }, + .pid = fake_mmap_info[i].pid, + .tid = fake_mmap_info[i].pid, + .start = fake_mmap_info[i].start, + .len =0x1000ULL , + .pgoff =0ULL , + }, + }; + +strcpy (fake_mmap_event.mmap.filename, + fake_mmap_info[i].filename); + +machine__process_mmap_event (machine, &fake_mmap_event,NULL ); + } + +for (i =0 ; i <ARRAY_SIZE (fake_symbols); i++) { +size_t k; +struct dso *dso; + + dso =__dsos__findnew (&machine->user_dsos, + fake_symbols[i].dso_name); +if (dso ==NULL ) + goto out; + +/* emulate dso__load() */ +dso__set_loaded (dso,MAP__FUNCTION ); + +for (k =0 ; k < fake_symbols[i].nr_syms; k++) { +struct symbol *sym; +struct fake_sym *fsym = &fake_symbols[i].syms[k]; + + sym =symbol__new (fsym->start, fsym->length, +STB_GLOBAL , fsym->name); +if (sym ==NULL ) + goto out; + +symbols__insert (&dso->symbols[MAP__FUNCTION ], sym); + } + } + +return machine; + +out: +pr_debug ("Not enough memory for machine setup\n" ); +machine__delete_threads (machine); +machine__delete (machine); +return NULL ; +}tools/perf/tests/hists_common.h new file +44
-0@@ -0,0 +1,44 @@ +#ifndef __PERF_TESTS__HISTS_COMMON_H__ +#define __PERF_TESTS__HISTS_COMMON_H__ + +struct machine ; +struct machines ; + +/* +* The setup_fake_machine() provides a test environment which consists +* of 3 processes that have 3 mappings and in turn, have 3 symbols +* respectively. See below table: +* +* Command: Pid Shared Object Symbol +* ............. ............. ................... +* perf: 100 perf main +* perf: 100 perf run_command +* perf: 100 perf comd_record +* perf: 100 libc malloc +* perf: 100 libc free +* perf: 100 libc realloc +* perf: 100 [kernel] schedule +* perf: 100 [kernel] page_fault +* perf: 100 [kernel] sys_perf_event_open +* perf: 200 perf main +* perf: 200 perf run_command +* perf: 200 perf comd_record +* perf: 200 libc malloc +* perf: 200 libc free +* perf: 200 libc realloc +* perf: 200 [kernel] schedule +* perf: 200 [kernel] page_fault +* perf: 200 [kernel] sys_perf_event_open +* bash: 300 bash main +* bash: 300 bash xmalloc +* bash: 300 bash xfree +* bash: 300 libc malloc +* bash: 300 libc free +* bash: 300 libc realloc +* bash: 300 [kernel] schedule +* bash: 300 [kernel] page_fault +* bash: 300 [kernel] sys_perf_event_open +*/ +struct machine *setup_fake_machine (struct machines *machines); + +#endif /* __PERF_TESTS__HISTS_COMMON_H__ */ tools/perf/tests/hists_link.c +2
-139@@ -8,145 +8,7 @@#include "machine.h" #include "thread.h" #include "parse-events.h" - -static struct { -u32 pid; -const char *comm; -} fake_threads[] = { - {100 ,"perf" }, - {200 ,"perf" }, - {300 ,"bash" }, -}; - -static struct { -u32 pid; -u64 start; -const char *filename; -} fake_mmap_info[] = { - {100 ,0x40000 ,"perf" }, - {100 ,0x50000 ,"libc" }, - {100 ,0xf0000 ,"[kernel]" }, - {200 ,0x40000 ,"perf" }, - {200 ,0x50000 ,"libc" }, - {200 ,0xf0000 ,"[kernel]" }, - {300 ,0x40000 ,"bash" }, - {300 ,0x50000 ,"libc" }, - {300 ,0xf0000 ,"[kernel]" }, -}; - -struct fake_sym { -u64 start; -u64 length; -const char *name; -}; - -static struct fake_sym perf_syms[] = { - {700 ,100 ,"main" }, - {800 ,100 ,"run_command" }, - {900 ,100 ,"cmd_record" }, -}; - -static struct fake_sym bash_syms[] = { - {700 ,100 ,"main" }, - {800 ,100 ,"xmalloc" }, - {900 ,100 ,"xfree" }, -}; - -static struct fake_sym libc_syms[] = { - {700 ,100 ,"malloc" }, - {800 ,100 ,"free" }, - {900 ,100 ,"realloc" }, -}; - -static struct fake_sym kernel_syms[] = { - {700 ,100 ,"schedule" }, - {800 ,100 ,"page_fault" }, - {900 ,100 ,"sys_perf_event_open" }, -}; - -static struct { -const char *dso_name; -struct fake_sym *syms; -size_t nr_syms; -} fake_symbols[] = { - {"perf" , perf_syms,ARRAY_SIZE (perf_syms) }, - {"bash" , bash_syms,ARRAY_SIZE (bash_syms) }, - {"libc" , libc_syms,ARRAY_SIZE (libc_syms) }, - {"[kernel]" , kernel_syms,ARRAY_SIZE (kernel_syms) }, -}; - -static struct machine *setup_fake_machine (struct machines *machines) -{ -struct machine *machine =machines__find (machines,HOST_KERNEL_ID ); -size_t i; - -if (machine ==NULL ) { -pr_debug ("Not enough memory for machine setup\n" ); -return NULL ; - } - -for (i =0 ; i <ARRAY_SIZE (fake_threads); i++) { -struct thread *thread; - - thread =machine__findnew_thread (machine, fake_threads[i].pid, - fake_threads[i].pid); -if (thread ==NULL ) - goto out; - -thread__set_comm (thread, fake_threads[i].comm,0 ); - } - -for (i =0 ; i <ARRAY_SIZE (fake_mmap_info); i++) { -union perf_event fake_mmap_event = { - .mmap = { - .header = { .misc =PERF_RECORD_MISC_USER , }, - .pid = fake_mmap_info[i].pid, - .tid = fake_mmap_info[i].pid, - .start = fake_mmap_info[i].start, - .len =0x1000ULL , - .pgoff =0ULL , - }, - }; - -strcpy (fake_mmap_event.mmap.filename, - fake_mmap_info[i].filename); - -machine__process_mmap_event (machine, &fake_mmap_event,NULL ); - } - -for (i =0 ; i <ARRAY_SIZE (fake_symbols); i++) { -size_t k; -struct dso *dso; - - dso =__dsos__findnew (&machine->user_dsos, - fake_symbols[i].dso_name); -if (dso ==NULL ) - goto out; - -/* emulate dso__load() */ -dso__set_loaded (dso,MAP__FUNCTION ); - -for (k =0 ; k < fake_symbols[i].nr_syms; k++) { -struct symbol *sym; -struct fake_sym *fsym = &fake_symbols[i].syms[k]; - - sym =symbol__new (fsym->start, fsym->length, -STB_GLOBAL , fsym->name); -if (sym ==NULL ) - goto out; - -symbols__insert (&dso->symbols[MAP__FUNCTION ], sym); - } - } - -return machine; - -out: -pr_debug ("Not enough memory for machine setup\n" ); -machine__delete_threads (machine); -machine__delete (machine); -return NULL ; -} +#include "hists_common.h" struct sample {u32 pid;@@ -156,6 +18,7 @@ struct sample {struct symbol *sym; }; +/* For the numbers, see hists_common.c */ static struct sample fake_common_samples[] = {/* perf [kernel] schedule() */ { .pid =100 , .ip =0xf0000 +700 , },Signature · 1 line
1.9.2
Namhyung Kim
maintainerHi Jiri,
Quoted 7 lines · Jiri Olsa
Quoted 3 lines · Namhyung Kim
The
fake_setup_machine()is for setting up a environment for testing various hists operations. As it'll be used for other test cases it'd better factoring it out.looks like
print_histscould be inhists_common.cas well.. within another update ;-)
The difference is that one in hists_link.c is working on the input tree while one in hists_filter.c is working on the output tree.
Quoted 6 lines
nice!
Acked-by Jiri Olsa <[email protected]>for patchset
Thanks for review!
Namhyung
Quoted 8 lines · Namhyung Kim
Hi Jiri,
Quoted 5 lines · Jiri Olsa
Quoted 3 lines · Namhyung Kim
The
fake_setup_machine()is for setting up a environment for testing various hists operations. As it'll be used for other test cases it'd better factoring it out.
Quoted 5 lines
Quoted 2 lines
looks like
print_histscould be inhists_common.cas well.. within another update ;-)The difference is that one in
hists_link.cis working on the input tree while one inhists_filter.cis working on the output tree.
I see, missed that.. ok
thanks,
jirka
tip-bot for Namhyung Kim
merge botperf tests: Factor out fake_setup_machine()
Commit-ID: 6e344a952dcfa45b8bfef8eaf8423ab73c5adaf2 Gitweb: http://git.kernel.org/tip/6e344a952dcfa45b8bfef8eaf8423ab73c5adaf2 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 25 Apr 2014 12:28:13 +0900 Committer: Jiri Olsa <[email protected]> CommitDate: Mon, 28 Apr 2014 13:42:29 +0200
perf tests: Factor out fake_setup_machine()
The fake_setup_machine() is for setting up a environment for testing various hists operations. As it'll be used for other test cases it'd better factoring it out.
--- tools/perf/Makefile.perf | 1 + tools/perf/tests/hists_common.c | 148 ++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/hists_common.h | 44 ++++++++++++ tools/perf/tests/hists_link.c | 141 +------------------------------------- 4 files changed, 195 insertions(+), 139 deletions(-)
tools/perf/Makefile.perf +1 -0
@@ -397,6 +397,7 @@ LIB_OBJS += $(OUTPUT)tests/rdpmc.o LIB_OBJS += $(OUTPUT)tests/evsel-roundtrip-name.o LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o LIB_OBJS += $(OUTPUT)tests/pmu.o +LIB_OBJS += $(OUTPUT)tests/hists_common.o LIB_OBJS += $(OUTPUT)tests/hists_link.o LIB_OBJS += $(OUTPUT)tests/python-use.o LIB_OBJS += $(OUTPUT)tests/bp_signal.o
tools/perf/tests/hists_common.c new file +148 -0
148 lines not on this page · raw message
tools/perf/tests/hists_common.h new file +44 -0
44 lines not on this page · raw message
tools/perf/tests/hists_link.c +2 -139
153 lines not on this page · raw message