From 9d343b3ed5ebe3fea2ec66601f4d450e4aeabcc4 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Fri, 24 Jun 2022 03:52:32 +0200 Subject: [PATCH] Get rid of performance counter code --- src/core/host_interface.cpp | 15 ------ src/core/system.cpp | 94 ------------------------------------- src/core/system.h | 3 -- 3 files changed, 112 deletions(-) diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index d8e96d76..ded41b1e 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -132,8 +132,6 @@ bool HostInterface::BootSystem(std::shared_ptr parameters) void HostInterface::ResetSystem() { System::Reset(); - System::ResetPerformanceCounters(); - System::ResetThrottler(); AddOSDMessage(TranslateStdString("OSDMessage", "System reset.")); } @@ -148,12 +146,6 @@ void HostInterface::PauseSystem(bool paused) m_audio_stream->PauseOutput(paused); OnSystemPaused(paused); - - if (!paused) - { - System::ResetPerformanceCounters(); - System::ResetThrottler(); - } } void HostInterface::DestroySystem() @@ -429,8 +421,6 @@ bool HostInterface::LoadState(const char* filename) return false; } - System::ResetPerformanceCounters(); - System::ResetThrottler(); OnDisplayInvalidated(); return true; } @@ -733,9 +723,6 @@ void HostInterface::CheckForSettingsChanges(const Settings& old_settings) m_audio_stream->PauseOutput(System::IsPaused()); } - if (g_settings.emulation_speed != old_settings.emulation_speed) - System::UpdateThrottlePeriod(); - if (g_settings.cpu_execution_mode != old_settings.cpu_execution_mode || g_settings.cpu_fastmem_mode != old_settings.cpu_fastmem_mode || g_settings.cpu_fastmem_rewrite != old_settings.cpu_fastmem_rewrite) @@ -1161,7 +1148,5 @@ void HostInterface::RecreateSystem() return; } - System::ResetPerformanceCounters(); - System::ResetThrottler(); OnDisplayInvalidated(); } diff --git a/src/core/system.cpp b/src/core/system.cpp index 49d1e716..007ff30b 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -109,17 +109,6 @@ static float s_target_speed = 1.0f; static float s_average_frame_time_accumulator = 0.0f; static float s_worst_frame_time_accumulator = 0.0f; -static float s_vps = 0.0f; -static float s_fps = 0.0f; -static float s_speed = 0.0f; -static float s_worst_frame_time = 0.0f; -static float s_average_frame_time = 0.0f; -static u32 s_last_frame_number = 0; -static u32 s_last_internal_frame_number = 0; -static u32 s_last_global_tick_counter = 0; -static Common::Timer s_fps_timer; -static Common::Timer s_frame_timer; - static std::unique_ptr s_cheat_list; static bool s_memory_saves_enabled = false; @@ -246,26 +235,6 @@ const std::string& GetRunningTitle() return s_running_game_title; } -float GetFPS() -{ - return s_fps; -} -float GetVPS() -{ - return s_vps; -} -float GetEmulationSpeed() -{ - return s_speed; -} -float GetAverageFrameTime() -{ - return s_average_frame_time; -} -float GetWorstFrameTime() -{ - return s_worst_frame_time; -} float GetThrottleFrequency() { return s_throttle_frequency; @@ -882,17 +851,6 @@ bool Initialize(bool force_software_renderer) s_average_frame_time_accumulator = 0.0f; s_worst_frame_time_accumulator = 0.0f; - s_vps = 0.0f; - s_fps = 0.0f; - s_speed = 0.0f; - s_worst_frame_time = 0.0f; - s_average_frame_time = 0.0f; - s_last_frame_number = 0; - s_last_internal_frame_number = 0; - s_last_global_tick_counter = 0; - s_fps_timer.Reset(); - s_frame_timer.Reset(); - TimingEvents::Initialize(); CPU::Initialize(); @@ -1168,7 +1126,6 @@ void Reset() s_frame_number = 1; s_internal_frame_number = 0; TimingEvents::Reset(); - ResetPerformanceCounters(); g_gpu->ResetGraphicsAPIState(); } @@ -1380,8 +1337,6 @@ void SingleStepCPU() { const u32 old_frame_number = s_frame_number; - s_frame_timer.Reset(); - g_gpu->RestoreGraphicsAPIState(); CPU::SingleStep(); @@ -1436,8 +1391,6 @@ void DoRunFrame() void RunFrame() { - s_frame_timer.Reset(); - if (s_rewind_load_counter >= 0) { DoRewind(); @@ -1468,50 +1421,6 @@ void SetThrottleFrequency(float frequency) s_throttle_frequency = frequency; } -void UpdatePerformanceCounters() -{ - const float frame_time = static_cast(s_frame_timer.GetTimeMilliseconds()); - s_average_frame_time_accumulator += frame_time; - s_worst_frame_time_accumulator = std::max(s_worst_frame_time_accumulator, frame_time); - - // update fps counter - const float time = static_cast(s_fps_timer.GetTimeSeconds()); - if (time < 1.0f) - return; - - const float frames_presented = static_cast(s_frame_number - s_last_frame_number); - const u32 global_tick_counter = TimingEvents::GetGlobalTickCounter(); - - s_worst_frame_time = s_worst_frame_time_accumulator; - s_worst_frame_time_accumulator = 0.0f; - s_average_frame_time = s_average_frame_time_accumulator / frames_presented; - s_average_frame_time_accumulator = 0.0f; - s_vps = static_cast(frames_presented / time); - s_last_frame_number = s_frame_number; - s_fps = static_cast(s_internal_frame_number - s_last_internal_frame_number) / time; - s_last_internal_frame_number = s_internal_frame_number; - s_speed = static_cast(static_cast(global_tick_counter - s_last_global_tick_counter) / - (static_cast(g_ticks_per_second) * time)) * - 100.0f; - s_last_global_tick_counter = global_tick_counter; - s_fps_timer.Reset(); - - Log_VerbosePrintf("FPS: %.2f VPS: %.2f Average: %.2fms Worst: %.2fms", s_fps, s_vps, s_average_frame_time, - s_worst_frame_time); - - g_host_interface->OnSystemPerformanceCountersUpdated(); -} - -void ResetPerformanceCounters() -{ - s_last_frame_number = s_frame_number; - s_last_internal_frame_number = s_internal_frame_number; - s_last_global_tick_counter = TimingEvents::GetGlobalTickCounter(); - s_average_frame_time_accumulator = 0.0f; - s_worst_frame_time_accumulator = 0.0f; - s_fps_timer.Reset(); -} - static bool LoadEXEToRAM(const char* filename, bool patch_bios) { std::FILE* fp = FileSystem::OpenCFile(filename, "rb"); @@ -2252,14 +2161,11 @@ void SetRewinding(bool enabled) void DoRewind() { - s_frame_timer.Reset(); - if (s_rewind_load_counter == 0) { const u32 skip_saves = BoolToUInt32(!s_rewinding_first_save); s_rewinding_first_save = false; LoadRewindState(skip_saves, false); - ResetPerformanceCounters(); s_rewind_load_counter = s_rewind_load_frequency; } else diff --git a/src/core/system.h b/src/core/system.h index 0eeb376f..92e197b3 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -164,9 +164,6 @@ void SetTargetSpeed(float speed); /// Adjusts the throttle frequency, i.e. how many times we should sleep per second. void SetThrottleFrequency(float frequency); -void UpdatePerformanceCounters(); -void ResetPerformanceCounters(); - // Access controllers for simulating input. Controller* GetController(u32 slot); void UpdateControllers();