Add support for sysfs event.cpus and cpu event term
Ian Rogers
reviewercover Add support for sysfs event.cpus and cpu event term
The need for a sysfs event.cpus file is discussed here:
https://lore.kernel.org/lkml/CAP-5=fXXuWchzUK0n5KTH8kamr=DQoEni+bUoo8f-4j8Y+eMBg@mail.gmail.com/
following Dhananjay Ugwekar's work on the RAPL /sys/devices/power PMU. These changes add support for the event.cpus file in sysfs and also a cpu event term allowing events to have differing CPUs. This was adding in order to test the parsing and map propagation for the sysfs case.
Ian Rogers (6):
perf pmu: Merge boolean sysfs event option parsing
perf parse-events: Pass cpu_list as a perf_cpu_map in __add_event perf pmu: Add support for event.cpus files in sysfs libperf cpumap: Add ability to create CPU from a single CPU number perf parse-events: Set is_pmu_core for legacy hardware events perf parse-events: Add "cpu" term to set the CPU an event is recorded
on
.../sysfs-bus-event_source-devices-events | 14 ++ tools/lib/perf/cpumap.c | 10 ++ tools/lib/perf/include/perf/cpumap.h | 2 + tools/perf/Documentation/perf-list.txt | 7 + tools/perf/util/evsel_config.h | 1 + tools/perf/util/parse-events.c | 156 ++++++++++++------ tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.l | 1 + tools/perf/util/pmu.c | 92 ++++++++--- tools/perf/util/pmu.h | 1 + 10 files changed, 213 insertions(+), 74 deletions(-)
Signature · 1 line
2.45.2.1089.g2a221341d9-goog
Ian Rogers
reviewerPATCH 1/6 perf pmu: Merge boolean sysfs event option parsing
Merge perf_pmu__parse_per_pkg and perf_pmu__parse_snapshot that do the same parsing except for the file suffix used.
--- tools/perf/util/pmu.c | 47 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-)
tools/perf/util/pmu.c +23 -24
@@ -367,8 +367,8 @@ static int perf_pmu__parse_unit(struct perf_pmu *pmu, struct perf_pmu_alias *alireturn -1 ; } -static int -perf_pmu__parse_per_pkg (struct perf_pmu *pmu,struct perf_pmu_alias *alias) +static bool perf_pmu__parse_event_source_bool (const char *pmu_name,const char *event_name, +const char *suffix) {char path[PATH_MAX ];size_t len;
@@ -376,37 +376,36 @@ perf_pmu__parse_per_pkg(struct perf_pmu *pmu, struct perf_pmu_alias *alias) len =perf_pmu__event_source_devices_scnprintf (path,sizeof (path));if (!len) -return 0 ; -scnprintf (path + len,sizeof (path) - len,"%s/events/%s.per-pkg" , pmu->name, alias->name); +return false; + +scnprintf (path + len,sizeof (path) - len,"%s/events/%s.%s" , pmu_name, event_name, suffix); fd =open (path,O_RDONLY );if (fd ==-1 ) -return -1 ; +return false; -close (fd); +#ifndef NDEBUG + { +char buf[8 ]; - alias->per_pkg = true; -return 0 ; + len =read (fd, buf,sizeof (buf)); +assert (len ==1 || len ==2 ); +assert (buf[0 ] =='1' ); + } +#endif + +close (fd); +return true; } -static int perf_pmu__parse_snapshot (struct perf_pmu *pmu,struct perf_pmu_alias *alias) +static void perf_pmu__parse_per_pkg (struct perf_pmu *pmu,struct perf_pmu_alias *alias) { -char path[PATH_MAX ]; -size_t len; -int fd; - - len =perf_pmu__event_source_devices_scnprintf (path,sizeof (path)); -if (!len) -return 0 ; -scnprintf (path + len,sizeof (path) - len,"%s/events/%s.snapshot" , pmu->name, alias->name); - - fd =open (path,O_RDONLY ); -if (fd ==-1 ) -return -1 ; + alias->per_pkg =perf_pmu__parse_event_source_bool (pmu->name, alias->name,"per-pkg" ); +} - alias->snapshot = true; -close (fd); -return 0 ; +static void perf_pmu__parse_snapshot (struct perf_pmu *pmu,struct perf_pmu_alias *alias) +{ + alias->snapshot =perf_pmu__parse_event_source_bool (pmu->name, alias->name,"snapshot" ); }/* Delete an alias entry. */
Signature · 1 line
2.45.2.1089.g2a221341d9-goog
Ian Rogers
reviewerPATCH 2/6 perf parse-events: Pass cpu_list as a perf_cpu_map in __add_event
In reply to Ian RogersPreviously the cpu_list is a string and typically no cpu_list is passed to __add_event. Wanting to make events have their cpus distinct from the PMU means that in more occassions we want to pass a cpu_list. If we're reading this from sysfs it is easier to read a perf_cpu_map than allocate and pass around strings that will later be parsed.
--- tools/perf/util/parse-events.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
tools/perf/util/parse-events.c +6 -5
@@ -227,12 +227,12 @@ __add_event(struct list_head *list, int *idx,bool init_attr, const char *name, const char *metric_id, struct perf_pmu *pmu, struct list_head *config_terms, bool auto_merge_stats, - const char *cpu_list) + struct perf_cpu_map *cpu_list) { struct evsel *evsel; -struct perf_cpu_map *cpus = pmu ?perf_cpu_map__get (pmu->cpus) : - cpu_list ?perf_cpu_map__new (cpu_list) :NULL ; +struct perf_cpu_map *cpus =perf_cpu_map__is_empty (cpu_list) && pmu ? pmu->cpus : cpu_list; + cpus =perf_cpu_map__get (cpus);if (pmu)perf_pmu__warn_invalid_formats (pmu);
@@ -305,16 +305,17 @@ static int add_event_tool(struct list_head *list, int *idx, .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_DUMMY, }; -const char *cpu_list =NULL ; +struct perf_cpu_map *cpu_list =NULL ;if (tool_event ==PERF_TOOL_DURATION_TIME ) {/* Duration time is gathered globally, pretend it is only on CPU0. */ - cpu_list ="0" ; + cpu_list =perf_cpu_map__new ("0" ); } evsel =__add_event (list, idx, &attr,/*init_attr=*/ true,/*name=*/ NULL ,/*metric_id=*/ NULL ,/*pmu=*/ NULL ,/*config_terms=*/ NULL ,/*auto_merge_stats=*/ false, cpu_list); +perf_cpu_map__put (cpu_list);if (!evsel)return -ENOMEM ; evsel->tool_event = tool_event;
Signature · 1 line
2.45.2.1089.g2a221341d9-goog
Ian Rogers
reviewerPATCH 3/6 perf pmu: Add support for event.cpus files in sysfs
In reply to Ian RogersIf an event file exists in sysfs, check if a event.cpus file exists and read a perf_cpu_map from it if it does. This allows particular events to have a different set of CPUs compared to the PMU.
One scenario where this could be useful is when a PMU is set up with a cpumask/events per SMT thread but some events record for all SMT threads. Programming an event on each SMT thread will cause unnecessary counters to be programmed and the aggregate value to be too large.
Another scenario where this could be useful if when a PMU has historically had a cpumask at the package level, but now newer per die, core or CPU information is available.
Additional context for the motivation is in these patches and conversation:
https://lore.kernel.org/lkml/[email protected]/
--- .../sysfs-bus-event_source-devices-events | 14 ++++++ tools/perf/util/parse-events.c | 45 ++++++++++--------- tools/perf/util/pmu.c | 44 +++++++++++++++++- tools/perf/util/pmu.h | 1 + 4 files changed, 82 insertions(+), 22 deletions(-)
Documentation/ABI/testing/sysfs-bus-event_source-devices-events +14 -0
@@ -70,6 +70,20 @@ Description: Per-pmu performance monitoring events specific to the running syste This is referred to as "event parameterization". Event parameters have the format 'param=?'. +What: /sys/bus/event_source/devices/<pmu>/events/<event>.cpus +Date: 2024/07/17 +Contact: Linux kernel mailing list <[email protected]> +Description: Perf event CPUs + + A list of CPUs on which a the perf event should be + opened by default. This is an event specific variant + of /sys/bus/event_source/devices/<pmu>/cpumask. + + Examples (each of these lines would be in a separate file): + + 0,2,4,6 + 0-7 + What: /sys/bus/event_source/devices/<pmu>/events/<event>.unit Date: 2014/02/24 Contact: Linux kernel mailing list <[email protected]>
tools/perf/util/parse-events.c +24 -21
109 lines not on this page · raw message
tools/perf/util/pmu.c +43 -1
86 lines not on this page · raw message
tools/perf/util/pmu.h +1 -0
@@ -177,6 +177,7 @@ struct perf_pmu {extern struct perf_pmu perf_pmu__fake;struct perf_pmu_info { +struct perf_cpu_map *cpus;const char *unit;double scale;bool per_pkg;
Signature · 1 line
2.45.2.1089.g2a221341d9-goog
Ian Rogers
reviewerPATCH 4/6 libperf cpumap: Add ability to create CPU from a single CPU number
In reply to Ian RogersAdd perf_cpu_map__new_int so that a CPU map can be created from a single integer.
--- tools/lib/perf/cpumap.c | 10 ++++++++++ tools/lib/perf/include/perf/cpumap.h | 2 ++ 2 files changed, 12 insertions(+)
tools/lib/perf/cpumap.c +10 -0
@@ -293,6 +293,16 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list)return cpus; } +struct perf_cpu_map *perf_cpu_map__new_int (int cpu) +{ +struct perf_cpu_map *cpus =perf_cpu_map__alloc (1 ); + +if (cpus) +RC_CHK_ACCESS (cpus)->map[0 ].cpu = cpu; + +return cpus; +} +static int __perf_cpu_map__nr (const struct perf_cpu_map *cpus) {return RC_CHK_ACCESS (cpus)->nr;
tools/lib/perf/include/perf/cpumap.h +2 -0
@@ -37,6 +37,8 @@ LIBPERF_API struct perf_cpu_map *perf_cpu_map__new_online_cpus(void);* perf_cpu_map__new_online_cpus is returned. */ LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); +/** perf_cpu_map__new_int - create a map with the one given cpu. */ +LIBPERF_API struct perf_cpu_map *perf_cpu_map__new_int(int cpu); LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file); LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map); LIBPERF_API struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
Signature · 1 line
2.45.2.1089.g2a221341d9-goog
Ian Rogers
reviewerPATCH 5/6 perf parse-events: Set is_pmu_core for legacy hardware events
In reply to Ian RogersAlso set the CPU map to all online CPU maps. This is done so the behavior of legacy hardware and hardware cache events better matches that of sysfs and json events during __perf_evlist__propagate_maps.
--- tools/perf/util/parse-events.c | 37 +++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 14 deletions(-)
tools/perf/util/parse-events.c +23 -14
@@ -230,21 +230,30 @@ __add_event(struct list_head *list, int *idx, struct perf_cpu_map *cpu_list) {struct evsel *evsel; -struct perf_cpu_map *cpus =perf_cpu_map__is_empty (cpu_list) && pmu ? pmu->cpus : cpu_list; +bool is_pmu_core; +struct perf_cpu_map *cpus; - cpus =perf_cpu_map__get (cpus); -if (pmu) +if (pmu) { + is_pmu_core = pmu->is_core; + cpus =perf_cpu_map__get (perf_cpu_map__is_empty (cpu_list) ? pmu->cpus : cpu_list);perf_pmu__warn_invalid_formats (pmu); - -if (pmu && (attr->type ==PERF_TYPE_RAW || attr->type >=PERF_TYPE_MAX )) { -perf_pmu__warn_invalid_config (pmu, attr->config, name, -PERF_PMU_FORMAT_VALUE_CONFIG ,"config" ); -perf_pmu__warn_invalid_config (pmu, attr->config1, name, -PERF_PMU_FORMAT_VALUE_CONFIG1 ,"config1" ); -perf_pmu__warn_invalid_config (pmu, attr->config2, name, -PERF_PMU_FORMAT_VALUE_CONFIG2 ,"config2" ); -perf_pmu__warn_invalid_config (pmu, attr->config3, name, -PERF_PMU_FORMAT_VALUE_CONFIG3 ,"config3" ); +if (attr->type ==PERF_TYPE_RAW || attr->type >=PERF_TYPE_MAX ) { +perf_pmu__warn_invalid_config (pmu, attr->config, name, +PERF_PMU_FORMAT_VALUE_CONFIG ,"config" ); +perf_pmu__warn_invalid_config (pmu, attr->config1, name, +PERF_PMU_FORMAT_VALUE_CONFIG1 ,"config1" ); +perf_pmu__warn_invalid_config (pmu, attr->config2, name, +PERF_PMU_FORMAT_VALUE_CONFIG2 ,"config2" ); +perf_pmu__warn_invalid_config (pmu, attr->config3, name, +PERF_PMU_FORMAT_VALUE_CONFIG3 ,"config3" ); + } + }else { + is_pmu_core = (attr->type ==PERF_TYPE_HARDWARE || + attr->type ==PERF_TYPE_HW_CACHE ); +if (perf_cpu_map__is_empty (cpu_list)) + cpus = is_pmu_core ?perf_cpu_map__new_online_cpus () :NULL ; +else + cpus =perf_cpu_map__get (cpu_list); }if (init_attr)event_attr_init (attr);
@@ -259,7 +268,7 @@ __add_event(struct list_head *list, int *idx, evsel->core.cpus = cpus; evsel->core.own_cpus =perf_cpu_map__get (cpus); evsel->core.requires_cpu = pmu ? pmu->is_uncore : false; - evsel->core.is_pmu_core = pmu ? pmu->is_core : false; + evsel->core.is_pmu_core = is_pmu_core; evsel->auto_merge_stats = auto_merge_stats; evsel->pmu = pmu; evsel->pmu_name = pmu ?strdup (pmu->name) :NULL ;
Signature · 1 line
2.45.2.1089.g2a221341d9-goog
Ian Rogers
reviewerPATCH 6/6 perf parse-events: Add "cpu" term to set the CPU an event is recorded on
In reply to Ian RogersThe -C option allows the CPUs for a list of events to be specified but its not possible to set the CPU for a single event. Add a term to allow this. The term isn't a general CPU list due to ',' already being a special character in event parsing.
An example of mixing different types of events counted on different CPUs:
``` $ perf stat -A -C 0,4,8 -e "instructions/cpu=0/,l1d-misses/cpu=4/,inst_retired.any/cpu=8/,cycles" -a sleep 0.1 Performance counter stats for 'system wide': CPU0 419,426 instructions/cpu=0/ # 0.25 insn per cycle CPU4 <not counted> instructions/cpu=0/ CPU8 <not counted> instructions/cpu=0/ CPU0 <not counted> l1d-misses [cpu] CPU4 45,574 l1d-misses [cpu] CPU8 <not counted> l1d-misses [cpu] CPU0 <not counted> cpu/cpu=8/ CPU4 <not counted> cpu/cpu=8/ CPU8 164,073 cpu/cpu=8/ CPU0 1,689,993 cycles CPU4 5,204,403 cycles CPU8 668,986 cycles ```
An example of spreading uncore overhead across two CPUs:
``` $ perf stat -A -e "data_read/cpu=0/,data_write/cpu=1/" -a sleep 0.1 Performance counter stats for 'system wide': CPU0 223.65 MiB uncore_imc_free_running_0/cpu=0/ CPU0 223.66 MiB uncore_imc_free_running_1/cpu=0/ CPU0 <not counted> MiB uncore_imc_free_running_0/cpu=1/ CPU1 5.78 MiB uncore_imc_free_running_0/cpu=1/ CPU0 <not counted> MiB uncore_imc_free_running_1/cpu=1/ CPU1 5.74 MiB uncore_imc_free_running_1/cpu=1/ ```
Note, the event names are missing as there are unmerged uniquify fixes like:
https://lore.kernel.org/lkml/[email protected]/
Manually fixing the output should be:
``` CPU0 223.65 MiB uncore_imc_free_running_0/data_read,cpu=0/ CPU0 223.66 MiB uncore_imc_free_running_1/data_read,cpu=0/ CPU1 5.78 MiB uncore_imc_free_running_0/data_write,cpu=1/ CPU1 5.74 MiB uncore_imc_free_running_1/data_write,cpu=1/ ```
That is data_read from 2 PMUs was read on CPU0 and data_write was read on CPU1.
--- tools/perf/Documentation/perf-list.txt | 7 +++ tools/perf/util/evsel_config.h | 1 + tools/perf/util/parse-events.c | 67 ++++++++++++++++++++++---- tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.l | 1 + tools/perf/util/pmu.c | 1 + 6 files changed, 69 insertions(+), 11 deletions(-)
tools/perf/Documentation/perf-list.txt +7 -0
@@ -273,6 +273,13 @@ Sums up the event counts for all hardware threads in a core, e.g.: perf stat -e cpu/event=0,umask=0x3,percore=1/ +cpu: + +Specifies the CPU to open the event upon: + + + perf stat -e data_read/cpu=0/,data_write/cpu=1/ -a sleep 1 + EVENT GROUPS ------------
tools/perf/util/evsel_config.h +1 -0
@@ -47,6 +47,7 @@ struct evsel_config_term {u32 aux_sample_size;u64 cfg_chg;char *str; +int cpu; } val;bool weak; };
tools/perf/util/parse-events.c +57 -10
170 lines not on this page · raw message
tools/perf/util/parse-events.h +2 -1
@@ -79,7 +79,8 @@ enum parse_events__term_type {PARSE_EVENTS__TERM_TYPE_RAW ,PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE ,PARSE_EVENTS__TERM_TYPE_HARDWARE , -#define __PARSE_EVENTS__TERM_TYPE_NR (PARSE_EVENTS__TERM_TYPE_HARDWARE + 1) +PARSE_EVENTS__TERM_TYPE_CPU , +#define __PARSE_EVENTS__TERM_TYPE_NR (PARSE_EVENTS__TERM_TYPE_CPU + 1) }; struct parse_events_term {
tools/perf/util/parse-events.l +1 -0
@@ -330,6 +330,7 @@ percore { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_PERCORE); } aux-output { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); } aux-sample-size { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE); } metric-id { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_METRIC_ID); } +cpu { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CPU); } cpu-cycles|cycles { return hw_term(yyscanner, PERF_COUNT_HW_CPU_CYCLES); } stalled-cycles-frontend|idle-cycles-frontend { return hw_term(yyscanner, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND); } stalled-cycles-backend|idle-cycles-backend { return hw_term(yyscanner, PERF_COUNT_HW_STALLED_CYCLES_BACKEND); }
tools/perf/util/pmu.c +1 -0
@@ -1767,6 +1767,7 @@ int perf_pmu__for_each_format(struct perf_pmu *pmu, void *state, pmu_format_call"percore" ,"aux-output" ,"aux-sample-size=number" , + "cpu=number", };struct perf_pmu_format *format;int ret;
Signature · 1 line
2.45.2.1089.g2a221341d9-goog