Changeset 9870 for ps

Timestamp:

07/18/11 10:08:06 (13 years ago)

Author:

Jan Wassenberg

Message:

fix for non-contiguous APIC IDs within a single package (happens on recent Intel CPUs)

File:

• ps/trunk/source/lib/sysdep/arch/x86_x64/topology.cpp (modified) (3 diffs)

ps/trunk/source/lib/sysdep/arch/x86_x64/topology.cpp

@@ -329 +329 @@
 {
     const size_t contiguousId = IndexFromApicId(cpuTopology.sortedApicIds, apicId);
-    return cpuTopology.logical(contiguousId);
+    return contiguousId % cpuTopology.logicalPerCore;
 }
 
@@ -335 +335 @@
 {
     const size_t contiguousId = IndexFromApicId(cpuTopology.sortedApicIds, apicId);
-    return cpuTopology.core(contiguousId);
+    return (contiguousId / cpuTopology.logicalPerCore) % cpuTopology.coresPerPackage;
 }
 
@@ -341 +341 @@
 {
     const size_t contiguousId = IndexFromApicId(cpuTopology.sortedApicIds, apicId);
-    return cpuTopology.package(contiguousId);
+    return contiguousId / (cpuTopology.logicalPerCore * cpuTopology.coresPerPackage);
 }