Skip to content

Commit

Permalink
Merge tag '2023-12-06' into push-2023-12-06-3
Browse files Browse the repository at this point in the history 
Change-Id: I20a81c32d34d639d9c01c32db97352c27c7d5c80
  • Loading branch information
@rdementi
rdementi committed Dec 7, 2023
2 parents 1b862c9 + 009a62c commit 729d3be
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 38 deletions.
121 changes: 85 additions & 36 deletions src/cpucounters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,12 @@ bool PCM::discoverSystemTopology()
uint32 corePlusSMTMaskWidth = 0;
uint32 coreMaskWidth = 0;

struct domain
{
TopologyEntry::DomainTypeID type = TopologyEntry::DomainTypeID::InvalidDomainTypeID;
unsigned levelShift = 0, nextLevelShift = 0, width = 0;
};
std::unordered_map<int, domain> topologyDomainMap;
{
TemporalThreadAffinity aff0(0);
do
Expand Down Expand Up @@ -1159,10 +1165,6 @@ bool PCM::discoverSystemTopology()
subleaf++;
} while (1);

struct domain
{
unsigned type, levelShift, nextLevelShift, width;
};
std::vector<domain> topologyDomains;
if (max_cpuid >= 0x1F)
{
Expand All @@ -1171,7 +1173,7 @@ bool PCM::discoverSystemTopology()
{
pcm_cpuid(0x1F, subleaf, cpuid_args);
domain d;
d.type = extract_bits_ui(cpuid_args.reg.ecx, 8, 15);
d.type = (TopologyEntry::DomainTypeID)extract_bits_ui(cpuid_args.reg.ecx, 8, 15);
if (d.type == TopologyEntry::DomainTypeID::InvalidDomainTypeID)
{
break;
Expand All @@ -1182,16 +1184,28 @@ bool PCM::discoverSystemTopology()
topologyDomains.push_back(d);
++subleaf;
} while (true);
#if 0
for (size_t l = 0; l < topologyDomains.size(); ++l)

if (topologyDomains.size())
{
std::cerr << "Topology level " << l <<
" type " << topologyDomains[l].type <<
" width " << topologyDomains[l].width <<
" levelShift " << topologyDomains[l].levelShift <<
" nextLevelShift " << topologyDomains[l].nextLevelShift << "\n";
domain d;
d.type = TopologyEntry::DomainTypeID::SocketPackageDomain;
d.levelShift = topologyDomains.back().nextLevelShift;
d.nextLevelShift = 32;
d.width = d.nextLevelShift - d.levelShift;
topologyDomains.push_back(d);
}
for (size_t l = 0; l < topologyDomains.size(); ++l)
{
topologyDomainMap[topologyDomains[l].type] = topologyDomains[l];
#if 0
std::cerr << "Topology level: " << l <<
" type: " << topologyDomains[l].type <<
" (" << TopologyEntry::getDomainTypeStr(topologyDomains[l].type) << ")" <<
" width: " << topologyDomains[l].width <<
" levelShift: " << topologyDomains[l].levelShift <<
" nextLevelShift: " << topologyDomains[l].nextLevelShift << "\n";
#endif
}
}
}

Expand Down Expand Up @@ -1232,12 +1246,51 @@ bool PCM::discoverSystemTopology()
#endif

