Skip to content

Place overlapping events on separate tracks. #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lstalmir wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Place overlapping events on separate tracks. #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eab943e
Place overlapping events on separate tracks.
lstalmir Mar 4, 2026
ba1b426
Assign tracks to all event types.
lstalmir Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 82 additions & 23 deletions VkLayer_profiler_layer/profiler_trace/profiler_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ namespace Profiler
, m_pJsonSerializer( new DeviceProfilerJsonSerializer( m_pStringSerializer ) )
, m_pData( nullptr )
, m_CommandQueue( VK_NULL_HANDLE )
, m_CommandQueueName()
, m_CommandQueueEventTracks()
, m_Events()
, m_DebugLabelStackDepth( 0 )
, m_HostTimeDomain( OSGetDefaultTimeDomain() )
Expand Down Expand Up @@ -147,12 +149,14 @@ namespace Profiler
frameName,
"Frames",
frameGpuBeginTimestamp,
VK_NULL_HANDLE ) );
"Frames" ) );

// Serialize the data
for( const auto& submitBatchData : data.m_Submits )
{
m_CommandQueue = submitBatchData.m_Handle;
m_CommandQueueName = m_pStringSerializer->GetName( m_CommandQueue );
m_CommandQueueEventTracks.clear();

// Insert queue submission event
m_Events.push_back( ApiTraceEvent(
Expand Down Expand Up @@ -228,7 +232,7 @@ namespace Profiler

m_Events.push_back( TraceCounterEvent(
GetNormalizedGpuTimestamp( data.m_PerformanceCounters.m_StreamTimestamps[i] ),
m_CommandQueue,
m_CommandQueueName,
performanceCountersCount,
performanceCounterProperties.data(),
performanceCounterSamples.data() ) );
Expand All @@ -237,7 +241,7 @@ namespace Profiler
Fill( performanceCounterSamples, VkProfilerPerformanceCounterResultEXT{} );
m_Events.push_back( TraceCounterEvent(
frameGpuEndTimestamp,
m_CommandQueue,
m_CommandQueueName,
performanceCountersCount,
performanceCounterProperties.data(),
performanceCounterSamples.data() ) );
Expand All @@ -248,7 +252,7 @@ namespace Profiler
frameName,
"Frames",
frameGpuEndTimestamp,
VK_NULL_HANDLE ) );
"Frames" ) );

