Merge pull request #7489 from Morph1984/steady-clock

general: Replace high_resolution_clock with steady_clock
This commit is contained in:
bunnei 2021-12-03 16:08:20 -08:00 committed by GitHub
commit a2fb5a13b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions

View File

@ -19,16 +19,16 @@ u64 EstimateRDTSCFrequency() {
// get current time // get current time
_mm_mfence(); _mm_mfence();
const u64 tscStart = __rdtsc(); const u64 tscStart = __rdtsc();
const auto startTime = std::chrono::high_resolution_clock::now(); const auto startTime = std::chrono::steady_clock::now();
// wait roughly 3 seconds // wait roughly 3 seconds
while (true) { while (true) {
auto milli = std::chrono::duration_cast<std::chrono::milliseconds>( auto milli = std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::high_resolution_clock::now() - startTime); std::chrono::steady_clock::now() - startTime);
if (milli.count() >= 3000) if (milli.count() >= 3000)
break; break;
std::this_thread::sleep_for(milli_10); std::this_thread::sleep_for(milli_10);
} }
const auto endTime = std::chrono::high_resolution_clock::now(); const auto endTime = std::chrono::steady_clock::now();
_mm_mfence(); _mm_mfence();
const u64 tscEnd = __rdtsc(); const u64 tscEnd = __rdtsc();
// calculate difference // calculate difference

View File

@ -96,7 +96,7 @@ private:
bool DecodeOpusData(u32& consumed, u32& sample_count, const std::vector<u8>& input, bool DecodeOpusData(u32& consumed, u32& sample_count, const std::vector<u8>& input,
std::vector<opus_int16>& output, u64* out_performance_time) const { std::vector<opus_int16>& output, u64* out_performance_time) const {
const auto start_time = std::chrono::high_resolution_clock::now(); const auto start_time = std::chrono::steady_clock::now();
const std::size_t raw_output_sz = output.size() * sizeof(opus_int16); const std::size_t raw_output_sz = output.size() * sizeof(opus_int16);
if (sizeof(OpusPacketHeader) > input.size()) { if (sizeof(OpusPacketHeader) > input.size()) {
LOG_ERROR(Audio, "Input is smaller than the header size, header_sz={}, input_sz={}", LOG_ERROR(Audio, "Input is smaller than the header size, header_sz={}, input_sz={}",
@ -135,7 +135,7 @@ private:
return false; return false;
} }
const auto end_time = std::chrono::high_resolution_clock::now() - start_time; const auto end_time = std::chrono::steady_clock::now() - start_time;
sample_count = out_sample_count; sample_count = out_sample_count;
consumed = static_cast<u32>(sizeof(OpusPacketHeader) + hdr.size); consumed = static_cast<u32>(sizeof(OpusPacketHeader) + hdr.size);
if (out_performance_time != nullptr) { if (out_performance_time != nullptr) {

View File

@ -33,7 +33,7 @@ public:
explicit PerfStats(u64 title_id_); explicit PerfStats(u64 title_id_);
~PerfStats(); ~PerfStats();
using Clock = std::chrono::high_resolution_clock; using Clock = std::chrono::steady_clock;
void BeginSystemFrame(); void BeginSystemFrame();
void EndSystemFrame(); void EndSystemFrame();
@ -87,7 +87,7 @@ private:
class SpeedLimiter { class SpeedLimiter {
public: public:
using Clock = std::chrono::high_resolution_clock; using Clock = std::chrono::steady_clock;
void DoSpeedLimiting(std::chrono::microseconds current_system_time_us); void DoSpeedLimiting(std::chrono::microseconds current_system_time_us);

View File

@ -18,7 +18,7 @@ int ShaderNotify::ShadersBuilding() noexcept {
const int now_complete = num_complete.load(std::memory_order::relaxed); const int now_complete = num_complete.load(std::memory_order::relaxed);
const int now_building = num_building.load(std::memory_order::relaxed); const int now_building = num_building.load(std::memory_order::relaxed);
if (now_complete == now_building) { if (now_complete == now_building) {
const auto now = std::chrono::high_resolution_clock::now(); const auto now = std::chrono::steady_clock::now();
if (completed && num_complete == num_when_completed) { if (completed && num_complete == num_when_completed) {
if (now - complete_time > TIME_TO_STOP_REPORTING) { if (now - complete_time > TIME_TO_STOP_REPORTING) {
report_base = now_complete; report_base = now_complete;

View File

@ -28,6 +28,6 @@ private:
bool completed{}; bool completed{};
int num_when_completed{}; int num_when_completed{};
std::chrono::high_resolution_clock::time_point complete_time; std::chrono::steady_clock::time_point complete_time;
}; };
} // namespace VideoCore } // namespace VideoCore

View File

@ -136,7 +136,7 @@ void LoadingScreen::OnLoadComplete() {
void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value,
std::size_t total) { std::size_t total) {
using namespace std::chrono; using namespace std::chrono;
const auto now = high_resolution_clock::now(); const auto now = steady_clock::now();
// reset the timer if the stage changes // reset the timer if the stage changes
if (stage != previous_stage) { if (stage != previous_stage) {
ui->progress_bar->setStyleSheet(QString::fromUtf8(progressbar_style[stage])); ui->progress_bar->setStyleSheet(QString::fromUtf8(progressbar_style[stage]));
@ -160,7 +160,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
// If theres a drastic slowdown in the rate, then display an estimate // If theres a drastic slowdown in the rate, then display an estimate
if (now - previous_time > milliseconds{50} || slow_shader_compile_start) { if (now - previous_time > milliseconds{50} || slow_shader_compile_start) {
if (!slow_shader_compile_start) { if (!slow_shader_compile_start) {
slow_shader_start = high_resolution_clock::now(); slow_shader_start = steady_clock::now();
slow_shader_compile_start = true; slow_shader_compile_start = true;
slow_shader_first_value = value; slow_shader_first_value = value;
} }

View File

@ -84,8 +84,8 @@ private:
// shaders, it will start quickly but end slow if new shaders were added since previous launch. // shaders, it will start quickly but end slow if new shaders were added since previous launch.
// These variables are used to detect the change in speed so we can generate an ETA // These variables are used to detect the change in speed so we can generate an ETA
bool slow_shader_compile_start = false; bool slow_shader_compile_start = false;
std::chrono::high_resolution_clock::time_point slow_shader_start; std::chrono::steady_clock::time_point slow_shader_start;
std::chrono::high_resolution_clock::time_point previous_time; std::chrono::steady_clock::time_point previous_time;
std::size_t slow_shader_first_value = 0; std::size_t slow_shader_first_value = 0;
}; };