lkml.org 
[lkml]   [2015]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/52] perf tools: Add stat config event synthesize function
    Date
    Introduce perf_event__synthesize_stat_config function to
    synthesize 'struct perf_stat_config'.

    Storing stat config in form of tag-value pairs in a believe
    it'll sort out future version issues.

    Link: http://lkml.kernel.org/n/tip-zof1adf5flwp38xdzxzn4p2z@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/tests/Build | 1 +
    tools/perf/tests/builtin-test.c | 4 ++++
    tools/perf/tests/stat.c | 53 +++++++++++++++++++++++++++++++++++++++++
    tools/perf/tests/tests.h | 1 +
    tools/perf/util/event.c | 40 +++++++++++++++++++++++++++++++
    tools/perf/util/event.h | 5 ++++
    6 files changed, 104 insertions(+)
    create mode 100644 tools/perf/tests/stat.c

    diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
    index 1c0296fc95ea..ea4ef8fdd463 100644
    --- a/tools/perf/tests/Build
    +++ b/tools/perf/tests/Build
    @@ -34,6 +34,7 @@ perf-y += thread-map.o
    perf-y += llvm.o
    perf-y += topology.o
    perf-y += cpumap.o
    +perf-y += stat.o

    ifeq ($(ARCH),$(filter $(ARCH),x86 arm arm64))
    perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
    diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
    index bdccd27868ba..1a9064f54da5 100644
    --- a/tools/perf/tests/builtin-test.c
    +++ b/tools/perf/tests/builtin-test.c
    @@ -174,6 +174,10 @@ static struct test generic_tests[] = {
    .func = test__cpu_map_synthesize,
    },
    {
    + .desc = "Test stat config synthesize",
    + .func = test__synthesize_stat_config,
    + },
    + {
    .func = NULL,
    },
    };
    diff --git a/tools/perf/tests/stat.c b/tools/perf/tests/stat.c
    new file mode 100644
    index 000000000000..5e6a2441998c
    --- /dev/null
    +++ b/tools/perf/tests/stat.c
    @@ -0,0 +1,53 @@
    +#include <linux/compiler.h>
    +#include "event.h"
    +#include "tests.h"
    +#include "stat.h"
    +#include "debug.h"
    +
    +static bool has_term(struct stat_config_event *config,
    + u64 tag, u64 val)
    +{
    + unsigned i;
    +
    + for (i = 0; i < config->nr; i++) {
    + if ((config->data[i].tag == tag) &&
    + (config->data[i].val == val))
    + return true;
    + }
    +
    + return false;
    +}
    +
    +static int process_event(struct perf_tool *tool __maybe_unused,
    + union perf_event *event,
    + struct perf_sample *sample __maybe_unused,
    + struct machine *machine __maybe_unused)
    +{
    + struct stat_config_event *config = &event->stat_config;
    +
    +#define HAS(term, val) \
    + has_term(config, PERF_STAT_CONFIG_TERM__##term, val)
    +
    + TEST_ASSERT_VAL("wrong nr", config->nr == PERF_STAT_CONFIG_TERM__MAX);
    + TEST_ASSERT_VAL("wrong aggr_mode", HAS(AGGR_MODE, AGGR_CORE));
    + TEST_ASSERT_VAL("wrong scale", HAS(SCALE, 1));
    + TEST_ASSERT_VAL("wrong interval", HAS(INTERVAL, 1));
    +
    +#undef HAS
    +
    + return 0;
    +}
    +
    +int test__synthesize_stat_config(void)
    +{
    + struct perf_stat_config stat_config = {
    + .aggr_mode = AGGR_CORE,
    + .scale = 1,
    + .interval = 1,
    + };
    +
    + TEST_ASSERT_VAL("failed to synthesize stat_config",
    + !perf_event__synthesize_stat_config(NULL, &stat_config, process_event, NULL));
    +
    + return 0;
    +}
    diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
    index c7f3c3211bcf..227ad216197e 100644
    --- a/tools/perf/tests/tests.h
    +++ b/tools/perf/tests/tests.h
    @@ -69,6 +69,7 @@ int test__llvm(void);
    int test_session_topology(void);
    int test__thread_map_synthesize(void);
    int test__cpu_map_synthesize(void);
    +int test__synthesize_stat_config(void);

    #if defined(__arm__) || defined(__aarch64__)
    #ifdef HAVE_DWARF_UNWIND_SUPPORT
    diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
    index 1165cb1d891f..a9f596cf6ad9 100644
    --- a/tools/perf/util/event.c
    +++ b/tools/perf/util/event.c
    @@ -10,6 +10,8 @@
    #include "thread.h"
    #include "thread_map.h"
    #include "symbol/kallsyms.h"
    +#include "asm/bug.h"
    +#include "stat.h"

    static const char *perf_event__names[] = {
    [0] = "TOTAL",
    @@ -869,6 +871,44 @@ int perf_event__synthesize_cpu_map(struct perf_tool *tool,
    return err;
    }

    +int perf_event__synthesize_stat_config(struct perf_tool *tool,
    + struct perf_stat_config *config,
    + perf_event__handler_t process,
    + struct machine *machine)
    +{
    + struct stat_config_event *event;
    + int size, i = 0, err;
    +
    + size = sizeof(*event);
    + size += (PERF_STAT_CONFIG_TERM__MAX * sizeof(event->data[0]));
    +
    + event = zalloc(size);
    + if (!event)
    + return -ENOMEM;
    +
    + event->header.type = PERF_RECORD_STAT_CONFIG;
    + event->header.size = size;
    + event->nr = PERF_STAT_CONFIG_TERM__MAX;
    +
    +#define ADD(__term, __val) \
    + event->data[i].tag = PERF_STAT_CONFIG_TERM__##__term; \
    + event->data[i].val = __val; \
    + i++;
    +
    + ADD(AGGR_MODE, config->aggr_mode)
    + ADD(INTERVAL, config->interval)
    + ADD(SCALE, config->scale)
    +
    + WARN_ONCE(i != PERF_STAT_CONFIG_TERM__MAX,
    + "stat config terms unbalanced\n");
    +#undef ADD
    +
    + err = process(tool, (union perf_event *) event, NULL, machine);
    +
    + free(event);
    + return err;
    +}
    +
    size_t perf_event__fprintf_comm(union perf_event *event, FILE *fp)
    {
    const char *s;
    diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
    index 0bc3393dd28c..5f246a7cf5ab 100644
    --- a/tools/perf/util/event.h
    +++ b/tools/perf/util/event.h
    @@ -446,6 +446,7 @@ void perf_event__print_totals(void);
    struct perf_tool;
    struct thread_map;
    struct cpu_map;
    +struct perf_stat_config;

    typedef int (*perf_event__handler_t)(struct perf_tool *tool,
    union perf_event *event,
    @@ -472,6 +473,10 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
    int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
    perf_event__handler_t process,
    struct machine *machine);
    +int perf_event__synthesize_stat_config(struct perf_tool *tool,
    + struct perf_stat_config *config,
    + perf_event__handler_t process,
    + struct machine *machine);

    int perf_event__synthesize_modules(struct perf_tool *tool,
    perf_event__handler_t process,
    --
    2.4.3


    \
     
     \ /
      Last update: 2015-10-25 16:21    [W:3.394 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site