piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12057 from iwubcode/config_core_timing_refresh_only

Browse Source 
Core: save core timing parameters into variables updated during refresh
This commit is contained in:
Admiral H. Curtiss 2023-07-24 01:14:18 +02:00 committed by GitHub
commit c468ca2107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/Core/CoreTiming.cpp
View File

@ -127,6 +127,14 @@ void CoreTimingManager::RefreshConfig()
Config::Get(Config::MAIN_OVERCLOCK_ENABLE) ? Config::Get(Config::MAIN_OVERCLOCK) : 1.0f; Config::Get(Config::MAIN_OVERCLOCK_ENABLE) ? Config::Get(Config::MAIN_OVERCLOCK) : 1.0f;
m_config_oc_inv_factor = 1.0f / m_config_oc_factor; m_config_oc_inv_factor = 1.0f / m_config_oc_factor;
m_config_sync_on_skip_idle = Config::Get(Config::MAIN_SYNC_ON_SKIP_IDLE); m_config_sync_on_skip_idle = Config::Get(Config::MAIN_SYNC_ON_SKIP_IDLE);
// A maximum fallback is used to prevent the system from sleeping for
// too long or going full speed in an attempt to catch up to timings.
m_max_fallback = std::chrono::duration_cast<DT>(DT_ms(Config::Get(Config::MAIN_MAX_FALLBACK)));
m_max_variance = std::chrono::duration_cast<DT>(DT_ms(Config::Get(Config::MAIN_TIMING_VARIANCE)));
m_emulation_speed = Config::Get(Config::MAIN_EMULATION_SPEED);
} }
void CoreTimingManager::DoState(PointerWrap& p) void CoreTimingManager::DoState(PointerWrap& p)
@ -355,21 +363,15 @@ void CoreTimingManager::Throttle(const s64 target_cycle)
m_throttle_last_cycle = target_cycle; m_throttle_last_cycle = target_cycle;
const double speed = const double speed = Core::GetIsThrottlerTempDisabled() ? 0.0 : m_emulation_speed;
Core::GetIsThrottlerTempDisabled() ? 0.0 : Config::Get(Config::MAIN_EMULATION_SPEED);
if (0.0 < speed) if (0.0 < speed)
m_throttle_deadline += m_throttle_deadline +=
std::chrono::duration_cast<DT>(DT_s(cycles) / (speed * m_throttle_clock_per_sec)); std::chrono::duration_cast<DT>(DT_s(cycles) / (speed * m_throttle_clock_per_sec));
// A maximum fallback is used to prevent the system from sleeping for
// too long or going full speed in an attempt to catch up to timings.
const DT max_fallback =
std::chrono::duration_cast<DT>(DT_ms(Config::Get(Config::MAIN_MAX_FALLBACK)));
const TimePoint time = Clock::now(); const TimePoint time = Clock::now();
const TimePoint min_deadline = time - max_fallback; const TimePoint min_deadline = time - m_max_fallback;
const TimePoint max_deadline = time + max_fallback; const TimePoint max_deadline = time + m_max_fallback;
if (m_throttle_deadline > max_deadline) if (m_throttle_deadline > max_deadline)
{ {
@ -382,11 +384,10 @@ void CoreTimingManager::Throttle(const s64 target_cycle)
m_throttle_deadline = min_deadline; m_throttle_deadline = min_deadline;
} }
const TimePoint vi_deadline = time - std::min(m_max_fallback, m_max_variance) / 2;
// Skip the VI interrupt if the CPU is lagging by a certain amount. // Skip the VI interrupt if the CPU is lagging by a certain amount.
// It doesn't matter what amount of lag we skip VI at, as long as it's constant. // It doesn't matter what amount of lag we skip VI at, as long as it's constant.
const DT max_variance =
std::chrono::duration_cast<DT>(DT_ms(Config::Get(Config::MAIN_TIMING_VARIANCE)));
const TimePoint vi_deadline = time - std::min(max_fallback, max_variance) / 2;
m_throttle_disable_vi_int = 0.0 < speed && m_throttle_deadline < vi_deadline; m_throttle_disable_vi_int = 0.0 < speed && m_throttle_deadline < vi_deadline;
// Only sleep if we are behind the deadline // Only sleep if we are behind the deadline

4
Source/Core/Core/CoreTiming.h
View File

@ -193,6 +193,10 @@ private:
s64 m_throttle_min_clock_per_sleep = 0; s64 m_throttle_min_clock_per_sleep = 0;
bool m_throttle_disable_vi_int = false; bool m_throttle_disable_vi_int = false;
DT m_max_fallback = {};
DT m_max_variance = {};
double m_emulation_speed = 1.0;
void ResetThrottle(s64 cycle); void ResetThrottle(s64 cycle);
int DowncountToCycles(int downcount) const; int DowncountToCycles(int downcount) const;