| Message ID | 20230219092848.639226-40-irogers@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | shadow metric clean up and improvements | expand |
On 2023-02-19 4:28 a.m., Ian Rogers wrote: > When there are no events and on Intel, the topdown events will be > added by default if present. To display the metrics associated with > these request special handling in stat-shadow.c. To more easily update > these metrics use the json metric version via the TopdownL1 > group. This makes the handling less platform specific. > > Modify the metricgroup__has_metric code to also cover metric groups. > > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/arch/x86/util/evlist.c | 6 +++--- > tools/perf/arch/x86/util/topdown.c | 30 ------------------------------ > tools/perf/arch/x86/util/topdown.h | 1 - > tools/perf/builtin-stat.c | 14 ++++++++++++++ > tools/perf/util/metricgroup.c | 6 ++---- > 5 files changed, 19 insertions(+), 38 deletions(-) > > diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c > index cb59ce9b9638..8a7ae4162563 100644 > --- a/tools/perf/arch/x86/util/evlist.c > +++ b/tools/perf/arch/x86/util/evlist.c > @@ -59,10 +59,10 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, > struct perf_event_attr *attrs, > size_t nr_attrs) > { > - if (nr_attrs) > - return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); > + if (!nr_attrs) > + return 0; > > - return topdown_parse_events(evlist); > + return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); > } > > struct evsel *arch_evlist__leader(struct list_head *list) > diff --git a/tools/perf/arch/x86/util/topdown.c b/tools/perf/arch/x86/util/topdown.c > index 54810f9acd6f..eb3a7d9652ab 100644 > --- a/tools/perf/arch/x86/util/topdown.c > +++ b/tools/perf/arch/x86/util/topdown.c > @@ -9,11 +9,6 @@ > #include "topdown.h" > #include "evsel.h" > > -#define TOPDOWN_L1_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}" > -#define TOPDOWN_L1_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/}" > -#define TOPDOWN_L2_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}" > -#define TOPDOWN_L2_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/,cpu_core/topdown-heavy-ops/,cpu_core/topdown-br-mispredict/,cpu_core/topdown-fetch-lat/,cpu_core/topdown-mem-bound/}" > - > /* Check whether there is a PMU which supports the perf metrics. */ > bool topdown_sys_has_perf_metrics(void) > { > @@ -99,28 +94,3 @@ const char *arch_get_topdown_pmu_name(struct evlist *evlist, bool warn) > > return pmu_name; > } > - > -int topdown_parse_events(struct evlist *evlist) > -{ > - const char *topdown_events; > - const char *pmu_name; > - > - if (!topdown_sys_has_perf_metrics()) > - return 0; > - > - pmu_name = arch_get_topdown_pmu_name(evlist, false); > - > - if (pmu_have_event(pmu_name, "topdown-heavy-ops")) { > - if (!strcmp(pmu_name, "cpu_core")) > - topdown_events = TOPDOWN_L2_EVENTS_CORE; > - else > - topdown_events = TOPDOWN_L2_EVENTS; > - } else { > - if (!strcmp(pmu_name, "cpu_core")) > - topdown_events = TOPDOWN_L1_EVENTS_CORE; > - else > - topdown_events = TOPDOWN_L1_EVENTS; > - } > - > - return parse_event(evlist, topdown_events); > -} > diff --git a/tools/perf/arch/x86/util/topdown.h b/tools/perf/arch/x86/util/topdown.h > index 7eb81f042838..46bf9273e572 100644 > --- a/tools/perf/arch/x86/util/topdown.h > +++ b/tools/perf/arch/x86/util/topdown.h > @@ -3,6 +3,5 @@ > #define _TOPDOWN_H 1 > > bool topdown_sys_has_perf_metrics(void); > -int topdown_parse_events(struct evlist *evlist); > > #endif > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 5e13171a7bba..796e98e453f6 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1996,6 +1996,7 @@ static int add_default_attributes(void) > stat_config.topdown_level = TOPDOWN_MAX_LEVEL; > > if (!evsel_list->core.nr_entries) { > + /* No events so add defaults. */ > if (target__has_cpu(&target)) > default_attrs0[0].config = PERF_COUNT_SW_CPU_CLOCK; > > @@ -2011,6 +2012,19 @@ static int add_default_attributes(void) > } > if (evlist__add_default_attrs(evsel_list, default_attrs1) < 0) > return -1; > + /* > + * Add TopdownL1 metrics if they exist. To minimize > + * multiplexing, don't request threshold computation. > + */ > + if (metricgroup__has_metric("TopdownL1") && > + metricgroup__parse_groups(evsel_list, "TopdownL1", > + /*metric_no_group=*/false, > + /*metric_no_merge=*/false, > + /*metric_no_threshold=*/true, > + stat_config.user_requested_cpu_list, > + stat_config.system_wide, > + &stat_config.metric_events) < 0) Does the metricgroup__* function check the existances of the events on the machine? If not, it may not be reliable to only check the event list. The existing code supports both L1 and L2 Topdown for SPR. But this patch seems remove the L2 Topdown support for SPR. The TopdownL1/L2 metric is added only for the big core with perf stat default. It's because that the perf_metrics is a dedicated register, which should not impact other events (using GP counters.) But this patch seems don't check the CPU type. It may brings extra multiplexing for the perf stat default on an ATOM platform. Thanks, Kan > + return -1; > /* Platform specific attrs */ > if (evlist__add_default_attrs(evsel_list, default_null_attrs) < 0) > return -1; > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > index afb6f2fdc24e..64a35f2787dc 100644 > --- a/tools/perf/util/metricgroup.c > +++ b/tools/perf/util/metricgroup.c > @@ -1647,10 +1647,8 @@ static int metricgroup__has_metric_callback(const struct pmu_metric *pm, > { > const char *metric = vdata; > > - if (!pm->metric_expr) > - return 0; > - > - if (match_metric(pm->metric_name, metric)) > + if (match_metric(pm->metric_name, metric) || > + match_metric(pm->metric_group, metric)) > return 1; > > return 0;
On Mon, Feb 27, 2023 at 11:12 AM Liang, Kan <kan.liang@linux.intel.com> wrote: > > > > On 2023-02-19 4:28 a.m., Ian Rogers wrote: > > When there are no events and on Intel, the topdown events will be > > added by default if present. To display the metrics associated with > > these request special handling in stat-shadow.c. To more easily update > > these metrics use the json metric version via the TopdownL1 > > group. This makes the handling less platform specific. > > > > Modify the metricgroup__has_metric code to also cover metric groups. > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/arch/x86/util/evlist.c | 6 +++--- > > tools/perf/arch/x86/util/topdown.c | 30 ------------------------------ > > tools/perf/arch/x86/util/topdown.h | 1 - > > tools/perf/builtin-stat.c | 14 ++++++++++++++ > > tools/perf/util/metricgroup.c | 6 ++---- > > 5 files changed, 19 insertions(+), 38 deletions(-) > > > > diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c > > index cb59ce9b9638..8a7ae4162563 100644 > > --- a/tools/perf/arch/x86/util/evlist.c > > +++ b/tools/perf/arch/x86/util/evlist.c > > @@ -59,10 +59,10 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, > > struct perf_event_attr *attrs, > > size_t nr_attrs) > > { > > - if (nr_attrs) > > - return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); > > + if (!nr_attrs) > > + return 0; > > > > - return topdown_parse_events(evlist); > > + return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); > > } > > > > struct evsel *arch_evlist__leader(struct list_head *list) > > diff --git a/tools/perf/arch/x86/util/topdown.c b/tools/perf/arch/x86/util/topdown.c > > index 54810f9acd6f..eb3a7d9652ab 100644 > > --- a/tools/perf/arch/x86/util/topdown.c > > +++ b/tools/perf/arch/x86/util/topdown.c > > @@ -9,11 +9,6 @@ > > #include "topdown.h" > > #include "evsel.h" > > > > -#define TOPDOWN_L1_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}" > > -#define TOPDOWN_L1_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/}" > > -#define TOPDOWN_L2_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}" > > -#define TOPDOWN_L2_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/,cpu_core/topdown-heavy-ops/,cpu_core/topdown-br-mispredict/,cpu_core/topdown-fetch-lat/,cpu_core/topdown-mem-bound/}" > > - > > /* Check whether there is a PMU which supports the perf metrics. */ > > bool topdown_sys_has_perf_metrics(void) > > { > > @@ -99,28 +94,3 @@ const char *arch_get_topdown_pmu_name(struct evlist *evlist, bool warn) > > > > return pmu_name; > > } > > - > > -int topdown_parse_events(struct evlist *evlist) > > -{ > > - const char *topdown_events; > > - const char *pmu_name; > > - > > - if (!topdown_sys_has_perf_metrics()) > > - return 0; > > - > > - pmu_name = arch_get_topdown_pmu_name(evlist, false); > > - > > - if (pmu_have_event(pmu_name, "topdown-heavy-ops")) { > > - if (!strcmp(pmu_name, "cpu_core")) > > - topdown_events = TOPDOWN_L2_EVENTS_CORE; > > - else > > - topdown_events = TOPDOWN_L2_EVENTS; > > - } else { > > - if (!strcmp(pmu_name, "cpu_core")) > > - topdown_events = TOPDOWN_L1_EVENTS_CORE; > > - else > > - topdown_events = TOPDOWN_L1_EVENTS; > > - } > > - > > - return parse_event(evlist, topdown_events); > > -} > > diff --git a/tools/perf/arch/x86/util/topdown.h b/tools/perf/arch/x86/util/topdown.h > > index 7eb81f042838..46bf9273e572 100644 > > --- a/tools/perf/arch/x86/util/topdown.h > > +++ b/tools/perf/arch/x86/util/topdown.h > > @@ -3,6 +3,5 @@ > > #define _TOPDOWN_H 1 > > > > bool topdown_sys_has_perf_metrics(void); > > -int topdown_parse_events(struct evlist *evlist); > > > > #endif > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > > index 5e13171a7bba..796e98e453f6 100644 > > --- a/tools/perf/builtin-stat.c > > +++ b/tools/perf/builtin-stat.c > > @@ -1996,6 +1996,7 @@ static int add_default_attributes(void) > > stat_config.topdown_level = TOPDOWN_MAX_LEVEL; > > > > if (!evsel_list->core.nr_entries) { > > + /* No events so add defaults. */ > > if (target__has_cpu(&target)) > > default_attrs0[0].config = PERF_COUNT_SW_CPU_CLOCK; > > > > @@ -2011,6 +2012,19 @@ static int add_default_attributes(void) > > } > > if (evlist__add_default_attrs(evsel_list, default_attrs1) < 0) > > return -1; > > + /* > > + * Add TopdownL1 metrics if they exist. To minimize > > + * multiplexing, don't request threshold computation. > > + */ > > + if (metricgroup__has_metric("TopdownL1") && > > + metricgroup__parse_groups(evsel_list, "TopdownL1", > > + /*metric_no_group=*/false, > > + /*metric_no_merge=*/false, > > + /*metric_no_threshold=*/true, > > + stat_config.user_requested_cpu_list, > > + stat_config.system_wide, > > + &stat_config.metric_events) < 0) > > Does the metricgroup__* function check the existances of the events on > the machine? If not, it may not be reliable to only check the event list. > > The existing code supports both L1 and L2 Topdown for SPR. But this > patch seems remove the L2 Topdown support for SPR. > > The TopdownL1/L2 metric is added only for the big core with perf stat > default. It's because that the perf_metrics is a dedicated register, > which should not impact other events (using GP counters.) But this patch > seems don't check the CPU type. It may brings extra multiplexing for the > perf stat default on an ATOM platform. > > Thanks, > Kan Hi Kan, The TopdownL2 metrics are present for SPR. The code changes to default for L1 as with json topdown the maximum topdown level (the default previously) is L6, and nobody really wants to see that. The --topdown option is no longer limited to Icelake+ processors, any with the TopdownL1 metricgroup will work as --topdown has just become a shortcut to that. There may be additional multiplexing, but also, in the old code events from different groups could be used to calculate a bogus metric. There are also additional events as the previous metrics don't agree with those in the TMA spreadsheet. If there is multiplexing from this change on SPR, the TMA json metrics do try to avoid this, I think the right path through this is to fix the json metrics. Thanks, Ian > > + return -1; > > /* Platform specific attrs */ > > if (evlist__add_default_attrs(evsel_list, default_null_attrs) < 0) > > return -1; > > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > > index afb6f2fdc24e..64a35f2787dc 100644 > > --- a/tools/perf/util/metricgroup.c > > +++ b/tools/perf/util/metricgroup.c > > @@ -1647,10 +1647,8 @@ static int metricgroup__has_metric_callback(const struct pmu_metric *pm, > > { > > const char *metric = vdata; > > > > - if (!pm->metric_expr) > > - return 0; > > - > > - if (match_metric(pm->metric_name, metric)) > > + if (match_metric(pm->metric_name, metric) || > > + match_metric(pm->metric_group, metric)) > > return 1; > > > > return 0;
On 2023-02-27 2:33 p.m., Ian Rogers wrote: > On Mon, Feb 27, 2023 at 11:12 AM Liang, Kan <kan.liang@linux.intel.com> wrote: >> >> >> >> On 2023-02-19 4:28 a.m., Ian Rogers wrote: >>> When there are no events and on Intel, the topdown events will be >>> added by default if present. To display the metrics associated with >>> these request special handling in stat-shadow.c. To more easily update >>> these metrics use the json metric version via the TopdownL1 >>> group. This makes the handling less platform specific. >>> >>> Modify the metricgroup__has_metric code to also cover metric groups. >>> >>> Signed-off-by: Ian Rogers <irogers@google.com> >>> --- >>> tools/perf/arch/x86/util/evlist.c | 6 +++--- >>> tools/perf/arch/x86/util/topdown.c | 30 ------------------------------ >>> tools/perf/arch/x86/util/topdown.h | 1 - >>> tools/perf/builtin-stat.c | 14 ++++++++++++++ >>> tools/perf/util/metricgroup.c | 6 ++---- >>> 5 files changed, 19 insertions(+), 38 deletions(-) >>> >>> diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c >>> index cb59ce9b9638..8a7ae4162563 100644 >>> --- a/tools/perf/arch/x86/util/evlist.c >>> +++ b/tools/perf/arch/x86/util/evlist.c >>> @@ -59,10 +59,10 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, >>> struct perf_event_attr *attrs, >>> size_t nr_attrs) >>> { >>> - if (nr_attrs) >>> - return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); >>> + if (!nr_attrs) >>> + return 0; >>> >>> - return topdown_parse_events(evlist); >>> + return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); >>> } >>> >>> struct evsel *arch_evlist__leader(struct list_head *list) >>> diff --git a/tools/perf/arch/x86/util/topdown.c b/tools/perf/arch/x86/util/topdown.c >>> index 54810f9acd6f..eb3a7d9652ab 100644 >>> --- a/tools/perf/arch/x86/util/topdown.c >>> +++ b/tools/perf/arch/x86/util/topdown.c >>> @@ -9,11 +9,6 @@ >>> #include "topdown.h" >>> #include "evsel.h" >>> >>> -#define TOPDOWN_L1_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}" >>> -#define TOPDOWN_L1_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/}" >>> -#define TOPDOWN_L2_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}" >>> -#define TOPDOWN_L2_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/,cpu_core/topdown-heavy-ops/,cpu_core/topdown-br-mispredict/,cpu_core/topdown-fetch-lat/,cpu_core/topdown-mem-bound/}" >>> - >>> /* Check whether there is a PMU which supports the perf metrics. */ >>> bool topdown_sys_has_perf_metrics(void) >>> { >>> @@ -99,28 +94,3 @@ const char *arch_get_topdown_pmu_name(struct evlist *evlist, bool warn) >>> >>> return pmu_name; >>> } >>> - >>> -int topdown_parse_events(struct evlist *evlist) >>> -{ >>> - const char *topdown_events; >>> - const char *pmu_name; >>> - >>> - if (!topdown_sys_has_perf_metrics()) >>> - return 0; >>> - >>> - pmu_name = arch_get_topdown_pmu_name(evlist, false); >>> - >>> - if (pmu_have_event(pmu_name, "topdown-heavy-ops")) { >>> - if (!strcmp(pmu_name, "cpu_core")) >>> - topdown_events = TOPDOWN_L2_EVENTS_CORE; >>> - else >>> - topdown_events = TOPDOWN_L2_EVENTS; >>> - } else { >>> - if (!strcmp(pmu_name, "cpu_core")) >>> - topdown_events = TOPDOWN_L1_EVENTS_CORE; >>> - else >>> - topdown_events = TOPDOWN_L1_EVENTS; >>> - } >>> - >>> - return parse_event(evlist, topdown_events); >>> -} >>> diff --git a/tools/perf/arch/x86/util/topdown.h b/tools/perf/arch/x86/util/topdown.h >>> index 7eb81f042838..46bf9273e572 100644 >>> --- a/tools/perf/arch/x86/util/topdown.h >>> +++ b/tools/perf/arch/x86/util/topdown.h >>> @@ -3,6 +3,5 @@ >>> #define _TOPDOWN_H 1 >>> >>> bool topdown_sys_has_perf_metrics(void); >>> -int topdown_parse_events(struct evlist *evlist); >>> >>> #endif >>> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c >>> index 5e13171a7bba..796e98e453f6 100644 >>> --- a/tools/perf/builtin-stat.c >>> +++ b/tools/perf/builtin-stat.c >>> @@ -1996,6 +1996,7 @@ static int add_default_attributes(void) >>> stat_config.topdown_level = TOPDOWN_MAX_LEVEL; >>> >>> if (!evsel_list->core.nr_entries) { >>> + /* No events so add defaults. */ >>> if (target__has_cpu(&target)) >>> default_attrs0[0].config = PERF_COUNT_SW_CPU_CLOCK; >>> >>> @@ -2011,6 +2012,19 @@ static int add_default_attributes(void) >>> } >>> if (evlist__add_default_attrs(evsel_list, default_attrs1) < 0) >>> return -1; >>> + /* >>> + * Add TopdownL1 metrics if they exist. To minimize >>> + * multiplexing, don't request threshold computation. >>> + */ >>> + if (metricgroup__has_metric("TopdownL1") && >>> + metricgroup__parse_groups(evsel_list, "TopdownL1", >>> + /*metric_no_group=*/false, >>> + /*metric_no_merge=*/false, >>> + /*metric_no_threshold=*/true, >>> + stat_config.user_requested_cpu_list, >>> + stat_config.system_wide, >>> + &stat_config.metric_events) < 0) >> >> Does the metricgroup__* function check the existances of the events on >> the machine? If not, it may not be reliable to only check the event list. >> >> The existing code supports both L1 and L2 Topdown for SPR. But this >> patch seems remove the L2 Topdown support for SPR. >> >> The TopdownL1/L2 metric is added only for the big core with perf stat >> default. It's because that the perf_metrics is a dedicated register, >> which should not impact other events (using GP counters.) But this patch >> seems don't check the CPU type. It may brings extra multiplexing for the >> perf stat default on an ATOM platform. >> >> Thanks, >> Kan > > Hi Kan, > > The TopdownL2 metrics are present for SPR. The code changes to default > for L1 as with json topdown the maximum topdown level (the default > previously) is L6, and nobody really wants to see that. The --topdown > option is no longer limited to Icelake+ processors, any with the > TopdownL1 metricgroup will work as --topdown has just become a > shortcut to that. This patch seems also changes the perf stat default. The current perf stat default shows both L1 and L2 for SPR. If that's the case, it should be a user visible changes. What's output of "perf stat sleep 1" with this patch on SPR? > > There may be additional multiplexing, but also, in the old code events > from different groups could be used to calculate a bogus metric. There > are also additional events as the previous metrics don't agree with > those in the TMA spreadsheet. If there is multiplexing from this > change on SPR, the TMA json metrics do try to avoid this, I think the > right path through this is to fix the json metrics. For the perf stat default, there should be no multiplexing. Also, it looks like the patch and the following several patches remove the existence check of an event (pmu_have_event()). It may not be a good idea. Those events/features usually be enumerated, which means that they may not be available in some cases. For example, we don't have the perf metrics support on KVM. I don't think the current JSON metrics checks the CPUID enumeration. If so, the patch may brings problem in a VM. Thanks, Kan > > Thanks, > Ian > >>> + return -1; >>> /* Platform specific attrs */ >>> if (evlist__add_default_attrs(evsel_list, default_null_attrs) < 0) >>> return -1; >>> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c >>> index afb6f2fdc24e..64a35f2787dc 100644 >>> --- a/tools/perf/util/metricgroup.c >>> +++ b/tools/perf/util/metricgroup.c >>> @@ -1647,10 +1647,8 @@ static int metricgroup__has_metric_callback(const struct pmu_metric *pm, >>> { >>> const char *metric = vdata; >>> >>> - if (!pm->metric_expr) >>> - return 0; >>> - >>> - if (match_metric(pm->metric_name, metric)) >>> + if (match_metric(pm->metric_name, metric) || >>> + match_metric(pm->metric_group, metric)) >>> return 1; >>> >>> return 0;
On Mon, Feb 27, 2023 at 12:13 PM Liang, Kan <kan.liang@linux.intel.com> wrote: > > > > On 2023-02-27 2:33 p.m., Ian Rogers wrote: > > On Mon, Feb 27, 2023 at 11:12 AM Liang, Kan <kan.liang@linux.intel.com> wrote: > >> > >> > >> > >> On 2023-02-19 4:28 a.m., Ian Rogers wrote: > >>> When there are no events and on Intel, the topdown events will be > >>> added by default if present. To display the metrics associated with > >>> these request special handling in stat-shadow.c. To more easily update > >>> these metrics use the json metric version via the TopdownL1 > >>> group. This makes the handling less platform specific. > >>> > >>> Modify the metricgroup__has_metric code to also cover metric groups. > >>> > >>> Signed-off-by: Ian Rogers <irogers@google.com> > >>> --- > >>> tools/perf/arch/x86/util/evlist.c | 6 +++--- > >>> tools/perf/arch/x86/util/topdown.c | 30 ------------------------------ > >>> tools/perf/arch/x86/util/topdown.h | 1 - > >>> tools/perf/builtin-stat.c | 14 ++++++++++++++ > >>> tools/perf/util/metricgroup.c | 6 ++---- > >>> 5 files changed, 19 insertions(+), 38 deletions(-) > >>> > >>> diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c > >>> index cb59ce9b9638..8a7ae4162563 100644 > >>> --- a/tools/perf/arch/x86/util/evlist.c > >>> +++ b/tools/perf/arch/x86/util/evlist.c > >>> @@ -59,10 +59,10 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, > >>> struct perf_event_attr *attrs, > >>> size_t nr_attrs) > >>> { > >>> - if (nr_attrs) > >>> - return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); > >>> + if (!nr_attrs) > >>> + return 0; > >>> > >>> - return topdown_parse_events(evlist); > >>> + return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); > >>> } > >>> > >>> struct evsel *arch_evlist__leader(struct list_head *list) > >>> diff --git a/tools/perf/arch/x86/util/topdown.c b/tools/perf/arch/x86/util/topdown.c > >>> index 54810f9acd6f..eb3a7d9652ab 100644 > >>> --- a/tools/perf/arch/x86/util/topdown.c > >>> +++ b/tools/perf/arch/x86/util/topdown.c > >>> @@ -9,11 +9,6 @@ > >>> #include "topdown.h" > >>> #include "evsel.h" > >>> > >>> -#define TOPDOWN_L1_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}" > >>> -#define TOPDOWN_L1_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/}" > >>> -#define TOPDOWN_L2_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}" > >>> -#define TOPDOWN_L2_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/,cpu_core/topdown-heavy-ops/,cpu_core/topdown-br-mispredict/,cpu_core/topdown-fetch-lat/,cpu_core/topdown-mem-bound/}" > >>> - > >>> /* Check whether there is a PMU which supports the perf metrics. */ > >>> bool topdown_sys_has_perf_metrics(void) > >>> { > >>> @@ -99,28 +94,3 @@ const char *arch_get_topdown_pmu_name(struct evlist *evlist, bool warn) > >>> > >>> return pmu_name; > >>> } > >>> - > >>> -int topdown_parse_events(struct evlist *evlist) > >>> -{ > >>> - const char *topdown_events; > >>> - const char *pmu_name; > >>> - > >>> - if (!topdown_sys_has_perf_metrics()) > >>> - return 0; > >>> - > >>> - pmu_name = arch_get_topdown_pmu_name(evlist, false); > >>> - > >>> - if (pmu_have_event(pmu_name, "topdown-heavy-ops")) { > >>> - if (!strcmp(pmu_name, "cpu_core")) > >>> - topdown_events = TOPDOWN_L2_EVENTS_CORE; > >>> - else > >>> - topdown_events = TOPDOWN_L2_EVENTS; > >>> - } else { > >>> - if (!strcmp(pmu_name, "cpu_core")) > >>> - topdown_events = TOPDOWN_L1_EVENTS_CORE; > >>> - else > >>> - topdown_events = TOPDOWN_L1_EVENTS; > >>> - } > >>> - > >>> - return parse_event(evlist, topdown_events); > >>> -} > >>> diff --git a/tools/perf/arch/x86/util/topdown.h b/tools/perf/arch/x86/util/topdown.h > >>> index 7eb81f042838..46bf9273e572 100644 > >>> --- a/tools/perf/arch/x86/util/topdown.h > >>> +++ b/tools/perf/arch/x86/util/topdown.h > >>> @@ -3,6 +3,5 @@ > >>> #define _TOPDOWN_H 1 > >>> > >>> bool topdown_sys_has_perf_metrics(void); > >>> -int topdown_parse_events(struct evlist *evlist); > >>> > >>> #endif > >>> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > >>> index 5e13171a7bba..796e98e453f6 100644 > >>> --- a/tools/perf/builtin-stat.c > >>> +++ b/tools/perf/builtin-stat.c > >>> @@ -1996,6 +1996,7 @@ static int add_default_attributes(void) > >>> stat_config.topdown_level = TOPDOWN_MAX_LEVEL; > >>> > >>> if (!evsel_list->core.nr_entries) { > >>> + /* No events so add defaults. */ > >>> if (target__has_cpu(&target)) > >>> default_attrs0[0].config = PERF_COUNT_SW_CPU_CLOCK; > >>> > >>> @@ -2011,6 +2012,19 @@ static int add_default_attributes(void) > >>> } > >>> if (evlist__add_default_attrs(evsel_list, default_attrs1) < 0) > >>> return -1; > >>> + /* > >>> + * Add TopdownL1 metrics if they exist. To minimize > >>> + * multiplexing, don't request threshold computation. > >>> + */ > >>> + if (metricgroup__has_metric("TopdownL1") && > >>> + metricgroup__parse_groups(evsel_list, "TopdownL1", > >>> + /*metric_no_group=*/false, > >>> + /*metric_no_merge=*/false, > >>> + /*metric_no_threshold=*/true, > >>> + stat_config.user_requested_cpu_list, > >>> + stat_config.system_wide, > >>> + &stat_config.metric_events) < 0) > >> > >> Does the metricgroup__* function check the existances of the events on > >> the machine? If not, it may not be reliable to only check the event list. > >> > >> The existing code supports both L1 and L2 Topdown for SPR. But this > >> patch seems remove the L2 Topdown support for SPR. > >> > >> The TopdownL1/L2 metric is added only for the big core with perf stat > >> default. It's because that the perf_metrics is a dedicated register, > >> which should not impact other events (using GP counters.) But this patch > >> seems don't check the CPU type. It may brings extra multiplexing for the > >> perf stat default on an ATOM platform. > >> > >> Thanks, > >> Kan > > > > Hi Kan, > > > > The TopdownL2 metrics are present for SPR. The code changes to default > > for L1 as with json topdown the maximum topdown level (the default > > previously) is L6, and nobody really wants to see that. The --topdown > > option is no longer limited to Icelake+ processors, any with the > > TopdownL1 metricgroup will work as --topdown has just become a > > shortcut to that. > > This patch seems also changes the perf stat default. The current perf > stat default shows both L1 and L2 for SPR. If that's the case, it should > be a user visible changes. What's output of "perf stat sleep 1" with > this patch on SPR? I'll need to find an SPR. The change from L2 to L1 as mentioned above is that the behavior was to print max topdown level, and with json metrics that is level 6. We could make the behavior level 2 if L2 topdown events are present. I didn't do this as it would mean SPR didn't align with everything else. > > > > There may be additional multiplexing, but also, in the old code events > > from different groups could be used to calculate a bogus metric. There > > are also additional events as the previous metrics don't agree with > > those in the TMA spreadsheet. If there is multiplexing from this > > change on SPR, the TMA json metrics do try to avoid this, I think the > > right path through this is to fix the json metrics. > > For the perf stat default, there should be no multiplexing. > > Also, it looks like the patch and the following several patches remove > the existence check of an event (pmu_have_event()). It may not be a good > idea. Those events/features usually be enumerated, which means that they > may not be available in some cases. For example, we don't have the perf > metrics support on KVM. I don't think the current JSON metrics checks > the CPUID enumeration. If so, the patch may brings problem in a VM. This seems like a general problem with json metrics. In the case that no metric is calculated the metric isn't printed, but you may see the events as not counted. We could special case this as the current code does or perhaps we can have some kind of "default event" flag and if such events fail to open just drop them from the output. There are likely other strategies. Thanks, Ian > Thanks, > Kan > > > > > Thanks, > > Ian > > > >>> + return -1; > >>> /* Platform specific attrs */ > >>> if (evlist__add_default_attrs(evsel_list, default_null_attrs) < 0) > >>> return -1; > >>> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > >>> index afb6f2fdc24e..64a35f2787dc 100644 > >>> --- a/tools/perf/util/metricgroup.c > >>> +++ b/tools/perf/util/metricgroup.c > >>> @@ -1647,10 +1647,8 @@ static int metricgroup__has_metric_callback(const struct pmu_metric *pm, > >>> { > >>> const char *metric = vdata; > >>> > >>> - if (!pm->metric_expr) > >>> - return 0; > >>> - > >>> - if (match_metric(pm->metric_name, metric)) > >>> + if (match_metric(pm->metric_name, metric) || > >>> + match_metric(pm->metric_group, metric)) > >>> return 1; > >>> > >>> return 0;
On 2023-02-28 1:27 a.m., Ian Rogers wrote: > On Mon, Feb 27, 2023 at 12:13 PM Liang, Kan <kan.liang@linux.intel.com> wrote: >> >> >> >> On 2023-02-27 2:33 p.m., Ian Rogers wrote: >>> On Mon, Feb 27, 2023 at 11:12 AM Liang, Kan <kan.liang@linux.intel.com> wrote: >>>> >>>> >>>> >>>> On 2023-02-19 4:28 a.m., Ian Rogers wrote: >>>>> When there are no events and on Intel, the topdown events will be >>>>> added by default if present. To display the metrics associated with >>>>> these request special handling in stat-shadow.c. To more easily update >>>>> these metrics use the json metric version via the TopdownL1 >>>>> group. This makes the handling less platform specific. >>>>> >>>>> Modify the metricgroup__has_metric code to also cover metric groups. >>>>> >>>>> Signed-off-by: Ian Rogers <irogers@google.com> >>>>> --- >>>>> tools/perf/arch/x86/util/evlist.c | 6 +++--- >>>>> tools/perf/arch/x86/util/topdown.c | 30 ------------------------------ >>>>> tools/perf/arch/x86/util/topdown.h | 1 - >>>>> tools/perf/builtin-stat.c | 14 ++++++++++++++ >>>>> tools/perf/util/metricgroup.c | 6 ++---- >>>>> 5 files changed, 19 insertions(+), 38 deletions(-) >>>>> >>>>> diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c >>>>> index cb59ce9b9638..8a7ae4162563 100644 >>>>> --- a/tools/perf/arch/x86/util/evlist.c >>>>> +++ b/tools/perf/arch/x86/util/evlist.c >>>>> @@ -59,10 +59,10 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, >>>>> struct perf_event_attr *attrs, >>>>> size_t nr_attrs) >>>>> { >>>>> - if (nr_attrs) >>>>> - return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); >>>>> + if (!nr_attrs) >>>>> + return 0; >>>>> >>>>> - return topdown_parse_events(evlist); >>>>> + return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); >>>>> } >>>>> >>>>> struct evsel *arch_evlist__leader(struct list_head *list) >>>>> diff --git a/tools/perf/arch/x86/util/topdown.c b/tools/perf/arch/x86/util/topdown.c >>>>> index 54810f9acd6f..eb3a7d9652ab 100644 >>>>> --- a/tools/perf/arch/x86/util/topdown.c >>>>> +++ b/tools/perf/arch/x86/util/topdown.c >>>>> @@ -9,11 +9,6 @@ >>>>> #include "topdown.h" >>>>> #include "evsel.h" >>>>> >>>>> -#define TOPDOWN_L1_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}" >>>>> -#define TOPDOWN_L1_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/}" >>>>> -#define TOPDOWN_L2_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}" >>>>> -#define TOPDOWN_L2_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/,cpu_core/topdown-heavy-ops/,cpu_core/topdown-br-mispredict/,cpu_core/topdown-fetch-lat/,cpu_core/topdown-mem-bound/}" >>>>> - >>>>> /* Check whether there is a PMU which supports the perf metrics. */ >>>>> bool topdown_sys_has_perf_metrics(void) >>>>> { >>>>> @@ -99,28 +94,3 @@ const char *arch_get_topdown_pmu_name(struct evlist *evlist, bool warn) >>>>> >>>>> return pmu_name; >>>>> } >>>>> - >>>>> -int topdown_parse_events(struct evlist *evlist) >>>>> -{ >>>>> - const char *topdown_events; >>>>> - const char *pmu_name; >>>>> - >>>>> - if (!topdown_sys_has_perf_metrics()) >>>>> - return 0; >>>>> - >>>>> - pmu_name = arch_get_topdown_pmu_name(evlist, false); >>>>> - >>>>> - if (pmu_have_event(pmu_name, "topdown-heavy-ops")) { >>>>> - if (!strcmp(pmu_name, "cpu_core")) >>>>> - topdown_events = TOPDOWN_L2_EVENTS_CORE; >>>>> - else >>>>> - topdown_events = TOPDOWN_L2_EVENTS; >>>>> - } else { >>>>> - if (!strcmp(pmu_name, "cpu_core")) >>>>> - topdown_events = TOPDOWN_L1_EVENTS_CORE; >>>>> - else >>>>> - topdown_events = TOPDOWN_L1_EVENTS; >>>>> - } >>>>> - >>>>> - return parse_event(evlist, topdown_events); >>>>> -} >>>>> diff --git a/tools/perf/arch/x86/util/topdown.h b/tools/perf/arch/x86/util/topdown.h >>>>> index 7eb81f042838..46bf9273e572 100644 >>>>> --- a/tools/perf/arch/x86/util/topdown.h >>>>> +++ b/tools/perf/arch/x86/util/topdown.h >>>>> @@ -3,6 +3,5 @@ >>>>> #define _TOPDOWN_H 1 >>>>> >>>>> bool topdown_sys_has_perf_metrics(void); >>>>> -int topdown_parse_events(struct evlist *evlist); >>>>> >>>>> #endif >>>>> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c >>>>> index 5e13171a7bba..796e98e453f6 100644 >>>>> --- a/tools/perf/builtin-stat.c >>>>> +++ b/tools/perf/builtin-stat.c >>>>> @@ -1996,6 +1996,7 @@ static int add_default_attributes(void) >>>>> stat_config.topdown_level = TOPDOWN_MAX_LEVEL; >>>>> >>>>> if (!evsel_list->core.nr_entries) { >>>>> + /* No events so add defaults. */ >>>>> if (target__has_cpu(&target)) >>>>> default_attrs0[0].config = PERF_COUNT_SW_CPU_CLOCK; >>>>> >>>>> @@ -2011,6 +2012,19 @@ static int add_default_attributes(void) >>>>> } >>>>> if (evlist__add_default_attrs(evsel_list, default_attrs1) < 0) >>>>> return -1; >>>>> + /* >>>>> + * Add TopdownL1 metrics if they exist. To minimize >>>>> + * multiplexing, don't request threshold computation. >>>>> + */ >>>>> + if (metricgroup__has_metric("TopdownL1") && >>>>> + metricgroup__parse_groups(evsel_list, "TopdownL1", >>>>> + /*metric_no_group=*/false, >>>>> + /*metric_no_merge=*/false, >>>>> + /*metric_no_threshold=*/true, >>>>> + stat_config.user_requested_cpu_list, >>>>> + stat_config.system_wide, >>>>> + &stat_config.metric_events) < 0) >>>> >>>> Does the metricgroup__* function check the existances of the events on >>>> the machine? If not, it may not be reliable to only check the event list. >>>> >>>> The existing code supports both L1 and L2 Topdown for SPR. But this >>>> patch seems remove the L2 Topdown support for SPR. >>>> >>>> The TopdownL1/L2 metric is added only for the big core with perf stat >>>> default. It's because that the perf_metrics is a dedicated register, >>>> which should not impact other events (using GP counters.) But this patch >>>> seems don't check the CPU type. It may brings extra multiplexing for the >>>> perf stat default on an ATOM platform. >>>> >>>> Thanks, >>>> Kan >>> >>> Hi Kan, >>> >>> The TopdownL2 metrics are present for SPR. The code changes to default >>> for L1 as with json topdown the maximum topdown level (the default >>> previously) is L6, and nobody really wants to see that. The --topdown >>> option is no longer limited to Icelake+ processors, any with the >>> TopdownL1 metricgroup will work as --topdown has just become a >>> shortcut to that. >> >> This patch seems also changes the perf stat default. The current perf >> stat default shows both L1 and L2 for SPR. If that's the case, it should >> be a user visible changes. What's output of "perf stat sleep 1" with >> this patch on SPR? > > I'll need to find an SPR. The change from L2 to L1 as mentioned above > is that the behavior was to print max topdown level, and with json > metrics that is level 6. We could make the behavior level 2 if L2 > topdown events are present. I didn't do this as it would mean SPR > didn't align with everything else. For L2, it's free on SPR. So we extended it only for SPR. That could give user more information with perf stat default. > >>> >>> There may be additional multiplexing, but also, in the old code events >>> from different groups could be used to calculate a bogus metric. There >>> are also additional events as the previous metrics don't agree with >>> those in the TMA spreadsheet. If there is multiplexing from this >>> change on SPR, the TMA json metrics do try to avoid this, I think the >>> right path through this is to fix the json metrics. >> >> For the perf stat default, there should be no multiplexing. >> >> Also, it looks like the patch and the following several patches remove >> the existence check of an event (pmu_have_event()). It may not be a good >> idea. Those events/features usually be enumerated, which means that they >> may not be available in some cases. For example, we don't have the perf >> metrics support on KVM. I don't think the current JSON metrics checks >> the CPUID enumeration. If so, the patch may brings problem in a VM. > > This seems like a general problem with json metrics. In the case that > no metric is calculated the metric isn't printed, but you may see the > events as not counted. We could special case this as the current code > does or perhaps we can have some kind of "default event" flag and if > such events fail to open just drop them from the output. There are > likely other strategies. Yes, it should be a general problem. The current behavior is to error out with an error message rather than 0 count. The 0 count sometimes may mislead the user. Either special case or a "default event" flag is OK for me. My point is that we should check the existence of the feature/events. So we can give user a clear message regarding the reason of dropping or 0 the events. If they really want the feature/metrics, they can update the kernel or ask the cloud vender to update the service. Maybe we can extend the same soulution to perf list as well. For the machine which doesn't have some feature, we may drop the metrics or use an alternative metrics. But that could be done later separately. Thanks, Kan > > Thanks, > Ian > >> Thanks, >> Kan >> >>> >>> Thanks, >>> Ian >>> >>>>> + return -1; >>>>> /* Platform specific attrs */ >>>>> if (evlist__add_default_attrs(evsel_list, default_null_attrs) < 0) >>>>> return -1; >>>>> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c >>>>> index afb6f2fdc24e..64a35f2787dc 100644 >>>>> --- a/tools/perf/util/metricgroup.c >>>>> +++ b/tools/perf/util/metricgroup.c >>>>> @@ -1647,10 +1647,8 @@ static int metricgroup__has_metric_callback(const struct pmu_metric *pm, >>>>> { >>>>> const char *metric = vdata; >>>>> >>>>> - if (!pm->metric_expr) >>>>> - return 0; >>>>> - >>>>> - if (match_metric(pm->metric_name, metric)) >>>>> + if (match_metric(pm->metric_name, metric) || >>>>> + match_metric(pm->metric_group, metric)) >>>>> return 1; >>>>> >>>>> return 0;
diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c index cb59ce9b9638..8a7ae4162563 100644 --- a/tools/perf/arch/x86/util/evlist.c +++ b/tools/perf/arch/x86/util/evlist.c @@ -59,10 +59,10 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, struct perf_event_attr *attrs, size_t nr_attrs) { - if (nr_attrs) - return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); + if (!nr_attrs) + return 0; - return topdown_parse_events(evlist); + return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); } struct evsel *arch_evlist__leader(struct list_head *list) diff --git a/tools/perf/arch/x86/util/topdown.c b/tools/perf/arch/x86/util/topdown.c index 54810f9acd6f..eb3a7d9652ab 100644 --- a/tools/perf/arch/x86/util/topdown.c +++ b/tools/perf/arch/x86/util/topdown.c @@ -9,11 +9,6 @@ #include "topdown.h" #include "evsel.h" -#define TOPDOWN_L1_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}" -#define TOPDOWN_L1_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/}" -#define TOPDOWN_L2_EVENTS "{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}" -#define TOPDOWN_L2_EVENTS_CORE "{slots,cpu_core/topdown-retiring/,cpu_core/topdown-bad-spec/,cpu_core/topdown-fe-bound/,cpu_core/topdown-be-bound/,cpu_core/topdown-heavy-ops/,cpu_core/topdown-br-mispredict/,cpu_core/topdown-fetch-lat/,cpu_core/topdown-mem-bound/}" - /* Check whether there is a PMU which supports the perf metrics. */ bool topdown_sys_has_perf_metrics(void) { @@ -99,28 +94,3 @@ const char *arch_get_topdown_pmu_name(struct evlist *evlist, bool warn) return pmu_name; } - -int topdown_parse_events(struct evlist *evlist) -{ - const char *topdown_events; - const char *pmu_name; - - if (!topdown_sys_has_perf_metrics()) - return 0; - - pmu_name = arch_get_topdown_pmu_name(evlist, false); - - if (pmu_have_event(pmu_name, "topdown-heavy-ops")) { - if (!strcmp(pmu_name, "cpu_core")) - topdown_events = TOPDOWN_L2_EVENTS_CORE; - else - topdown_events = TOPDOWN_L2_EVENTS; - } else { - if (!strcmp(pmu_name, "cpu_core")) - topdown_events = TOPDOWN_L1_EVENTS_CORE; - else - topdown_events = TOPDOWN_L1_EVENTS; - } - - return parse_event(evlist, topdown_events); -} diff --git a/tools/perf/arch/x86/util/topdown.h b/tools/perf/arch/x86/util/topdown.h index 7eb81f042838..46bf9273e572 100644 --- a/tools/perf/arch/x86/util/topdown.h +++ b/tools/perf/arch/x86/util/topdown.h @@ -3,6 +3,5 @@ #define _TOPDOWN_H 1 bool topdown_sys_has_perf_metrics(void); -int topdown_parse_events(struct evlist *evlist); #endif diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 5e13171a7bba..796e98e453f6 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1996,6 +1996,7 @@ static int add_default_attributes(void) stat_config.topdown_level = TOPDOWN_MAX_LEVEL; if (!evsel_list->core.nr_entries) { + /* No events so add defaults. */ if (target__has_cpu(&target)) default_attrs0[0].config = PERF_COUNT_SW_CPU_CLOCK; @@ -2011,6 +2012,19 @@ static int add_default_attributes(void) } if (evlist__add_default_attrs(evsel_list, default_attrs1) < 0) return -1; + /* + * Add TopdownL1 metrics if they exist. To minimize + * multiplexing, don't request threshold computation. + */ + if (metricgroup__has_metric("TopdownL1") && + metricgroup__parse_groups(evsel_list, "TopdownL1", + /*metric_no_group=*/false, + /*metric_no_merge=*/false, + /*metric_no_threshold=*/true, + stat_config.user_requested_cpu_list, + stat_config.system_wide, + &stat_config.metric_events) < 0) + return -1; /* Platform specific attrs */ if (evlist__add_default_attrs(evsel_list, default_null_attrs) < 0) return -1; diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index afb6f2fdc24e..64a35f2787dc 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1647,10 +1647,8 @@ static int metricgroup__has_metric_callback(const struct pmu_metric *pm, { const char *metric = vdata; - if (!pm->metric_expr) - return 0; - - if (match_metric(pm->metric_name, metric)) + if (match_metric(pm->metric_name, metric) || + match_metric(pm->metric_group, metric)) return 1; return 0;
When there are no events and on Intel, the topdown events will be added by default if present. To display the metrics associated with these request special handling in stat-shadow.c. To more easily update these metrics use the json metric version via the TopdownL1 group. This makes the handling less platform specific. Modify the metricgroup__has_metric code to also cover metric groups. Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/arch/x86/util/evlist.c | 6 +++--- tools/perf/arch/x86/util/topdown.c | 30 ------------------------------ tools/perf/arch/x86/util/topdown.h | 1 - tools/perf/builtin-stat.c | 14 ++++++++++++++ tools/perf/util/metricgroup.c | 6 ++---- 5 files changed, 19 insertions(+), 38 deletions(-)