Make CLOCK_PERF_HW_CLOCK_NS the default for Intel PT if it is supported. To allow that to be overridden, support also --no-clockid. Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> --- tools/perf/arch/x86/util/intel-pt.c | 6 ++++++ tools/perf/util/clockid.c | 1 + tools/perf/util/record.h | 1 + 3 files changed, 8 insertions(+) diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c index 5424c42337e7..bba55b6f75b6 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -927,6 +927,12 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, evsel__reset_sample_bit(tracking_evsel, BRANCH_STACK); } + if (!opts->use_clockid && !opts->no_clockid && perf_can_perf_clock_hw_clock_ns()) { + opts->use_clockid = true; + opts->ns_clockid = true; + opts->clockid = CLOCK_PERF_HW_CLOCK_NS; + } + /* * Warn the user when we do not have enough information to decode i.e. * per-cpu with no sched_switch (except workload-only). diff --git a/tools/perf/util/clockid.c b/tools/perf/util/clockid.c index 2fcffee690e1..f9c0200e1ec2 100644 --- a/tools/perf/util/clockid.c +++ b/tools/perf/util/clockid.c @@ -81,6 +81,7 @@ int parse_clockid(const struct option *opt, const char *str, int unset) if (unset) { opts->use_clockid = 0; + opts->no_clockid = true; return 0; } diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h index 1dbbf6b314dc..9a1dabfd158b 100644 --- a/tools/perf/util/record.h +++ b/tools/perf/util/record.h @@ -68,6 +68,7 @@ struct record_opts { int initial_delay; bool use_clockid; bool ns_clockid; + bool no_clockid; clockid_t clockid; u64 clockid_res_ns; int nr_cblocks; -- 2.25.1