otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

GUI: add performance metrics

Browse source
This commit is contained in:
tildearrow 2023-04-13 19:43:48 -05:00
parent f1c6cd5097
commit eee0999cd6
3 changed files with 156 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/debugWindow.cpp
View file

@ -540,9 +540,23 @@ void FurnaceGUI::drawDebug() {
} }
if (ImGui::TreeNode("Performance")) { if (ImGui::TreeNode("Performance")) {
double perfFreq=SDL_GetPerformanceFrequency()/1000000.0; double perfFreq=SDL_GetPerformanceFrequency()/1000000.0;
int lastProcTime=(int)e->processTime/1000;
TAAudioDesc& audioGot=e->getAudioDescGot();
ImGui::Text("video frame: %.0fµs",ImGui::GetIO().DeltaTime*1000000.0);
ImGui::Text("audio frame: %.0fµs",1000000.0*(double)audioGot.bufsize/(double)audioGot.rate);
ImGui::Separator();
ImGui::Text("audio: %dµs",lastProcTime);
ImGui::Text("render: %.0fµs",(double)renderTimeDelta/perfFreq); ImGui::Text("render: %.0fµs",(double)renderTimeDelta/perfFreq);
ImGui::Text("layout: %.0fµs",(double)layoutTimeDelta/perfFreq); ImGui::Text("layout: %.0fµs",(double)layoutTimeDelta/perfFreq);
ImGui::Text("event: %.0fµs",(double)eventTimeDelta/perfFreq); ImGui::Text("event: %.0fµs",(double)eventTimeDelta/perfFreq);
ImGui::Separator();
ImGui::Text("details:");
for (int i=0; i<perfMetricsLastLen; i++) {
ImGui::Text("%s: %.0fµs",perfMetricsLast[i].name,(double)perfMetricsLast[i].elapsed/perfFreq);
}
ImGui::TreePop(); ImGui::TreePop();
} }
if (ImGui::TreeNode("Settings")) { if (ImGui::TreeNode("Settings")) {

179
src/gui/gui.cpp
View file

@ -3271,7 +3271,62 @@ bool FurnaceGUI::detectOutOfBoundsWindow() {
return false; return false;
} }
#define DECLARE_METRIC(_n) \
int __perfM##_n;
#define MEASURE_BEGIN(_n) \
__perfM##_n=SDL_GetPerformanceCounter();
#define MEASURE_END(_n) \
if (perfMetricsLen<64) { \
perfMetrics[perfMetricsLen++]=FurnaceGUIPerfMetric(#_n,SDL_GetPerformanceCounter()-__perfM##_n); \
}
#define MEASURE(_n,_x) \
MEASURE_BEGIN(_n) \
_x; \
MEASURE_END(_n)
bool FurnaceGUI::loop() { bool FurnaceGUI::loop() {
DECLARE_METRIC(calcChanOsc)
DECLARE_METRIC(mobileControls)
DECLARE_METRIC(mobileOrderSel)
DECLARE_METRIC(subSongs)
DECLARE_METRIC(findReplace)
DECLARE_METRIC(spoiler)
DECLARE_METRIC(pattern)
DECLARE_METRIC(editControls)
DECLARE_METRIC(speed)
DECLARE_METRIC(grooves)
DECLARE_METRIC(songInfo)
DECLARE_METRIC(orders)
DECLARE_METRIC(intro)
DECLARE_METRIC(sampleList)
DECLARE_METRIC(sampleEdit)
DECLARE_METRIC(waveList)
DECLARE_METRIC(waveEdit)
DECLARE_METRIC(insList)
DECLARE_METRIC(insEdit)
DECLARE_METRIC(mixer)
DECLARE_METRIC(readOsc)
DECLARE_METRIC(osc)
DECLARE_METRIC(chanOsc)
DECLARE_METRIC(volMeter)
DECLARE_METRIC(settings)
DECLARE_METRIC(debug)
DECLARE_METRIC(stats)
DECLARE_METRIC(compatFlags)
DECLARE_METRIC(piano)
DECLARE_METRIC(notes)
DECLARE_METRIC(channels)
DECLARE_METRIC(patManager)
DECLARE_METRIC(sysManager)
DECLARE_METRIC(clock)
DECLARE_METRIC(regView)
DECLARE_METRIC(log)
DECLARE_METRIC(effectList)
DECLARE_METRIC(popup)
#ifdef IS_MOBILE #ifdef IS_MOBILE
bool doThreadedInput=true; bool doThreadedInput=true;
#else #else
@ -3293,6 +3348,11 @@ bool FurnaceGUI::loop() {
drawHalt=0; drawHalt=0;
if (settings.powerSave) SDL_WaitEventTimeout(NULL,500); if (settings.powerSave) SDL_WaitEventTimeout(NULL,500);
} }
memcpy(perfMetricsLast,perfMetrics,64*sizeof(FurnaceGUIPerfMetric));
perfMetricsLastLen=perfMetricsLen;
perfMetricsLen=0;
eventTimeBegin=SDL_GetPerformanceCounter(); eventTimeBegin=SDL_GetPerformanceCounter();
bool updateWindow=false; bool updateWindow=false;
if (injectBackUp) { if (injectBackUp) {
@ -4181,83 +4241,85 @@ bool FurnaceGUI::loop() {
ImGui::EndMainMenuBar(); ImGui::EndMainMenuBar();
} }
calcChanOsc(); MEASURE(calcChanOsc,calcChanOsc());
if (mobileUI) { if (mobileUI) {
globalWinFlags=ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoBringToFrontOnFocus; globalWinFlags=ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoBringToFrontOnFocus;
//globalWinFlags=ImGuiWindowFlags_NoTitleBar; //globalWinFlags=ImGuiWindowFlags_NoTitleBar;
// scene handling goes here! // scene handling goes here!
drawMobileControls(); MEASURE(mobileControls,drawMobileControls());
switch (mobScene) { switch (mobScene) {
case GUI_SCENE_ORDERS: case GUI_SCENE_ORDERS:
ordersOpen=true; ordersOpen=true;
curWindow=GUI_WINDOW_ORDERS; curWindow=GUI_WINDOW_ORDERS;
drawOrders(); MEASURE(orders,drawOrders());
break; break;
case GUI_SCENE_INSTRUMENT: case GUI_SCENE_INSTRUMENT:
insEditOpen=true; insEditOpen=true;
curWindow=GUI_WINDOW_INS_EDIT; curWindow=GUI_WINDOW_INS_EDIT;
drawInsEdit(); MEASURE(insEdit,drawInsEdit());
drawPiano(); MEASURE(piano,drawPiano());
break; break;
case GUI_SCENE_WAVETABLE: case GUI_SCENE_WAVETABLE:
waveEditOpen=true; waveEditOpen=true;
curWindow=GUI_WINDOW_WAVE_EDIT; curWindow=GUI_WINDOW_WAVE_EDIT;
drawWaveEdit(); MEASURE(waveEdit,drawWaveEdit());
drawPiano(); MEASURE(piano,drawPiano());
break; break;
case GUI_SCENE_SAMPLE: case GUI_SCENE_SAMPLE:
sampleEditOpen=true; sampleEditOpen=true;
curWindow=GUI_WINDOW_SAMPLE_EDIT; curWindow=GUI_WINDOW_SAMPLE_EDIT;
drawSampleEdit(); MEASURE(sampleEdit,drawSampleEdit());
drawPiano(); MEASURE(piano,drawPiano());
break; break;
case GUI_SCENE_CHANNELS: case GUI_SCENE_CHANNELS:
channelsOpen=true; channelsOpen=true;
curWindow=GUI_WINDOW_CHANNELS; curWindow=GUI_WINDOW_CHANNELS;
drawChannels(); MEASURE(channels,drawChannels());
break; break;
case GUI_SCENE_CHIPS: case GUI_SCENE_CHIPS:
sysManagerOpen=true; sysManagerOpen=true;
curWindow=GUI_WINDOW_SYS_MANAGER; curWindow=GUI_WINDOW_SYS_MANAGER;
drawSysManager(); MEASURE(sysManager,drawSysManager());
break; break;
case GUI_SCENE_MIXER: case GUI_SCENE_MIXER:
mixerOpen=true; mixerOpen=true;
curWindow=GUI_WINDOW_MIXER; curWindow=GUI_WINDOW_MIXER;
drawMixer(); MEASURE(mixer,drawMixer());
break; break;
default: default:
patternOpen=true; patternOpen=true;
curWindow=GUI_WINDOW_PATTERN; curWindow=GUI_WINDOW_PATTERN;
drawPattern(); MEASURE(pattern,drawPattern());
drawPiano(); MEASURE(piano,drawPiano());
drawMobileOrderSel(); MEASURE(mobileOrderSel,drawMobileOrderSel());
globalWinFlags=0; globalWinFlags=0;
drawFindReplace(); MEASURE(findReplace,drawFindReplace());
break; break;
} }
globalWinFlags=0; globalWinFlags=0;
drawSettings(); MEASURE(settings,drawSettings());
drawDebug(); MEASURE(debug,drawDebug());
drawLog(); MEASURE(log,drawLog());
drawCompatFlags(); MEASURE(compatFlags,drawCompatFlags());
drawStats(); MEASURE(stats,drawStats());
} else { } else {
globalWinFlags=0; globalWinFlags=0;
ImGui::DockSpaceOverViewport(NULL,lockLayout?(ImGuiDockNodeFlags_NoWindowMenuButton|ImGuiDockNodeFlags_NoMove|ImGuiDockNodeFlags_NoResize|ImGuiDockNodeFlags_NoCloseButton|ImGuiDockNodeFlags_NoDocking|ImGuiDockNodeFlags_NoDockingSplitMe|ImGuiDockNodeFlags_NoDockingSplitOther):0); ImGui::DockSpaceOverViewport(NULL,lockLayout?(ImGuiDockNodeFlags_NoWindowMenuButton|ImGuiDockNodeFlags_NoMove|ImGuiDockNodeFlags_NoResize|ImGuiDockNodeFlags_NoCloseButton|ImGuiDockNodeFlags_NoDocking|ImGuiDockNodeFlags_NoDockingSplitMe|ImGuiDockNodeFlags_NoDockingSplitOther):0);
drawSubSongs(); MEASURE(subSongs,drawSubSongs());
drawFindReplace(); MEASURE(findReplace,drawFindReplace());
drawSpoiler(); MEASURE(spoiler,drawSpoiler());
drawPattern(); MEASURE(pattern,drawPattern());
drawEditControls(); MEASURE(editControls,drawEditControls());
drawSpeed(); MEASURE(speed,drawSpeed());
if (!basicMode) drawGrooves(); if (!basicMode) {
drawSongInfo(); MEASURE(grooves,drawGrooves());
drawOrders(); }
MEASURE(songInfo,drawSongInfo());
MEASURE(orders,drawOrders());
if (introMonOpen) { if (introMonOpen) {
int totalTicks=e->getTotalTicks(); int totalTicks=e->getTotalTicks();
int totalSeconds=e->getTotalSeconds(); int totalSeconds=e->getTotalSeconds();
@ -4269,36 +4331,38 @@ bool FurnaceGUI::loop() {
if (e->isPlaying()) monitorPos+=ImGui::GetIO().DeltaTime; if (e->isPlaying()) monitorPos+=ImGui::GetIO().DeltaTime;
} }
drawSampleList(); MEASURE(sampleList,drawSampleList());
drawSampleEdit(); MEASURE(sampleEdit,drawSampleEdit());
drawWaveList(); MEASURE(waveList,drawWaveList());
drawWaveEdit(); MEASURE(waveEdit,drawWaveEdit());
drawInsList(); MEASURE(insList,drawInsList());
drawInsEdit(); MEASURE(insEdit,drawInsEdit());
drawMixer(); MEASURE(mixer,drawMixer());
readOsc(); MEASURE(readOsc,readOsc());
drawOsc(); MEASURE(osc,drawOsc());
drawChanOsc(); MEASURE(chanOsc,drawChanOsc());
drawVolMeter(); MEASURE(volMeter,drawVolMeter());
drawSettings(); MEASURE(settings,drawSettings());
drawDebug(); MEASURE(debug,drawDebug());
drawStats(); MEASURE(stats,drawStats());
if (!basicMode) drawCompatFlags();
drawPiano();
drawNotes();
if (!basicMode) { if (!basicMode) {
drawChannels(); MEASURE(compatFlags,drawCompatFlags());
} }
drawPatManager(); MEASURE(piano,drawPiano());
MEASURE(notes,drawNotes());
if (!basicMode) { if (!basicMode) {
drawSysManager(); MEASURE(channels,drawChannels());
} }
drawClock(); MEASURE(patManager,drawPatManager());
drawRegView(); if (!basicMode) {
drawLog(); MEASURE(sysManager,drawSysManager());
drawEffectList(); }
MEASURE(clock,drawClock());
MEASURE(regView,drawRegView());
MEASURE(log,drawLog());
MEASURE(effectList,drawEffectList());
} }
activateTutorial(GUI_TUTORIAL_OVERVIEW); activateTutorial(GUI_TUTORIAL_OVERVIEW);
@ -4960,6 +5024,8 @@ bool FurnaceGUI::loop() {
} }
if (aboutOpen) drawAbout(); if (aboutOpen) drawAbout();
MEASURE_BEGIN(popup);
if (ImGui::BeginPopupModal("Rendering...",NULL,ImGuiWindowFlags_AlwaysAutoResize)) { if (ImGui::BeginPopupModal("Rendering...",NULL,ImGuiWindowFlags_AlwaysAutoResize)) {
ImGui::Text("Please wait..."); ImGui::Text("Please wait...");
if (ImGui::Button("Abort")) { if (ImGui::Button("Abort")) {
@ -5491,12 +5557,16 @@ bool FurnaceGUI::loop() {
ImGui::EndPopup(); ImGui::EndPopup();
} }
MEASURE_END(popup);
if (!tutorial.introPlayed || settings.alwaysPlayIntro!=0) { if (!tutorial.introPlayed || settings.alwaysPlayIntro!=0) {
MEASURE_BEGIN(intro);
initialScreenWipe=0; initialScreenWipe=0;
if (settings.alwaysPlayIntro==1) { if (settings.alwaysPlayIntro==1) {
shortIntro=true; shortIntro=true;
} }
drawIntro(introPos); drawIntro(introPos);
MEASURE_END(intro);
} else { } else {
introPos=12.0; introPos=12.0;
} }
@ -6577,6 +6647,7 @@ FurnaceGUI::FurnaceGUI():
eventTimeBegin(0), eventTimeBegin(0),
eventTimeEnd(0), eventTimeEnd(0),
eventTimeDelta(0), eventTimeDelta(0),
perfMetricsLen(0),
chanToMove(-1), chanToMove(-1),
sysToMove(-1), sysToMove(-1),
sysToDelete(-1), sysToDelete(-1),

17
src/gui/gui.h
View file

@ -1153,6 +1153,17 @@ struct FurnaceGUIImage {
ch(0) {} ch(0) {}
}; };
struct FurnaceGUIPerfMetric {
const char* name;
int elapsed;
FurnaceGUIPerfMetric(const char* n, int t):
name(n),
elapsed(t) {}
FurnaceGUIPerfMetric():
name(NULL),
elapsed(0) {}
};
class FurnaceGUI { class FurnaceGUI {
DivEngine* e; DivEngine* e;
@ -1738,6 +1749,12 @@ class FurnaceGUI {
int renderTimeBegin, renderTimeEnd, renderTimeDelta; int renderTimeBegin, renderTimeEnd, renderTimeDelta;
int eventTimeBegin, eventTimeEnd, eventTimeDelta; int eventTimeBegin, eventTimeEnd, eventTimeDelta;
FurnaceGUIPerfMetric perfMetrics[64];
int perfMetricsLen;
FurnaceGUIPerfMetric perfMetricsLast[64];
int perfMetricsLastLen;
std::map<FurnaceGUIImages,FurnaceGUIImage*> images; std::map<FurnaceGUIImages,FurnaceGUIImage*> images;
int chanToMove, sysToMove, sysToDelete, opToMove; int chanToMove, sysToMove, sysToDelete, opToMove;