From: Leo Yan <leo.yan@linaro.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Will Deacon <will@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
John Garry <john.garry@huawei.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Kemeng Shi <shikemeng@huawei.com>,
Ian Rogers <irogers@google.com>,
Remi Bernon <rbernon@codeweavers.com>,
Nick Gasson <nick.gasson@arm.com>,
Stephane Eranian <eranian@google.com>,
Andi Kleen <ak@linux.intel.com>,
Steve MacLean <Steve.MacLean@Microsoft.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Zou Wei <zou_wei@huawei.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v4 4/6] perf tsc: Support cap_user_time_short for event TIME_CONV
Date: Mon, 14 Sep 2020 19:53:09 +0800 [thread overview]
Message-ID: <20200914115311.2201-5-leo.yan@linaro.org> (raw)
In-Reply-To: <20200914115311.2201-1-leo.yan@linaro.org>
The synthesized event TIME_CONV doesn't contain the complete parameters
for counters, this will lead to wrong conversion between counter cycles
and timestamp.
This patch extends event TIME_CONV to record flags 'cap_user_time_zero'
which is used to indicate the counter parameters are valid or not, if
not will directly return 0 for timestamp calculation. And record the
flag 'cap_user_time_short' and its relevant fields 'time_cycles' and
'time_mask' for cycle calibration.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
tools/lib/perf/include/perf/event.h | 4 ++++
tools/perf/util/jitdump.c | 14 +++++++++-----
tools/perf/util/tsc.c | 4 ++++
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/perf/event.h
index 842028858d66..a6dbba6b9073 100644
--- a/tools/lib/perf/include/perf/event.h
+++ b/tools/lib/perf/include/perf/event.h
@@ -324,6 +324,10 @@ struct perf_record_time_conv {
__u64 time_shift;
__u64 time_mult;
__u64 time_zero;
+ __u64 time_cycles;
+ __u64 time_mask;
+ bool cap_user_time_zero;
+ bool cap_user_time_short;
};
struct perf_record_header_feature {
diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
index 0804308ef285..055bab7a92b3 100644
--- a/tools/perf/util/jitdump.c
+++ b/tools/perf/util/jitdump.c
@@ -374,11 +374,15 @@ static uint64_t convert_timestamp(struct jit_buf_desc *jd, uint64_t timestamp)
if (!jd->use_arch_timestamp)
return timestamp;
- tc.time_shift = jd->session->time_conv.time_shift;
- tc.time_mult = jd->session->time_conv.time_mult;
- tc.time_zero = jd->session->time_conv.time_zero;
-
- if (!tc.time_mult)
+ tc.time_shift = jd->session->time_conv.time_shift;
+ tc.time_mult = jd->session->time_conv.time_mult;
+ tc.time_zero = jd->session->time_conv.time_zero;
+ tc.time_cycles = jd->session->time_conv.time_cycles;
+ tc.time_mask = jd->session->time_conv.time_mask;
+ tc.cap_user_time_zero = jd->session->time_conv.cap_user_time_zero;
+ tc.cap_user_time_short = jd->session->time_conv.cap_user_time_short;
+
+ if (!tc.cap_user_time_zero)
return 0;
return tsc_to_perf_time(timestamp, &tc);
diff --git a/tools/perf/util/tsc.c b/tools/perf/util/tsc.c
index c0ca40204649..62b4c75c966c 100644
--- a/tools/perf/util/tsc.c
+++ b/tools/perf/util/tsc.c
@@ -98,6 +98,10 @@ int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc,
event.time_conv.time_mult = tc.time_mult;
event.time_conv.time_shift = tc.time_shift;
event.time_conv.time_zero = tc.time_zero;
+ event.time_conv.time_cycles = tc.time_cycles;
+ event.time_conv.time_mask = tc.time_mask;
+ event.time_conv.cap_user_time_zero = tc.cap_user_time_zero;
+ event.time_conv.cap_user_time_short = tc.cap_user_time_short;
return process(tool, &event, NULL, machine);
}
--
2.17.1
next prev parent reply other threads:[~2020-09-14 17:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 11:53 [PATCH v4 0/6] Perf tool: Support TSC for Arm64 Leo Yan
2020-09-14 11:53 ` [PATCH v4 1/6] perf tsc: Move out common functions from x86 Leo Yan
2020-09-14 11:53 ` [PATCH v4 2/6] perf tsc: Add rdtsc() for Arm64 Leo Yan
2020-09-14 11:53 ` [PATCH v4 3/6] perf tsc: Calculate timestamp with cap_user_time_short Leo Yan
2020-09-14 11:53 ` Leo Yan [this message]
2020-09-14 11:53 ` [PATCH v4 5/6] perf tests tsc: Make tsc testing as a common testing Leo Yan
2020-09-14 11:53 ` [PATCH v4 6/6] perf tests tsc: Add checking helper is_supported() Leo Yan
2020-09-22 12:07 ` [PATCH v4 0/6] Perf tool: Support TSC for Arm64 Leo Yan
2020-09-22 16:49 ` Arnaldo Carvalho de Melo
2020-09-23 8:12 ` Leo Yan
2020-09-23 15:27 ` Arnaldo Carvalho de Melo
2020-09-23 15:55 ` Arnaldo Carvalho de Melo
2020-09-23 23:48 ` Leo Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200914115311.2201-5-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=Steve.MacLean@Microsoft.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=gustavoars@kernel.org \
--cc=irogers@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=nick.gasson@arm.com \
--cc=peterz@infradead.org \
--cc=rbernon@codeweavers.com \
--cc=shikemeng@huawei.com \
--cc=will@kernel.org \
--cc=zou_wei@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).