// Insert TIP events
Serialize( data.m_TIP );
Expand Down Expand Up @@ -377,14 +381,15 @@ namespace Profiler
void DeviceProfilerTraceSerializer::Serialize( const DeviceProfilerCommandBufferData& data )
{
const std::string eventName = m_pStringSerializer->GetName( data );
const std::string trackName = AssignTrackForEvent( data );

// Begin
m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationBegin,
eventName,
"Command buffers",
GetNormalizedGpuTimestamp( data.m_BeginTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );

// Performance counters
const uint32_t performanceCounterCount = static_cast<uint32_t>( data.m_PerformanceCounters.m_Results.size() );
Expand All @@ -400,7 +405,7 @@ namespace Profiler

m_Events.push_back( TraceCounterEvent(
GetNormalizedGpuTimestamp( data.m_BeginTimestamp.m_Value ),
m_CommandQueue,
m_CommandQueueName,
performanceCounterProperties.size(),
performanceCounterProperties.data(),
data.m_PerformanceCounters.m_Results.data() ) );
Expand All @@ -420,7 +425,7 @@ namespace Profiler
{
m_Events.push_back( TraceCounterEvent(
GetNormalizedGpuTimestamp( data.m_EndTimestamp.m_Value ),
m_CommandQueue,
m_CommandQueueName,
performanceCounterProperties.size(),
performanceCounterProperties.data(),
nullptr ) );
Expand All @@ -432,7 +437,7 @@ namespace Profiler
eventName,
"Command buffers",
GetNormalizedGpuTimestamp( data.m_EndTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );
}

/*************************************************************************\
Expand All @@ -448,29 +453,40 @@ namespace Profiler
{
const bool isValidRenderPass = (data.m_Type != DeviceProfilerRenderPassType::eNone);
const std::string eventName = m_pStringSerializer->GetName(data);
std::string trackName;

if( isValidRenderPass )
{
trackName = AssignTrackForEvent( data );

// Begin
m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationBegin,
eventName,
"Render passes",
GetNormalizedGpuTimestamp( data.m_BeginTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );

if( (data.HasBeginCommand()) &&
(data.m_Begin.m_BeginTimestamp.m_Value != UINT64_MAX) )
{
const std::string beginEventName = m_pStringSerializer->GetName( data.m_Begin, data.m_Dynamic );
const std::string beginEventTrackName = AssignTrackForEvent( data.m_Begin );

// vkCmdBeginRenderPass
m_Events.push_back( TraceCompleteEvent(
m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationBegin,
beginEventName,
"Drawcalls",
GetNormalizedGpuTimestamp( data.m_Begin.m_BeginTimestamp.m_Value ),
GetDuration( data.m_Begin ),
m_CommandQueue ) );
beginEventTrackName ) );

m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationEnd,
beginEventName,
"Drawcalls",
GetNormalizedGpuTimestamp( data.m_Begin.m_EndTimestamp.m_Value ),
beginEventTrackName ) );
}
}

Expand All @@ -486,14 +502,22 @@ namespace Profiler
(data.m_End.m_BeginTimestamp.m_Value != UINT64_MAX) )
{
const std::string endEventName = m_pStringSerializer->GetName( data.m_End, data.m_Dynamic );
const std::string endEventTrackName = AssignTrackForEvent( data.m_End );

// vkCmdEndRenderPass
m_Events.push_back( TraceCompleteEvent(
m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationBegin,
endEventName,
"Drawcalls",
GetNormalizedGpuTimestamp( data.m_End.m_BeginTimestamp.m_Value ),
GetDuration( data.m_End ),
m_CommandQueue ) );
endEventTrackName ) );

m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationEnd,
endEventName,
"Drawcalls",
GetNormalizedGpuTimestamp( data.m_End.m_EndTimestamp.m_Value ),
endEventTrackName ) );
}

// End
Expand All @@ -502,7 +526,7 @@ namespace Profiler
eventName,
"Render passes",
GetNormalizedGpuTimestamp( data.m_EndTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );
}
}

Expand All @@ -518,15 +542,18 @@ namespace Profiler
void DeviceProfilerTraceSerializer::Serialize( const DeviceProfilerSubpassData& data, bool isOnlySubpassInRenderPass )
{
const std::string eventName = m_pStringSerializer->GetName( data );
std::string trackName;

if( !isOnlySubpassInRenderPass )
{
trackName = AssignTrackForEvent( data );

// Begin
m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationBegin,
eventName, "",
GetNormalizedGpuTimestamp( data.m_BeginTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );
}

for( const auto& data : data.m_Data )
Expand Down Expand Up @@ -555,7 +582,7 @@ namespace Profiler
TraceEvent::Phase::eDurationEnd,
eventName, "",
GetNormalizedGpuTimestamp( data.m_EndTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );
}
}

Expand All @@ -572,6 +599,7 @@ namespace Profiler
{
const std::string eventName = m_pStringSerializer->GetName( data, true /*showEntryPoints*/ );
const nlohmann::json eventArgs = m_pJsonSerializer->GetPipelineArgs( data );
std::string trackName;

const bool isValidPipeline =
(data.m_Handle ||
Expand All @@ -580,14 +608,16 @@ namespace Profiler

if( isValidPipeline )
{
trackName = AssignTrackForEvent( data );

// Begin
m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationBegin,
eventName,
"Pipelines",
GetNormalizedGpuTimestamp( data.m_BeginTimestamp.m_Value ),
m_CommandQueue,
{} ,
trackName,
{},
eventArgs ) );
}

Expand All @@ -608,7 +638,7 @@ namespace Profiler
eventName,
"Pipelines",
GetNormalizedGpuTimestamp( data.m_EndTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );
}
}

