projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf stat aggregation: Add separate core member
[linux-2.6-microblaze.git]
/
tools
/
perf
/
util
/
stat-display.c
diff --git
a/tools/perf/util/stat-display.c
b/tools/perf/util/stat-display.c
index
7903922
..
2b3842f
100644
(file)
--- a/
tools/perf/util/stat-display.c
+++ b/
tools/perf/util/stat-display.c
@@
-73,10
+73,10
@@
static void aggr_printout(struct perf_stat_config *config,
switch (config->aggr_mode) {
case AGGR_CORE:
fprintf(config->output, "S%d-D%d-C%*d%s%*d%s",
switch (config->aggr_mode) {
case AGGR_CORE:
fprintf(config->output, "S%d-D%d-C%*d%s%*d%s",
-
cpu_map__id_to_socket(id.id)
,
-
cpu_map__id_to_die(id.id)
,
+
id.socket
,
+
id.die
,
config->csv_output ? 0 : -8,
config->csv_output ? 0 : -8,
-
cpu_map__id_to_cpu(id.id)
,
+
id.core
,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
@@
-84,9
+84,9
@@
static void aggr_printout(struct perf_stat_config *config,
break;
case AGGR_DIE:
fprintf(config->output, "S%d-D%*d%s%*d%s",
break;
case AGGR_DIE:
fprintf(config->output, "S%d-D%*d%s%*d%s",
-
cpu_map__id_to_socket(id.id << 16)
,
+
id.socket
,
config->csv_output ? 0 : -8,
config->csv_output ? 0 : -8,
-
cpu_map__id_to_die(id.id << 16)
,
+
id.die
,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
@@
-95,7
+95,7
@@
static void aggr_printout(struct perf_stat_config *config,
case AGGR_SOCKET:
fprintf(config->output, "S%*d%s%*d%s",
config->csv_output ? 0 : -5,
case AGGR_SOCKET:
fprintf(config->output, "S%*d%s%*d%s",
config->csv_output ? 0 : -5,
- id.
id
,
+ id.
socket
,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
config->csv_sep,
config->csv_output ? 0 : 4,
nr,
@@
-113,14
+113,14
@@
static void aggr_printout(struct perf_stat_config *config,
case AGGR_NONE:
if (evsel->percore && !config->percore_show_thread) {
fprintf(config->output, "S%d-D%d-C%*d%s",
case AGGR_NONE:
if (evsel->percore && !config->percore_show_thread) {
fprintf(config->output, "S%d-D%d-C%*d%s",
-
cpu_map__id_to_socket(id.id)
,
-
cpu_map__id_to_die(id.id)
,
+
id.socket
,
+
id.die
,
config->csv_output ? 0 : -3,
config->csv_output ? 0 : -3,
-
cpu_map__id_to_cpu(id.id)
, config->csv_sep);
- } else if (id.
id
> -1) {
+
id.core
, config->csv_sep);
+ } else if (id.
core
> -1) {
fprintf(config->output, "CPU%*d%s",
config->csv_output ? 0 : -7,
fprintf(config->output, "CPU%*d%s",
config->csv_output ? 0 : -7,
- evsel__cpus(evsel)->map[id.
id
],
+ evsel__cpus(evsel)->map[id.
core
],
config->csv_sep);
}
break;
config->csv_sep);
}
break;
@@
-326,7
+326,7
@@
static int first_shadow_cpu(struct perf_stat_config *config,
int i;
if (config->aggr_mode == AGGR_NONE)
int i;
if (config->aggr_mode == AGGR_NONE)
- return id.
id
;
+ return id.
core
;
if (!config->aggr_get_id)
return 0;
if (!config->aggr_get_id)
return 0;
@@
-658,7
+658,7
@@
static void print_counter_aggrdata(struct perf_stat_config *config,
uval = val * counter->scale;
if (cpu != -1) {
id = cpu_map__empty_aggr_cpu_id();
uval = val * counter->scale;
if (cpu != -1) {
id = cpu_map__empty_aggr_cpu_id();
- id.
id
= cpu;
+ id.
core
= cpu;
}
printout(config, id, nr, counter, uval,
prefix, run, ena, 1.0, &rt_stat);
}
printout(config, id, nr, counter, uval,
prefix, run, ena, 1.0, &rt_stat);
@@
-871,7
+871,7
@@
static void print_counter(struct perf_stat_config *config,
uval = val * counter->scale;
id = cpu_map__empty_aggr_cpu_id();
uval = val * counter->scale;
id = cpu_map__empty_aggr_cpu_id();
- id.
id
= cpu;
+ id.
core
= cpu;
printout(config, id, 0, counter, uval, prefix,
run, ena, 1.0, &rt_stat);
printout(config, id, 0, counter, uval, prefix,
run, ena, 1.0, &rt_stat);
@@
-898,7
+898,7
@@
static void print_no_aggr_metric(struct perf_stat_config *config,
fputs(prefix, config->output);
evlist__for_each_entry(evlist, counter) {
id = cpu_map__empty_aggr_cpu_id();
fputs(prefix, config->output);
evlist__for_each_entry(evlist, counter) {
id = cpu_map__empty_aggr_cpu_id();
- id.
id
= cpu;
+ id.
core
= cpu;
if (first) {
aggr_printout(config, counter, id, 0);
first = false;
if (first) {
aggr_printout(config, counter, id, 0);
first = false;