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

PerformanceMetrics: Track min/avg/max frame time

This commit is contained in:
Stenzek 2023-01-06 23:49:06 +10:00 committed by refractionpcsx2
parent f28c40aa8e
commit c85b826978
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Frontend/ImGuiOverlays.cpp
View File

@ -197,8 +197,8 @@ void ImGuiManager::DrawPerformanceOverlay()
if (GSConfig.OsdShowCPU) if (GSConfig.OsdShowCPU)
{ {
text.clear(); text.clear();
fmt::format_to(std::back_inserter(text), "{:.2f}ms ({:.2f}ms worst)", PerformanceMetrics::GetAverageFrameTime(), fmt::format_to(std::back_inserter(text), "{:.2f}ms | {:.2f}ms | {:.2f}ms", PerformanceMetrics::GetMinimumFrameTime(),
PerformanceMetrics::GetWorstFrameTime()); PerformanceMetrics::GetAverageFrameTime(), PerformanceMetrics::GetMaximumFrameTime());
DRAW_LINE(fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255)); DRAW_LINE(fixed_font, text.c_str(), IM_COL32(255, 255, 255, 255));
text.clear(); text.clear();

31
pcsx2/PerformanceMetrics.cpp
View File

@ -33,10 +33,12 @@ static const float UPDATE_INTERVAL = 0.5f;
static float s_vertical_frequency = 0.0f; static float s_vertical_frequency = 0.0f;
static float s_fps = 0.0f; static float s_fps = 0.0f;
static float s_internal_fps = 0.0f; static float s_internal_fps = 0.0f;
static float s_worst_frame_time = 0.0f; static float s_minimum_frame_time = 0.0f;
static float s_minimum_frame_time_accumulator = 0.0f;
static float s_average_frame_time = 0.0f; static float s_average_frame_time = 0.0f;
static float s_average_frame_time_accumulator = 0.0f; static float s_average_frame_time_accumulator = 0.0f;
static float s_worst_frame_time_accumulator = 0.0f; static float s_maximum_frame_time = 0.0f;
static float s_maximum_frame_time_accumulator = 0.0f;
static u32 s_frames_since_last_update = 0; static u32 s_frames_since_last_update = 0;
static u32 s_unskipped_frames_since_last_update = 0; static u32 s_unskipped_frames_since_last_update = 0;
static Common::Timer s_last_update_time; static Common::Timer s_last_update_time;
@ -86,8 +88,9 @@ void PerformanceMetrics::Clear()
s_fps = 0.0f; s_fps = 0.0f;
s_internal_fps = 0.0f; s_internal_fps = 0.0f;
s_worst_frame_time = 0.0f; s_minimum_frame_time = 0.0f;
s_average_frame_time = 0.0f; s_average_frame_time = 0.0f;
s_maximum_frame_time = 0.0f;
s_internal_fps_method = PerformanceMetrics::InternalFPSMethod::None; s_internal_fps_method = PerformanceMetrics::InternalFPSMethod::None;
s_cpu_thread_usage = 0.0f; s_cpu_thread_usage = 0.0f;
@ -112,8 +115,9 @@ void PerformanceMetrics::Reset()
s_unskipped_frames_since_last_update = 0; s_unskipped_frames_since_last_update = 0;
s_gs_framebuffer_blits_since_last_update = 0; s_gs_framebuffer_blits_since_last_update = 0;
s_gs_privileged_register_writes_since_last_update = 0; s_gs_privileged_register_writes_since_last_update = 0;
s_minimum_frame_time_accumulator = 0.0f;
s_average_frame_time_accumulator = 0.0f; s_average_frame_time_accumulator = 0.0f;
s_worst_frame_time_accumulator = 0.0f; s_maximum_frame_time_accumulator = 0.0f;
s_accumulated_gpu_time = 0.0f; s_accumulated_gpu_time = 0.0f;
s_presents_since_last_update = 0; s_presents_since_last_update = 0;
@ -135,8 +139,9 @@ void PerformanceMetrics::Update(bool gs_register_write, bool fb_blit, bool is_sk
if (!is_skipping_present) if (!is_skipping_present)
{ {
const float frame_time = s_last_frame_time.GetTimeMillisecondsAndReset(); const float frame_time = s_last_frame_time.GetTimeMillisecondsAndReset();
s_minimum_frame_time_accumulator = (s_minimum_frame_time_accumulator == 0.0f) ? frame_time : std::min(s_minimum_frame_time_accumulator, frame_time);
s_average_frame_time_accumulator += frame_time; s_average_frame_time_accumulator += frame_time;
s_worst_frame_time_accumulator = std::max(s_worst_frame_time_accumulator, frame_time); s_maximum_frame_time_accumulator = std::max(s_maximum_frame_time_accumulator, frame_time);
s_frame_time_history[s_frame_time_history_pos] = frame_time; s_frame_time_history[s_frame_time_history_pos] = frame_time;
s_frame_time_history_pos = (s_frame_time_history_pos + 1) % NUM_FRAME_TIME_SAMPLES; s_frame_time_history_pos = (s_frame_time_history_pos + 1) % NUM_FRAME_TIME_SAMPLES;
s_unskipped_frames_since_last_update++; s_unskipped_frames_since_last_update++;
@ -154,10 +159,9 @@ void PerformanceMetrics::Update(bool gs_register_write, bool fb_blit, bool is_sk
return; return;
s_last_update_time.ResetTo(now_ticks); s_last_update_time.ResetTo(now_ticks);
s_worst_frame_time = s_worst_frame_time_accumulator; s_minimum_frame_time = std::exchange(s_minimum_frame_time_accumulator, 0.0f);
s_worst_frame_time_accumulator = 0.0f; s_average_frame_time = std::exchange(s_average_frame_time_accumulator, 0.0f) / static_cast<float>(s_unskipped_frames_since_last_update);
s_average_frame_time = s_average_frame_time_accumulator / static_cast<float>(s_unskipped_frames_since_last_update); s_maximum_frame_time = std::exchange(s_maximum_frame_time_accumulator, 0.0f);
s_average_frame_time_accumulator = 0.0f;
s_fps = static_cast<float>(s_frames_since_last_update) / time; s_fps = static_cast<float>(s_frames_since_last_update) / time;
s_average_gpu_time = s_accumulated_gpu_time / static_cast<float>(s_unskipped_frames_since_last_update); s_average_gpu_time = s_accumulated_gpu_time / static_cast<float>(s_unskipped_frames_since_last_update);
s_gpu_usage = s_accumulated_gpu_time / (time * 10.0f); s_gpu_usage = s_accumulated_gpu_time / (time * 10.0f);
@ -291,9 +295,14 @@ float PerformanceMetrics::GetAverageFrameTime()
return s_average_frame_time; return s_average_frame_time;
} }
float PerformanceMetrics::GetWorstFrameTime() float PerformanceMetrics::GetMinimumFrameTime()
{ {
return s_worst_frame_time; return s_minimum_frame_time;
}
float PerformanceMetrics::GetMaximumFrameTime()
{
return s_maximum_frame_time;
} }
double PerformanceMetrics::GetCPUThreadUsage() double PerformanceMetrics::GetCPUThreadUsage()

3
pcsx2/PerformanceMetrics.h
View File

@ -54,7 +54,8 @@ namespace PerformanceMetrics
float GetInternalFPS(); float GetInternalFPS();
float GetSpeed(); float GetSpeed();
float GetAverageFrameTime(); float GetAverageFrameTime();
float GetWorstFrameTime(); float GetMinimumFrameTime();
float GetMaximumFrameTime();
double GetCPUThreadUsage(); double GetCPUThreadUsage();
double GetCPUThreadAverageTime(); double GetCPUThreadAverageTime();