Scarfski/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2026-08-27 13:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining MemWrites.

Browse Source
This commit is contained in:
Bartosz Taudul
2026-06-05 00:00:04 +02:00
parent 6b92ec1a23
commit 20e6835da6
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
public/client/TracyRocprof.cpp
View File

@@ -98,12 +98,12 @@ uint8_t gpu_context_allocate( ToolData* data )
{
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuNewContext );
tracy::MemWrite( &item->gpuNewContext.cpuTime, cpu_timestamp );
tracy::MemWrite( &item->gpuNewContext.gpuTime, gpu_timestamp );
tracy::MemWrite( &item->gpuNewContext.cpuTime, int64_t( cpu_timestamp ) );
tracy::MemWrite( &item->gpuNewContext.gpuTime, int64_t( gpu_timestamp ) );
memset( &item->gpuNewContext.thread, 0, sizeof( item->gpuNewContext.thread ) );
tracy::MemWrite( &item->gpuNewContext.period, timestamp_period );
tracy::MemWrite( &item->gpuNewContext.context, context_id );
tracy::MemWrite( &item->gpuNewContext.flags, context_flags );
tracy::MemWrite( &item->gpuNewContext.flags, GpuContextFlags( context_flags ) );
tracy::MemWrite( &item->gpuNewContext.type, tracy::GpuContextType::Rocprof );
tracy::Profiler::QueueSerialFinish();
}
@@ -119,8 +119,8 @@ uint8_t gpu_context_allocate( ToolData* data )
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuContextName );
tracy::MemWrite( &item->gpuContextNameFat.context, context_id );
tracy::MemWrite( &item->gpuContextNameFat.ptr, (uint64_t)cloned_name );
tracy::MemWrite( &item->gpuContextNameFat.size, name_length );
tracy::MemWrite( &item->gpuContextNameFat.ptr, uint64_t( cloned_name ) );
tracy::MemWrite( &item->gpuContextNameFat.size, uint16_t( name_length ) );
tracy::Profiler::QueueSerialFinish();
}
@@ -181,8 +181,8 @@ void record_interval( ToolData* data, rocprofiler_timestamp_t start_timestamp, r
{
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuZoneBeginAllocSrcLocSerial );
tracy::MemWrite( &item->gpuZoneBegin.cpuTime, cpu_start_time );
tracy::MemWrite( &item->gpuZoneBegin.srcloc, (uint64_t)src_loc );
tracy::MemWrite( &item->gpuZoneBegin.cpuTime, int64_t( cpu_start_time ) );
tracy::MemWrite( &item->gpuZoneBegin.srcloc, src_loc );
tracy::MemWrite( &item->gpuZoneBegin.thread, tracy::GetThreadHandle() );
tracy::MemWrite( &item->gpuZoneBegin.queryId, query_id );
tracy::MemWrite( &item->gpuZoneBegin.context, context_id );
@@ -195,7 +195,7 @@ void record_interval( ToolData* data, rocprofiler_timestamp_t start_timestamp, r
{
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuZoneBeginSerial );
tracy::MemWrite( &item->gpuZoneBegin.cpuTime, cpu_start_time );
tracy::MemWrite( &item->gpuZoneBegin.cpuTime, int64_t( cpu_start_time ) );
tracy::MemWrite( &item->gpuZoneBegin.srcloc, (uint64_t)&src_loc );
tracy::MemWrite( &item->gpuZoneBegin.thread, tracy::GetThreadHandle() );
tracy::MemWrite( &item->gpuZoneBegin.queryId, query_id );
@@ -207,7 +207,7 @@ void record_interval( ToolData* data, rocprofiler_timestamp_t start_timestamp, r
{
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuTime );
tracy::MemWrite( &item->gpuTime.gpuTime, start_timestamp );
tracy::MemWrite( &item->gpuTime.gpuTime, int64_t( start_timestamp ) );
tracy::MemWrite( &item->gpuTime.queryId, query_id );
tracy::MemWrite( &item->gpuTime.context, context_id );
tracy::Profiler::QueueSerialFinish();
@@ -216,7 +216,7 @@ void record_interval( ToolData* data, rocprofiler_timestamp_t start_timestamp, r
{
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuZoneEndSerial );
tracy::MemWrite( &item->gpuZoneEnd.cpuTime, cpu_end_time );
tracy::MemWrite( &item->gpuZoneEnd.cpuTime, int64_t( cpu_end_time ) );
tracy::MemWrite( &item->gpuZoneEnd.thread, tracy::GetThreadHandle() );
tracy::MemWrite( &item->gpuZoneEnd.queryId, query_id );
tracy::MemWrite( &item->gpuZoneEnd.context, context_id );
@@ -226,7 +226,7 @@ void record_interval( ToolData* data, rocprofiler_timestamp_t start_timestamp, r
{
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuTime );
tracy::MemWrite( &item->gpuTime.gpuTime, end_timestamp );
tracy::MemWrite( &item->gpuTime.gpuTime, int64_t( end_timestamp ) );
tracy::MemWrite( &item->gpuTime.queryId, query_id );
tracy::MemWrite( &item->gpuTime.context, context_id );
tracy::Profiler::QueueSerialFinish();
@@ -266,7 +266,7 @@ void record_callback( rocprofiler_dispatch_counting_service_data_t dispatch_data
{
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuZoneAnnotation );
tracy::MemWrite( &item->zoneAnnotation.noteId, p.first );
tracy::MemWrite( &item->zoneAnnotation.noteId, int64_t( p.first ) );
tracy::MemWrite( &item->zoneAnnotation.queryId, query_id );
tracy::MemWrite( &item->zoneAnnotation.thread, thread_id );
tracy::MemWrite( &item->zoneAnnotation.value, p.second );
@@ -356,9 +356,9 @@ void dispatch_callback( rocprofiler_dispatch_counting_service_data_t dispatch_da
auto* item = tracy::Profiler::QueueSerial();
tracy::MemWrite( &item->hdr.type, tracy::QueueType::GpuAnnotationName );
tracy::MemWrite( &item->gpuAnnotationNameFat.context, data->context_id );
tracy::MemWrite( &item->gpuAnnotationNameFat.noteId, counter.handle );
tracy::MemWrite( &item->gpuAnnotationNameFat.ptr, (uint64_t)cloned_name );
tracy::MemWrite( &item->gpuAnnotationNameFat.size, name_length );
tracy::MemWrite( &item->gpuAnnotationNameFat.noteId, int64_t( counter.handle ) );
tracy::MemWrite( &item->gpuAnnotationNameFat.ptr, uint64_t( cloned_name ) );
tracy::MemWrite( &item->gpuAnnotationNameFat.size, uint16_t( name_length ) );
tracy::Profiler::QueueSerialFinish();
}
}

2
public/tracy/TracyD3D11.hpp
View File

@@ -132,7 +132,7 @@ public:
MemWrite( &item->gpuNewContext.thread, uint32_t(0) ); // #TODO: why not GetThreadHandle()?
MemWrite( &item->gpuNewContext.period, 1.0f );
MemWrite( &item->gpuNewContext.context, m_contextId);
MemWrite( &item->gpuNewContext.flags, uint8_t(0) );
MemWrite( &item->gpuNewContext.flags, GpuContextFlags(0) );
MemWrite( &item->gpuNewContext.type, GpuContextType::Direct3D11 );
#ifdef TRACY_ON_DEMAND

8
public/tracy/TracyD3D12.hpp
View File

@@ -125,8 +125,8 @@ namespace tracy
auto* item = Profiler::QueueSerial();
MemWrite(&item->hdr.type, QueueType::GpuCalibration);
MemWrite(&item->gpuCalibration.gpuTime, gpuTimestamp);
MemWrite(&item->gpuCalibration.cpuTime, cpuTimestamp);
MemWrite(&item->gpuCalibration.gpuTime, int64_t(gpuTimestamp));
MemWrite(&item->gpuCalibration.cpuTime, int64_t(cpuTimestamp));
MemWrite(&item->gpuCalibration.cpuDelta, cpuDeltaNS);
MemWrite(&item->gpuCalibration.context, GetId());
SubmitQueueItem(item);
@@ -249,8 +249,8 @@ namespace tracy
MemWrite(&item->gpuNewContext.thread, static_cast<uint32_t>(0)); // zero means the context is not associated with a specific thread
MemWrite(&item->gpuNewContext.period, static_cast<float>(period));
MemWrite(&item->gpuNewContext.context, static_cast<uint8_t>(GetId()));
MemWrite(&item->gpuNewContext.flags, static_cast<uint8_t>(GpuContextCalibration));
MemWrite(&item->gpuNewContext.type, static_cast<uint8_t>(GpuContextType::Direct3D12));
MemWrite(&item->gpuNewContext.flags, GpuContextCalibration);
MemWrite(&item->gpuNewContext.type, GpuContextType::Direct3D12);
SubmitQueueItem(item);
}

10
public/tracy/TracyOpenCL.hpp
View File

@@ -113,8 +113,8 @@ namespace tracy {
memset(&item->gpuNewContext.thread, 0, sizeof(item->gpuNewContext.thread));
MemWrite(&item->gpuNewContext.period, 1.0f);
MemWrite(&item->gpuNewContext.type, GpuContextType::OpenCL);
MemWrite(&item->gpuNewContext.context, (uint8_t) m_contextId);
MemWrite(&item->gpuNewContext.flags, (uint8_t)0);
MemWrite(&item->gpuNewContext.context, uint8_t(m_contextId));
MemWrite(&item->gpuNewContext.flags, GpuContextFlags(0));
#ifdef TRACY_ON_DEMAND
GetProfiler().DeferItem(*item);
#endif
@@ -187,9 +187,9 @@ namespace tracy {
auto item = Profiler::QueueSerial();
MemWrite(&item->hdr.type, QueueType::GpuTime);
MemWrite(&item->gpuTime.gpuTime, (int64_t)eventTimeStamp);
MemWrite(&item->gpuTime.queryId, (uint16_t)m_tail);
MemWrite(&item->gpuTime.context, m_contextId);
MemWrite(&item->gpuTime.gpuTime, int64_t(eventTimeStamp));
MemWrite(&item->gpuTime.queryId, uint16_t(m_tail));
MemWrite(&item->gpuTime.context, uint8_t(m_contextId));
Profiler::QueueSerialFinish();
if (eventInfo.phase == EventPhase::End)