From 48665cc09ba14e6eb92273fadcdba5cb25f2f7ac Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 26 Apr 2018 15:25:54 +0200 Subject: [PATCH] s/TRACY_RDTSCP_SUPPORTED/TRACY_HW_TIMER/ --- TracyLua.hpp | 6 +++--- client/TracyProfiler.cpp | 10 +++++----- client/TracyProfiler.hpp | 10 +++++----- client/TracyScoped.hpp | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/TracyLua.hpp b/TracyLua.hpp index d6ce4ecb..441662a1 100644 --- a/TracyLua.hpp +++ b/TracyLua.hpp @@ -145,7 +145,7 @@ static inline int LuaZoneBegin( lua_State* L ) auto& tail = token->get_tail_index(); auto item = token->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneBeginAllocSrcLoc ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) ); #else uint32_t cpu; @@ -196,7 +196,7 @@ static inline int LuaZoneBeginN( lua_State* L ) auto& tail = token->get_tail_index(); auto item = token->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneBeginAllocSrcLoc ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) ); #else uint32_t cpu; @@ -216,7 +216,7 @@ static inline int LuaZoneEnd( lua_State* L ) auto& tail = token->get_tail_index(); auto item = token->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneEnd ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneEnd.time, Profiler::GetTime( item->zoneEnd.cpu ) ); #else uint32_t cpu; diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index 59de5e60..1ffdd683 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -497,7 +497,7 @@ bool Profiler::HandleServerQuery() void Profiler::CalibrateTimer() { -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER uint32_t cpu; std::atomic_signal_fence( std::memory_order_acq_rel ); const auto t0 = std::chrono::high_resolution_clock::now(); @@ -545,7 +545,7 @@ void Profiler::CalibrateDelay() auto item = ptoken->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneBegin ); MemWrite( &item->zoneBegin.thread, GetThreadHandle() ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) ); #else uint32_t cpu; @@ -561,7 +561,7 @@ void Profiler::CalibrateDelay() auto item = ptoken->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneEnd ); MemWrite( &item->zoneEnd.thread, uint64_t( 0 ) ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneEnd.time, GetTime( item->zoneEnd.cpu ) ); #else uint32_t cpu; @@ -587,7 +587,7 @@ void Profiler::CalibrateDelay() auto item = ptoken->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneBegin ); MemWrite( &item->zoneBegin.thread, GetThreadHandle() ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) ); #else uint32_t cpu; @@ -603,7 +603,7 @@ void Profiler::CalibrateDelay() auto item = ptoken->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneEnd ); MemWrite( &item->zoneEnd.thread, uint64_t( 0 ) ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneEnd.time, GetTime( item->zoneEnd.cpu ) ); #else uint32_t cpu; diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp index c51c10c5..cd68c3f9 100644 --- a/client/TracyProfiler.hpp +++ b/client/TracyProfiler.hpp @@ -20,7 +20,7 @@ #endif #if defined _MSC_VER || defined __CYGWIN__ || ( ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 ) && !defined __ANDROID__ ) -# define TRACY_RDTSCP_SUPPORTED +# define TRACY_HW_TIMER #endif namespace tracy @@ -61,7 +61,7 @@ public: Profiler(); ~Profiler(); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER static tracy_force_inline int64_t tracy_rdtscp( uint32_t& cpu ) { #if defined _MSC_VER || defined __CYGWIN__ @@ -75,7 +75,7 @@ public: } #endif -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER static tracy_force_inline int64_t tracy_rdtscp() { #if defined _MSC_VER || defined __CYGWIN__ @@ -92,7 +92,7 @@ public: static tracy_force_inline int64_t GetTime( uint32_t& cpu ) { -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER return tracy_rdtscp( cpu ); #else cpu = 0xFFFFFFFF; @@ -102,7 +102,7 @@ public: static tracy_force_inline int64_t GetTime() { -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER return tracy_rdtscp(); #else return std::chrono::duration_cast( std::chrono::high_resolution_clock::now().time_since_epoch() ).count(); diff --git a/client/TracyScoped.hpp b/client/TracyScoped.hpp index 189a17dc..fcaafd2f 100644 --- a/client/TracyScoped.hpp +++ b/client/TracyScoped.hpp @@ -24,7 +24,7 @@ public: auto& tail = token->get_tail_index(); auto item = token->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneBegin ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneBegin.time, Profiler::GetTime( item->zoneBegin.cpu ) ); #else uint32_t cpu; @@ -43,7 +43,7 @@ public: auto& tail = token->get_tail_index(); auto item = token->enqueue_begin( magic ); MemWrite( &item->hdr.type, QueueType::ZoneEnd ); -#ifdef TRACY_RDTSCP_SUPPORTED +#ifdef TRACY_HW_TIMER MemWrite( &item->zoneEnd.time, Profiler::GetTime( item->zoneEnd.cpu ) ); #else uint32_t cpu;