Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52bab886 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Support output in nanoseconds 



Upcoming changes add timestamp output in perf report. Add a --ns
argument similar to perf script to support nanoseconds resolution when
needed.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20190305144758.12397-5-andi@firstfloor.org


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

tools/perf/Documentation/perf-report.txt

+3 −0
Original line number Diff line number Diff line
@@ -477,6 +477,9 @@ include::itrace.txt[] 
	Please note that not all mmaps are stored, options affecting which ones

	are include 'perf record --data', for instance.



--ns::

	Show time stamps in nanoseconds.



--stats::

	Display overall events statistics without any further processing.

	(like the one at the end of the perf report -D command)

tools/perf/builtin-report.c

+1 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,7 @@ int cmd_report(int argc, const char **argv) 
	OPT_CALLBACK(0, "percent-type", &report.annotation_opts, "local-period",

		     "Set percent type local/global-period/hits",

		     annotate_parse_percent_type),

	OPT_BOOLEAN(0, "ns", &symbol_conf.nanosecs, "Show times in nanosecs"),

	OPT_END()

	};

	struct perf_data data = {

tools/perf/builtin-script.c

+5 −6
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static bool no_callchain; 
static bool			latency_format;

static bool			system_wide;

static bool			print_flags;

static bool			nanosecs;

static const char		*cpu_list;

static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);

static struct perf_stat_config	stat_config;
@@ -691,7 +690,7 @@ static int perf_sample__fprintf_start(struct perf_sample *sample, 
		secs = nsecs / NSEC_PER_SEC;

		nsecs -= secs * NSEC_PER_SEC;



		if (nanosecs)

		if (symbol_conf.nanosecs)

			printed += fprintf(fp, "%5lu.%09llu: ", secs, nsecs);

		else {

			char sample_time[32];
@@ -3244,7 +3243,7 @@ static int parse_insn_trace(const struct option *opt __maybe_unused, 
{

	parse_output_fields(NULL, "+insn,-event,-period", 0);

	itrace_parse_synth_opts(opt, "i0ns", 0);

	nanosecs = true;

	symbol_conf.nanosecs = true;

	return 0;

}
@@ -3262,7 +3261,7 @@ static int parse_call_trace(const struct option *opt __maybe_unused, 
{

	parse_output_fields(NULL, "-ip,-addr,-event,-period,+callindent", 0);

	itrace_parse_synth_opts(opt, "cewp", 0);

	nanosecs = true;

	symbol_conf.nanosecs = true;

	return 0;

}
@@ -3272,7 +3271,7 @@ static int parse_callret_trace(const struct option *opt __maybe_unused, 
{

	parse_output_fields(NULL, "-ip,-addr,-event,-period,+callindent,+flags", 0);

	itrace_parse_synth_opts(opt, "crewp", 0);

	nanosecs = true;

	symbol_conf.nanosecs = true;

	return 0;

}
@@ -3408,7 +3407,7 @@ int cmd_script(int argc, const char **argv) 
	OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"),

	OPT_INTEGER(0, "max-blocks", &max_blocks,

		    "Maximum number of code blocks to dump with brstackinsn"),

	OPT_BOOLEAN(0, "ns", &nanosecs,

	OPT_BOOLEAN(0, "ns", &symbol_conf.nanosecs,

		    "Use 9 decimal places when displaying time"),

	OPT_CALLBACK_OPTARG(0, "itrace", &itrace_synth_opts, NULL, "opts",

			    "Instruction Tracing options\n" ITRACE_HELP,

tools/perf/util/symbol.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ int vmlinux_path__nr_entries; 
char **vmlinux_path;



struct symbol_conf symbol_conf = {

	.nanosecs		= false,

	.use_modules		= true,

	.try_vmlinux_path	= true,

	.demangle		= true,

tools/perf/util/symbol_conf.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ struct strlist; 
struct intlist;



struct symbol_conf {

	bool		nanosecs;

	unsigned short	priv_size;

	bool		try_vmlinux_path,

			init_annotation,