Upstreamed BUILTIN_CLOCK_TSC clocksource
Change-Id: If9f863585bfe787607c74aea08a8a1be9fb55d46
diff --git a/include/perfetto/base/build_config.h b/include/perfetto/base/build_config.h
index a0e6bb9..5f7a7bd 100644
--- a/include/perfetto/base/build_config.h
+++ b/include/perfetto/base/build_config.h
@@ -139,6 +139,12 @@
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ARCH_CPU_ARM64() 0
#endif
+#if defined(__x86_64__) || defined(_M_X64)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ARCH_CPU_X86_64() 1
+#else
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ARCH_CPU_X86_64() 0
+#endif
+
// perfetto_build_flags.h contains the tweakable build flags defined via GN.
// - In GN builds (e.g., standalone, chromium, v8) this file is generated at
// build time via the gen_rule //gn/gen_buildflags.
diff --git a/include/perfetto/base/time.h b/include/perfetto/base/time.h
index 3e5b101..13e575c 100644
--- a/include/perfetto/base/time.h
+++ b/include/perfetto/base/time.h
@@ -37,6 +37,14 @@
#include <emscripten/emscripten.h>
#endif
+#if PERFETTO_BUILDFLAG(PERFETTO_ARCH_CPU_X86_64)
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
+#include <intrin.h>
+#else
+#include <x86intrin.h>
+#endif
+#endif
+
namespace perfetto {
namespace base {
@@ -272,6 +280,12 @@
return TimeGm(&tms);
}
+#if PERFETTO_BUILDFLAG(PERFETTO_ARCH_CPU_X86_64)
+inline uint64_t Rdtsc() {
+ return static_cast<uint64_t>(__rdtsc());
+}
+#endif
+
std::optional<int32_t> GetTimezoneOffsetMins();
} // namespace base
diff --git a/protos/perfetto/common/builtin_clock.proto b/protos/perfetto/common/builtin_clock.proto
index dba9ec9..6b1ecc1 100644
--- a/protos/perfetto/common/builtin_clock.proto
+++ b/protos/perfetto/common/builtin_clock.proto
@@ -26,11 +26,8 @@
BUILTIN_CLOCK_MONOTONIC_COARSE = 4;
BUILTIN_CLOCK_MONOTONIC_RAW = 5;
BUILTIN_CLOCK_BOOTTIME = 6;
+ BUILTIN_CLOCK_TSC = 9;
BUILTIN_CLOCK_MAX_ID = 63;
reserved 7, 8;
-
- // An internal CL (ag/16521245) has taken this for BUILTIN_CLOCK_TSC.
- // That might get upstreamed later on. Avoid diverging on this ID in future.
- reserved 9;
}
diff --git a/protos/perfetto/config/perfetto_config.proto b/protos/perfetto/config/perfetto_config.proto
index 6623597..2fd3c55 100644
--- a/protos/perfetto/config/perfetto_config.proto
+++ b/protos/perfetto/config/perfetto_config.proto
@@ -339,13 +339,10 @@
BUILTIN_CLOCK_MONOTONIC_COARSE = 4;
BUILTIN_CLOCK_MONOTONIC_RAW = 5;
BUILTIN_CLOCK_BOOTTIME = 6;
+ BUILTIN_CLOCK_TSC = 9;
BUILTIN_CLOCK_MAX_ID = 63;
reserved 7, 8;
-
- // An internal CL (ag/16521245) has taken this for BUILTIN_CLOCK_TSC.
- // That might get upstreamed later on. Avoid diverging on this ID in future.
- reserved 9;
}
// End of protos/perfetto/common/builtin_clock.proto
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index c8b4c9e..fd5483f 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -339,13 +339,10 @@
BUILTIN_CLOCK_MONOTONIC_COARSE = 4;
BUILTIN_CLOCK_MONOTONIC_RAW = 5;
BUILTIN_CLOCK_BOOTTIME = 6;
+ BUILTIN_CLOCK_TSC = 9;
BUILTIN_CLOCK_MAX_ID = 63;
reserved 7, 8;
-
- // An internal CL (ag/16521245) has taken this for BUILTIN_CLOCK_TSC.
- // That might get upstreamed later on. Avoid diverging on this ID in future.
- reserved 9;
}
// End of protos/perfetto/common/builtin_clock.proto
diff --git a/src/tracing/core/clock_snapshots.cc b/src/tracing/core/clock_snapshots.cc
index 98fe7c5..a4fe6c0 100644
--- a/src/tracing/core/clock_snapshots.cc
+++ b/src/tracing/core/clock_snapshots.cc
@@ -66,6 +66,12 @@
ClockReading(protos::pbzero::BUILTIN_CLOCK_MONOTONIC, wall_time_ns));
#endif
+#if PERFETTO_BUILDFLAG(PERFETTO_ARCH_CPU_X86_64)
+ // X86-specific but OS-independent TSC clocksource
+ snapshot_data.push_back(
+ ClockReading(protos::pbzero::BUILTIN_CLOCK_TSC, base::Rdtsc()));
+#endif // PERFETTO_BUILDFLAG(PERFETTO_ARCH_CPU_X86_64)
+
return snapshot_data;
}
