libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-28 19:00:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4228 from thedax/i7CPUDetection

Browse Source 
System Info screen: Add correct core count detection for i7(and maybe i5/i3?) CPUs.
This commit is contained in:
Henrik Rydgård 2013-10-17 16:27:01 -07:00
commit 850b5d2961
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Common/CPUDetect.cpp
View File

@ -192,8 +192,22 @@ void CPUInfo::Detect()
int apic_id_core_id_size = (cpu_id[2] >> 12) & 0xF;
if (apic_id_core_id_size == 0) {
if (ht) {
#ifdef _WIN32
// TODO: Make this work on non-Windows.
// 0x0B is the preferred method on i7(i5, i3, too? Unsure..).
// Inspired by https://github.com/D-Programming-Language/druntime/blob/master/src/core/cpuid.d#L562.
if (vendor == VENDOR_INTEL && max_std_fn >= 0x0B) {
__cpuidex(cpu_id, 0x0B, 0);
logical_cpu_count = cpu_id[1] & 0xFFFF;
__cpuidex(cpu_id, 0x0B, 1);
int totalThreads = cpu_id[1] & 0xFFFF;
num_cores = totalThreads / logical_cpu_count;
}
else if (vendor == VENDOR_INTEL) {
#else
// New mechanism for modern Intel CPUs.
if (vendor == VENDOR_INTEL) {
#endif
__cpuid(cpu_id, 0x00000004);
int cores_x_package = ((cpu_id[0] >> 26) & 0x3F) + 1;
HTT = (cores_x_package < logical_cpu_count);

4
UI/DevScreens.cpp
View File

@ -188,7 +188,9 @@ void SystemInfoScreen::CreateViews() {
#ifdef ARM
deviceSpecs->Add(new InfoItem("Cores", StringFromInt(cpu_info.num_cores)));
#else
deviceSpecs->Add(new InfoItem("Threads", StringFromInt(cpu_info.num_cores)));
int totalThreads = cpu_info.num_cores * cpu_info.logical_cpu_count;
std::string cores = StringFromFormat("%d (%d per core, %d cores)", totalThreads, cpu_info.logical_cpu_count, cpu_info.num_cores);
deviceSpecs->Add(new InfoItem("Threads", cores));
#endif
deviceSpecs->Add(new ItemHeader("GPU Information"));
deviceSpecs->Add(new InfoItem("Vendor", (char *)glGetString(GL_VENDOR)));