yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #2545 from lioncash/timing 

core/core_timing_util: Use std::chrono types for specifying time units
This commit is contained in:
Zach Hilman 2019-06-05 15:52:37 -04:00 committed by GitHub
parent 6aff1005ef 2548661c08
commit 81e09bb121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio_core/stream.cpp
View File

@ -57,7 +57,9 @@ Stream::State Stream::GetState() const {
s64 Stream::GetBufferReleaseCycles(const Buffer& buffer) const { s64 Stream::GetBufferReleaseCycles(const Buffer& buffer) const {
const std::size_t num_samples{buffer.GetSamples().size() / GetNumChannels()}; const std::size_t num_samples{buffer.GetSamples().size() / GetNumChannels()};
return Core::Timing::usToCycles((static_cast<u64>(num_samples) * 1000000) / sample_rate); const auto us =
std::chrono::microseconds((static_cast<u64>(num_samples) * 1000000) / sample_rate);
return Core::Timing::usToCycles(us);
} }
static void VolumeAdjustSamples(std::vector<s16>& samples) { static void VolumeAdjustSamples(std::vector<s16>& samples) {

42
src/core/core_timing_util.cpp
View File

@ -13,52 +13,40 @@ namespace Core::Timing {
constexpr u64 MAX_VALUE_TO_MULTIPLY = std::numeric_limits<s64>::max() / BASE_CLOCK_RATE; constexpr u64 MAX_VALUE_TO_MULTIPLY = std::numeric_limits<s64>::max() / BASE_CLOCK_RATE;
s64 usToCycles(s64 us) { s64 msToCycles(std::chrono::milliseconds ms) {
if (static_cast<u64>(us / 1000000) > MAX_VALUE_TO_MULTIPLY) { if (static_cast<u64>(ms.count() / 1000) > MAX_VALUE_TO_MULTIPLY) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value"); LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max(); return std::numeric_limits<s64>::max();
} }
if (static_cast<u64>(us) > MAX_VALUE_TO_MULTIPLY) { if (static_cast<u64>(ms.count()) > MAX_VALUE_TO_MULTIPLY) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding"); LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE * (us / 1000000); return BASE_CLOCK_RATE * (ms.count() / 1000);
} }
return (BASE_CLOCK_RATE * us) / 1000000; return (BASE_CLOCK_RATE * ms.count()) / 1000;
} }
s64 usToCycles(u64 us) { s64 usToCycles(std::chrono::microseconds us) {
if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) { if (static_cast<u64>(us.count() / 1000000) > MAX_VALUE_TO_MULTIPLY) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value"); LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max(); return std::numeric_limits<s64>::max();
} }
if (us > MAX_VALUE_TO_MULTIPLY) { if (static_cast<u64>(us.count()) > MAX_VALUE_TO_MULTIPLY) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding"); LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE * static_cast<s64>(us / 1000000); return BASE_CLOCK_RATE * (us.count() / 1000000);
} }
return (BASE_CLOCK_RATE * static_cast<s64>(us)) / 1000000; return (BASE_CLOCK_RATE * us.count()) / 1000000;
} }
s64 nsToCycles(s64 ns) { s64 nsToCycles(std::chrono::nanoseconds ns) {
if (static_cast<u64>(ns / 1000000000) > MAX_VALUE_TO_MULTIPLY) { if (static_cast<u64>(ns.count() / 1000000000) > MAX_VALUE_TO_MULTIPLY) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value"); LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max(); return std::numeric_limits<s64>::max();
} }
if (static_cast<u64>(ns) > MAX_VALUE_TO_MULTIPLY) { if (static_cast<u64>(ns.count()) > MAX_VALUE_TO_MULTIPLY) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding"); LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE * (ns / 1000000000); return BASE_CLOCK_RATE * (ns.count() / 1000000000);
} }
return (BASE_CLOCK_RATE * ns) / 1000000000; return (BASE_CLOCK_RATE * ns.count()) / 1000000000;
}
s64 nsToCycles(u64 ns) {
if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) {
LOG_ERROR(Core_Timing, "Integer overflow, use max value");
return std::numeric_limits<s64>::max();
}
if (ns > MAX_VALUE_TO_MULTIPLY) {
LOG_DEBUG(Core_Timing, "Time very big, do rounding");
return BASE_CLOCK_RATE * (static_cast<s64>(ns) / 1000000000);
}
return (BASE_CLOCK_RATE * static_cast<s64>(ns)) / 1000000000;
} }
u64 CpuCyclesToClockCycles(u64 ticks) { u64 CpuCyclesToClockCycles(u64 ticks) {

54
src/core/core_timing_util.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <chrono>
#include "common/common_types.h" #include "common/common_types.h"
namespace Core::Timing { namespace Core::Timing {
@ -13,53 +14,20 @@ namespace Core::Timing {
constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch clock speed is 1020MHz un/docked constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch clock speed is 1020MHz un/docked
constexpr u64 CNTFREQ = 19200000; // Value from fusee. constexpr u64 CNTFREQ = 19200000; // Value from fusee.
inline s64 msToCycles(int ms) { s64 msToCycles(std::chrono::milliseconds ms);
// since ms is int there is no way to overflow s64 usToCycles(std::chrono::microseconds us);
return BASE_CLOCK_RATE * static_cast<s64>(ms) / 1000; s64 nsToCycles(std::chrono::nanoseconds ns);
inline std::chrono::milliseconds CyclesToMs(s64 cycles) {
return std::chrono::milliseconds(cycles * 1000 / BASE_CLOCK_RATE);
} }
inline s64 msToCycles(float ms) { inline std::chrono::nanoseconds CyclesToNs(s64 cycles) {
return static_cast<s64>(BASE_CLOCK_RATE * (0.001f) * ms); return std::chrono::nanoseconds(cycles * 1000000000 / BASE_CLOCK_RATE);
} }
inline s64 msToCycles(double ms) { inline std::chrono::microseconds CyclesToUs(s64 cycles) {
return static_cast<s64>(BASE_CLOCK_RATE * (0.001) * ms); return std::chrono::microseconds(cycles * 1000000 / BASE_CLOCK_RATE);
}
inline s64 usToCycles(float us) {
return static_cast<s64>(BASE_CLOCK_RATE * (0.000001f) * us);
}
inline s64 usToCycles(int us) {
return (BASE_CLOCK_RATE * static_cast<s64>(us) / 1000000);
}
s64 usToCycles(s64 us);
s64 usToCycles(u64 us);
inline s64 nsToCycles(float ns) {
return static_cast<s64>(BASE_CLOCK_RATE * (0.000000001f) * ns);
}
inline s64 nsToCycles(int ns) {
return BASE_CLOCK_RATE * static_cast<s64>(ns) / 1000000000;
}
s64 nsToCycles(s64 ns);
s64 nsToCycles(u64 ns);
inline u64 cyclesToNs(s64 cycles) {
return cycles * 1000000000 / BASE_CLOCK_RATE;
}
inline s64 cyclesToUs(s64 cycles) {
return cycles * 1000000 / BASE_CLOCK_RATE;
}
inline u64 cyclesToMs(s64 cycles) {
return cycles * 1000 / BASE_CLOCK_RATE;
} }
u64 CpuCyclesToClockCycles(u64 ticks); u64 CpuCyclesToClockCycles(u64 ticks);

4
src/core/hle/kernel/thread.cpp
View File

@ -75,9 +75,9 @@ void Thread::WakeAfterDelay(s64 nanoseconds) {
// This function might be called from any thread so we have to be cautious and use the // This function might be called from any thread so we have to be cautious and use the
// thread-safe version of ScheduleEvent. // thread-safe version of ScheduleEvent.
const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds});
Core::System::GetInstance().CoreTiming().ScheduleEventThreadsafe( Core::System::GetInstance().CoreTiming().ScheduleEventThreadsafe(
Core::Timing::nsToCycles(nanoseconds), kernel.ThreadWakeupCallbackEventType(), cycles, kernel.ThreadWakeupCallbackEventType(), callback_handle);
callback_handle);
} }
void Thread::CancelWakeupTimer() { void Thread::CancelWakeupTimer() {

3
src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
View File

@ -185,7 +185,8 @@ u32 nvhost_ctrl_gpu::GetGpuTime(const std::vector<u8>& input, std::vector<u8>& o
IoctlGetGpuTime params{}; IoctlGetGpuTime params{};
std::memcpy(&params, input.data(), input.size()); std::memcpy(&params, input.data(), input.size());
params.gpu_time = Core::Timing::cyclesToNs(Core::System::GetInstance().CoreTiming().GetTicks()); const auto ns = Core::Timing::CyclesToNs(Core::System::GetInstance().CoreTiming().GetTicks());
params.gpu_time = static_cast<u64_le>(ns.count());
std::memcpy(output.data(), &params, output.size()); std::memcpy(output.data(), &params, output.size());
return 0; return 0;
} }

9
src/core/hle/service/time/time.cpp
View File

@ -108,8 +108,9 @@ private:
LOG_DEBUG(Service_Time, "called"); LOG_DEBUG(Service_Time, "called");
const auto& core_timing = Core::System::GetInstance().CoreTiming(); const auto& core_timing = Core::System::GetInstance().CoreTiming();
const SteadyClockTimePoint steady_clock_time_point{ const auto ms = Core::Timing::CyclesToMs(core_timing.GetTicks());
Core::Timing::cyclesToMs(core_timing.GetTicks()) / 1000}; const SteadyClockTimePoint steady_clock_time_point{static_cast<u64_le>(ms.count() / 1000),
{}};
IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2}; IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushRaw(steady_clock_time_point); rb.PushRaw(steady_clock_time_point);
@ -284,8 +285,8 @@ void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) {
} }
const auto& core_timing = Core::System::GetInstance().CoreTiming(); const auto& core_timing = Core::System::GetInstance().CoreTiming();
const SteadyClockTimePoint steady_clock_time_point{ const auto ms = Core::Timing::CyclesToMs(core_timing.GetTicks());
Core::Timing::cyclesToMs(core_timing.GetTicks()) / 1000, {}}; const SteadyClockTimePoint steady_clock_time_point{static_cast<u64_le>(ms.count() / 1000), {}};
CalendarTime calendar_time{}; CalendarTime calendar_time{};
calendar_time.year = tm->tm_year + 1900; calendar_time.year = tm->tm_year + 1900;

2
src/video_core/gpu_thread.cpp
View File

@ -75,7 +75,7 @@ void ThreadManager::StartThread(VideoCore::RendererBase& renderer, Tegra::DmaPus
void ThreadManager::SubmitList(Tegra::CommandList&& entries) { void ThreadManager::SubmitList(Tegra::CommandList&& entries) {
const u64 fence{PushCommand(SubmitListCommand(std::move(entries)))}; const u64 fence{PushCommand(SubmitListCommand(std::move(entries)))};
const s64 synchronization_ticks{Core::Timing::usToCycles(9000)}; const s64 synchronization_ticks{Core::Timing::usToCycles(std::chrono::microseconds{9000})};
system.CoreTiming().ScheduleEvent(synchronization_ticks, synchronization_event, fence); system.CoreTiming().ScheduleEvent(synchronization_ticks, synchronization_event, fence);
} }