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 | 5 +++++
tools/perf/util/clockid.c | 1 +
tools/perf/util/record.h | 1 +
3 files changed, 7 insertions(+)
diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index ce5dc70e392a..d5cdc53471ff 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -926,6 +926,11 @@ 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->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 380429725df1..e3500a254103 100644
--- a/tools/perf/util/clockid.c
+++ b/tools/perf/util/clockid.c
@@ -78,6 +78,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 ef6c2715fdd9..20bcd4310146 100644
--- a/tools/perf/util/record.h
+++ b/tools/perf/util/record.h
@@ -67,6 +67,7 @@ struct record_opts {
bool sample_transaction;
int initial_delay;
bool use_clockid;
+ bool no_clockid;
clockid_t clockid;
u64 clockid_res_ns;
int nr_cblocks;
--
2.25.1
