Messages in this thread | | | Subject | Re: [RFC 3/3] perf tools: Fix p_stage_cyc sort key behavior | From | Athira Rajeev <> | Date | Tue, 16 Nov 2021 21:59:42 +0530 |
| |
> On 06-Nov-2021, at 4:26 AM, Namhyung Kim <namhyung@kernel.org> wrote: > > Like weight and local_weight, the p_stage_cyc (for pipeline stage > cycles) should be handled the same way. Not sure it also needs > the local and global variants.
Hi Namhyung,
Thanks for the fixes. I could test the fix for "weight" and "ins_lat" in powerpc. Also it makes sense to have global variant for p_stage_cyc as well. Thanks for pointing that. I will post fix to have both the variants for the p_stage_cyc.
Thanks Athira > > But I couldn't test it actually because I don't have the machine. > > Cc: Kan Liang <kan.liang@linux.intel.com> > Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > --- > tools/perf/util/hist.c | 12 ++++-------- > tools/perf/util/sort.c | 4 ++-- > tools/perf/util/sort.h | 2 +- > 3 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c > index 54fe97dd191c..b776465e04ef 100644 > --- a/tools/perf/util/hist.c > +++ b/tools/perf/util/hist.c > @@ -289,12 +289,10 @@ static long hist_time(unsigned long htime) > return htime; > } > > -static void he_stat__add_period(struct he_stat *he_stat, u64 period, > - u64 p_stage_cyc) > +static void he_stat__add_period(struct he_stat *he_stat, u64 period) > { > he_stat->period += period; > he_stat->nr_events += 1; > - he_stat->p_stage_cyc += p_stage_cyc; > } > > static void he_stat__add_stat(struct he_stat *dest, struct he_stat *src) > @@ -305,7 +303,6 @@ static void he_stat__add_stat(struct he_stat *dest, struct he_stat *src) > dest->period_guest_sys += src->period_guest_sys; > dest->period_guest_us += src->period_guest_us; > dest->nr_events += src->nr_events; > - dest->p_stage_cyc += src->p_stage_cyc; > } > > static void he_stat__decay(struct he_stat *he_stat) > @@ -593,7 +590,6 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists, > struct hist_entry *he; > int64_t cmp; > u64 period = entry->stat.period; > - u64 p_stage_cyc = entry->stat.p_stage_cyc; > bool leftmost = true; > > p = &hists->entries_in->rb_root.rb_node; > @@ -612,11 +608,11 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists, > > if (!cmp) { > if (sample_self) { > - he_stat__add_period(&he->stat, period, p_stage_cyc); > + he_stat__add_period(&he->stat, period); > hist_entry__add_callchain_period(he, period); > } > if (symbol_conf.cumulate_callchain) > - he_stat__add_period(he->stat_acc, period, p_stage_cyc); > + he_stat__add_period(he->stat_acc, period); > > /* > * This mem info was allocated from sample__resolve_mem > @@ -726,7 +722,6 @@ __hists__add_entry(struct hists *hists, > .stat = { > .nr_events = 1, > .period = sample->period, > - .p_stage_cyc = sample->p_stage_cyc, > }, > .parent = sym_parent, > .filtered = symbol__parent_filter(sym_parent) | al->filtered, > @@ -741,6 +736,7 @@ __hists__add_entry(struct hists *hists, > .time = hist_time(sample->time), > .weight = sample->weight, > .ins_lat = sample->ins_lat, > + .p_stage_cyc = sample->p_stage_cyc, > }, *he = hists__findnew_entry(hists, &entry, al, sample_self); > > if (!hists->has_callchains && he && he->callchain_size != 0) > diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c > index adc0584695d6..a111065b484e 100644 > --- a/tools/perf/util/sort.c > +++ b/tools/perf/util/sort.c > @@ -1394,13 +1394,13 @@ struct sort_entry sort_global_ins_lat = { > static int64_t > sort__global_p_stage_cyc_cmp(struct hist_entry *left, struct hist_entry *right) > { > - return left->stat.p_stage_cyc - right->stat.p_stage_cyc; > + return left->p_stage_cyc - right->p_stage_cyc; > } > > static int hist_entry__p_stage_cyc_snprintf(struct hist_entry *he, char *bf, > size_t size, unsigned int width) > { > - return repsep_snprintf(bf, size, "%-*u", width, he->stat.p_stage_cyc); > + return repsep_snprintf(bf, size, "%-*u", width, he->p_stage_cyc); > } > > struct sort_entry sort_p_stage_cyc = { > diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h > index 22ae7c6ae398..7b7145501933 100644 > --- a/tools/perf/util/sort.h > +++ b/tools/perf/util/sort.h > @@ -49,7 +49,6 @@ struct he_stat { > u64 period_us; > u64 period_guest_sys; > u64 period_guest_us; > - u64 p_stage_cyc; > u32 nr_events; > }; > > @@ -109,6 +108,7 @@ struct hist_entry { > u64 code_page_size; > u64 weight; > u64 ins_lat; > + u64 p_stage_cyc; > u8 cpumode; > u8 depth; > > -- > 2.34.0.rc0.344.g81b53c2807-goog >
| |