izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clamp GpuProfilerEvent times to valid values plus remove unused variables

Browse Source 
SanitizeEventTree was not clamping start times to be >= to previous root start times, so
we were hitting asserts in TraverseEventTree() for:

    lastStartTime >= GpuProfilerEvents[Root].GetStartResultMicroseconds()

This CL should sanitize all start/end time values

#jira UE-89825
#rb Yujiang.Wang, Arciel.Rekman
[FYI] Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12142863 in //UE4/Release-4.25/... via CL 12142872
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12142890 by michael sartain in Main branch]
This commit is contained in:
michael sartain
2020-03-11 18:08:11 -04:00
parent 752d2cbded
commit 24658e3f19
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Engine/Source/Runtime/RenderCore/Private/ProfilingDebugging/RealtimeGPUProfiler.cpp
View File

@@ -263,9 +263,6 @@ void TraverseEventTree(
uint64 lastStartTime = 0;
uint64 lastEndTime = 0;
uint64 RootStartTime = 0;
uint64 RootEndTime = 0;
if (Root != 0)
{
FGpuProfilerTrace::SpecifyEventByName(GpuProfilerEvents[Root].GetName());
@@ -292,25 +289,6 @@ void TraverseEventTree(
FGpuProfilerTrace::EndEvent(GpuProfilerEvents[Root].GetEndResultMicroseconds());
}
}
void SanitizeEventTree(
TArray<FRealtimeGPUProfilerEvent, TInlineAllocator<100u>>& GpuProfilerEvents,
const TArray<TArray<int32>>& GpuProfilerEventChildrenIndices,
int32 Root,
uint64& MonotonicTime)
{
GpuProfilerEvents[Root].StartResultMicroseconds = FMath::Max(GpuProfilerEvents[Root].StartResultMicroseconds, MonotonicTime);
GpuProfilerEvents[Root].EndResultMicroseconds = FMath::Max(GpuProfilerEvents[Root].EndResultMicroseconds, GpuProfilerEvents[Root].GetStartResultMicroseconds());
for (int32 Subroot : GpuProfilerEventChildrenIndices[Root])
{
SanitizeEventTree(GpuProfilerEvents, GpuProfilerEventChildrenIndices, Subroot, MonotonicTime);
}
GpuProfilerEvents[Root].EndResultMicroseconds = FMath::Max(GpuProfilerEvents[Root].EndResultMicroseconds, MonotonicTime);
MonotonicTime = FMath::Max(MonotonicTime, GpuProfilerEvents[Root].GetEndResultMicroseconds());
}
#endif
/*-----------------------------------------------------------------------------
@@ -532,8 +510,36 @@ public:
}
}
uint64 MonotonicTime = 0;
SanitizeEventTree(GpuProfilerEvents, GpuProfilerEventChildrenIndices, 0, MonotonicTime);
// Sanitize event start/end times
uint64 lastEndTime = 0;
for (int32 EventIdx = 1; EventIdx < GpuProfilerEventParentIndices.Num(); ++EventIdx)
{
const int32 ParentIdx = GpuProfilerEventParentIndices[EventIdx];
FRealtimeGPUProfilerEvent& Event = GpuProfilerEvents[EventIdx];
if (ParentIdx == 0)
{
// Start time must be >= last end time
Event.StartResultMicroseconds = FMath::Max(Event.StartResultMicroseconds, lastEndTime);
// End time must be >= start time
Event.EndResultMicroseconds = FMath::Max(Event.StartResultMicroseconds, Event.EndResultMicroseconds);
// No parent, so set last end time
lastEndTime = Event.EndResultMicroseconds;
}
else
{
FRealtimeGPUProfilerEvent& EventParent = GpuProfilerEvents[ParentIdx];
// Clamp start/end times to be inside parent start/end times
Event.StartResultMicroseconds = FMath::Clamp(Event.StartResultMicroseconds,
EventParent.StartResultMicroseconds,
EventParent.EndResultMicroseconds);
Event.EndResultMicroseconds = FMath::Clamp(Event.EndResultMicroseconds,
Event.StartResultMicroseconds,
EventParent.EndResultMicroseconds);
}
}
FGpuProfilerTrace::BeginFrame(Timestamp);
TraverseEventTree(GpuProfilerEvents, GpuProfilerEventChildrenIndices, 0);