perf/Power7: Use macros to identify perf events
Subsystems (3)
PATCH 1/5 perf/Power7: Use macros to identify perf events
Define and use macros to identify perf events codes This would make it easier and more readable when these event codes need to be used in more than one place.
--- arch/powerpc/perf/power7-pmu.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-)
arch/powerpc/perf/power7-pmu.c +20 -8
@@ -51,6 +51,18 @@#define MMCR1_PMCSEL_MSK 0xff/* +* Power7 event codes. +*/ +#define PME_PM_CYC 0x1e +#define PME_PM_GCT_NOSLOT_CYC 0x100f8 +#define PME_PM_CMPLU_STALL 0x4000a +#define PME_PM_INST_CMPL 0x2 +#define PME_PM_LD_REF_L1 0xc880 +#define PME_PM_LD_MISS_L1 0x400f0 +#define PME_PM_BRU_FIN 0x10068 +#define PME_PM_BRU_MPRED 0x400f6 + +/* * Layout of constraint bits: * 6666555555555544444444443333333333222222222211111111110000000000 * 3210987654321098765432109876543210987654321098765432109876543210
@@ -296,14 +308,14 @@ static void power7_disable_pmc(unsigned int pmc, unsigned long mmcr[]) }static int power7_generic_events[] = { - [PERF_COUNT_HW_CPU_CYCLES ] =0x1e , - [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND ] =0x100f8 ,/* GCT_NOSLOT_CYC */ - [PERF_COUNT_HW_STALLED_CYCLES_BACKEND ] =0x4000a ,/* CMPLU_STALL */ - [PERF_COUNT_HW_INSTRUCTIONS ] =2 , - [PERF_COUNT_HW_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU*/ - [PERF_COUNT_HW_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ - [PERF_COUNT_HW_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ - [PERF_COUNT_HW_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ + [PERF_COUNT_HW_CPU_CYCLES ] =PME_PM_CYC , + [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND ] =PME_PM_GCT_NOSLOT_CYC , + [PERF_COUNT_HW_STALLED_CYCLES_BACKEND ] =PME_PM_CMPLU_STALL , + [PERF_COUNT_HW_INSTRUCTIONS ] =PME_PM_INST_CMPL , + [PERF_COUNT_HW_CACHE_REFERENCES ] =PME_PM_LD_REF_L1 , + [PERF_COUNT_HW_CACHE_MISSES ] =PME_PM_LD_MISS_L1 , + [PERF_COUNT_HW_BRANCH_INSTRUCTIONS ] =PME_PM_BRU_FIN , + [PERF_COUNT_HW_BRANCH_MISSES ] =PME_PM_BRU_MPRED , };#define C (x) PERF_COUNT_HW_CACHE_##x
Signature · 1 line
1.7.1
PATCH 2/5 perf: Make EVENT_ATTR and EVENT_PTR global
Rename EVENT_ATTR() and EVENT_PTR() PMU_EVENT_ATTR() and PMU_EVENT_PTR(). Make them global so they are available to all architectures.
Further to allow architectures flexibility, have PMU_EVENT_PTR() pass in the variable name as a parameter.
--- arch/x86/kernel/cpu/perf_event.c | 17 +++++------------ include/linux/perf_event.h | 13 +++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/perf_event.c +5 -12
@@ -1316,11 +1316,6 @@ static struct attribute_group x86_pmu_format_group = { .attrs = NULL, }; -struct perf_pmu_events_attr { -struct device_attribute attr; -u64 id; -}; -/* * Remove all undefined events (x86_pmu.event_map(id) == 0) * out of events_attr attributes.
@@ -1351,14 +1346,12 @@ static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *atreturn x86_pmu.events_sysfs_show (page, config); } -#define EVENT_VAR (_id) event_attr_##_id -#define EVENT_PTR (_id) &event_attr_##_id.attr.attr +#define EVENT_VAR (_id) event_attr_##_id +#define EVENT_ID (_id) PERF_COUNT_HW_##_id +#define EVENT_PTR (_id) PMU_EVENT_PTR(EVENT_VAR(_id)) -#define EVENT_ATTR (_name, _id) \ -static struct perf_pmu_events_attr EVENT_VAR(_id) = { \ - .attr = __ATTR(_name, 0444, events_sysfs_show, NULL), \ - .id = PERF_COUNT_HW_##_id, \ -}; +#define EVENT_ATTR (_name, _id) \ + PMU_EVENT_ATTR(_name, EVENT_VAR(_id), EVENT_ID(_id), events_sysfs_show)EVENT_ATTR (cpu-cycles,CPU_CYCLES );EVENT_ATTR (instructions,INSTRUCTIONS );
include/linux/perf_event.h +13 -0
@@ -817,6 +817,19 @@ do { \ }while (0 ) +struct perf_pmu_events_attr { +struct device_attribute attr; +u64 id; +}; + +#define PMU_EVENT_PTR (_var) &_var.attr.attr + +#define PMU_EVENT_ATTR (_name, _var, _id, _show) \ +static struct perf_pmu_events_attr _var = { \ + .attr = __ATTR(_name, 0444, _show, NULL), \ + .id = _id, \ +}; +#define PMU_FORMAT_ATTR (_name, _format) \ static ssize_t \ _name##_show(struct device *dev, \
Signature · 1 line
1.7.1
Re: [PATCH 2/5] perf: Make EVENT_ATTR and EVENT_PTR global
Quoted 7 lines · Sukadev Bhattiprolu
Rename
EVENT_ATTR()andEVENT_PTR()PMU_EVENT_ATTR()andPMU_EVENT_PTR(). Make them global so they are available to all architectures.Further to allow architectures flexibility, have
PMU_EVENT_PTR()pass in the variable name as a parameter.
hi,
the change looks ok apart from some nits below.
There' another version of the x86 event attributes change I mentioned earlier:
http://marc.info/?l=linux-kernel&m=135601815224373&w=2
I'm not sure which one will make it in first, but you guys need to sync ;-) CC-ing Andi and Stephane.
thanks,
jirka
Quoted 29 lines
Signed-off-by Sukadev Bhattiprolu <[email protected]>--- arch/x86/kernel/cpu/perf_event.c | 17 +++++------------ include/linux/perf_event.h | 13 +++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-)arch/x86/kernel/cpu/perf_event.c +1
-7@@ -1316,11 +1316,6 @@ static struct attribute_group x86_pmu_format_group = { .attrs = NULL, }; -struct perf_pmu_events_attr { -struct device_attribute attr; -u64 id; -}; -/* * Remove all undefined events (x86_pmu.event_map(id) == 0) * out of events_attr attributes. @@ -1351,14 +1346,12 @@ static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *atreturn x86_pmu.events_sysfs_show (page, config); } -#define EVENT_VAR (_id) event_attr_##_id -#define EVENT_PTR (_id) &event_attr_##_id.attr.attr +#define EVENT_VAR (_id) event_attr_##_id
arch/x86/kernel/cpu/perf_event.c static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *at · line 1354
Quoted 10 lines
arch/x86/kernel/cpu/perf_event.c +4
-5+#define EVENT_ID (_id) PERF_COUNT_HW_##_id +#define EVENT_PTR (_id) PMU_EVENT_PTR(EVENT_VAR(_id)) -#define EVENT_ATTR (_name, _id) \ -static struct perf_pmu_events_attr EVENT_VAR(_id) = { \ - .attr = __ATTR(_name, 0444, events_sysfs_show, NULL), \ - .id = PERF_COUNT_HW_##_id, \ -}; +#define EVENT_ATTR (_name, _id) \ + PMU_EVENT_ATTR(_name, EVENT_VAR(_id), EVENT_ID(_id), events_sysfs_show)
probably no need to define EVENT_ID macro if it's used on just one place
Quoted 8 lines
arch/x86/kernel/cpu/perf_event.c +0
-0EVENT_ATTR (cpu-cycles,CPU_CYCLES );EVENT_ATTR (instructions,INSTRUCTIONS );include/linux/perf_event.h +0
-0
include/linux/perf_event.h do { \ · line 825
Quoted 9 lines
include/linux/perf_event.h +6
-0@@ -817,6 +817,19 @@ do { \ }while (0 ) +struct perf_pmu_events_attr { +struct device_attribute attr; +u64 id; +}; + +#define PMU_EVENT_PTR (_var) &_var.attr.attr
this one seems superfluous as well, could be replaced by '&'
Re: [PATCH 2/5] perf: Make EVENT_ATTR and EVENT_PTR global
Jiri Olsa [[email protected]] wrote:
| On Tue, Dec 18, 2012 at 11:28:02PM -0800, Sukadev Bhattiprolu wrote: | > | > Rename EVENT_ATTR() and EVENT_PTR() PMU_EVENT_ATTR() and PMU_EVENT_PTR(). | > Make them global so they are available to all architectures. | > | > Further to allow architectures flexibility, have PMU_EVENT_PTR() pass in the | > variable name as a parameter. | > | hi, | the change looks ok apart from some nits below. | | There' another version of the x86 event attributes change | I mentioned earlier: | | http://marc.info/?l=linux-kernel&m=135601815224373&w=2 | | I'm not sure which one will make it in first, but you | guys need to sync ;-) CC-ing Andi and Stephane.
One change that would help powerpc (and other architectures) is to move the 'struct perf_pmu_events_attr' to say, include/linux/perf_event.h.
Each architecture can define EVENT_VAR(), EVENT_PTR() etc as needed.
| | thanks, | jirka |
<snip>
| > +struct perf_pmu_events_attr {
| > + struct device_attribute attr;
| > + u64 id;
| > +};
| > +
| > +#define PMU_EVENT_PTR(_var) &_var.attr.attr
|
| this one seems superfluous as well, could be replaced by '&'I guess that would encode the assumption that both the 'attr' fields are the first in their respective structures. If so, an explicit comment beside the fields would be useful.
Sukadev
PATCH 3/5 perf/POWER7: Make generic event translations available in sysfs
In reply to Sukadev Bhattiprolu[PATCH 3/5] perf/POWER7: Make generic event translations available in sysfs
Make the generic perf events in POWER7 available via sysfs.
$ ls /sys/bus/event_source/devices/cpu/events branch-instructions branch-misses cache-misses cache-references cpu-cycles instructions stalled-cycles-backend stalled-cycles-frontend
$ cat /sys/bus/event_source/devices/cpu/events/cache-misses event=0x400f0
This patch is based on commits that implement this functionality on x86. Eg:
commit a47473939db20e3961b200eb00acf5fcf084d755 Author: Jiri Olsa <[email protected]> Date: Wed Oct 10 14:53:11 2012 +0200 perf/x86: Make hardware event translations available in sysfs
--- arch/powerpc/include/asm/perf_event_server.h | 25 +++++++++++++++++++ arch/powerpc/perf/core-book3s.c | 12 +++++++++ arch/powerpc/perf/power7-pmu.c | 34 ++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/perf_event_server.h +25 -0
@@ -11,6 +11,7 @@#include <linux/types.h> #include <asm/hw_irq.h> +#include <linux/device.h> #define MAX_HWEVENTS 8#define MAX_EVENT_ALTERNATIVES 8
@@ -35,6 +36,7 @@ struct power_pmu {void (*disable_pmc)(unsigned int pmc,unsigned long mmcr[]);int (*limited_pmc_event)(u64 event_id);u32 flags; +const struct attribute_group **attr_groups;int n_generic;int *generic_events;int (*cache_events)[PERF_COUNT_HW_CACHE_MAX ]
@@ -109,3 +111,26 @@ extern unsigned long perf_instruction_pointer(struct pt_regs *regs);* If an event_id is not subject to the constraint expressed by a particular * field, then it will have 0 in both the mask and value for that field. */ + +extern ssize_t power_events_sysfs_show (struct device *dev, +struct device_attribute *attr,char *page); + +/* +* EVENT_VAR() is same as PMU_EVENT_VAR with a suffix. +* +* Having a suffix allows us to have aliases in sysfs - eg: the generic +* event 'cpu-cycles' can have two entries in sysfs: 'cpu-cycles' and +* 'PM_CYC' where the latter is the name by which the event is known in +* POWER CPU specification. +*/ +#define EVENT_VAR (_id, _suffix) event_attr_##_id##_suffix +#define EVENT_PTR (_id, _suffix) PMU_EVENT_PTR(EVENT_VAR(_id, _suffix)) +#define EVENT_ID (_id) PME_PM_##_id + +#define EVENT_ATTR (_name, _id, _suffix) \ + PMU_EVENT_ATTR(_name, EVENT_VAR(_id, _suffix), EVENT_ID(_id), \ + power_events_sysfs_show) + +#define GENERIC_EVENT_ATTR (_name, _id) EVENT_ATTR(_name, _id, _g) +#define GENERIC_EVENT_PTR (_id) EVENT_PTR(_id, _g) +
arch/powerpc/perf/core-book3s.c +12 -0
@@ -1305,6 +1305,16 @@ static int power_pmu_event_idx(struct perf_event *event)return event->hw.idx; } +ssize_t power_events_sysfs_show (struct device *dev, +struct device_attribute *attr,char *page) +{ +struct perf_pmu_events_attr *pmu_attr; + + pmu_attr = container_of(attr, struct perf_pmu_events_attr, attr); + +return sprintf (page,"event=0x%02llx\n" , pmu_attr->id); +} +struct pmu power_pmu = { .pmu_enable = power_pmu_enable, .pmu_disable = power_pmu_disable,
@@ -1537,6 +1547,8 @@ int __cpuinit register_power_pmu(struct power_pmu *pmu)pr_info ("%s performance monitor hardware support registered\n" , pmu->name); + power_pmu.attr_groups = ppmu->attr_groups; +#ifdef MSR_HV /* * Use FCHV to ignore kernel events if MSR.HV is set.
arch/powerpc/perf/power7-pmu.c +34 -0
@@ -363,6 +363,39 @@ static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = { }, }; + +GENERIC_EVENT_ATTR (cpu-cycles,CYC ); +GENERIC_EVENT_ATTR (stalled-cycles-frontend,GCT_NOSLOT_CYC ); +GENERIC_EVENT_ATTR (stalled-cycles-backend,CMPLU_STALL ); +GENERIC_EVENT_ATTR (instructions,INST_CMPL ); +GENERIC_EVENT_ATTR (cache-references,LD_REF_L1 ); +GENERIC_EVENT_ATTR (cache-misses,LD_MISS_L1 ); +GENERIC_EVENT_ATTR (branch-instructions,BRU_FIN ); +GENERIC_EVENT_ATTR (branch-misses,BRU_MPRED ); + +static struct attribute *power7_events_attr[] = { +GENERIC_EVENT_PTR (CYC ), +GENERIC_EVENT_PTR (GCT_NOSLOT_CYC ), +GENERIC_EVENT_PTR (CMPLU_STALL ), +GENERIC_EVENT_PTR (INST_CMPL ), +GENERIC_EVENT_PTR (LD_REF_L1 ), +GENERIC_EVENT_PTR (LD_MISS_L1 ), +GENERIC_EVENT_PTR (BRU_FIN ), +GENERIC_EVENT_PTR (BRU_MPRED ), +NULL +}; + + +static struct attribute_group power7_pmu_events_group = { + .name ="events" , + .attrs = power7_events_attr, +}; + +static const struct attribute_group *power7_pmu_attr_groups[] = { + &power7_pmu_events_group, +NULL , +}; +static struct power_pmu power7_pmu = { .name ="POWER7" , .n_counter =6 ,
@@ -374,6 +407,7 @@ static struct power_pmu power7_pmu = { .get_alternatives = power7_get_alternatives, .disable_pmc = power7_disable_pmc, .flags = PPMU_ALT_SIPR, + .attr_groups = power7_pmu_attr_groups, .n_generic = ARRAY_SIZE(power7_generic_events), .generic_events = power7_generic_events, .cache_events = &power7_cache_events,
Signature · 1 line
1.7.1
Re: [PATCH 3/5] perf/POWER7: Make generic event translations available in sysfs
Quoted 26 lines · Sukadev Bhattiprolu
[PATCH 3/5] perf/POWER7: Make generic event translations available in sysfs
Make the generic perf events in POWER7 available via sysfs.
$ ls /sys/bus/event_source/devices/cpu/events branch-instructions branch-misses cache-misses cache-references cpu-cycles instructions stalled-cycles-backend stalled-cycles-frontend$ cat /sys/bus/event_source/devices/cpu/events/cache-misses event=0x400f0This patch is based on commits that implement this functionality on x86. Eg:
commit a47473939db20e3961b200eb00acf5fcf084d755 Author: Jiri Olsa <[email protected]> Date: Wed Oct 10 14:53:11 2012 +0200 perf/x86: Make hardware event translations available in sysfs
Quoted 6 lines
Signed-off-by Sukadev Bhattiprolu <[email protected]>--- arch/powerpc/include/asm/perf_event_server.h | 25 +++++++++++++++++++ arch/powerpc/perf/core-book3s.c | 12 +++++++++ arch/powerpc/perf/power7-pmu.c | 34 ++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 0 deletions(-)
As you are adding new sysfs files, you must also add new Documentation/ABI entries at the same time. Please also do this for the other patches in this series that add new sysfs files.
thanks,
greg k-h
Re: [PATCH 3/5] perf/POWER7: Make generic event translations available in sysfs
Greg KH [[email protected]] wrote:
| On Tue, Dec 18, 2012 at 11:28:49PM -0800, Sukadev Bhattiprolu wrote: | > | > [PATCH 3/5] perf/POWER7: Make generic event translations available in sysfs | | As you are adding new sysfs files, you must also add new | Documentation/ABI entries at the same time. Please also do this for the | other patches in this series that add new sysfs files.
Ok. Will wait for any other review comments on this patchset and repost with the ABI info.
Sukadev
PATCH 4/5 perf/POWER7: Make some POWER7 events available in sysfs
In reply to Sukadev BhattiproluMake some POWER7-specific perf events available in sysfs.
$ /bin/ls -1 /sys/bus/event_source/devices/cpu/events/ branch-instructions branch-misses cache-misses cache-references cpu-cycles instructions PM_BRU_FIN PM_BRU_MPRED PM_CMPLU_STALL PM_CYC PM_GCT_NOSLOT_CYC PM_INST_CMPL PM_LD_MISS_L1 PM_LD_REF_L1 stalled-cycles-backend stalled-cycles-frontend
where the 'PM_*' events are POWER specific and the others are the generic events.
This will enable users to specify these events with their symbolic names rather than with their raw code.
perf stat -e 'cpu/PM_CYC' ...
--- arch/powerpc/include/asm/perf_event_server.h | 2 ++ arch/powerpc/perf/power7-pmu.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/perf_event_server.h +2 -0
@@ -134,3 +134,5 @@ extern ssize_t power_events_sysfs_show(struct device *dev,#define GENERIC_EVENT_ATTR (_name, _id) EVENT_ATTR(_name, _id, _g)#define GENERIC_EVENT_PTR (_id) EVENT_PTR(_id, _g) +#define POWER_EVENT_ATTR (_name, _id) EVENT_ATTR(PM_##_name, _id, _p) +#define POWER_EVENT_PTR (_id) EVENT_PTR(_id, _p)
arch/powerpc/perf/power7-pmu.c +18 -0
@@ -373,6 +373,15 @@ GENERIC_EVENT_ATTR(cache-misses, LD_MISS_L1);GENERIC_EVENT_ATTR (branch-instructions,BRU_FIN );GENERIC_EVENT_ATTR (branch-misses,BRU_MPRED ); +POWER_EVENT_ATTR (CYC ,CYC ); +POWER_EVENT_ATTR (GCT_NOSLOT_CYC ,GCT_NOSLOT_CYC ); +POWER_EVENT_ATTR (CMPLU_STALL ,CMPLU_STALL ); +POWER_EVENT_ATTR (INST_CMPL ,INST_CMPL ); +POWER_EVENT_ATTR (LD_REF_L1 ,LD_REF_L1 ); +POWER_EVENT_ATTR (LD_MISS_L1 ,LD_MISS_L1 ); +POWER_EVENT_ATTR(BRU_FIN, BRU_FIN) +POWER_EVENT_ATTR (BRU_MPRED ,BRU_MPRED ); +static struct attribute *power7_events_attr[] = {GENERIC_EVENT_PTR (CYC ),GENERIC_EVENT_PTR (GCT_NOSLOT_CYC ),
@@ -382,6 +391,15 @@ static struct attribute *power7_events_attr[] = {GENERIC_EVENT_PTR (LD_MISS_L1 ),GENERIC_EVENT_PTR (BRU_FIN ),GENERIC_EVENT_PTR (BRU_MPRED ), + +POWER_EVENT_PTR (CYC ), +POWER_EVENT_PTR (GCT_NOSLOT_CYC ), +POWER_EVENT_PTR (CMPLU_STALL ), +POWER_EVENT_PTR (INST_CMPL ), +POWER_EVENT_PTR (LD_REF_L1 ), +POWER_EVENT_PTR (LD_MISS_L1 ), +POWER_EVENT_PTR (BRU_FIN ), +POWER_EVENT_PTR (BRU_MPRED ),NULL };
Signature · 1 line
1.7.1
PATCH 5/5 perf: Create a sysfs entry for Power event format
In reply to Sukadev BhattiproluCreate a sysfs entry, '/sys/bus/event_source/devices/cpu/format/event' which describes the format of a POWER cpu.
The format of the event is the same for all POWER cpus at least in (Power6, Power7), so bulk of this change is common in the code common to POWER cpus.
This code is based on corresponding code in x86.
Changelog[v2]: [Jiri Osla] Use PMU_FORMAT_ATTR() rather than duplicating it.
--- arch/powerpc/include/asm/perf_event_server.h | 6 ++++++ arch/powerpc/perf/core-book3s.c | 12 ++++++++++++ arch/powerpc/perf/power7-pmu.c | 1 + 3 files changed, 19 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/perf_event_server.h +6 -0
@@ -136,3 +136,9 @@ extern ssize_t power_events_sysfs_show(struct device *dev,#define POWER_EVENT_ATTR (_name, _id) EVENT_ATTR(PM_##_name, _id, _p)#define POWER_EVENT_PTR (_id) EVENT_PTR(_id, _p) + +/* +* Format of a perf event is the same on all POWER cpus. Declare a +* common sysfs attribute group that individual POWER cpus can share. +*/ +extern struct attribute_group power_pmu_format_group;
arch/powerpc/perf/core-book3s.c +12 -0
@@ -1315,6 +1315,18 @@ ssize_t power_events_sysfs_show(struct device *dev,return sprintf (page,"event=0x%02llx\n" , pmu_attr->id); } +PMU_FORMAT_ATTR (event,"config:0-20" ); + +static struct attribute *power_pmu_format_attr[] = { + &format_attr_event.attr, +NULL , +}; + +struct attribute_group power_pmu_format_group = { + .name ="format" , + .attrs = power_pmu_format_attr, +}; +struct pmu power_pmu = { .pmu_enable = power_pmu_enable, .pmu_disable = power_pmu_disable,
arch/powerpc/perf/power7-pmu.c +1 -0
@@ -410,6 +410,7 @@ static struct attribute_group power7_pmu_events_group = { };static const struct attribute_group *power7_pmu_attr_groups[] = { + &power_pmu_format_group, &power7_pmu_events_group,NULL , };
Signature · 1 line
1.7.1