ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ImGuiManager: Cap usage percents to 100%

This commit is contained in:
Connor McLaughlin 2022-03-16 21:01:41 +10:00 committed by refractionpcsx2
parent 8e08cd772b
commit fe3a743814
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pcsx2/Frontend/ImGuiManager.cpp
View File

@ -469,6 +469,17 @@ static void DrawOSDMessages()
} }
} }
static void FormatProcessorStat(FastFormatAscii& text, double usage, double time)
{
// Some values, such as GPU (and even CPU to some extent) can be out of phase with the wall clock,
// which the processor time is divided by to get a utilization percentage. Let's clamp it at 100%,
// so that people don't get confused, and remove the decimal places when it's there while we're at it.
if (usage >= 99.95)
text.Write("100%% (%.2fms)", time);
else
text.Write("%.1f%% (%.2fms)", usage, time);
}
static void DrawPerformanceOverlay() static void DrawPerformanceOverlay()
{ {
const float scale = s_global_scale; const float scale = s_global_scale;
@ -575,37 +586,31 @@ static void DrawPerformanceOverlay()
text.Clear(); text.Clear();
if (EmuConfig.Speedhacks.EECycleRate != 0 || EmuConfig.Speedhacks.EECycleSkip != 0) if (EmuConfig.Speedhacks.EECycleRate != 0 || EmuConfig.Speedhacks.EECycleSkip != 0)
{ text.Write("EE[%d/%d]: ", EmuConfig.Speedhacks.EECycleRate, EmuConfig.Speedhacks.EECycleSkip);
text.Write("EE[%d/%d]: %.1f%% (%.2fms)", EmuConfig.Speedhacks.EECycleRate, EmuConfig.Speedhacks.EECycleSkip,
PerformanceMetrics::GetCPUThreadUsage(),
PerformanceMetrics::GetCPUThreadAverageTime());
}
else else
{ text.Write("EE: ");
text.Write("EE: %.1f%% (%.2fms)", PerformanceMetrics::GetCPUThreadUsage(), FormatProcessorStat(text, PerformanceMetrics::GetCPUThreadUsage(), PerformanceMetrics::GetCPUThreadAverageTime());
PerformanceMetrics::GetCPUThreadAverageTime());
}
DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255)); DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255));
text.Clear(); text.Clear();
text.Write("GS: %.1f%% (%.2fms)", PerformanceMetrics::GetGSThreadUsage(), text.Write("GS: ");
PerformanceMetrics::GetGSThreadAverageTime()); FormatProcessorStat(text, PerformanceMetrics::GetGSThreadUsage(), PerformanceMetrics::GetGSThreadAverageTime());
DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255)); DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255));
const u32 gs_sw_threads = PerformanceMetrics::GetGSSWThreadCount(); const u32 gs_sw_threads = PerformanceMetrics::GetGSSWThreadCount();
for (u32 i = 0; i < gs_sw_threads; i++) for (u32 i = 0; i < gs_sw_threads; i++)
{ {
text.Clear(); text.Clear();
text.Write("SW-%u: %.1f%% (%.2fms)", i, PerformanceMetrics::GetGSSWThreadUsage(i), text.Write("SW-%u: ", i);
PerformanceMetrics::GetGSSWThreadAverageTime(i)); FormatProcessorStat(text, PerformanceMetrics::GetGSSWThreadUsage(i), PerformanceMetrics::GetGSSWThreadAverageTime(i));
DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255)); DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255));
} }
if (THREAD_VU1) if (THREAD_VU1)
{ {
text.Clear(); text.Clear();
text.Write("VU: %.1f%% (%.2fms)", PerformanceMetrics::GetVUThreadUsage(), text.Write("VU: ");
PerformanceMetrics::GetVUThreadAverageTime()); FormatProcessorStat(text, PerformanceMetrics::GetVUThreadUsage(), PerformanceMetrics::GetVUThreadAverageTime());
DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255)); DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255));
} }
} }
@ -613,8 +618,8 @@ static void DrawPerformanceOverlay()
if (GSConfig.OsdShowGPU) if (GSConfig.OsdShowGPU)
{ {
text.Clear(); text.Clear();
text.Write("GPU: %.1f%% (%.2fms)", PerformanceMetrics::GetGPUUsage(), text.Write("GPU: ");
PerformanceMetrics::GetGPUAverageTime()); FormatProcessorStat(text, PerformanceMetrics::GetGPUUsage(), PerformanceMetrics::GetGPUAverageTime());
DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255)); DRAW_LINE(s_fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255));
} }