Expand All @@ -627,14 +657,15 @@ namespace Profiler
{
const std::string eventName = m_pStringSerializer->GetCommandName( data );
const nlohmann::json eventArgs = m_pJsonSerializer->GetCommandArgs( data );
const std::string trackName = AssignTrackForEvent( data );

// Cannot use complete events due to loss of precision
m_Events.push_back( TraceEvent(
TraceEvent::Phase::eDurationBegin,
eventName,
"Drawcalls",
GetNormalizedGpuTimestamp( data.m_BeginTimestamp.m_Value ),
m_CommandQueue,
trackName,
{},
eventArgs ) );

Expand All @@ -643,7 +674,7 @@ namespace Profiler
eventName,
"Drawcalls",
GetNormalizedGpuTimestamp( data.m_EndTimestamp.m_Value ),
m_CommandQueue ) );
trackName ) );
}

else
Expand Down Expand Up @@ -711,6 +742,34 @@ namespace Profiler

/*************************************************************************\

Function:
AssignTrackForEvent

\*************************************************************************/
std::string DeviceProfilerTraceSerializer::AssignTrackForEvent( uint64_t beginTimestamp, uint64_t endTimestamp )
{
if( beginTimestamp == UINT64_MAX || endTimestamp == UINT64_MAX )
{
return std::string();
}

// Try to find an existing track which is not occupied during the event time
for( size_t i = 0; i < m_CommandQueueEventTracks.size(); ++i )
{
if( beginTimestamp >= m_CommandQueueEventTracks[i] )
{
m_CommandQueueEventTracks[i] = endTimestamp;
return m_CommandQueueName + " [" + std::to_string( i ) + "]";
}
}

// Create a new track
m_CommandQueueEventTracks.push_back( endTimestamp );
return m_CommandQueueName + " [" + std::to_string( m_CommandQueueEventTracks.size() - 1 ) + "]";
}

/*************************************************************************\

Function:
ConstructTraceFileName

Expand Down
15 changes: 13 additions & 2 deletions VkLayer_profiler_layer/profiler_trace/profiler_trace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019-2025 Lukasz Stalmirski
// Copyright (c) 2019-2026 Lukasz Stalmirski
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -84,7 +84,9 @@ namespace Profiler
const struct DeviceProfilerFrameData* m_pData;

// Target command queue for the current batch
VkQueue m_CommandQueue;
VkQueueHandle m_CommandQueue;
std::string m_CommandQueueName;
std::vector<uint64_t> m_CommandQueueEventTracks;

// Serialized events
nlohmann::json m_Events;
Expand All @@ -110,6 +112,15 @@ namespace Profiler
return (data.m_EndTimestamp.m_Value - data.m_BeginTimestamp.m_Value) * m_GpuTimestampPeriod;
}

// Track management
std::string AssignTrackForEvent( uint64_t beginTimestamp, uint64_t endTimestamp );

template<typename DataStructType>
inline std::string AssignTrackForEvent( const DataStructType& data )
{
return AssignTrackForEvent( data.GetBeginTimestamp().m_Value, data.GetEndTimestamp().m_Value );
}

// Serialization
void Serialize( const struct DeviceProfilerCommandBufferData& );
void Serialize( const struct DeviceProfilerRenderPassData& );
Expand Down
7 changes: 1 addition & 6 deletions VkLayer_profiler_layer/profiler_trace/profiler_trace_event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,13 @@ namespace Profiler
\*************************************************************************/
void TraceEvent::Serialize( nlohmann::json& jsonObject ) const
{
using namespace std::literals;

char queueHexHandle[ 32 ] = {};
ProfilerStringFunctions::Hex( queueHexHandle, reinterpret_cast<uint64_t>(m_Queue) );

jsonObject = {
{ "name", m_Name },
{ "cat", m_Category },
{ "ph", std::string( 1, static_cast<char>(m_Phase) ) },
{ "ts", m_Timestamp.count() },
{ "pid", 0 },
{ "tid", "VkQueue 0x"s + queueHexHandle } };
{ "tid", m_Track } };

if( !m_Color.empty() )
{
Expand Down
Loading