mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-27 00:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #619 from gan74/master

Browse Source 
Fixed Vulkan query id generation not being thread safe
This commit is contained in:
Bartosz Taudul 2023-09-11 15:41:41 +02:00 committed by GitHub
commit 1ed4b71afc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/tracy/TracyVulkan.hpp
View File

@ -42,6 +42,8 @@ using TracyVkCtx = void*;
#include "../client/TracyProfiler.hpp" #include "../client/TracyProfiler.hpp"
#include "../client/TracyCallstack.hpp" #include "../client/TracyCallstack.hpp"
#include <atomic>
namespace tracy namespace tracy
{ {
@ -243,18 +245,21 @@ public:
{ {
ZoneScopedC( Color::Red4 ); ZoneScopedC( Color::Red4 );
if( m_tail == m_head ) return; const uint64_t head = m_head.load(std::memory_order_relaxed);
if( m_tail == head ) return;
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
if( !GetProfiler().IsConnected() ) if( !GetProfiler().IsConnected() )
{ {
VK_FUNCTION_WRAPPER( vkCmdResetQueryPool( cmdbuf, m_query, 0, m_queryCount ) ); VK_FUNCTION_WRAPPER( vkCmdResetQueryPool( cmdbuf, m_query, 0, m_queryCount ) );
m_head = m_tail = m_oldCnt = 0; m_tail = head;
m_oldCnt = 0;
int64_t tgpu; int64_t tgpu;
if( m_timeDomain != VK_TIME_DOMAIN_DEVICE_EXT ) Calibrate( m_device, m_prevCalibration, tgpu ); if( m_timeDomain != VK_TIME_DOMAIN_DEVICE_EXT ) Calibrate( m_device, m_prevCalibration, tgpu );
return; return;
} }
#endif #endif
assert(head > m_tail);
unsigned int cnt; unsigned int cnt;
if( m_oldCnt != 0 ) if( m_oldCnt != 0 )
@ -264,10 +269,13 @@ public:
} }
else else
{ {
cnt = m_head < m_tail ? m_queryCount - m_tail : m_head - m_tail; cnt = (unsigned int)(head - m_tail);
assert(cnt <= m_queryCount);
} }
if( VK_FUNCTION_WRAPPER( vkGetQueryPoolResults( m_device, m_query, m_tail, cnt, sizeof( int64_t ) * m_queryCount, m_res, sizeof( int64_t ), VK_QUERY_RESULT_64_BIT ) == VK_NOT_READY ) )
const unsigned int tail = (unsigned int)(m_tail % m_queryCount);
if( VK_FUNCTION_WRAPPER( vkGetQueryPoolResults( m_device, m_query, tail, cnt, sizeof( int64_t ) * m_queryCount, m_res, sizeof( int64_t ), VK_QUERY_RESULT_64_BIT ) == VK_NOT_READY ) )
{ {
m_oldCnt = cnt; m_oldCnt = cnt;
return; return;
@ -278,7 +286,7 @@ public:
auto item = Profiler::QueueSerial(); auto item = Profiler::QueueSerial();
MemWrite( &item->hdr.type, QueueType::GpuTime ); MemWrite( &item->hdr.type, QueueType::GpuTime );
MemWrite( &item->gpuTime.gpuTime, m_res[idx] ); MemWrite( &item->gpuTime.gpuTime, m_res[idx] );
MemWrite( &item->gpuTime.queryId, uint16_t( m_tail + idx ) ); MemWrite( &item->gpuTime.queryId, uint16_t( tail + idx ) );
MemWrite( &item->gpuTime.context, m_context ); MemWrite( &item->gpuTime.context, m_context );
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
@ -302,19 +310,16 @@ public:
} }
} }
VK_FUNCTION_WRAPPER( vkCmdResetQueryPool( cmdbuf, m_query, m_tail, cnt ) ); VK_FUNCTION_WRAPPER( vkCmdResetQueryPool( cmdbuf, m_query, tail, cnt ) );
m_tail += cnt; m_tail += cnt;
if( m_tail == m_queryCount ) m_tail = 0;
} }
private: private:
tracy_force_inline unsigned int NextQueryId() tracy_force_inline unsigned int NextQueryId()
{ {
const auto id = m_head; const uint64_t id = m_head.fetch_add(1, std::memory_order_relaxed);
m_head = ( m_head + 1 ) % m_queryCount; return id % m_queryCount;
assert( m_head != m_tail );
return id;
} }
tracy_force_inline uint8_t GetId() const tracy_force_inline uint8_t GetId() const
@ -466,8 +471,8 @@ private:
int64_t m_prevCalibration; int64_t m_prevCalibration;
uint8_t m_context; uint8_t m_context;
unsigned int m_head; std::atomic<uint64_t> m_head;
unsigned int m_tail; uint64_t m_tail;
unsigned int m_oldCnt; unsigned int m_oldCnt;
unsigned int m_queryCount; unsigned int m_queryCount;