Commit Graph

104 Commits

Author SHA1 Message Date
devin doucette
93dce73de7 Extended FCookStats to support new use cases
FCookStats::FScopedStatsCounter is now movable and copying is blocked to avoid incorrect behavior. This supports usage patterns such as: COOK_STAT(auto Timer = Condition ? UsageStats.TimeSyncWork() : UsageStats.TimeAsyncWork());

FCookStats::FDDCResourceUsage has been extracted into a standalone type, FDerivedDataUsageStats. The name is more in line with other DDC type names, and can now be forward-declared when necessary.

#rb Zousar.Shaker
[RN] minor Core/Cooker

#ROBOMERGE-SOURCE: CL 12472517 via CL 12472525 via CL 12472529 via CL 12472531
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12472536 by devin doucette in Main branch]
2020-03-27 14:02:41 -04:00
serge bernier
6969f854ef Add support for per player view csv stats
[at]rb Mickael G. Jordan C.
#rnx


#ROBOMERGE-SOURCE: CL 11884794 via CL 11884801 via CL 11884807
#ROBOMERGE-BOT: (v656-11643781)

[CL 11889427 by serge bernier in Main branch]
2020-03-03 17:13:13 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
Stefan Boberg
55a8b15f1f Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb none

[CL 11258477 by Stefan Boberg in Main branch]
2020-02-05 14:26:36 -05:00
michael noland
67320d9750 Core: Additional conversion and narrowing warning fixes for Clang
#rb marc.audy
[FYI] Steve.Robb
#jira UE-87131


#ROBOMERGE-SOURCE: CL 11140226 via CL 11140233 via CL 11140235
#ROBOMERGE-BOT: (v640-11091645)

[CL 11140236 by michael noland in Main branch]
2020-01-28 19:31:47 -05:00
Stefan Boberg
8f0e83305e Added mimalloc allocator from https://github.com/microsoft/mimalloc
Performs better than mimalloc in cooker benchmarks, but we still default to TBB malloc until the behaviour has been explored in more depth

To opt in to mimalloc, pass -mimalloc on the command line

#rb none

[CL 11114787 by Stefan Boberg in Dev-Core branch]
2020-01-27 07:08:26 -05:00
PJ Kack
ef8a7b620e AUTO MERGE
Merging //UE4/Main @ 11112898 to //UE4/Dev-Core (dev-core-l0178)

#rb none

(ushell-p4-mergedown)

[CL 11113593 by PJ Kack in Dev-Core branch]
2020-01-26 11:35:42 -05:00
PJ Kack
3a9ca4d2f9 Merging //UE4/Main @ 11112898 to //UE4/Dev-Core (dev-core-l0178)
#rb none

(ushell-p4-mergedown)

[CL 11113592 by PJ Kack in Dev-Core branch]
2020-01-26 11:33:22 -05:00
Johan Berg
ab0349effc Rename "CpuProfiler" channel to "Cpu" and disable frame names with indices.
* Rename CpuProfilerChannel to CpuChannel.
* Removed NamedEventsChannel and use CpuChannel.

#rb cm.nordin

[CL 11104150 by Johan Berg in Dev-Core branch]
2020-01-24 08:02:25 -05:00
michael noland
2d6847d01a Core: Fixes for various unsafe implicit type conversion warnings in the Core module (WIP; some files still suppress the warning)
- Ptrdiff -> int32
- Float/int confusion and double/float
- size_t stuff; various changes to the algorithms to use a deduced IndexType template argument and/or decltype to use the appropriate size for indicies and counts
- Fixed GetNum(FString) incorrectly returning SIZE_T instead of int32, and GetNum(container) now returns whatever container.Num() does (so usually int32)
#jira UE-86949
#rb marc.audy, steve.robb


#ROBOMERGE-OWNER: michael.noland
#ROBOMERGE-AUTHOR: michael.noland
#ROBOMERGE-SOURCE: CL 11050799 via CL 11050828 via CL 11050837
#ROBOMERGE-BOT: (v637-11041722)

[CL 11051763 by michael noland in Main branch]
2020-01-17 13:49:41 -05:00
Johan Berg
98577bc4da Fix nested cpu scopes with different channels.
Nested CpuProfiler scopes were ended too early in certain nested scenarios. This was solved by introducing a channel gate to OutputEndEvent. This means in order to see the cpu scopes from for example RHICommands channel, users also need to enable CpuProfilerChannel. Also removed bThreadEnabled which wasn't needed.

#rb cm.nordin

[CL 11041113 by Johan Berg in Dev-Core branch]
2020-01-17 03:16:59 -05:00
Johan Berg
672f245053 Users of TraceLog now use channels
Systems that use TraceLog now uses channels to control if events are emitted. Also introduce a new command line argument "-trace" which allows users to specify a comma separated list of channel names to enable.

