diff options
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 3e4e7bdc68..d2ee6769cc 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -23,6 +23,21 @@ namespace Core::Timing { constexpr s64 MAX_SLICE_LENGTH = 10000; +constexpr u32 CPU_CLOCK_BASE_MHZ = 1020; +constexpr u32 CPU_CLOCK_BOOST_MHZ = 1734; +constexpr u32 CPU_CLOCK_OVERCLOCK_MHZ = 2040; + +constexpr u32 CpuClockTargetMhz(Settings::CpuClock clock) { + switch (clock) { + case Settings::CpuClock::Boost: + return CPU_CLOCK_BOOST_MHZ; + case Settings::CpuClock::Overclock: + return CPU_CLOCK_OVERCLOCK_MHZ; + default: + return CPU_CLOCK_BASE_MHZ; + } +} + std::shared_ptr<EventType> CreateEvent(std::string name, TimedCallback&& callback) { return std::make_shared<EventType>(std::move(callback), std::move(name)); } @@ -58,7 +73,8 @@ void CoreTiming::Initialize(std::function<void()>&& on_thread_init_) { if (is_multicore) { timer_thread = std::jthread([this](std::stop_token stop_token) { Common::SetCurrentThreadName("HostTiming"); - Common::SetCurrentThreadPriority(Common::ThreadPriority::High); + Common::SetCurrentThreadPriority(Common::ThreadPriority::VeryHigh); + Common::SetCurrentThreadToPerformanceCores(); on_thread_init(); has_started = true; @@ -209,8 +225,9 @@ void CoreTiming::ResetTicks() { u64 CoreTiming::GetClockTicks() const { u64 fres = is_multicore ? Common::g_wall_clock.GetCNTPCT() : Common::WallClock::CPUTickToCNTPCT(cpu_ticks); - if (auto const overclock = Settings::values.fast_cpu_time.GetValue(); overclock != Settings::CpuClock::Off) { - fres = u64(f64(fres) * (1.7 + 0.3 * u32(overclock))); + if (const u32 target = CpuClockTargetMhz(Settings::values.cpu_clock.GetValue()); + target != CPU_CLOCK_BASE_MHZ) { + fres = fres * target / CPU_CLOCK_BASE_MHZ; } if (::Settings::values.sync_core_speed.GetValue()) { auto const ticks = f64(fres); |