tools/power turbostat: add format "average" for external attributes

External atributes with format "raw" are not printed in summary lines
for nodes/packages (or with option -S). The new format "average"
behaves like "raw" but also adds the summary data

Signed-off-by: Michael Hebenstreit <michael.hebenstreit@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8
index db3888b8af129ad70c66667c7f16b17ed9b931d5..3340def58d015cd128349a465db9f455205452ec 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.8
+++ b/tools/power/x86/turbostat/turbostat.8
@@ -47,10 +47,11 @@ name as necessary to disambiguate it from others is necessary.  Note that option
                MSRs are read as 64-bits, u32 truncates the displayed value to 32-bits.
                default: u64
 
-       format: {\fBraw\fP | \fBdelta\fP | \fBpercent\fP}
+       format: {\fBraw\fP | \fBdelta\fP | \fBpercent\fP | \fBaverage\fP}
                'raw' shows the MSR contents in hex.
                'delta' shows the difference in values during the measurement interval.
                'percent' shows the delta as a percentage of the cycles elapsed.
+               'average' similar to raw, but also averaged for node/package summaries (or when using -S).
                default: delta
 
        name: "name_string"

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index dd1160144625e383eee8a4c3dc802e81d38ce7c0..9ad3b1aa79ef17af906f94b1bd47ed66b6932796 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2756,7 +2756,7 @@ void print_header(char *delim)
 
        for (mp = sys.tp; mp; mp = mp->next) {
 
-               if (mp->format == FORMAT_RAW) {
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {
                        if (mp->width == 64)
                                outp += sprintf(outp, "%s%18.18s", (printed++ ? delim : ""), mp->name);
                        else
@@ -2831,7 +2831,7 @@ void print_header(char *delim)
        }
 
        for (mp = sys.cp; mp; mp = mp->next) {
-               if (mp->format == FORMAT_RAW) {
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {
                        if (mp->width == 64)
                                outp += sprintf(outp, "%s%18.18s", delim, mp->name);
                        else
@@ -2961,7 +2961,7 @@ void print_header(char *delim)
                outp += sprintf(outp, "%sUncMHz", (printed++ ? delim : ""));
 
        for (mp = sys.pp; mp; mp = mp->next) {
-               if (mp->format == FORMAT_RAW) {
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {
                        if (mp->width == 64)
                                outp += sprintf(outp, "%s%18.18s", delim, mp->name);
                        else if (mp->width == 32)
@@ -3282,7 +3282,7 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
 
        /* Added counters */
        for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {
-               if (mp->format == FORMAT_RAW) {
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {
                        if (mp->width == 32)
                                outp +=
                                    sprintf(outp, "%s0x%08x", (printed++ ? delim : ""), (unsigned int)t->counter[i]);
@@ -3379,7 +3379,7 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
                outp += sprintf(outp, "%s%lld", (printed++ ? delim : ""), c->core_throt_cnt);
 
        for (i = 0, mp = sys.cp; mp; i++, mp = mp->next) {
-               if (mp->format == FORMAT_RAW) {
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {
                        if (mp->width == 32)
                                outp +=
                                    sprintf(outp, "%s0x%08x", (printed++ ? delim : ""), (unsigned int)c->counter[i]);
@@ -3578,7 +3578,7 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
                outp += sprintf(outp, "%s%d", (printed++ ? delim : ""), p->uncore_mhz);
 
        for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {
-               if (mp->format == FORMAT_RAW) {
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {
                        if (mp->width == 32)
                                outp +=
                                    sprintf(outp, "%s0x%08x", (printed++ ? delim : ""), (unsigned int)p->counter[i]);
@@ -3755,7 +3755,7 @@ int delta_package(struct pkg_data *new, struct pkg_data *old)
            new->rapl_dram_perf_status.raw_value - old->rapl_dram_perf_status.raw_value;
 
        for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {
-               if (mp->format == FORMAT_RAW)
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE)
                        old->counter[i] = new->counter[i];
                else if (mp->format == FORMAT_AVERAGE)
                        old->counter[i] = new->counter[i];
@@ -3799,7 +3799,7 @@ void delta_core(struct core_data *new, struct core_data *old)
        DELTA_WRAP32(new->core_energy.raw_value, old->core_energy.raw_value);
 
        for (i = 0, mp = sys.cp; mp; i++, mp = mp->next) {
-               if (mp->format == FORMAT_RAW)
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE)
                        old->counter[i] = new->counter[i];
                else
                        old->counter[i] = new->counter[i] - old->counter[i];
@@ -3913,7 +3913,7 @@ int delta_thread(struct thread_data *new, struct thread_data *old, struct core_d
                old->smi_count = new->smi_count - old->smi_count;
 
        for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {
-               if (mp->format == FORMAT_RAW)
+               if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE)
                        old->counter[i] = new->counter[i];
                else
                        old->counter[i] = new->counter[i] - old->counter[i];
@@ -10419,6 +10419,10 @@ void parse_add_command_msr(char *add_command)
                        format = FORMAT_RAW;
                        goto next;
                }
+               if (!strncmp(add_command, "average", strlen("average"))) {
+                       format = FORMAT_AVERAGE;
+                       goto next;
+               }
                if (!strncmp(add_command, "delta", strlen("delta"))) {
                        format = FORMAT_DELTA;
                        goto next;
@@ -10691,13 +10695,19 @@ next:
                        has_format = true;
                }
 
+               if (strcmp("average", format_name) == 0) {
+                       format = FORMAT_AVERAGE;
+                       has_format = true;
+               }
+
                if (strcmp("delta", format_name) == 0) {
                        format = FORMAT_DELTA;
                        has_format = true;
                }
 
                if (!has_format) {
-                       fprintf(stderr, "%s: Invalid format %s. Expected raw or delta\n", __func__, format_name);
+                       fprintf(stderr, "%s: Invalid format %s. Expected raw, average or delta\n",
+                               __func__, format_name);
                        exit(1);
                }
        }