#rb martin.ridgers, ionut.matasaru

[CL 10950761 by Johan Berg in Dev-Core branch]
2020-01-13 07:16:21 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
ben woodhouse
dc7ae0779f Reinstate CL 10806937 with a fix for the metadata bug:
Copy the metadata at the endCapture since the FinalizeCsvFile can happen a few frames later. We need to ensure that the metadata correspond to what happening BeginCapture/Endcapture. We enqueue the metadata, the same way we enqueue the start/stop command, so the will always match.

#rb serge.bernier


#ROBOMERGE-OWNER: ben.woodhouse
#ROBOMERGE-AUTHOR: ben.woodhouse
#ROBOMERGE-SOURCE: CL 10857164 via CL 10857231 via CL 10860499 via CL 10860511 via CL 10860522
#ROBOMERGE-BOT: (v610-10636431)

[CL 10860562 by ben woodhouse in Main branch]
2019-12-20 13:58:23 -05:00
bob tellez
9eccbf2e24 Back out changelist 10806937 to fix broken CSV metadata
[FYI] serge.bernier


#ROBOMERGE-OWNER: bob.tellez
#ROBOMERGE-AUTHOR: ben.woodhouse
#ROBOMERGE-SOURCE: CL 10839911 via CL 10839912 via CL 10843222 via CL 10843528 via CL 10843643
#ROBOMERGE-BOT: (v610-10636431)

[CL 10843805 by bob tellez in Main branch]
2019-12-19 23:34:48 -05:00
serge bernier
77af8b54e2 Copy the metadata at the endCapture since the FinalizeCsvFile can happen a few frames later. We need to ensure that the metadata correspond to what happening BeginCapture/Endcapture. We enqueue the metadata, the same way we enqueue the start/stop command, so the will always match.
#rnx


#ROBOMERGE-OWNER: serge.bernier
#ROBOMERGE-AUTHOR: serge.bernier
#ROBOMERGE-SOURCE: CL 10806937 via CL 10806938 via CL 10806978 via CL 10806981 via CL 10806982
#ROBOMERGE-BOT: (v610-10636431)

[CL 10806983 by serge bernier in Main branch]
2019-12-18 22:10:06 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Stefan Boberg
d2f9a61b06 Copy-up from Dev-Core
#rb none

[CL 10419044 by Stefan Boberg in Main branch]
2019-11-25 12:03:09 -05:00
serge bernier
85679053b8 Start/Stop csv on event + add frameCount inside csv profiler
example:
-csvStartOnEvent="My Event1" -csvStopOnEvent="My Event2"
-csvStartOnEvent="My Event1" -csvCaptureOnEventFrameCount=1500

#rsx
#rb ben.woodhouse


#ROBOMERGE-SOURCE: CL 9883620 via CL 9883622
#ROBOMERGE-BOT: (v553-9872581)

[CL 9883623 by serge bernier in Main branch]
2019-10-29 14:02:35 -04:00
martin ridgers
231920f0f8 Fixed merge errors when Dev-RenPlatStage copied up to Main.
#rb cm
#jira none
#rnx

(ushell-p4-cherrypick of 9631298 by Martin.Ridgers)
(ushell-p4-cherrypick of 9631305 by Martin.Ridgers)
(ushell-p4-cherrypick of 9631347 by Martin.Ridgers)

#ROBOMERGE-SOURCE: CL 9676333 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v536-9675740)

[CL 9676335 by martin ridgers in Main branch]
2019-10-18 04:56:34 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
Martin Ridgers
6c06684cab Re-enabled CPU scope trace events on Linux. They were disabled temporarily due to a Linux merge error.
#rb trivial
#rnx
#jira UE-81173

(ushell-p4-cherrypick of 9439746 by Martin.Ridgers)

[CL 9470674 by Martin Ridgers in Main branch]
2019-10-08 04:12:28 -04:00
bart hawthorne
ae8ee7327c Add a CSV_PROFILER_USE_CUSTOM_FRAME_TIMINGS preprocesser macro to allow a game to call FCsvProfiler::BeginFrame and EndFrame instead of using the engine defaults.
#rb ben.woodhouse, louisphilippe.seguin


#ROBOMERGE-SOURCE: CL 9442974 via CL 9443020 via CL 9443044
#ROBOMERGE-BOT: (v490-9439918)

[CL 9443058 by bart hawthorne in Main branch]
2019-10-07 09:59:03 -04:00
Stefan Boberg
5b36d417de Rearranged members to hopefully work around issue which I could not repro (could be that some #include site has a custom pragma pack leak)
#jira UE-81344
#rb trivial

[CL 9419693 by Stefan Boberg in Main branch]
2019-10-04 11:43:10 -04:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00