Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755541Ab3HCAl1 (ORCPT ); Fri, 2 Aug 2013 20:41:27 -0400 Received: from mga14.intel.com ([143.182.124.37]:12085 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752988Ab3HCAlY (ORCPT ); Fri, 2 Aug 2013 20:41:24 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,805,1367996400"; d="scan'208";a="340958087" From: Andi Kleen To: acme@infradead.org Cc: eranian@google.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 5/5] perf, tools: Output running time and run/enabled ratio in CSV mode Date: Fri, 2 Aug 2013 17:41:13 -0700 Message-Id: <1375490473-1503-6-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1375490473-1503-1-git-send-email-andi@firstfloor.org> References: <1375490473-1503-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3750 Lines: 140 From: Andi Kleen The information how much a counter ran in perf stat can be quite interesting for other tools to judge how trustworthy a measurement is. Currently it is only output in non CSV mode. This patches make perf stat always output the running time and the enabled/running ratio in CSV mode. This adds two new fields at the end for each line. I assume that existing tools ignore new fields at the end, so it's on by default. Only CSV mode is affected, no difference otherwise. Signed-off-by: Andi Kleen --- tools/perf/builtin-stat.c | 57 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index f686d5f..940fcfd 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -982,6 +982,13 @@ static void print_aggr(char *prefix) fprintf(output, "%s%s", csv_sep, counter->cgrp->name); + if (csv_output) + fprintf(output, "%s%" PRIu64 "%s%.2f", + csv_sep, + run, + csv_sep, + 100.0 * run / ena); + fputc('\n', output); continue; } @@ -997,6 +1004,12 @@ static void print_aggr(char *prefix) if (run != ena) fprintf(output, " (%.2f%%)", 100.0 * run / ena); + } else { + fprintf(output, "%s%" PRIu64 "%s%.2f", + csv_sep, + run, + csv_sep, + 100.0 * run / ena); } fputc('\n', output); } @@ -1012,6 +1025,10 @@ 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 avg_enabled, avg_running; + + avg_enabled = avg_stats(&ps->res_stats[1]); + avg_running = avg_stats(&ps->res_stats[2]); if (prefix) fprintf(output, "%s", prefix); @@ -1027,6 +1044,13 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix) if (counter->cgrp) fprintf(output, "%s%s", csv_sep, counter->cgrp->name); + if (csv_output) + fprintf(output, "%s%.0f%s%.2f", + csv_sep, + avg_running, + csv_sep, + 100.0 * avg_running / avg_enabled); + fputc('\n', output); return; } @@ -1038,19 +1062,14 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix) print_noise(counter, avg); - if (csv_output) { - fputc('\n', output); - return; - } - - if (scaled) { - double avg_enabled, avg_running; - - avg_enabled = avg_stats(&ps->res_stats[1]); - avg_running = avg_stats(&ps->res_stats[2]); - + if (csv_output) + fprintf(output, "%s%.0f%s%.2f", + csv_sep, + avg_running, + csv_sep, + 100.0 * avg_running / avg_enabled); + else fprintf(output, " [%5.2f%%]", 100 * avg_running / avg_enabled); - } fprintf(output, "\n"); } @@ -1085,6 +1104,13 @@ static void print_counter(struct perf_evsel *counter, char *prefix) fprintf(output, "%s%s", csv_sep, counter->cgrp->name); + if (csv_output) + fprintf(output, "%s%" PRIu64 "%s%.2f", + csv_sep, + run, + csv_sep, + 100.0 * run / ena); + fputc('\n', output); continue; } @@ -1100,7 +1126,14 @@ static void print_counter(struct perf_evsel *counter, char *prefix) if (run != ena) fprintf(output, " (%.2f%%)", 100.0 * run / ena); + } else { + fprintf(output, "%s%" PRIu64 "%s%.2f", + csv_sep, + run, + csv_sep, + 100.0 * run / ena); } + fputc('\n', output); } } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/