#ifndef __APPLE__
auto populateEntry = [&smtMaskWidth, &coreMaskWidth, &l2CacheMaskShift](TopologyEntry & entry, const int apic_id)
auto populateEntry = [&topologyDomainMap,&smtMaskWidth, &coreMaskWidth, &l2CacheMaskShift](TopologyEntry& entry)
{
entry.thread_id = smtMaskWidth ? extract_bits_ui(apic_id, 0, smtMaskWidth - 1) : 0;
entry.core_id = (smtMaskWidth + coreMaskWidth) ? extract_bits_ui(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;
entry.socket = extract_bits_ui(apic_id, smtMaskWidth + coreMaskWidth, 31);
entry.tile_id = extract_bits_ui(apic_id, l2CacheMaskShift, 31);
auto getAPICID = [&](const uint32 leaf)
{
PCM_CPUID_INFO cpuid_args;
#if defined(__FreeBSD__) || defined(__DragonFly__)
pcm_cpuid_bsd(leaf, cpuid_args, entry.os_id);
#else
pcm_cpuid(leaf, 0x0, cpuid_args);
#endif
return cpuid_args.array[3];
};
if (topologyDomainMap.size())
{
auto getID = [&topologyDomainMap](const int apic_id, const TopologyEntry::DomainTypeID t)
{
const auto di = topologyDomainMap.find(t);
if (di != topologyDomainMap.end())
{
const auto & d = di->second;
return extract_bits_ui(apic_id, d.levelShift, d.nextLevelShift - 1);
}
return 0U;
};
entry.tile_id = extract_bits_ui(getAPICID(0xb), l2CacheMaskShift, 31);
const int apic_id = getAPICID(0x1F);
entry.thread_id = getID(apic_id, TopologyEntry::DomainTypeID::LogicalProcessorDomain);
entry.core_id = getID(apic_id, TopologyEntry::DomainTypeID::CoreDomain);
entry.module_id = getID(apic_id, TopologyEntry::DomainTypeID::ModuleDomain);
if (entry.tile_id == 0)
{
entry.tile_id = getID(apic_id, TopologyEntry::DomainTypeID::TileDomain);
}
entry.die_id = getID(apic_id, TopologyEntry::DomainTypeID::DieDomain);
entry.die_grp_id = getID(apic_id, TopologyEntry::DomainTypeID::DieGrpDomain);
entry.socket = getID(apic_id, TopologyEntry::DomainTypeID::SocketPackageDomain);
}
else
{
const int apic_id = getAPICID(0xb);
entry.thread_id = smtMaskWidth ? extract_bits_ui(apic_id, 0, smtMaskWidth - 1) : 0;
entry.core_id = (smtMaskWidth + coreMaskWidth) ? extract_bits_ui(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;
entry.socket = extract_bits_ui(apic_id, smtMaskWidth + coreMaskWidth, 31);
entry.tile_id = extract_bits_ui(apic_id, l2CacheMaskShift, 31);
}
};
#endif

Expand Down Expand Up @@ -1315,14 +1368,10 @@ bool PCM::discoverSystemTopology()
{
ThreadGroupTempAffinity affinity(i);

pcm_cpuid(0xb, 0x0, cpuid_args);

int apic_id = cpuid_args.array[3];

TopologyEntry entry;
entry.os_id = i;

populateEntry(entry, apic_id);
populateEntry(entry);
if (populateHybridEntry(entry, i) == false)
{
return false;
Expand Down Expand Up @@ -1369,10 +1418,8 @@ bool PCM::discoverSystemTopology()
//std::cout << "os_core_id: " << entry.os_id << "\n";
try {
TemporalThreadAffinity _(entry.os_id);
pcm_cpuid(0xb, 0x0, cpuid_args);
int apic_id = cpuid_args.array[3];

populateEntry(entry, apic_id);
populateEntry(entry);
if (populateHybridEntry(entry, entry.os_id) == false)
{
return false;
Expand Down Expand Up @@ -1410,13 +1457,9 @@ bool PCM::discoverSystemTopology()

for (int i = 0; i < num_cores; i++)
{
pcm_cpuid_bsd(0xb, cpuid_args, i);

int apic_id = cpuid_args.array[3];

entry.os_id = i;

populateEntry(entry, apic_id);
populateEntry(entry);
if (populateHybridEntry(entry, i) == false)
{
return false;
Expand Down Expand Up @@ -2866,7 +2909,7 @@ PCM::PCM() :
if (safe_getenv("PCM_PRINT_TOPOLOGY") == "1")
#endif
{
printDetailedSystemTopology();
printDetailedSystemTopology(1);
}

initEnergyMonitoring();
Expand Down Expand Up @@ -2898,23 +2941,29 @@ PCM::PCM() :
#endif
}

void PCM::printDetailedSystemTopology()
void PCM::printDetailedSystemTopology(const int detailLevel)
{
// produce debug output similar to Intel MPI cpuinfo
if (true)
{
std::cerr << "\n===== Processor topology =====\n";
std::cerr << "OS_Processor Thread_Id Core_Id Tile_Id Package_Id Core_Type Native_CPU_Model\n";
std::cerr << "OS_Processor Thread_Id Core_Id ";
if (detailLevel > 0) std::cerr << "Module_Id ";
std::cerr << "Tile_Id ";
if (detailLevel > 0) std::cerr << "Die_Id Die_Group_Id ";
std::cerr << "Package_Id Core_Type Native_CPU_Model\n";
std::map<uint32, std::vector<uint32> > os_id_by_core, os_id_by_tile, core_id_by_socket;
size_t counter = 0;
for (auto it = topology.begin(); it != topology.end(); ++it)
{
std::cerr << std::left << std::setfill(' ')
<< std::setw(16) << ((it->os_id >= 0) ? it->os_id : counter)
<< std::setw(16) << it->thread_id
<< std::setw(16) << it->core_id
<< std::setw(16) << it->tile_id
<< std::setw(16) << it->socket
<< std::setw(16) << it->core_id;
if (detailLevel > 0) std::cerr << std::setw(16) << it->module_id;
std::cerr << std::setw(16) << it->tile_id;
if (detailLevel > 0) std::cerr << std::setw(16) << it->die_id << std::setw(16) << it->die_grp_id;
std::cerr << std::setw(16) << it->socket
<< std::setw(16) << it->getCoreTypeStr()
<< std::setw(16) << it->native_cpu_model
<< "\n";
Expand Down
2 changes: 1 addition & 1 deletion src/cpucounters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ class PCM_API PCM
}

//! prints detailed system topology
void printDetailedSystemTopology();
void printDetailedSystemTopology(const int detailLevel = 0);

/*!
\brief checks if QOS monitoring support present
Expand Down
18 changes: 17 additions & 1 deletion src/topologyentry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ struct PCM_API TopologyEntry // describes a core
ModuleDomain = 3,
TileDomain = 4,
DieDomain = 5,
DieGrpDomain = 6
DieGrpDomain = 6,
SocketPackageDomain = 0xffff
};
enum CoreType
{
Expand All @@ -51,6 +52,21 @@ struct PCM_API TopologyEntry // describes a core
}
return "unknown";
}
static const char* getDomainTypeStr(const DomainTypeID & id)
{
switch (id)
{
case InvalidDomainTypeID: return "invalid";
case LogicalProcessorDomain: return "LogicalProcessor";
case CoreDomain: return "Core";
case ModuleDomain: return "Module";
case TileDomain: return "Tile";
case DieDomain: return "Die";
case DieGrpDomain: return "DieGroup";
case SocketPackageDomain: return "Socket/Package";
}
return "unknown";
}
};

}
Expand Down

0 comments on commit 729d3be

Please sign in to comment.