Commit Graph

170 Commits

Author SHA1 Message Date
geoff evans
13d705fba1 Profiler updates
1) Fix Visual Studio Profiling PerfAPI build script pathing for modern era of Visual Studio, add IDEDir to UBT for base path of PerfAPI lib/headers

2) Add initial support for Superluminal instrumentation API, if it's installed and -Superluminal is passed on the command line. Dial back color saturation a bit to go easier on the eyes (my eyes!!). This is WIP support, we are technically violating the API rules by feeding in changing strings to the same profile marker. So, with this change you can see the instrumentation markers in the timeline, but using all the event features in Superluminal causes weird artifacts like event strings changing as you use profiler features. Subsequent change will attempt to pry apart static and instance string data in the instrumentation, as this is a common trope across profilers (and non-PC platforms).

Updated FExternalProfiler API to forward along color information from the instrumentation. This is a minor breaking change as it's very unlikely there are direct callers of these APIs.

[CL 14321510 by geoff evans in ue5-main branch]
2020-09-15 14:26:08 -04:00
Arciel Rekman
cb998fe373 Remove unused private fields - Automation
#rb Andrew.Grant
#review-14242502 @Andrew.Grant
#jira none

[CL 14243816 by Arciel Rekman in ue5-main branch]
2020-09-02 09:24:31 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Martin Ridgers
7734ed92e3 Fixed trace initialisation after a bad merge from UE-Main.
#rb jb
#rnx

#ushell-cherrypick of 13650632 by Martin.Ridgers

#ushell-cherrypick of 13873967 by Martin.Ridgers

[CL 13874021 by Martin Ridgers in ue5-main branch]
2020-07-16 09:26:09 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
louisphilippe seguin
464fd28cc5 Enable CSVProfiler processing thread on multithread forked servers
#rb Ryan.Gerleve

#ROBOMERGE-SOURCE: CL 13025925 via CL 13025929 via CL 13025930 via CL 13025933 via CL 13025946
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13025955 by louisphilippe seguin in Main branch]
2020-04-23 19:51:37 -04:00
martin ridgers
805e282786 Added an "end thread" event. This is used to as an indication that CPU trace analysis should flush its state and drop the thread.
#rb cm
#jira ue-91551
#lockdown stefan.boberg
#ushell-cherrypick of 12619791 by Martin.Ridgers

#ROBOMERGE-SOURCE: CL 12619837 in //UE4/Release-4.25/... via CL 12619841 via CL 12619842
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12619844 by martin ridgers in Main branch]
2020-04-06 06:09:13 -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
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
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
Johan Berg
6596dc076d Removse event enable/disable.
#rb martin.ridgers

[CL 11072617 by Johan Berg in Dev-Core branch]
2020-01-21 10:50:50 -05:00
Johan Berg
45efa76d0e Fix frame cycle counting when enabling channels during run.
#rb cm.nordin

[CL 11072459 by Johan Berg in Dev-Core branch]
2020-01-21 10:41:24 -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
92c98af440 #UE4 Reapply deprecation fix
#ROBOMERGE-SOURCE: CL 10844263 via CL 10844264 via CL 10844265
#ROBOMERGE-BOT: (v610-10636431)

[CL 10844266 by bob tellez in Main branch]
2019-12-19 23:55:51 -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
marc audy
a39b3b02c3 Fix deprecation
#jira
#rnx
[FYI] Serge.Bernier


#ROBOMERGE-SOURCE: CL 10807408 via CL 10807410 via CL 10807413
#ROBOMERGE-BOT: (v610-10636431)

[CL 10807414 by marc audy in Main branch]
2019-12-18 23:03:21 -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