Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak TSC calibration #7996

Merged
merged 1 commit into from Apr 9, 2020
Merged

Tweak TSC calibration #7996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions Utilities/sysinfo.cpp
View file
Open in desktop
Expand Up @@ -133,7 +133,7 @@ std::string utils::get_system_info()

if (const ullong tsc_freq = get_tsc_freq())
{
fmt::append(result, " | TSC: %.02fGHz", tsc_freq / 1000000000.);
fmt::append(result, " | TSC: %.03fGHz", tsc_freq / 1000000000.);
}
else
{
Expand Down Expand Up @@ -264,7 +264,7 @@ std::string utils::get_OS_version()

static constexpr ullong round_tsc(ullong val)
{
return ::rounded_div(val, 20'000'000) * 20'000'000;
return ::rounded_div(val, 1'000'000) * 1'000'000;
}

ullong utils::get_tsc_freq()
Expand All @@ -273,6 +273,7 @@ ullong utils::get_tsc_freq()
{
if (!has_invariant_tsc())
return 0;

#ifdef _WIN32
LARGE_INTEGER freq;
if (!QueryPerformanceFrequency(&freq))
Expand All @@ -293,14 +294,11 @@ ullong utils::get_tsc_freq()
constexpr int samples = 40;
ullong rdtsc_data[samples];
ullong timer_data[samples];
ullong rdtsc_diff[samples - 1];
ullong timer_diff[samples - 1];

for (int i = 0; i < samples; i++)
{
rdtsc_data[i] = (_mm_lfence(), __rdtsc());
if (i > 0)
rdtsc_diff[i - 1] = rdtsc_data[i] - rdtsc_data[i - 1];

#ifdef _WIN32
LARGE_INTEGER ctr;
QueryPerformanceCounter(&ctr);
Expand All @@ -314,15 +312,13 @@ ullong utils::get_tsc_freq()
timer_data[i] = ts.tv_nsec + (ts.tv_sec - sec_base) * 1'000'000'000;
usleep(200);
#endif
if (i > 0)
timer_diff[i - 1] = timer_data[i] - timer_data[i - 1];
}

// Compute average TSC
ullong acc = 0;
for (int i = 0; i < samples - 1; i++)
{
acc += rdtsc_diff[i] * timer_freq / timer_diff[i];
acc += (rdtsc_data[i + 1] - rdtsc_data[i]) * timer_freq / (timer_data[i + 1] - timer_data[i]);
}

// Rounding
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/SPUThread.cpp
View file
Open in desktop
Expand Up @@ -3278,7 +3278,7 @@ void fmt_class_string<spu_channel>::format(std::string& out, u64 arg)
}
else
{
out += "empty";
out += "empty";
}
}

Expand Down