mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 12:23:53 +00:00
Code Issues Releases Wiki Activity

Record CPU id.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-01 19:11:01 +02:00
parent f46781808c
commit a1abf1f015
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/TracyProfiler.cpp
View File

@ -50,7 +50,8 @@ Profiler::Profiler()
CalibrateTimer(); CalibrateTimer();
CalibrateDelay(); CalibrateDelay();
m_timeBegin = GetTime(); int8_t cpu;
m_timeBegin = GetTime( cpu );
m_thread = std::thread( [this] { Worker(); } ); m_thread = std::thread( [this] { Worker(); } );
SetThreadName( m_thread, "Tracy Profiler" ); SetThreadName( m_thread, "Tracy Profiler" );
@ -85,9 +86,10 @@ uint64_t Profiler::GetNewId()
void Profiler::FrameMark() void Profiler::FrameMark()
{ {
int8_t cpu;
auto item = s_queue.enqueue_begin( s_token ); auto item = s_queue.enqueue_begin( s_token );
item->hdr.type = QueueType::FrameMarkMsg; item->hdr.type = QueueType::FrameMarkMsg;
item->hdr.id = (uint64_t)GetTime(); item->hdr.id = (uint64_t)GetTime( cpu );
s_queue.enqueue_finish( s_token ); s_queue.enqueue_finish( s_token );
} }
@ -296,6 +298,7 @@ void Profiler::CalibrateDelay()
enum { Events = Iterations * 2 }; // start + end enum { Events = Iterations * 2 }; // start + end
static_assert( Events * 2 < QueuePrealloc, "Delay calibration loop will allocate memory in queue" ); static_assert( Events * 2 < QueuePrealloc, "Delay calibration loop will allocate memory in queue" );
int8_t cpu;
moodycamel::ProducerToken ptoken( s_queue ); moodycamel::ProducerToken ptoken( s_queue );
for( int i=0; i<Iterations; i++ ) for( int i=0; i<Iterations; i++ )
{ {
@ -305,7 +308,7 @@ void Profiler::CalibrateDelay()
auto item = s_queue.enqueue_begin( ptoken ); auto item = s_queue.enqueue_begin( ptoken );
item->hdr.type = QueueType::ZoneBegin; item->hdr.type = QueueType::ZoneBegin;
item->hdr.id = id; item->hdr.id = id;
item->zoneBegin.time = GetTime(); item->zoneBegin.time = GetTime( item->zoneBegin.cpu );
item->zoneBegin.srcloc = (uint64_t)&__tracy_source_location; item->zoneBegin.srcloc = (uint64_t)&__tracy_source_location;
item->zoneBegin.thread = GetThreadHandle(); item->zoneBegin.thread = GetThreadHandle();
s_queue.enqueue_finish( ptoken ); s_queue.enqueue_finish( ptoken );
@ -314,17 +317,17 @@ void Profiler::CalibrateDelay()
auto item = s_queue.enqueue_begin( ptoken ); auto item = s_queue.enqueue_begin( ptoken );
item->hdr.type = QueueType::ZoneEnd; item->hdr.type = QueueType::ZoneEnd;
item->hdr.id = id; item->hdr.id = id;
item->zoneEnd.time = GetTime(); item->zoneEnd.time = GetTime( item->zoneEnd.cpu );
s_queue.enqueue_finish( ptoken ); s_queue.enqueue_finish( ptoken );
} }
} }
const auto f0 = GetTime(); const auto f0 = GetTime( cpu );
for( int i=0; i<Iterations; i++ ) for( int i=0; i<Iterations; i++ )
{ {
static const tracy::SourceLocation __tracy_source_location { __FUNCTION__, __FILE__, __LINE__, 0 }; static const tracy::SourceLocation __tracy_source_location { __FUNCTION__, __FILE__, __LINE__, 0 };
FakeZone ___tracy_scoped_zone( &__tracy_source_location ); FakeZone ___tracy_scoped_zone( &__tracy_source_location );
} }
const auto t0 = GetTime(); const auto t0 = GetTime( cpu );
for( int i=0; i<Iterations; i++ ) for( int i=0; i<Iterations; i++ )
{ {
static const tracy::SourceLocation __tracy_source_location { __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 }; static const tracy::SourceLocation __tracy_source_location { __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 };
@ -333,7 +336,7 @@ void Profiler::CalibrateDelay()
auto item = s_queue.enqueue_begin( ptoken ); auto item = s_queue.enqueue_begin( ptoken );
item->hdr.type = QueueType::ZoneBegin; item->hdr.type = QueueType::ZoneBegin;
item->hdr.id = id; item->hdr.id = id;
item->zoneBegin.time = GetTime(); item->zoneBegin.time = GetTime( item->zoneBegin.cpu );
item->zoneBegin.srcloc = (uint64_t)&__tracy_source_location; item->zoneBegin.srcloc = (uint64_t)&__tracy_source_location;
item->zoneBegin.thread = GetThreadHandle(); item->zoneBegin.thread = GetThreadHandle();
s_queue.enqueue_finish( ptoken ); s_queue.enqueue_finish( ptoken );
@ -342,11 +345,11 @@ void Profiler::CalibrateDelay()
auto item = s_queue.enqueue_begin( ptoken ); auto item = s_queue.enqueue_begin( ptoken );
item->hdr.type = QueueType::ZoneEnd; item->hdr.type = QueueType::ZoneEnd;
item->hdr.id = id; item->hdr.id = id;
item->zoneEnd.time = GetTime(); item->zoneEnd.time = GetTime( item->zoneEnd.cpu );
s_queue.enqueue_finish( ptoken ); s_queue.enqueue_finish( ptoken );
} }
} }
const auto t1 = GetTime(); const auto t1 = GetTime( cpu );
const auto dt = t1 - t0; const auto dt = t1 - t0;
const auto df = t0 - f0; const auto df = t0 - f0;
m_delay = ( dt - df ) / Events; m_delay = ( dt - df ) / Events;
@ -354,8 +357,8 @@ void Profiler::CalibrateDelay()
uint64_t mindiff = std::numeric_limits<uint64_t>::max(); uint64_t mindiff = std::numeric_limits<uint64_t>::max();
for( int i=0; i<Iterations * 10; i++ ) for( int i=0; i<Iterations * 10; i++ )
{ {
const auto t0 = GetTime(); const auto t0 = GetTime( cpu );
const auto t1 = GetTime(); const auto t1 = GetTime( cpu );
const auto dt = t1 - t0; const auto dt = t1 - t0;
if( dt > 0 && dt < mindiff ) mindiff = dt; if( dt > 0 && dt < mindiff ) mindiff = dt;
} }

