perf stat: Move summary prefix printing logic in CSV output

It matches to the prefix (interval timestamp), so better to have them together.
No functional change intended.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20221123180208.2068936-3-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 46e90f0bb423f9c492763144571e74a29230bf2a..d86f2f8e020d4cf816353d973afd49533fc744e9 100644 (file)
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -713,11 +713,6 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int
                nl = config->metric_only ? new_line_metric : new_line_std;
        }
 
-       if (!config->no_csv_summary && config->csv_output &&
-           config->summary && !config->interval && !config->metric_only) {
-               fprintf(config->output, "%16s%s", "summary", config->csv_sep);
-       }
-
        if (run == 0 || ena == 0 || counter->counts->scaled == -1) {
                if (config->metric_only) {
                        pm(config, &os, NULL, "", "", 0);
@@ -828,8 +823,13 @@ static void print_counter_aggrdata(struct perf_stat_config *config,
        ena = aggr->counts.ena;
        run = aggr->counts.run;
 
-       if (prefix && !metric_only)
-               fprintf(output, "%s", prefix);
+       if (!metric_only) {
+               if (prefix)
+                       fprintf(output, "%s", prefix);
+               else if (config->summary && config->csv_output &&
+                        !config->no_csv_summary && !config->interval)
+                       fprintf(output, "%16s%s", "summary", config->csv_sep);
+       }
 
        uval = val * counter->scale;