From: Jiri Olsa <jolsa@redhat.com> To: John Garry <john.garry@huawei.com> Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, will@kernel.org, ak@linux.intel.com, linuxarm@huawei.com, linux-kernel@vger.kernel.org, qiangqing.zhang@nxp.com, irogers@google.com, robin.murphy@arm.com, zhangshaokun@hisilicon.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH RFC v3 09/12] perf metricgroup: Split up metricgroup__add_metric() Date: Mon, 11 May 2020 13:01:18 +0200 [thread overview] Message-ID: <20200511110118.GA2986380@krava> (raw) In-Reply-To: <1588852671-61996-10-git-send-email-john.garry@huawei.com> On Thu, May 07, 2020 at 07:57:48PM +0800, John Garry wrote: > To aid supporting system event metric groups, break up the function > metricgroup__add_metric() into a part which iterates metrics and a part > which actually "adds" the metric. > > No functional change intended. this no longer applied on Arnaldo's perf/core, it's very busy part now :-\ jirka > > Signed-off-by: John Garry <john.garry@huawei.com> > --- > tools/perf/util/metricgroup.c | 75 ++++++++++++++++++++++++++----------------- > 1 file changed, 45 insertions(+), 30 deletions(-) > > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > index 926449a7cdbf..d1033756a1bc 100644 > --- a/tools/perf/util/metricgroup.c > +++ b/tools/perf/util/metricgroup.c > @@ -231,6 +231,12 @@ static bool match_metric(const char *n, const char *list) > return false; > } > > +static bool match_pe_metric(struct pmu_event *pe, const char *metric) > +{ > + return match_metric(pe->metric_group, metric) || > + match_metric(pe->metric_name, metric); > +} > + > struct mep { > struct rb_node nd; > const char *name; > @@ -485,6 +491,40 @@ static bool metricgroup__has_constraint(struct pmu_event *pe) > return false; > } > > +static int metricgroup__add_metric_pmu_event(struct pmu_event *pe, > + struct strbuf *events, > + struct list_head *group_list) > +{ > + const char **ids; > + int idnum; > + struct egroup *eg; > + > + pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name); > + > + if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum) < 0) > + return 0; > + > + if (events->len > 0) > + strbuf_addf(events, ","); > + > + if (metricgroup__has_constraint(pe)) > + metricgroup__add_metric_non_group(events, ids, idnum); > + else > + metricgroup__add_metric_weak_group(events, ids, idnum); > + > + eg = malloc(sizeof(*eg)); > + if (!eg) > + return -ENOMEM; > + eg->ids = ids; > + eg->idnum = idnum; > + eg->metric_name = pe->metric_name; > + eg->metric_expr = pe->metric_expr; > + eg->metric_unit = pe->unit; > + list_add_tail(&eg->nd, group_list); > + > + return 0; > +} > + > static int metricgroup__add_metric(const char *metric, struct strbuf *events, > struct list_head *group_list) > { > @@ -502,37 +542,12 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events, > break; > if (!pe->metric_expr) > continue; > - if (match_metric(pe->metric_group, metric) || > - match_metric(pe->metric_name, metric)) { > - const char **ids; > - int idnum; > - struct egroup *eg; > - > - pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name); > > - if (expr__find_other(pe->metric_expr, > - NULL, &ids, &idnum) < 0) > - continue; > - if (events->len > 0) > - strbuf_addf(events, ","); > - > - if (metricgroup__has_constraint(pe)) > - metricgroup__add_metric_non_group(events, ids, idnum); > - else > - metricgroup__add_metric_weak_group(events, ids, idnum); > - > - eg = malloc(sizeof(struct egroup)); > - if (!eg) { > - ret = -ENOMEM; > - break; > - } > - eg->ids = ids; > - eg->idnum = idnum; > - eg->metric_name = pe->metric_name; > - eg->metric_expr = pe->metric_expr; > - eg->metric_unit = pe->unit; > - list_add_tail(&eg->nd, group_list); > - ret = 0; > + if (match_pe_metric(pe, metric)) { > + ret = metricgroup__add_metric_pmu_event(pe, events, > + group_list); > + if (ret) > + return ret; > } > } > return ret; > -- > 2.16.4 >
WARNING: multiple messages have this Message-ID (diff)
From: Jiri Olsa <jolsa@redhat.com> To: John Garry <john.garry@huawei.com> Cc: mark.rutland@arm.com, irogers@google.com, ak@linux.intel.com, qiangqing.zhang@nxp.com, peterz@infradead.org, robin.murphy@arm.com, linuxarm@huawei.com, acme@kernel.org, linux-kernel@vger.kernel.org, zhangshaokun@hisilicon.com, alexander.shishkin@linux.intel.com, mingo@redhat.com, namhyung@kernel.org, will@kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH RFC v3 09/12] perf metricgroup: Split up metricgroup__add_metric() Date: Mon, 11 May 2020 13:01:18 +0200 [thread overview] Message-ID: <20200511110118.GA2986380@krava> (raw) In-Reply-To: <1588852671-61996-10-git-send-email-john.garry@huawei.com> On Thu, May 07, 2020 at 07:57:48PM +0800, John Garry wrote: > To aid supporting system event metric groups, break up the function > metricgroup__add_metric() into a part which iterates metrics and a part > which actually "adds" the metric. > > No functional change intended. this no longer applied on Arnaldo's perf/core, it's very busy part now :-\ jirka > > Signed-off-by: John Garry <john.garry@huawei.com> > --- > tools/perf/util/metricgroup.c | 75 ++++++++++++++++++++++++++----------------- > 1 file changed, 45 insertions(+), 30 deletions(-) > > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > index 926449a7cdbf..d1033756a1bc 100644 > --- a/tools/perf/util/metricgroup.c > +++ b/tools/perf/util/metricgroup.c > @@ -231,6 +231,12 @@ static bool match_metric(const char *n, const char *list) > return false; > } > > +static bool match_pe_metric(struct pmu_event *pe, const char *metric) > +{ > + return match_metric(pe->metric_group, metric) || > + match_metric(pe->metric_name, metric); > +} > + > struct mep { > struct rb_node nd; > const char *name; > @@ -485,6 +491,40 @@ static bool metricgroup__has_constraint(struct pmu_event *pe) > return false; > } > > +static int metricgroup__add_metric_pmu_event(struct pmu_event *pe, > + struct strbuf *events, > + struct list_head *group_list) > +{ > + const char **ids; > + int idnum; > + struct egroup *eg; > + > + pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name); > + > + if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum) < 0) > + return 0; > + > + if (events->len > 0) > + strbuf_addf(events, ","); > + > + if (metricgroup__has_constraint(pe)) > + metricgroup__add_metric_non_group(events, ids, idnum); > + else > + metricgroup__add_metric_weak_group(events, ids, idnum); > + > + eg = malloc(sizeof(*eg)); > + if (!eg) > + return -ENOMEM; > + eg->ids = ids; > + eg->idnum = idnum; > + eg->metric_name = pe->metric_name; > + eg->metric_expr = pe->metric_expr; > + eg->metric_unit = pe->unit; > + list_add_tail(&eg->nd, group_list); > + > + return 0; > +} > + > static int metricgroup__add_metric(const char *metric, struct strbuf *events, > struct list_head *group_list) > { > @@ -502,37 +542,12 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events, > break; > if (!pe->metric_expr) > continue; > - if (match_metric(pe->metric_group, metric) || > - match_metric(pe->metric_name, metric)) { > - const char **ids; > - int idnum; > - struct egroup *eg; > - > - pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name); > > - if (expr__find_other(pe->metric_expr, > - NULL, &ids, &idnum) < 0) > - continue; > - if (events->len > 0) > - strbuf_addf(events, ","); > - > - if (metricgroup__has_constraint(pe)) > - metricgroup__add_metric_non_group(events, ids, idnum); > - else > - metricgroup__add_metric_weak_group(events, ids, idnum); > - > - eg = malloc(sizeof(struct egroup)); > - if (!eg) { > - ret = -ENOMEM; > - break; > - } > - eg->ids = ids; > - eg->idnum = idnum; > - eg->metric_name = pe->metric_name; > - eg->metric_expr = pe->metric_expr; > - eg->metric_unit = pe->unit; > - list_add_tail(&eg->nd, group_list); > - ret = 0; > + if (match_pe_metric(pe, metric)) { > + ret = metricgroup__add_metric_pmu_event(pe, events, > + group_list); > + if (ret) > + return ret; > } > } > return ret; > -- > 2.16.4 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-05-11 11:01 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-07 11:57 [PATCH RFC v3 00/12] perf pmu-events: Support event aliasing for system PMUs John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 01/12] perf jevents: Add support for an extra directory level John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 02/12] perf jevents: Add support for system events tables John Garry 2020-05-07 11:57 ` John Garry 2020-05-11 11:01 ` Jiri Olsa 2020-05-11 11:01 ` Jiri Olsa 2020-05-11 14:52 ` John Garry 2020-05-11 14:52 ` John Garry 2020-05-11 11:01 ` Jiri Olsa 2020-05-11 11:01 ` Jiri Olsa 2020-05-11 15:02 ` John Garry 2020-05-11 15:02 ` John Garry 2020-05-11 16:21 ` Ian Rogers 2020-05-11 16:21 ` Ian Rogers 2020-05-12 10:29 ` Jiri Olsa 2020-05-12 10:29 ` Jiri Olsa 2020-05-11 11:01 ` Jiri Olsa 2020-05-11 11:01 ` Jiri Olsa 2020-05-07 11:57 ` [PATCH RFC v3 03/12] perf vendor events arm64: Relocate hip08 events John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 04/12] perf vendor events arm64: Add Architected events smmuv3-pmcg.json John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 05/12] perf vendor events arm64: Add hip08 SMMUv3 PMCG events John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 06/12] perf pmu: Add pmu_id() John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 07/12] perf pmu: Add pmu_add_sys_aliases() John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 08/12] perf vendor events: Add JSON metrics for imx8mm DDR Perf John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 09/12] perf metricgroup: Split up metricgroup__add_metric() John Garry 2020-05-07 11:57 ` John Garry 2020-05-11 11:01 ` Jiri Olsa [this message] 2020-05-11 11:01 ` Jiri Olsa 2020-05-11 11:25 ` John Garry 2020-05-11 11:25 ` John Garry 2020-05-11 11:35 ` Joakim Zhang 2020-05-11 11:35 ` Joakim Zhang 2020-05-07 11:57 ` [PATCH RFC v3 10/12] perf metricgroup: Split up metricgroup__print() John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 11/12] perf metricgroup: Support printing metric groups for system PMUs John Garry 2020-05-07 11:57 ` John Garry 2020-05-07 11:57 ` [PATCH RFC v3 12/12] perf metricgroup: Support adding metrics " John Garry 2020-05-07 11:57 ` John Garry 2020-05-08 2:55 ` [PATCH RFC v3 00/12] perf pmu-events: Support event aliasing " Joakim Zhang 2020-05-08 2:55 ` Joakim Zhang 2020-05-12 8:02 ` Joakim Zhang 2020-05-12 8:02 ` Joakim Zhang 2020-05-12 10:13 ` John Garry 2020-05-12 10:13 ` John Garry 2020-05-12 10:30 ` Joakim Zhang 2020-05-12 10:30 ` Joakim Zhang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200511110118.GA2986380@krava \ --to=jolsa@redhat.com \ --cc=acme@kernel.org \ --cc=ak@linux.intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=irogers@google.com \ --cc=john.garry@huawei.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxarm@huawei.com \ --cc=mark.rutland@arm.com \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ --cc=qiangqing.zhang@nxp.com \ --cc=robin.murphy@arm.com \ --cc=will@kernel.org \ --cc=zhangshaokun@hisilicon.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.