Messages in this thread | | | Subject | Re: [PATCH 01/12] perf tools: Add hw_idx in struct branch_stack | From | "Liang, Kan" <> | Date | Wed, 4 Mar 2020 11:07:43 -0500 |
| |
On 3/4/2020 10:45 AM, Arnaldo Carvalho de Melo wrote: > Em Wed, Mar 04, 2020 at 10:49:02AM -0300, Arnaldo Carvalho de Melo escreveu: >> Em Fri, Feb 28, 2020 at 08:30:00AM -0800, kan.liang@linux.intel.com escreveu: >>> From: Kan Liang <kan.liang@linux.intel.com> >>> The low level index of raw branch records for the most recent branch can >>> be recorded in a sample with PERF_SAMPLE_BRANCH_HW_INDEX >>> branch_sample_type. Extend struct branch_stack to support it. > >>> However, if the PERF_SAMPLE_BRANCH_HW_INDEX is not applied, only nr and >>> entries[] will be output by kernel. The pointer of entries[] could be >>> wrong, since the output format is different with new struct branch_stack. >>> Add a variable no_hw_idx in struct perf_sample to indicate whether the >>> hw_idx is output. >>> Add get_branch_entry() to return corresponding pointer of entries[0]. > >> This should be broken up in at least two patches, one that syncs >> tools/include/uapi/linux/perf_event.h with the kernel, and another to do >> what this changeset log message states, I'll do it this time to expedite >> processing of this patchset, please do it that way next time. >
Thanks. I will keep it in mind.
> So, after doing that split I'm also suggesting/tentatively applying this > patch on top of it, to keep the naming convention we have in tools/perf, > and also the 'static' to that inline,
Thanks. The changes look good to me.
Thanks, Kan
> please holler if you disagree, > I'll put the end result in a branch for further visualization/comments. > > At some point these functions obtaining stuff from a 'struct perf_sample' to > tools/lib/perf/ (aka libperf), so better go doing proper namespacing, > etc, right Jiri? > > - Arnaldo > > diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c > index acf3107bbda2..656b347f6dd8 100644 > --- a/tools/perf/builtin-script.c > +++ b/tools/perf/builtin-script.c > @@ -735,7 +735,7 @@ static int perf_sample__fprintf_brstack(struct perf_sample *sample, > struct perf_event_attr *attr, FILE *fp) > { > struct branch_stack *br = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > struct addr_location alf, alt; > u64 i, from, to; > int printed = 0; > @@ -783,7 +783,7 @@ static int perf_sample__fprintf_brstacksym(struct perf_sample *sample, > struct perf_event_attr *attr, FILE *fp) > { > struct branch_stack *br = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > struct addr_location alf, alt; > u64 i, from, to; > int printed = 0; > @@ -829,7 +829,7 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample, > struct perf_event_attr *attr, FILE *fp) > { > struct branch_stack *br = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > struct addr_location alf, alt; > u64 i, from, to; > int printed = 0; > @@ -1056,7 +1056,7 @@ static int perf_sample__fprintf_brstackinsn(struct perf_sample *sample, > struct machine *machine, FILE *fp) > { > struct branch_stack *br = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > u64 start, end; > int i, insn, len, nr, ilen, printed = 0; > struct perf_insn x; > diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h > index 014c3cd4cb32..154a05cd03af 100644 > --- a/tools/perf/util/branch.h > +++ b/tools/perf/util/branch.h > @@ -54,7 +54,7 @@ struct branch_stack { > * Check whether the hw_idx is available, > * and return the corresponding pointer of entries[0]. > */ > -inline struct branch_entry *get_branch_entry(struct perf_sample *sample) > +static inline struct branch_entry *perf_sample__branch_entries(struct perf_sample *sample) > { > u64 *entry = (u64 *)sample->branch_stack; > > diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c > index 808ca27bd5cf..e74a5acf66d9 100644 > --- a/tools/perf/util/hist.c > +++ b/tools/perf/util/hist.c > @@ -2584,7 +2584,7 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al, > u64 *total_cycles) > { > struct branch_info *bi; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > > /* If we have branch cycles always annotate them. */ > if (bs && bs->nr && entries[0].flags.cycles) { > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > index b0623f99fb9c..fd14f1489802 100644 > --- a/tools/perf/util/machine.c > +++ b/tools/perf/util/machine.c > @@ -2081,7 +2081,7 @@ struct branch_info *sample__resolve_bstack(struct perf_sample *sample, > { > unsigned int i; > const struct branch_stack *bs = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > struct branch_info *bi = calloc(bs->nr, sizeof(struct branch_info)); > > if (!bi) > @@ -2186,7 +2186,7 @@ static int resolve_lbr_callchain_sample(struct thread *thread, > /* LBR only affects the user callchain */ > if (i != chain_nr) { > struct branch_stack *lbr_stack = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > int lbr_nr = lbr_stack->nr, j, k; > bool branch; > struct branch_flags *flags; > @@ -2281,7 +2281,7 @@ static int thread__resolve_callchain_sample(struct thread *thread, > int max_stack) > { > struct branch_stack *branch = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > struct ip_callchain *chain = sample->callchain; > int chain_nr = 0; > u8 cpumode = PERF_RECORD_MISC_USER; > diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c > index 02b6c87c5abe..8c1b27cd8b99 100644 > --- a/tools/perf/util/scripting-engines/trace-event-python.c > +++ b/tools/perf/util/scripting-engines/trace-event-python.c > @@ -464,7 +464,7 @@ static PyObject *python_process_brstack(struct perf_sample *sample, > struct thread *thread) > { > struct branch_stack *br = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > PyObject *pylist; > u64 i; > > @@ -562,7 +562,7 @@ static PyObject *python_process_brstacksym(struct perf_sample *sample, > struct thread *thread) > { > struct branch_stack *br = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > PyObject *pylist; > u64 i; > char bf[512]; > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c > index dab985e3f136..055b00abd56d 100644 > --- a/tools/perf/util/session.c > +++ b/tools/perf/util/session.c > @@ -1007,7 +1007,7 @@ static void callchain__lbr_callstack_printf(struct perf_sample *sample) > { > struct ip_callchain *callchain = sample->callchain; > struct branch_stack *lbr_stack = sample->branch_stack; > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > u64 kernel_callchain_nr = callchain->nr; > unsigned int i; > > @@ -1069,7 +1069,7 @@ static void callchain__printf(struct evsel *evsel, > > static void branch_stack__printf(struct perf_sample *sample, bool callstack) > { > - struct branch_entry *entries = get_branch_entry(sample); > + struct branch_entry *entries = perf_sample__branch_entries(sample); > uint64_t i; > > printf("%s: nr:%" PRIu64 "\n", >
| |