CLOCK_MONOTONIC can't be correlated with timestamps in trace, so to allow the JVMTI agent to be used with SPE and Coresight, use CNTVCT_EL0 when JITDUMP_USE_ARCH_TIMESTAMP is set.
Signed-off-by: James Clark james.clark@linaro.org --- tools/perf/jvmti/jvmti_agent.c | 5 +++++ tools/perf/tests/workloads/jitdump.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c index 526dcaf9f079..674eed455586 100644 --- a/tools/perf/jvmti/jvmti_agent.c +++ b/tools/perf/jvmti/jvmti_agent.c @@ -96,6 +96,11 @@ get_arch_timestamp(void) asm volatile("rdtsc" : "=a" (low), "=d" (high));
return low | ((uint64_t)high) << 32; +#elif defined(__aarch64__) + uint64_t val; + + asm volatile("mrs %0, cntvct_el0" : "=r" (val)); + return val; #else return 0; #endif diff --git a/tools/perf/tests/workloads/jitdump.c b/tools/perf/tests/workloads/jitdump.c index 01cbbbd564e8..8422b66ee600 100644 --- a/tools/perf/tests/workloads/jitdump.c +++ b/tools/perf/tests/workloads/jitdump.c @@ -34,6 +34,11 @@ static inline uint64_t get_timestamp(void) asm volatile("rdtsc" : "=a"(low), "=d"(high));
return low | ((uint64_t)high) << 32; +#elif defined(__aarch64__) + uint64_t val; + + asm volatile("mrs %0, cntvct_el0" : "=r" (val)); + return val; #else struct timespec ts; int ret; @@ -55,7 +60,7 @@ static FILE *open_jitdump(void) .pid = getpid(), .timestamp = get_timestamp(), .flags = -#if defined(__x86_64__) || defined(__i386__) +#if defined(__x86_64__) || defined(__i386__) || defined(__aarch64__) JITDUMP_FLAGS_ARCH_TIMESTAMP, #else 0,