mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
4102ff8b1f
Unlike with events, metrics can be matched by name or a list of metric groups. However, when a metric refers to another metric it isn't referring to a group but the singular metric in question. Prior to this change every "id" in a metric expression is checked to see if it is a metric by scanning all the metrics in the metrics table. As the table is sorted my metric name we can speed the search in the resolution case by binary searching for the metric. Rename some of the metricgroup functions to make it clearer whether they match a metric by name or by both name and group. Before: ``` $ time perf test -v 10 10: PMU JSON event tests : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok 10.5: Parsing of metric thresholds with fake PMUs : Ok real 0m15.972s user 0m13.176s sys 0m3.001s ``` After: ``` $ time perf test -v 10 10: PMU JSON event tests : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok 10.5: Parsing of metric thresholds with fake PMUs : Ok real 0m5.343s user 0m1.871s sys 0m2.128s ``` Committer testing: root@number:~# grep -m1 'model name' /proc/cpuinfo model name : AMD Ryzen 9 9950X3D 16-Core Processor root@number:~# Before: root@number:~# time perf test "Parsing of PMU event table metrics" 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok real 0m9.286s user 0m9.354s sys 0m0.062s root@number:~# After: root@number:~# time perf test "Parsing of PMU event table metrics" 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok real 0m0.689s user 0m0.766s sys 0m0.042s root@number:~# time perf test 10 10: PMU JSON event tests : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok 10.5: Parsing of metric thresholds with fake PMUs : Ok real 0m0.696s user 0m0.807s sys 0m0.064s root@number:~# Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Tested-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Xu Yang <xu.yang_2@nxp.com> Link: https://lore.kernel.org/r/20250512194622.33258-4-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
97 lines
3.2 KiB
C
97 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#ifndef METRICGROUP_H
|
|
#define METRICGROUP_H 1
|
|
|
|
#include <linux/list.h>
|
|
#include <linux/rbtree.h>
|
|
#include <stdbool.h>
|
|
#include "pmu-events/pmu-events.h"
|
|
|
|
struct evlist;
|
|
struct evsel;
|
|
struct option;
|
|
struct print_callbacks;
|
|
struct rblist;
|
|
struct cgroup;
|
|
|
|
/**
|
|
* A node in a rblist keyed by the evsel. The global rblist of metric events
|
|
* generally exists in perf_stat_config. The evsel is looked up in the rblist
|
|
* yielding a list of metric_expr.
|
|
*/
|
|
struct metric_event {
|
|
struct rb_node nd;
|
|
struct evsel *evsel;
|
|
bool is_default; /* the metric evsel from the Default metricgroup */
|
|
struct list_head head; /* list of metric_expr */
|
|
};
|
|
|
|
/**
|
|
* A metric referenced by a metric_expr. When parsing a metric expression IDs
|
|
* will be looked up, matching either a value (from metric_events) or a
|
|
* metric_ref. A metric_ref will then be parsed recursively. The metric_refs and
|
|
* metric_events need to be known before parsing so that their values may be
|
|
* placed in the parse context for lookup.
|
|
*/
|
|
struct metric_ref {
|
|
const char *metric_name;
|
|
const char *metric_expr;
|
|
};
|
|
|
|
/**
|
|
* One in a list of metric_expr associated with an evsel. The data is used to
|
|
* generate a metric value during stat output.
|
|
*/
|
|
struct metric_expr {
|
|
struct list_head nd;
|
|
/** The expression to parse, for example, "instructions/cycles". */
|
|
const char *metric_expr;
|
|
/** The name of the meric such as "IPC". */
|
|
const char *metric_name;
|
|
const char *metric_threshold;
|
|
/**
|
|
* The "ScaleUnit" that scales and adds a unit to the metric during
|
|
* output. For example, "6.4e-05MiB" means to scale the resulting metric
|
|
* by 6.4e-05 (typically converting a unit like cache lines to something
|
|
* more human intelligible) and then add "MiB" afterward when displayed.
|
|
*/
|
|
const char *metric_unit;
|
|
/** Displayed metricgroup name of the Default metricgroup */
|
|
const char *default_metricgroup_name;
|
|
/** Null terminated array of events used by the metric. */
|
|
struct evsel **metric_events;
|
|
/** Null terminated array of referenced metrics. */
|
|
struct metric_ref *metric_refs;
|
|
/** A value substituted for '?' during parsing. */
|
|
int runtime;
|
|
};
|
|
|
|
struct metric_event *metricgroup__lookup(struct rblist *metric_events,
|
|
struct evsel *evsel,
|
|
bool create);
|
|
int metricgroup__parse_groups(struct evlist *perf_evlist,
|
|
const char *pmu,
|
|
const char *str,
|
|
bool metric_no_group,
|
|
bool metric_no_merge,
|
|
bool metric_no_threshold,
|
|
const char *user_requested_cpu_list,
|
|
bool system_wide,
|
|
bool hardware_aware_grouping,
|
|
struct rblist *metric_events);
|
|
int metricgroup__parse_groups_test(struct evlist *evlist,
|
|
const struct pmu_metrics_table *table,
|
|
const char *str,
|
|
struct rblist *metric_events);
|
|
|
|
void metricgroup__print(const struct print_callbacks *print_cb, void *print_state);
|
|
bool metricgroup__has_metric_or_groups(const char *pmu, const char *metric_or_groups);
|
|
unsigned int metricgroups__topdown_max_level(void);
|
|
int arch_get_runtimeparam(const struct pmu_metric *pm);
|
|
void metricgroup__rblist_exit(struct rblist *metric_events);
|
|
|
|
int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *cgrp,
|
|
struct rblist *new_metric_events,
|
|
struct rblist *old_metric_events);
|
|
#endif
|