lkml.org 
[lkml]   [2020]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V6 14/16] perf script: Add support for PERF_SAMPLE_CODE_PAGE_SIZE
    Date
    From: Stephane Eranian <eranian@google.com>

    Display sampled code page sizes when PERF_SAMPLE_CODE_PAGE_SIZE was set.

    For example,
    perf script --fields comm,event,ip,code_page_size
    dtlb mem-loads:uP: 445777 4K
    dtlb mem-loads:uP: 40f724 4K
    dtlb mem-loads:uP: 474926 4K
    dtlb mem-loads:uP: 401075 4K
    dtlb mem-loads:uP: 401095 4K
    dtlb mem-loads:uP: 401095 4K
    dtlb mem-loads:uP: 4010cc 4K
    dtlb mem-loads:uP: 440b6f 4K

    Signed-off-by: Stephane Eranian <eranian@google.com>
    ---
    tools/perf/Documentation/perf-script.txt | 2 +-
    tools/perf/builtin-script.c | 13 +++++++++++--
    tools/perf/util/session.c | 3 +++
    3 files changed, 15 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
    index 27a49f2e6cb7..fd7ec6cb971c 100644
    --- a/tools/perf/Documentation/perf-script.txt
    +++ b/tools/perf/Documentation/perf-script.txt
    @@ -118,7 +118,7 @@ OPTIONS
    comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff,
    srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output,
    brstackinsn, brstackoff, callindent, insn, insnlen, synth, phys_addr,
    - metric, misc, srccode, ipc, data_page_size.
    + metric, misc, srccode, ipc, data_page_size, code_page_size.
    Field list can be prepended with the type, trace, sw or hw,
    to indicate to which event type the field list applies.
    e.g., -F sw:comm,tid,time,ip,sym and -F trace:time,cpu,trace
    diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
    index 69773025cc58..e6341216e6f7 100644
    --- a/tools/perf/builtin-script.c
    +++ b/tools/perf/builtin-script.c
    @@ -116,6 +116,7 @@ enum perf_output_field {
    PERF_OUTPUT_SRCCODE = 1ULL << 30,
    PERF_OUTPUT_IPC = 1ULL << 31,
    PERF_OUTPUT_DATA_PAGE_SIZE = 1ULL << 32,
    + PERF_OUTPUT_CODE_PAGE_SIZE = 1ULL << 33,
    };

    struct output_option {
    @@ -155,6 +156,7 @@ struct output_option {
    {.str = "srccode", .field = PERF_OUTPUT_SRCCODE},
    {.str = "ipc", .field = PERF_OUTPUT_IPC},
    {.str = "data_page_size", .field = PERF_OUTPUT_DATA_PAGE_SIZE},
    + {.str = "code_page_size", .field = PERF_OUTPUT_CODE_PAGE_SIZE},
    };

    enum {
    @@ -228,7 +230,7 @@ static struct {
    PERF_OUTPUT_DSO | PERF_OUTPUT_PERIOD |
    PERF_OUTPUT_ADDR | PERF_OUTPUT_DATA_SRC |
    PERF_OUTPUT_WEIGHT | PERF_OUTPUT_PHYS_ADDR |
    - PERF_OUTPUT_DATA_PAGE_SIZE,
    + PERF_OUTPUT_DATA_PAGE_SIZE | PERF_OUTPUT_CODE_PAGE_SIZE,

    .invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT,
    },
    @@ -481,6 +483,10 @@ static int perf_evsel__check_attr(struct evsel *evsel, struct perf_session *sess
    evsel__check_stype(evsel, PERF_SAMPLE_DATA_PAGE_SIZE, "DATA_PAGE_SIZE", PERF_OUTPUT_DATA_PAGE_SIZE))
    return -EINVAL;

    + if (PRINT_FIELD(CODE_PAGE_SIZE) &&
    + evsel__check_stype(evsel, PERF_SAMPLE_CODE_PAGE_SIZE, "CODE_PAGE_SIZE", PERF_OUTPUT_CODE_PAGE_SIZE))
    + return -EINVAL;
    +
    return 0;
    }

    @@ -1953,6 +1959,9 @@ static void process_event(struct perf_script *script,
    if (PRINT_FIELD(DATA_PAGE_SIZE))
    fprintf(fp, " %s", get_page_size_name(sample->data_page_size, str));

    + if (PRINT_FIELD(CODE_PAGE_SIZE))
    + fprintf(fp, " %s", get_page_size_name(sample->code_page_size, str));
    +
    perf_sample__fprintf_ipc(sample, attr, fp);

    fprintf(fp, "\n");
    @@ -3436,7 +3445,7 @@ int cmd_script(int argc, const char **argv)
    "addr,symoff,srcline,period,iregs,uregs,brstack,"
    "brstacksym,flags,bpf-output,brstackinsn,brstackoff,"
    "callindent,insn,insnlen,synth,phys_addr,metric,misc,ipc,"
    - "data_page_size",
    + "data_page_size,code_page_size",
    parse_output_fields),
    OPT_BOOLEAN('a', "all-cpus", &system_wide,
    "system-wide collection from all CPUs"),
    diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
    index f810b07d10d2..83d4680044a2 100644
    --- a/tools/perf/util/session.c
    +++ b/tools/perf/util/session.c
    @@ -1286,6 +1286,9 @@ static void dump_sample(struct evsel *evsel, union perf_event *event,
    if (sample_type & PERF_SAMPLE_DATA_PAGE_SIZE)
    printf(" .. data page size: %s\n", get_page_size_name(sample->data_page_size, str));

    + if (sample_type & PERF_SAMPLE_CODE_PAGE_SIZE)
    + printf(" .. code page size: %s\n", get_page_size_name(sample->code_page_size, str));
    +
    if (sample_type & PERF_SAMPLE_TRANSACTION)
    printf("... transaction: %" PRIx64 "\n", sample->transaction);

    --
    2.17.1
    \
     
     \ /
      Last update: 2020-08-10 23:28    [W:4.953 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site