perf/x86: add Intel RAPL PMU support
Subsystems (2)
v4 cover perf/x86: add Intel RAPL PMU support
This patch adds a new uncore PMU to expose the Intel
RAPL (Running Average Power Limit) energy consumption counters. Up to 3 counters, each counting a particular RAPL event are exposed.
The RAPL counters are available on Intel SandyBridge, IvyBridge, Haswell. The server skus add a 3rd counter to measure DRAM power consumption.
The following events are available nd exposed in sysfs:
- power/energy-cores: power consumption of all cores on socket
- power/energy-pkg: power consumption of all cores + LLc cache
- power/energy-dram: power consumption of DRAM (server skus only)
The RAPL PMU is uncore by nature and is implemented such that it only works in system-wide mode. Measuring only one CPU per socket is sufficient. The /sys/devices/rapl/cpumask is exported and can be used by tools to figure out which CPU to monitor by default. For instance, on a 2-socket system, 2 CPUs (one on each socket) will be shown.
The counters all count in the same unit. The perf_events API exposes all RAPL counters as 64-bit integers counting in unit of 1/2^32 Joules (or 0.23 nJ). User level tools must convert the counts by multiplying them by 0.23 and divide 10^9 to obtain Joules. The reason for this is that the kernel avoids doing floating point math whenever possible because it is expensive (user floating-point state must be saved). The method used avoids kernel floating-point and minimizes the loss of precision (bits). Thanks to PeterZ for suggesting this approach.
To convert the raw count in Watt: W = C * 0.23 / (1e9 * time)
The kernel exposes both the scaling factor (0.23 nJ) and the unit (Joules) in sysfs:
$ ls -1 /sys/devices/power/events/energy-* /sys/devices/power/events/energy-cores /sys/devices/power/events/energy-cores.scale /sys/devices/power/events/energy-cores.unit /sys/devices/power/events/energy-pkg /sys/devices/power/events/energy-pkg.scale /sys/devices/power/events/energy-pkg.unit
$ cat /sys/devices/power/events/energy-cores.scale 2.3e-10
$ cat cat /sys/devices/power/events/energy-cores.unit Joules
RAPL PMU is a new standalone PMU which registers with the perf_event core subsystem. The PMU type (attr->type) is dynamically allocated and is available from /sys/device/rapl/type.
Sampling is not supported by the RAPL PMU. There is no privilege level filtering either.
The PMU exports a cpumask in /sys/devices/power/cpumask. It is used by perf to ensure only one instance of each RAPL event is measured per processor socket. Hotplug CPU is also supported.
The perf stat infrasrtructure is modified to now show event unit. It also applies the scaling factor. As such it will print RAPL events in Joules (and not increments on 0.23 nJ):
# perf stat -a -e power/energy-pkg/,power/energy-cores/,cycles -I 1000 sleep 1000
# time counts unit events
1.000282860 2.51 Joules power/energy-pkg/ [100.00%]
1.000282860 0.31 Joules power/energy-cores/
1.000282860 37765378 ? cycles [100.00%]The patch adds a hrtimer to poll the counters given that they do no interrupt on overflow. Hardware counters are 32-bit wide.
In v2, we add the locking necesarry to protect the rapl_pmu struct. We also add a description at the top of the file. We check for Intel only processor. We improved the data layout of the rapl_pmu struct. We also lifted the restriction of the number of instances of RAPL counters that can be active at the same time. RAPL is free running counters, so ought to be able to measure events as many times as necessary in parallel via multiple tools. There is never multiplexing among RAPL events.
In v3, we have renamed the event to be more generic power/* instead of rapl/*. We have modified perf stat to print the event with the unit and scaling factors.
In v4, we integrate the feedback from Jiri and rebase to 3.12-rc7+ from tip.git.
Supported CPUs: SandyBridge, IvyBridge, Haswell.
Stephane Eranian (4):
perf: add active_entry list head to struct perf_event perf stat: add event unit and scale support perf,x86: add Intel RAPL PMU support perf,x86: add RAPL hrtimer support
arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 720 +++++++++++++++++++++++++++ include/linux/perf_event.h | 5 +- kernel/events/core.c | 1 + tools/perf/builtin-stat.c | 72 ++- tools/perf/util/evsel.c | 2 + tools/perf/util/evsel.h | 3 + tools/perf/util/parse-events.c | 1 + tools/perf/util/pmu.c | 170 ++++++- tools/perf/util/pmu.h | 3 + 10 files changed, 956 insertions(+), 23 deletions(-) create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
Signature · 1 line
1.7.9.5
PATCH v4 1/4 perf: add active_entry list head to struct perf_event
This patch adds a new field to the struct perf_event. It is intended to be used to chain events which are active (enabled). It helps in the hardware layer for PMUs which do not have actual counter restrictions, i.e., free running read-only counters. Active events are chained as opposed to being tracked via the counter they use.
To save space we use a union with hlist_entry as both are mutually exclusive (suggested by Jiri Olsa).
--- include/linux/perf_event.h | 5 ++++- kernel/events/core.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
include/linux/perf_event.h +4 -1
@@ -319,7 +319,10 @@ struct perf_event {*/ struct list_head migrate_entry; -struct hlist_node hlist_entry; +union { +struct hlist_node hlist_entry; +struct list_head active_entry; + };int nr_siblings;int group_flags;struct perf_event *group_leader;
kernel/events/core.c +1 -0
@@ -6663,6 +6663,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,INIT_LIST_HEAD (&event->event_entry);INIT_LIST_HEAD (&event->sibling_list);INIT_LIST_HEAD (&event->rb_entry); +INIT_LIST_HEAD (&event->active_entry);init_waitqueue_head (&event->waitq);init_irq_work (&event->pending, perf_pending_event);
Signature · 1 line
1.7.9.5
PATCH v4 2/4 perf stat: add event unit and scale support
In reply to Stephane EranianThis patch adds perf stat support fo rhandling event units and scales as exported by the kernel.
The kernel can export PMU events actual unit and scaling factor via sysfs:
$ ls -1 /sys/devices/power/events/energy-* /sys/devices/power/events/energy-cores /sys/devices/power/events/energy-cores.scale /sys/devices/power/events/energy-cores.unit /sys/devices/power/events/energy-pkg /sys/devices/power/events/energy-pkg.scale /sys/devices/power/events/energy-pkg.unit $ cat /sys/devices/power/events/energy-cores.scale 2.3e-10 $ cat cat /sys/devices/power/events/energy-cores.unit Joules
This patch modifies the pmu event alias code to check for the presence of the .unit and .scale files to load the corresponding values. They are then used by perf stat transparentely:
# perf stat -a -e power/energy-pkg/,power/energy-cores/,cycles -I 1000 sleep 1000
# time counts unit events
1.000214717 3.07 Joules power/energy-pkg/ [100.00%]
1.000214717 0.53 Joules power/energy-cores/
1.000214717 12965028 ? cycles [100.00%]
2.000749289 3.01 Joules power/energy-pkg/
2.000749289 0.52 Joules power/energy-cores/
2.000749289 15817043 ? cycles--- tools/perf/builtin-stat.c | 72 ++++++++++++----- tools/perf/util/evsel.c | 2 + tools/perf/util/evsel.h | 3 + tools/perf/util/parse-events.c | 1 + tools/perf/util/pmu.c | 170 +++++++++++++++++++++++++++++++++++++++- tools/perf/util/pmu.h | 3 + 6 files changed, 230 insertions(+), 21 deletions(-)
tools/perf/builtin-stat.c +53 -19
@@ -138,6 +138,7 @@ static const char *post_cmd = NULL;static bool sync_run = false;static unsigned int interval =0 ;static unsigned int initial_delay =0 ; +static unsigned int unit_width =4 ;/* strlen("unit") */ static bool forever = false;static struct timespec ref_time;static struct cpu_map *aggr_map;
@@ -462,17 +463,17 @@ static void print_interval(void)if (num_print_interval ==0 && !csv_output) {switch (aggr_mode) {case AGGR_SOCKET : -fprintf (output,"# time socket cpus counts events\n" ); +fprintf (output,"# time socket cpus counts %*s events\n" , unit_width,"unit" );break ;case AGGR_CORE : -fprintf (output,"# time core cpus counts events\n" ); +fprintf (output,"# time core cpus counts %*s events\n" , unit_width,"unit" );break ;case AGGR_NONE : -fprintf (output,"# time CPU counts events\n" ); +fprintf (output,"# time CPU counts %*s events\n" , unit_width,"unit" );break ;case AGGR_GLOBAL :default : -fprintf (output,"# time counts events\n" ); +fprintf (output,"# time counts %*s events\n" , unit_width,"unit" ); } }
@@ -517,6 +518,7 @@ static int __run_perf_stat(int argc, const char **argv)unsigned long long t0, t1;struct perf_evsel *counter;struct timespec ts; +size_t l;int status =0 ;const bool forks = (argc >0 );
@@ -566,6 +568,10 @@ static int __run_perf_stat(int argc, const char **argv)return -1 ; } counter->supported = true; + + l =strlen (counter->unit); +if (l > unit_width) + unit_width = l; }if (perf_evlist__apply_filters (evsel_list)) {
@@ -911,19 +917,32 @@ static void abs_printout(int cpu, int nr, struct perf_evsel *evsel, double avg)double total, ratio =0.0 , total2;const char *fmt; -if (csv_output) - fmt ="%.0f%s%s" ; -else if (big_num) - fmt ="%'18.0f%s%-25s" ; -else - fmt ="%18.0f%s%-25s" ; +if (csv_output) { +if (evsel->scale !=1.0 ) + fmt ="%.2f%s%s%s%s" ; +else + fmt ="%.0f%s%s%s%s" ; + }else if (big_num) +if (evsel->scale !=1.0 ) + fmt ="%'18.2f%s%-*s%s%-25s" ; +else + fmt ="%'18.0f%s%-*s%s%-25s" ; +else { +if (evsel->scale !=1.0 ) + fmt ="%18.2f%s%-*s%s%-25s" ; +else + fmt ="%18.0f%s%-*s%s%-25s" ; + }aggr_printout (evsel, cpu, nr);if (aggr_mode ==AGGR_GLOBAL ) cpu =0 ; -fprintf (output, fmt, avg, csv_sep,perf_evsel__name (evsel)); +if (csv_output) +fprintf (output, fmt, avg, csv_sep, evsel->unit, csv_sep,perf_evsel__name (evsel)); +else +fprintf (output, fmt, avg, csv_sep, unit_width, evsel->unit, csv_sep,perf_evsel__name (evsel));if (evsel->cgrp)fprintf (output,"%s%s" , csv_sep, evsel->cgrp->name);
@@ -1062,6 +1081,7 @@ static void print_aggr(char *prefix) {struct perf_evsel *counter;int cpu, cpu2, s, s2, id, nr; +double uval;u64 ena, run, val;if (!(aggr_map || aggr_get_id))
@@ -1088,9 +1108,13 @@ static void print_aggr(char *prefix)if (run ==0 || ena ==0 ) {aggr_printout (counter, id, nr); -fprintf (output,"%*s%s%*s" , +fprintf (output,"%*s%s%*s%s%*s" , csv_output ?0 :18 , counter->supported ?CNTR_NOT_COUNTED :CNTR_NOT_SUPPORTED , + + csv_sep, + csv_output ?0 :-10 , + counter->unit, csv_sep, csv_output ?0 :-24 ,perf_evsel__name (counter));
@@ -1102,11 +1126,12 @@ static void print_aggr(char *prefix)fputc ('\n' , output);continue ; } + uval = val * counter->scale;if (nsec_counter (counter)) -nsec_printout (id, nr, counter, val); +nsec_printout (id, nr, counter, uval);else -abs_printout (id, nr, counter, val); +abs_printout (id, nr, counter, uval);if (!csv_output) {print_noise (counter,1.0 );
@@ -1129,6 +1154,7 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)struct perf_stat *ps = counter->priv;double avg =avg_stats (&ps->res_stats[0 ]);int scaled = counter->counts->scaled; +double uval;if (prefix)fprintf (output,"%s" , prefix);
@@ -1148,10 +1174,12 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)return ; } + uval = avg * counter->scale; +if (nsec_counter (counter)) -nsec_printout (-1 ,0 , counter, avg); +nsec_printout (-1 ,0 , counter, uval);else -abs_printout (-1 ,0 , counter, avg); +abs_printout (-1 ,0 , counter, uval);print_noise (counter, avg);
@@ -1178,6 +1206,7 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)static void print_counter (struct perf_evsel *counter,char *prefix) {u64 ena, run, val; +double uval;int cpu;for (cpu =0 ; cpu <perf_evsel__nr_cpus (counter); cpu++) {
@@ -1189,12 +1218,15 @@ static void print_counter(struct perf_evsel *counter, char *prefix)fprintf (output,"%s" , prefix);if (run ==0 || ena ==0 ) { -fprintf (output,"CPU%*d%s%*s%s%*s" , +fprintf (output,"CPU%*d%s%*s%s%*s%s%*s" , csv_output ?0 :-4 ,perf_evsel__cpus (counter)->map[cpu], csv_sep, csv_output ?0 :18 , counter->supported ?CNTR_NOT_COUNTED :CNTR_NOT_SUPPORTED , csv_sep, + csv_output ?0 :-10 , + counter->unit, + csv_sep, csv_output ?0 :-24 ,perf_evsel__name (counter));
@@ -1206,10 +1238,12 @@ static void print_counter(struct perf_evsel *counter, char *prefix)continue ; } + uval = val * counter->scale; +if (nsec_counter (counter)) -nsec_printout (cpu,0 , counter, val); +nsec_printout (cpu,0 , counter, uval);else -abs_printout (cpu,0 , counter, val); +abs_printout (cpu,0 , counter, uval);if (!csv_output) {print_noise (counter,1.0 );
tools/perf/util/evsel.c +2 -0
@@ -162,6 +162,8 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->idx = idx; evsel->attr = *attr; evsel->leader = evsel; + evsel->unit ="?" ; + evsel->scale =1.0 ;INIT_LIST_HEAD (&evsel->node);hists__init (&evsel->hists); evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);
tools/perf/util/evsel.h +3 -0
@@ -68,6 +68,8 @@ struct perf_evsel {u32 ids;struct hists hists;char *name; +double scale; +const char *unit;struct event_format *tp_format;union {void *priv;
@@ -130,6 +132,7 @@ extern const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX];int __perf_evsel__hw_cache_type_op_res_name (u8 type,u8 op,u8 result,char *bf,size_t size);const char *perf_evsel__name (struct perf_evsel *evsel); +const char *perf_evsel__group_name (struct perf_evsel *evsel);int perf_evsel__group_desc (struct perf_evsel *evsel,char *buf,size_t size);
tools/perf/util/parse-events.c +1 -0
@@ -838,6 +838,7 @@ int parse_events_name(struct list_head *list, char *name)list_for_each_entry (evsel, list, node) {if (!evsel->name) evsel->name =strdup (name); +pmu_get_event_unit_scale (evsel); }return 0 ;
tools/perf/util/pmu.c +168 -2
222 lines not on this page · raw message
tools/perf/util/pmu.h +3 -0
@@ -4,6 +4,7 @@#include <linux/bitops.h> #include <linux/perf_event.h> #include <stdbool.h> +#include "util/evsel.h" enum {PERF_PMU_FORMAT_VALUE_CONFIG ,
@@ -45,4 +46,6 @@ void print_pmu_events(const char *event_glob, bool name_only);bool pmu_have_event (const char *pname,const char *name);int perf_pmu__test (void ); + +int pmu_get_event_unit_scale (struct perf_evsel *evsel);#endif /* __PMU_H */
Signature · 1 line
1.7.9.5
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Quoted 17 lines · Stephane Eranian
This patch adds perf stat support fo rhandling event units and scales as exported by the kernel.
The kernel can export PMU events actual unit and scaling factor via sysfs:
$ ls -1 /sys/devices/power/events/energy-* /sys/devices/power/events/energy-cores /sys/devices/power/events/energy-cores.scale /sys/devices/power/events/energy-cores.unit /sys/devices/power/events/energy-pkg /sys/devices/power/events/energy-pkg.scale /sys/devices/power/events/energy-pkg.unit $ cat /sys/devices/power/events/energy-cores.scale 2.3e-10 $ cat cat /sys/devices/power/events/energy-cores.unit Joules
Quoted 5 lines
This patch modifies the pmu event alias code to check for the presence of the .unit and .scale files to load the corresponding values. They are then used by perf stat transparentely:
wrt our previous conversation, attached patch is what I meant (based on your changes)
you could get rid of following functions:
pmu_event_unit
pmu_event_scale
pmu_get_event_unit_scale
and have the unit/scale processing within the alias code
the name that matters is the term name which is available in the parse_events_add_pmu as one of the terms
jirka
--- tools/perf/util/parse-events.c | 29 ++++++++----- tools/perf/util/pmu.c | 92 +++++++++++++++--------------------------- tools/perf/util/pmu.h | 6 +-- 3 files changed, 53 insertions(+), 74 deletions(-)
tools/perf/util/parse-events.c +19 -10
@@ -269,9 +269,10 @@ const char *event_type(int type) -static int __add_event (struct list_head *list,int *idx, -struct perf_event_attr *attr, -char *name,struct cpu_map *cpus) +static struct perf_evsel * +__add_event (struct list_head *list,int *idx, +struct perf_event_attr *attr, +char *name,struct cpu_map *cpus) {struct perf_evsel *evsel;
@@ -279,19 +280,19 @@ static int __add_event(struct list_head *list, int *idx, evsel =perf_evsel__new (attr, (*idx)++);if (!evsel) -return -ENOMEM ; +return NULL ; evsel->cpus = cpus;if (name) evsel->name =strdup (name);list_add_tail (&evsel->node, list); -return 0 ; +return evsel; }static int add_event (struct list_head *list,int *idx,struct perf_event_attr *attr,char *name) { -return __add_event (list, idx, attr, name,NULL ); +return __add_event (list, idx, attr, name,NULL ) ?0 : -ENOMEM ; }static int parse_aliases (char *str,const char *names[][PERF_EVSEL__MAX_ALIASES ],int size)
@@ -633,6 +634,9 @@ int parse_events_add_pmu(struct list_head *list, int *idx, {struct perf_event_attr attr;struct perf_pmu *pmu; +struct perf_evsel *evsel; +char *unit; +double scale; pmu =perf_pmu__find (name);if (!pmu)
@@ -640,7 +644,7 @@ int parse_events_add_pmu(struct list_head *list, int *idx,memset (&attr,0 ,sizeof (attr)); -if (perf_pmu__check_alias (pmu, head_config)) +if (perf_pmu__check_alias (pmu, head_config, &unit, &scale))return -EINVAL ;/*
@@ -652,8 +656,14 @@ int parse_events_add_pmu(struct list_head *list, int *idx,if (perf_pmu__config (pmu, &attr, head_config))return -EINVAL ; -return __add_event (list, idx, &attr,pmu_event_name (head_config), - pmu->cpus); + evsel =__add_event (list, idx, &attr,pmu_event_name (head_config), + pmu->cpus); +if (evsel) { + evsel->unit = unit; + evsel->scale = scale; + } + +return evsel ?0 : -ENOMEM ; } int parse_events__modifier_group(struct list_head *list,
@@ -838,7 +848,6 @@ int parse_events_name(struct list_head *list, char *name)list_for_each_entry (evsel, list, node) {if (!evsel->name) evsel->name =strdup (name); -pmu_get_event_unit_scale (evsel); }return 0 ;
tools/perf/util/pmu.c +32 -60
116 lines not on this page · raw message
tools/perf/util/pmu.h +2 -4
@@ -4,7 +4,6 @@#include <linux/bitops.h> #include <linux/perf_event.h> #include <stdbool.h> -#include "util/evsel.h" enum {PERF_PMU_FORMAT_VALUE_CONFIG ,
@@ -29,7 +28,8 @@ int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,int perf_pmu__config_terms (struct list_head *formats,struct perf_event_attr *attr,struct list_head *head_terms); -int perf_pmu__check_alias (struct perf_pmu *pmu,struct list_head *head_terms); +int perf_pmu__check_alias (struct perf_pmu *pmu,struct list_head *head_terms, +char **unit,double *scale);struct list_head *perf_pmu__alias (struct perf_pmu *pmu,struct list_head *head_terms);int perf_pmu_wrap (void );
@@ -46,6 +46,4 @@ void print_pmu_events(const char *event_glob, bool name_only);bool pmu_have_event (const char *pname,const char *name);int perf_pmu__test (void ); - -int pmu_get_event_unit_scale (struct perf_evsel *evsel);#endif /* __PMU_H */
Signature · 1 line
1.7.11.7
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Jiri,
Thanks for the patch. I tested it and it works fine. I will merge it with my "unit and scale" and add your Signed-off-by. Is that okay with you?
Quoted 284 lines · Jiri Olsa
Quoted 17 lines · Stephane Eranian
This patch adds perf stat support fo rhandling event units and scales as exported by the kernel.
The kernel can export PMU events actual unit and scaling factor via sysfs:
$ ls -1 /sys/devices/power/events/energy-* /sys/devices/power/events/energy-cores /sys/devices/power/events/energy-cores.scale /sys/devices/power/events/energy-cores.unit /sys/devices/power/events/energy-pkg /sys/devices/power/events/energy-pkg.scale /sys/devices/power/events/energy-pkg.unit $ cat /sys/devices/power/events/energy-cores.scale 2.3e-10 $ cat cat /sys/devices/power/events/energy-cores.unit JoulesQuoted 5 lines
This patch modifies the pmu event alias code to check for the presence of the .unit and .scale files to load the corresponding values. They are then used by perf stat transparentely:
wrt our previous conversation, attached patch is what I meant (based on your changes)
you could get rid of following functions:
pmu_event_unit
pmu_event_scale
pmu_get_event_unit_scaleand have the unit/scale processing within the alias code
the name that matters is the term name which is available in the
parse_events_add_pmuas one of the termsjirka
--- tools/perf/util/parse-events.c | 29 ++++++++----- tools/perf/util/pmu.c | 92 +++++++++++++++--------------------------- tools/perf/util/pmu.h | 6 +-- 3 files changed, 53 insertions(+), 74 deletions(-)tools/perf/util/parse-events.c +19
-10@@ -269,9 +269,10 @@ const char *event_type(int type) -static int __add_event (struct list_head *list,int *idx, -struct perf_event_attr *attr, -char *name,struct cpu_map *cpus) +static struct perf_evsel * +__add_event (struct list_head *list,int *idx, +struct perf_event_attr *attr, +char *name,struct cpu_map *cpus) {struct perf_evsel *evsel;@@ -279,19 +280,19 @@ static int __add_event(struct list_head *list, int *idx, evsel =perf_evsel__new (attr, (*idx)++);if (!evsel) -return -ENOMEM ; +return NULL ; evsel->cpus = cpus;if (name) evsel->name =strdup (name);list_add_tail (&evsel->node, list); -return 0 ; +return evsel; }static int add_event (struct list_head *list,int *idx,struct perf_event_attr *attr,char *name) { -return __add_event (list, idx, attr, name,NULL ); +return __add_event (list, idx, attr, name,NULL ) ?0 : -ENOMEM ; }static int parse_aliases (char *str,const char *names[][PERF_EVSEL__MAX_ALIASES ],int size)@@ -633,6 +634,9 @@ int parse_events_add_pmu(struct list_head *list, int *idx, {struct perf_event_attr attr;struct perf_pmu *pmu; +struct perf_evsel *evsel; +char *unit; +double scale; pmu =perf_pmu__find (name);if (!pmu)@@ -640,7 +644,7 @@ int parse_events_add_pmu(struct list_head *list, int *idx,memset (&attr,0 ,sizeof (attr)); -if (perf_pmu__check_alias (pmu, head_config)) +if (perf_pmu__check_alias (pmu, head_config, &unit, &scale))return -EINVAL ;/* @@ -652,8 +656,14 @@ int parse_events_add_pmu(struct list_head *list, int *idx,if (perf_pmu__config (pmu, &attr, head_config))return -EINVAL ; -return __add_event (list, idx, &attr,pmu_event_name (head_config), - pmu->cpus); + evsel =__add_event (list, idx, &attr,pmu_event_name (head_config), + pmu->cpus); +if (evsel) { + evsel->unit = unit; + evsel->scale = scale; + } + +return evsel ?0 : -ENOMEM ; } int parse_events__modifier_group(struct list_head *list,@@ -838,7 +848,6 @@ int parse_events_name(struct list_head *list, char *name)list_for_each_entry (evsel, list, node) {if (!evsel->name) evsel->name =strdup (name); -pmu_get_event_unit_scale (evsel); }return 0 ;tools/perf/util/pmu.c +32
-60@@ -620,16 +620,42 @@ static struct perf_pmu_alias *pmu_find_alias(struct perf_pmu *pmu,return NULL ; } + +static int check_unit_scale (struct perf_pmu_alias *alias, +char **unit,double *scale) +{ +/* +* Only one term in event definition can +* define unit and scale, fail if there's +* more than one. +*/ +if ((*unit && alias->unit) || + (*scale && alias->scale)) +return -EINVAL ; + +if (alias->unit) + *unit = alias->unit; + +if (alias->scale) + *scale = alias->scale; + +return 0 ; +} +/* * Find alias in the terms list and replace it with the terms * defined for the alias */ -int perf_pmu__check_alias (struct perf_pmu *pmu,struct list_head *head_terms) +int perf_pmu__check_alias (struct perf_pmu *pmu,struct list_head *head_terms, +char **unit,double *scale) {struct parse_events_term *term, *h;struct perf_pmu_alias *alias;int ret; + *unit =NULL ; + *scale =0 ; +list_for_each_entry_safe (term, h, head_terms, list) { alias =pmu_find_alias (pmu, term);if (!alias)@@ -637,6 +663,11 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms) ret =pmu_alias_terms (alias, &term->list);if (ret)return ret; + + ret =check_unit_scale (alias, unit, scale); +if (ret) +return ret; +list_del (&term->list);free (term); }@@ -760,62 +791,3 @@ bool pmu_have_event(const char *pname, const char *name) }return false; } - -static const char *pmu_event_unit (struct perf_pmu *pmu,const char *name) -{ -struct perf_pmu_alias *alias; -char buf[1024 ]; -char *fname; -const char *unit ="?" ; - -if (!name) -return unit; - -list_for_each_entry (alias, &pmu->aliases, list) { - fname =format_alias (buf,sizeof (buf), pmu, alias); -if (!strcmp (fname, name)) { - unit = alias->unit; -break ; - } - } -return unit; -} - -static double pmu_event_scale (struct perf_pmu *pmu,const char *name) -{ -struct perf_pmu_alias *alias; -char buf[1024 ]; -char *fname; -double scale =1.0 ; - -if (!name) -return 1.0 ; - -list_for_each_entry (alias, &pmu->aliases, list) { - fname =format_alias (buf,sizeof (buf), pmu, alias); -if (!strcmp (fname, name)) { - scale = alias->scale; -break ; - } - } -return scale; -} - -int pmu_get_event_unit_scale (struct perf_evsel *evsel) -{ -__u32 type = evsel->attr.type; -struct perf_pmu *pmu; - -if (!evsel->name) -return -1 ; - -list_for_each_entry (pmu, &pmus, list) { -if (pmu->type == type) - goto found; - } -return -1 ; -found: - evsel->unit =pmu_event_unit (pmu, evsel->name); - evsel->scale =pmu_event_scale (pmu, evsel->name); -return 0 ; -}tools/perf/util/pmu.h +2
-5@@ -4,7 +4,6 @@#include <linux/bitops.h> #include <linux/perf_event.h> #include <stdbool.h> -#include "util/evsel.h" enum {PERF_PMU_FORMAT_VALUE_CONFIG ,@@ -29,7 +28,8 @@ int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,int perf_pmu__config_terms (struct list_head *formats,struct perf_event_attr *attr,struct list_head *head_terms); -int perf_pmu__check_alias (struct perf_pmu *pmu,struct list_head *head_terms); +int perf_pmu__check_alias (struct perf_pmu *pmu,struct list_head *head_terms, +char **unit,double *scale);struct list_head *perf_pmu__alias (struct perf_pmu *pmu,struct list_head *head_terms);int perf_pmu_wrap (void );@@ -46,6 +46,4 @@ void print_pmu_events(const char *event_glob, bool name_only);bool pmu_have_event (const char *pname,const char *name);int perf_pmu__test (void ); - -int pmu_get_event_unit_scale (struct perf_evsel *evsel);#endif /* __PMU_H */ --1.7.11.7
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Quoted 6 lines · Stephane Eranian
Jiri,
Thanks for the patch. I tested it and it works fine. I will merge it with my "unit and scale" and add your Signed-off-by. Is that okay with you?
sure, np
jirka
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Hi,
One thing I realized while testing is that we cannot simply add the unit printout like that.
This may break all the scripts people may have written to parse the output of perf stat.
I think we need to make the display of the unit optional. If I do:
$ perf stat -e cycles ls
The output should remain as it was before and not show:
$ perf stat -e cycles ls
22782847475 ? cyclesSo I think we need a --show-unit option. It would be off by default. Of course doing this causes a mess with the current code because of all the various printf() in builtin-stat.c but I think it is better for the end user.
Any opinion?
Quoted 11 lines · Jiri Olsa
Quoted 6 lines · Stephane Eranian
Jiri,
Thanks for the patch. I tested it and it works fine. I will merge it with my "unit and scale" and add your Signed-off-by. Is that okay with you?
sure, np
jirka
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Quoted 6 lines · Stephane Eranian
Hi,
One thing I realized while testing is that we cannot simply add the unit printout like that.
This may break all the scripts people may have written to parse the output of perf stat.
isn't it what the -x output is meant for?
perf stat -x, ...
1.738605,task-clock
367,context-switches
0,cpu-migrations
272,page-faults
6722006,cycles
2592661,stalled-cycles-frontend
1935855,stalled-cycles-backend
4324013,instructions
823229,branches
11192,branch-misses
Quoted 6 lines
I think we need to make the display of the unit optional. If I do:
$ perf stat -e cycles lsThe output should remain as it was before and not show:
$ perf stat -e cycles ls 22782847475 ? cycles
maybe we should display just space ' ' instead
of the '?' ...seems confusing
Quoted 7 lines
So I think we need a --show-unit option. It would be off by default. Of course doing this causes a mess with the current code because of all the various
printf()inbuiltin-stat.cbut I think it is better for the end user.Any opinion?
I haven't checked by I think we changed the default perf stat output in the past without any fuzz
maybe just keep the -x output or add the unit
to the end of the line
jirka
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Quoted 12 lines · Jiri Olsa
Quoted 6 lines · Stephane Eranian
Hi,
One thing I realized while testing is that we cannot simply add the unit printout like that.
This may break all the scripts people may have written to parse the output of perf stat.isn't it what the -x output is meant for?
perf stat -x, ...
Somewhat. It is used to make parsing easy for the perf stat output. But if you have a script that was expecting 2222267,cycles and now is getting 222267,?,cycles. Things will break.
Quoted 14 lines
1.738605,task-clock
367,context-switches
0,cpu-migrations
272,page-faults
6722006,cycles
2592661,stalled-cycles-frontend
1935855,stalled-cycles-backend
4324013,instructions
823229,branches
11192,branch-missesQuoted 3 lines
I think we need to make the display of the unit optional. If I do:
$ perf stat -e cycles ls
Quoted 7 lines
Quoted 3 lines
The output should remain as it was before and not show:
$ perf stat -e cycles ls 22782847475 ? cyclesmaybe we should display just space ' ' instead
of the '?' ...seems confusing
But then, it is not so good for the -x option to get ' ' in the csv output.
Quoted 6 lines
Quoted 6 lines
So I think we need a --show-unit option. It would be off by default. Of course doing this causes a mess with the current code because of all the various
printf()inbuiltin-stat.cbut I think it is better for the end user.
Quoted 8 lines
Quoted 1 line
Any opinion?
I haven't checked by I think we changed the default perf stat output in the past without any fuzz
maybe just keep the -x output or add the unit
to the end of the line
Well, that's what I had initially. But then people thought it was more natural to have in before the event. I agreed with that.
I almost have the --show-unit option working now. I think we should go with that.
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
In reply to Stephane EranianQuoted 1 line
Any opinion?
Just don't show the unit if there is no unit.
That is what I asked for earlier.
-Andi
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Quoted 5 lines · Andi Kleen
Quoted 1 line
Any opinion?
Just don't show the unit if there is no unit.
That is what I asked for earlier.
You said, print ? if no unit.
Re: [PATCH v4 2/4] perf stat: add event unit and scale support
Quoted 7 lines · Stephane Eranian
Quoted 5 lines · Andi Kleen
Quoted 1 line
Any opinion?
Just don't show the unit if there is no unit.
That is what I asked for earlier.You said, print ? if no unit.
Okay, I now print nothing when there is no unit. Fixed up a couple of printf alignment issues.
It's all good now. Posting the series momentarily.
PATCH v4 3/4 perf/x86: add Intel RAPL PMU support
In reply to Stephane EranianThis patch adds a new uncore PMU to expose the Intel RAPL energy consumption counters. Up to 3 counters, each counting a particular RAPL event are exposed.
The RAPL counters are available on Intel SandyBridge, IvyBridge, Haswell. The server skus add a 3rd counter.
The following events are available and exposed in sysfs:
- power/energy-cores: power consumption of all cores on socket
- power/energy-pkg: power consumption of all cores + LLc cache
- power/energy-dram: power consumption of DRAM (servers only)
For each event both the unit (Joules) and scale (0.23 nJ) is exposed in sysfs for use by perf stat and other tools. Files are:
/sys/devices/power/events/energy-*.unit /sys/devices/power/events/energy-*.scale
The RAPL PMU is uncore by nature and is implemented such that it only works in system-wide mode. Measuring only one CPU per socket is sufficient. The /sys/devices/power/cpumask file can be used by tools to figure out which CPUs to monitor by default. For instance, on a 2-socket system, 2 CPUs (one on each socket) will be shown.
All the counters measure in the same unit (exposed via sysfs). The perf_events API exposes all RAPL counters as 64-bit integers counting in unit of 1/2^32 Joules (or 0.23 nJ). User level tools must convert the counts by multiplying them by 0.23 and divide 10^9 to obtain Joules. The reason for this is that the kernel avoids doing floating point math whenever possible because it is expensive (user floating-point state must be saved). The method used avoids kernel floating-point usage. There is no loss of precision. Thanks to PeterZ for suggesting this approach.
To convert the raw count in Watt:
W = C * 2.3 / (1e10 * time)
or ldexp(C, -32).
RAPL PMU is a new standalone PMU which registers with the perf_event core subsystem. The PMU type (attr->type) is dynamically allocated and is available from /sys/device/power/type.
Sampling is not supported by the RAPL PMU. There is no privilege level filtering either.
Thanks to Maria Dimakopoulou for her contributions to this patch especially on the math aspects.
--- arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 655 +++++++++++++++++++++++++++ 2 files changed, 656 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
arch/x86/kernel/cpu/Makefile +1 -1
@@ -36,7 +36,7 @@ obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_iommu.o endif obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_uncore.o +obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_uncore.o perf_event_intel_rapl.o endif
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +655 -0
655 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Peter Zijlstra
maintainerQuoted 2 lines · Stephane Eranian
+/*
+ * we compute in 0.23 nJ increments regardless of MSR
We don't in fact use 0.23 nJ, we use 2^-32 J.
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 337
Quoted 4 lines
+ */
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +3
-0+EVENT_ATTR_STR (energy-cores.scale, rapl_cores_scale,"2.3e-10" ); +EVENT_ATTR_STR (energy-pkg.scale, rapl_pkg_scale,"2.3e-10" ); +EVENT_ATTR_STR (energy-ram.scale, rapl_ram_scale,"2.3e-10" );
Am I weird for proposing we use:
"2.3283064365386962890625e-10"
instead? Its not like anybody needs to go type this by hand.
PATCH v4 4/4 perf,x86: add RAPL hrtimer support
In reply to Stephane EranianThe RAPL PMU counters do not interrupt on overflow. Therefore, the kernel needs to poll the counters to avoid missing an overflow. This patch adds the hrtimer code to do this.
The timer internval is calculated at boot time based on the power unit used by the HW.
--- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 75 +++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_rapl.c +70 -5
@@ -92,11 +92,13 @@ static struct kobj_attribute format_attr_##_var = \struct rapl_pmu {spinlock_t lock; -atomic_t refcnt;int hw_unit;/* 1/2^hw_unit Joule */ -int phys_id; -int n_active;/* number of active events */ +struct hrtimer hrtimer;struct list_head active_list; +ktime_t timer_interval;/* in ktime_t unit */ +int n_active;/* number of active events */ +int phys_id; +atomic_t refcnt; };static struct pmu rapl_pmu_class;
@@ -161,6 +163,47 @@ static u64 rapl_event_update(struct perf_event *event)return new_raw_count; } +static void rapl_start_hrtimer (struct rapl_pmu *pmu) +{ +__hrtimer_start_range_ns (&pmu->hrtimer, + pmu->timer_interval,0 , +HRTIMER_MODE_REL_PINNED ,0 ); +} + +static void rapl_stop_hrtimer (struct rapl_pmu *pmu) +{ +hrtimer_cancel (&pmu->hrtimer); +} + +static enum hrtimer_restart rapl_hrtimer_handle (struct hrtimer *hrtimer) +{ + struct rapl_pmu *pmu = container_of(hrtimer, struct rapl_pmu, hrtimer); +struct perf_event *event; +unsigned long flags; + +if (!pmu->n_active) +return HRTIMER_NORESTART ; + +spin_lock_irqsave (&pmu->lock, flags); + +list_for_each_entry (event, &pmu->active_list, active_entry) { +rapl_event_update (event); + } + +spin_unlock_irqrestore (&pmu->lock, flags); + +hrtimer_forward_now (&pmu->hrtimer, pmu->timer_interval); + +return HRTIMER_RESTART ; +} + +static void rapl_hrtimer_init (struct rapl_pmu *pmu) +{ +hrtimer_init (&pmu->hrtimer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); + pmu->hrtimer.function = rapl_hrtimer_handle; +} + +static void __rapl_pmu_event_start (struct rapl_pmu *pmu,struct perf_event *event) {
@@ -174,6 +217,8 @@ static void __rapl_pmu_event_start(struct rapl_pmu *pmu,local64_set (&event->hw.prev_count,rapl_read_counter (event)); pmu->n_active++; +if (pmu->n_active ==1 ) +rapl_start_hrtimer (pmu); }static void rapl_pmu_event_start (struct perf_event *event,int mode)
@@ -198,6 +243,8 @@ static void rapl_pmu_event_stop(struct perf_event *event, int mode)if (!(hwc->state &PERF_HES_STOPPED )) {WARN_ON_ONCE (pmu->n_active <=0 ); pmu->n_active--; +if (pmu->n_active ==0 ) +rapl_stop_hrtimer (pmu);list_del (&event->active_entry);
@@ -439,6 +486,7 @@ static int rapl_cpu_prepare(int cpu) {struct rapl_pmu *pmu =per_cpu (rapl_pmu, cpu);int phys_id =topology_physical_package_id (cpu); +u64 ms;if (pmu)return 0 ;
@@ -464,6 +512,20 @@ static int rapl_cpu_prepare(int cpu)rdmsrl (MSR_RAPL_POWER_UNIT , pmu->hw_unit); pmu->hw_unit = (pmu->hw_unit >>8 ) &0x1FULL ; +/* +* use reference of 200W for scaling the timeout +* to avoid missing counter overflows. +* 200W = 200 Joules/sec +* divide interval by 2 to avoid lockstep (2 * 100) +* if hw unit is 32, then we use 2 ms 1/200/2 +*/ +if (pmu->hw_unit <32 ) + ms =1000 * (1ULL << (32 - pmu->hw_unit -1 )) / (2 *100 ); +else + ms =2 ; + + pmu->timer_interval =ms_to_ktime (ms); +/* set RAPL pmu for this cpu for now */ per_cpu (rapl_pmu_kfree, cpu) =NULL ;per_cpu (rapl_pmu, cpu) = pmu;
@@ -625,6 +687,7 @@ static int __init rapl_pmu_init(void) }rapl_cpu_prepare (cpu);cpumask_set_cpu (cpu, &rapl_cpu_mask); +rapl_hrtimer_init (per_cpu (rapl_pmu, cpu)); }perf_cpu_notifier (rapl_cpu_notifier);
@@ -640,9 +703,11 @@ static int __init rapl_pmu_init(void)pr_info ("RAPL PMU detected, hw unit 2^-%d Joules," " API unit is 2^-32 Joules," -" %d fixed counters\n" , +" %d fixed counters" +" %llu ms ovfl timer\n" , pmu->hw_unit, -hweight32 (rapl_cntr_mask)); +hweight32 (rapl_cntr_mask), +ktime_to_ms (pmu->timer_interval));put_online_cpus ();
Signature · 1 line
1.7.9.5