Commit 0aa802a7 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Get rid of extra clock display function 



There's no reason to have separate function to display clock events.
It's only purpose was to convert the nanosecond value into microseconds.
We do that now in generic code, if the unit and scale values are
properly set, which this patch do for clock events.

The output differs in the unit field being displayed in its columns
rather than having it added as a suffix of the event name. Plus the
value is rounded into 2 decimal numbers as for any other event.

Before:

  # perf stat  -e cpu-clock,task-clock -C 0 sleep 3

   Performance counter stats for 'CPU(s) 0':

       3001.123137      cpu-clock (msec)          #    1.000 CPUs utilized
       3001.133250      task-clock (msec)         #    1.000 CPUs utilized

       3.001159813 seconds time elapsed

Now:

  # perf stat  -e cpu-clock,task-clock -C 0 sleep 3

   Performance counter stats for 'CPU(s) 0':

          3,001.05 msec cpu-clock                 #    1.000 CPUs utilized
          3,001.05 msec task-clock                #    1.000 CPUs utilized

       3.001077794 seconds time elapsed

There's a small difference in csv output, as we now output the unit
field, which was empty before. It's in the proper spot, so there's no
compatibility issue.

Before:

  # perf stat  -e cpu-clock,task-clock -C 0 -x, sleep 3
  3001.065177,,cpu-clock,3001064187,100.00,1.000,CPUs utilized
  3001.077085,,task-clock,3001077085,100.00,1.000,CPUs utilized

  # perf stat  -e cpu-clock,task-clock -C 0 -x, sleep 3
  3000.80,msec,cpu-clock,3000799026,100.00,1.000,CPUs utilized
  3000.80,msec,task-clock,3000799550,100.00,1.000,CPUs utilized

Add perf_evsel__is_clock to replace nsec_counter.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180720110036.32251-2-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2d6cae13

tools/perf/builtin-stat.c

+2 −46
Original line number Diff line number Diff line
@@ -296,18 +296,6 @@ static int create_perf_stat_counter(struct perf_evsel *evsel) 
	return perf_evsel__open_per_thread(evsel, evsel_list->threads);

}



/*

 * Does the counter have nsecs as a unit?

 */

static inline int nsec_counter(struct perf_evsel *evsel)

{

	if (perf_evsel__match(evsel, SOFTWARE, SW_CPU_CLOCK) ||

	    perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK))

		return 1;



	return 0;

}



static int process_synthesized_event(struct perf_tool *tool __maybe_unused,

				     union perf_event *event,

				     struct perf_sample *sample __maybe_unused,
@@ -1058,34 +1046,6 @@ static void print_metric_header(void *ctx, const char *color __maybe_unused, 
		fprintf(os->fh, "%*s ", metric_only_len, unit);

}



static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg)

{

	FILE *output = stat_config.output;

	double msecs = avg / NSEC_PER_MSEC;

	const char *fmt_v, *fmt_n;

	char name[25];



	fmt_v = csv_output ? "%.6f%s" : "%18.6f%s";

	fmt_n = csv_output ? "%s" : "%-25s";



	aggr_printout(evsel, id, nr);



	scnprintf(name, sizeof(name), "%s%s",

		  perf_evsel__name(evsel), csv_output ? "" : " (msec)");



	fprintf(output, fmt_v, msecs, csv_sep);



	if (csv_output)

		fprintf(output, "%s%s", evsel->unit, csv_sep);

	else

		fprintf(output, "%-*s%s", unit_width, evsel->unit, csv_sep);



	fprintf(output, fmt_n, name);



	if (evsel->cgrp)

		fprintf(output, "%s%s", csv_sep, evsel->cgrp->name);

}



static int first_shadow_cpu(struct perf_evsel *evsel, int id)

{

	int i;
@@ -1241,11 +1201,7 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval, 
		return;

	}



	if (metric_only)

		/* nothing */;

	else if (nsec_counter(counter))

		nsec_printout(id, nr, counter, uval);

	else

	if (!metric_only)

		abs_printout(id, nr, counter, uval);



	out.print_metric = pm;
@@ -1331,7 +1287,7 @@ static void collect_all_aliases(struct perf_evsel *counter, 
		    alias->scale != counter->scale ||

		    alias->cgrp != counter->cgrp ||

		    strcmp(alias->unit, counter->unit) ||

		    nsec_counter(alias) != nsec_counter(counter))

		    perf_evsel__is_clock(alias) != perf_evsel__is_clock(counter))

			break;

		alias->merged_stat = true;

		cb(alias, data, false);

tools/perf/util/evsel.c

+11 −0
Original line number Diff line number Diff line
@@ -260,6 +260,17 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx) 
		evsel->attr.sample_period = 1;

	}



	if (perf_evsel__is_clock(evsel)) {

		/*

		 * The evsel->unit points to static alias->unit

		 * so it's ok to use static string in here.

		 */

		static const char *unit = "msec";



		evsel->unit = unit;

		evsel->scale = 1e-6;

	}



	return evsel;

}

tools/perf/util/evsel.h

+6 −0
Original line number Diff line number Diff line
@@ -405,6 +405,12 @@ static inline bool perf_evsel__is_bpf_output(struct perf_evsel *evsel) 
	return perf_evsel__match(evsel, SOFTWARE, SW_BPF_OUTPUT);

}



static inline bool perf_evsel__is_clock(struct perf_evsel *evsel)

{

	return perf_evsel__match(evsel, SOFTWARE, SW_CPU_CLOCK) ||

	       perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK);

}



struct perf_attr_details {

	bool freq;

	bool verbose;

tools/perf/util/stat-shadow.c

+2 −3
Original line number Diff line number Diff line
@@ -913,11 +913,10 @@ void perf_stat__print_shadow_stats(struct perf_evsel *evsel, 
			ratio = total / avg;



		print_metric(ctxp, NULL, "%8.0f", "cycles / elision", ratio);

	} else if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK) ||

		   perf_evsel__match(evsel, SOFTWARE, SW_CPU_CLOCK)) {

	} else if (perf_evsel__is_clock(evsel)) {

		if ((ratio = avg_stats(&walltime_nsecs_stats)) != 0)

			print_metric(ctxp, NULL, "%8.3f", "CPUs utilized",

				     avg / ratio);

				     avg / (ratio * evsel->scale));

		else

			print_metric(ctxp, NULL, NULL, "CPUs utilized", 0);

	} else if (perf_stat_evsel__is(evsel, TOPDOWN_FETCH_BUBBLES)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE