Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2024-09-30 14:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1082 Fixed hwloc autoconfig with AMD FX CPUs.

Browse source
This commit is contained in:
XMRig 2019-07-29 19:24:53 +07:00
parent 0ae1e5f1d4
commit 6b3b1c3fc4
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/backend/cpu/platform/HwlocCpuInfo.cpp
View file

@ -84,6 +84,15 @@ static inline void findByType(hwloc_obj_t obj, hwloc_obj_type_t type, func lambd
} }
static inline std::vector<hwloc_obj_t> findByType(hwloc_obj_t obj, hwloc_obj_type_t type)
{
std::vector<hwloc_obj_t> out;
findByType(obj, type, [&out](hwloc_obj_t found) { out.emplace_back(found); });
return out;
}
static inline size_t countByType(hwloc_topology_t topology, hwloc_obj_type_t type) static inline size_t countByType(hwloc_topology_t topology, hwloc_obj_type_t type)
{ {
const int count = hwloc_get_nbobjs_by_type(topology, type); const int count = hwloc_get_nbobjs_by_type(topology, type);
@ -132,8 +141,7 @@ xmrig::HwlocCpuInfo::HwlocCpuInfo() : BasicCpuInfo(),
} }
# endif # endif
std::vector<hwloc_obj_t> packages; const std::vector<hwloc_obj_t> packages = findByType(hwloc_get_root_obj(m_topology), HWLOC_OBJ_PACKAGE);
findByType(hwloc_get_root_obj(m_topology), HWLOC_OBJ_PACKAGE, [&packages](hwloc_obj_t found) { packages.emplace_back(found); });
if (packages.size()) { if (packages.size()) {
const char *value = hwloc_obj_get_info_by_name(packages[0], "CPUModel"); const char *value = hwloc_obj_get_info_by_name(packages[0], "CPUModel");
if (value) { if (value) {
@ -249,14 +257,9 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
if (cacheHashes >= PUs) { if (cacheHashes >= PUs) {
for (hwloc_obj_t core : cores) { for (hwloc_obj_t core : cores) {
if (core->arity == 0) { const std::vector<hwloc_obj_t> units = findByType(core, HWLOC_OBJ_PU);
continue; for (hwloc_obj_t pu : units) {
} threads.push_back(CpuThread(1, pu->os_index));
for (unsigned i = 0; i < core->arity; ++i) {
if (core->children[i]->type == HWLOC_OBJ_PU) {
threads.push_back(CpuThread(1, core->children[i]->os_index));
}
} }
} }
@ -268,7 +271,8 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
bool allocated_pu = false; bool allocated_pu = false;
for (hwloc_obj_t core : cores) { for (hwloc_obj_t core : cores) {
if (core->arity <= pu_id || core->children[pu_id]->type != HWLOC_OBJ_PU) { const std::vector<hwloc_obj_t> units = findByType(core, HWLOC_OBJ_PU);
if (units.size() <= pu_id) {
continue; continue;
} }
@ -276,7 +280,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
PUs--; PUs--;
allocated_pu = true; allocated_pu = true;
threads.push_back(CpuThread(1, core->children[pu_id]->os_index)); threads.push_back(CpuThread(1, units[pu_id]->os_index));
if (cacheHashes == 0) { if (cacheHashes == 0) {
break; break;