7
client/TracyProfiler.hpp
View File

@ -32,12 +32,15 @@ public:
Profiler(); Profiler();
~Profiler(); ~Profiler();
static int64_t GetTime() static int64_t GetTime( int8_t& cpu )
{ {
#if defined _MSC_VER || defined __CYGWIN__ #if defined _MSC_VER || defined __CYGWIN__
unsigned int ui; unsigned int ui;
return int64_t( __rdtscp( &ui ) ); const auto t = int64_t( __rdtscp( &ui ) );
cpu = (int8_t)ui;
return t;
#else #else
cpu = -1;
return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count(); return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
#endif #endif
} }

4
client/TracyScoped.hpp
View File

@ -19,7 +19,7 @@ public:
auto item = Profiler::StartItem(); auto item = Profiler::StartItem();
item->hdr.type = QueueType::ZoneBegin; item->hdr.type = QueueType::ZoneBegin;
item->hdr.id = m_id; item->hdr.id = m_id;
item->zoneBegin.time = Profiler::GetTime(); item->zoneBegin.time = Profiler::GetTime( item->zoneBegin.cpu );
item->zoneBegin.srcloc = (uint64_t)srcloc; item->zoneBegin.srcloc = (uint64_t)srcloc;
item->zoneBegin.thread = GetThreadHandle(); item->zoneBegin.thread = GetThreadHandle();
Profiler::FinishItem(); Profiler::FinishItem();
@ -30,7 +30,7 @@ public:
auto item = Profiler::StartItem(); auto item = Profiler::StartItem();
item->hdr.type = QueueType::ZoneEnd; item->hdr.type = QueueType::ZoneEnd;
item->hdr.id = m_id; item->hdr.id = m_id;
item->zoneEnd.time = Profiler::GetTime(); item->zoneEnd.time = Profiler::GetTime( item->zoneEnd.cpu );
Profiler::FinishItem(); Profiler::FinishItem();
} }

2
common/TracyQueue.hpp
View File

@ -27,11 +27,13 @@ struct QueueZoneBegin
int64_t time; int64_t time;
uint64_t srcloc; // ptr uint64_t srcloc; // ptr
uint64_t thread; uint64_t thread;
int8_t cpu;
}; };
struct QueueZoneEnd struct QueueZoneEnd
{ {
int64_t time; int64_t time;
int8_t cpu;
}; };
struct QueueSourceLocation struct QueueSourceLocation