Skip to content

GitLab

Commit 8fc0aad8 authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r9045] Upgrade hwloc to v1.3.

parent e95f3ab1
Expand all Hide whitespace changes
Inline Side-by-side
CHANGES
View file @ 8fc0aad8
......@@ -9,7 +9,7 @@
functions is: MPIX_Ibcast, MPIX_Ibarrier, MPIX_Ireduce, MPIX_Ialltoallv,
MPIX_Iallreduce.
# PM/PMI: Upgrade hwloc to 1.3rc2.
# PM/PMI: Upgrade hwloc to 1.3.
===============================================================================
......
src/pm/hydra/tools/topo/hwloc/hwloc/VERSION
View file @ 8fc0aad8
......@@ -16,7 +16,7 @@ release=0
# requirement is that it must be entirely printable ASCII characters
# and have no white space.
greek=rc2
greek=rc3
# If want_repo_rev=1, then the SVN r number will be included in the overall
# hwloc version number in some form.
......
src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
View file @ 8fc0aad8
......@@ -758,6 +758,18 @@ AC_DEFUN([_HWLOC_CHECK_DIFF_U], [
AC_MSG_RESULT([$HWLOC_DIFF_U])
])
AC_DEFUN([_HWLOC_CHECK_DIFF_W], [
AC_MSG_CHECKING([whether diff accepts -w])
if diff -w /dev/null /dev/null 2> /dev/null
then
HWLOC_DIFF_W="-w"
else
HWLOC_DIFF_W=""
fi
AC_SUBST([HWLOC_DIFF_W])
AC_MSG_RESULT([$HWLOC_DIFF_W])
])
#-----------------------------------------------------------------------
dnl HWLOC_CHECK_DECL
......
src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc_internal.m4
View file @ 8fc0aad8
......@@ -299,6 +299,7 @@ EOF
unset hwloc_old_LIBS
_HWLOC_CHECK_DIFF_U
_HWLOC_CHECK_DIFF_W
# Only generate this if we're building the utilities
AC_CONFIG_FILES(
......
src/pm/hydra/tools/topo/hwloc/hwloc/doc/Makefile.am
View file @ 8fc0aad8
......@@ -148,14 +148,16 @@ if HWLOC_DOXYGEN_BROKEN_SHORT_NAMES
-@mv -f $(DOX_DIR)/latex/cpu_mem_bind.tex $(DOX_DIR)/latex/a00004.tex
-@mv -f $(DOX_DIR)/html/iodevices.html $(DOX_DIR)/html/a00005.html
-@mv -f $(DOX_DIR)/latex/iodevices.tex $(DOX_DIR)/latex/a00005.tex
-@mv -f $(DOX_DIR)/html/interoperability.html $(DOX_DIR)/html/a00006.html
-@mv -f $(DOX_DIR)/latex/interoperability.tex $(DOX_DIR)/latex/a00006.tex
-@mv -f $(DOX_DIR)/html/threadsafety.html $(DOX_DIR)/html/a00007.html
-@mv -f $(DOX_DIR)/latex/threadsafety.tex $(DOX_DIR)/latex/a00007.tex
-@mv -f $(DOX_DIR)/html/embed.html $(DOX_DIR)/html/a00008.html
-@mv -f $(DOX_DIR)/latex/embed.tex $(DOX_DIR)/latex/a00008.tex
-@mv -f $(DOX_DIR)/html/faq.html $(DOX_DIR)/html/a00009.html
-@mv -f $(DOX_DIR)/latex/faq.tex $(DOX_DIR)/latex/a00009.tex
-@mv -f $(DOX_DIR)/html/xml.html $(DOX_DIR)/html/a00006.html
-@mv -f $(DOX_DIR)/latex/xml.tex $(DOX_DIR)/latex/a00006.tex
-@mv -f $(DOX_DIR)/html/interoperability.html $(DOX_DIR)/html/a00007.html
-@mv -f $(DOX_DIR)/latex/interoperability.tex $(DOX_DIR)/latex/a00007.tex
-@mv -f $(DOX_DIR)/html/threadsafety.html $(DOX_DIR)/html/a00008.html
-@mv -f $(DOX_DIR)/latex/threadsafety.tex $(DOX_DIR)/latex/a00008.tex
-@mv -f $(DOX_DIR)/html/embed.html $(DOX_DIR)/html/a00009.html
-@mv -f $(DOX_DIR)/latex/embed.tex $(DOX_DIR)/latex/a00009.tex
-@mv -f $(DOX_DIR)/html/faq.html $(DOX_DIR)/html/a00010.html
-@mv -f $(DOX_DIR)/latex/faq.tex $(DOX_DIR)/latex/a00010.tex
endif
endif
......
src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-xml.c
View file @ 8fc0aad8
......@@ -9,6 +9,7 @@
#include <private/autogen/config.h>
#include <hwloc.h>
#include <private/private.h>
#include <private/misc.h>
#include <private/debug.h>
#include <assert.h>
......@@ -1051,7 +1052,7 @@ hwloc__xml_export_new_child(hwloc__xml_export_output_t output, const char *name)
assert(0);
#endif
} else {
int res = snprintf(output->buffer, output->remaining, "%*s<%s", output->indent, "", name);
int res = hwloc_snprintf(output->buffer, output->remaining, "%*s<%s", output->indent, "", name);
hwloc__xml_export_update_buffer(output, res);
output->indent += 2;
}
......@@ -1112,7 +1113,7 @@ hwloc__xml_export_new_prop(hwloc__xml_export_output_t output, const char *name,
#endif
} else {
char *escaped = hwloc__xml_export_escape_string(value);
int res = snprintf(output->buffer, output->remaining, " %s=\"%s\"", name, escaped ? escaped : value);
int res = hwloc_snprintf(output->buffer, output->remaining, " %s=\"%s\"", name, escaped ? escaped : value);
hwloc__xml_export_update_buffer(output, res);
free(escaped);
}
......@@ -1128,7 +1129,7 @@ hwloc__xml_export_end_props(hwloc__xml_export_output_t output, unsigned nr_child
assert(0);
#endif
} else {
int res = snprintf(output->buffer, output->remaining, nr_children ? ">\n" : "/>\n");
int res = hwloc_snprintf(output->buffer, output->remaining, nr_children ? ">\n" : "/>\n");
hwloc__xml_export_update_buffer(output, res);
}
}
......@@ -1146,7 +1147,7 @@ hwloc__xml_export_end_child(hwloc__xml_export_output_t output, const char *name,
int res;
output->indent -= 2;
if (nr_children) {
res = snprintf(output->buffer, output->remaining, "%*s</%s>\n", output->indent, "", name);
res = hwloc_snprintf(output->buffer, output->remaining, "%*s</%s>\n", output->indent, "", name);
hwloc__xml_export_update_buffer(output, res);
}
}
......@@ -1365,7 +1366,7 @@ hwloc___nolibxml_prepare_export(hwloc_topology_t topology, char *xmlbuffer, int
output.buffer = xmlbuffer;
output.remaining = buflen;
res = snprintf(output.buffer, output.remaining,
res = hwloc_snprintf(output.buffer, output.remaining,
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE topology SYSTEM \"hwloc.dtd\">\n");
hwloc__xml_export_update_buffer(&output, res);
......
src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c
View file @ 8fc0aad8
......@@ -478,7 +478,7 @@ hwloc_obj_attr_snprintf(char * __hwloc_restrict string, size_t size, hwloc_obj_t
*assoc = '\0';
else
snprintf(assoc, sizeof(assoc), "%sways=%d", separator, obj->attr->cache.associativity);
res = hwloc_snprintf(tmp, tmplen, "%s%lu%s%sline=%u%s",
res = hwloc_snprintf(tmp, tmplen, "%ssize=%lu%s%slinesize=%u%s",
prefix,
(unsigned long) hwloc_memory_size_printf_value(obj->attr->cache.size, verbose),
hwloc_memory_size_printf_unit(obj->attr->cache.size, verbose),
......
src/pm/hydra/tools/topo/hwloc/hwloc/tests/linux/16amd64-8n2c-cpusets.output
View file @ 8fc0aad8
Machine (P#0 total=41943040KB DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux LinuxCgroup=/dummy)
NUMANode L#0 (P#0)
Socket L#0 (P#0)
L2Cache L#0 (1024KB line=64 ways=16)
L1Cache L#0 (64KB line=64 ways=2)
L2Cache L#0 (size=1024KB linesize=64 ways=16)
L1Cache L#0 (size=64KB linesize=64 ways=2)
Core L#0 (P#0)
PU L#0 (P#0)
L2Cache L#1 (1024KB line=64 ways=16)
L1Cache L#1 (64KB line=64 ways=2)
L2Cache L#1 (size=1024KB linesize=64 ways=16)
L1Cache L#1 (size=64KB linesize=64 ways=2)
Core L#1 (P#1)
PU L#1 (P#1)
NUMANode L#1 (P#1 local=8388608KB total=8388608KB)
Socket L#1 (P#1)
L2Cache L#2 (1024KB line=64 ways=16)
L1Cache L#2 (64KB line=64 ways=2)
L2Cache L#2 (size=1024KB linesize=64 ways=16)
L1Cache L#2 (size=64KB linesize=64 ways=2)
Core L#2 (P#0)
PU L#2 (P#2)
L2Cache L#3 (1024KB line=64 ways=16)
L1Cache L#3 (64KB line=64 ways=2)
L2Cache L#3 (size=1024KB linesize=64 ways=16)
L1Cache L#3 (size=64KB linesize=64 ways=2)
Core L#3 (P#1)
PU L#3 (P#3)
NUMANode L#2 (P#2 local=8388608KB total=8388608KB)
Socket L#2 (P#2)
L2Cache L#4 (1024KB line=64 ways=16)
L1Cache L#4 (64KB line=64 ways=2)
L2Cache L#4 (size=1024KB linesize=64 ways=16)
L1Cache L#4 (size=64KB linesize=64 ways=2)
Core L#4 (P#1)
PU L#4 (P#5)
NUMANode L#3 (P#3 local=8388608KB total=8388608KB)
Socket L#3 (P#3)
L2Cache L#5 (1024KB line=64 ways=16)
L1Cache L#5 (64KB line=64 ways=2)
L2Cache L#5 (size=1024KB linesize=64 ways=16)
L1Cache L#5 (size=64KB linesize=64 ways=2)
Core L#5 (P#0)
PU L#5 (P#6)
NUMANode L#4 (P#4 local=8388608KB total=8388608KB)
NUMANode L#5 (P#5 local=8388608KB total=8388608KB)
NUMANode L#6 (P#6)
Socket L#4 (P#6)
L2Cache L#6 (1024KB line=64 ways=16)
L1Cache L#6 (64KB line=64 ways=2)
L2Cache L#6 (size=1024KB linesize=64 ways=16)
L1Cache L#6 (size=64KB linesize=64 ways=2)
Core L#6 (P#0)
PU L#6 (P#12)
L2Cache L#7 (1024KB line=64 ways=16)
L1Cache L#7 (64KB line=64 ways=2)
L2Cache L#7 (size=1024KB linesize=64 ways=16)
L1Cache L#7 (size=64KB linesize=64 ways=2)
Core L#7 (P#1)
PU L#7 (P#13)
NUMANode L#7 (P#7)
Socket L#5 (P#7)
L2Cache L#8 (1024KB line=64 ways=16)
L1Cache L#8 (64KB line=64 ways=2)
L2Cache L#8 (size=1024KB linesize=64 ways=16)
L1Cache L#8 (size=64KB linesize=64 ways=2)
Core L#8 (P#0)
PU L#8 (P#14)
L2Cache L#9 (1024KB line=64 ways=16)
L1Cache L#9 (64KB line=64 ways=2)
L2Cache L#9 (size=1024KB linesize=64 ways=16)
L1Cache L#9 (size=64KB linesize=64 ways=2)
Core L#9 (P#1)
PU L#9 (P#15)
depth 0: 1 Machine (type #1)
......
src/pm/hydra/tools/topo/hwloc/hwloc/tests/linux/16amd64-8n2c-cpusets_noadmin.output
View file @ 8fc0aad8
Machine (P#0 total=67106960KB DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux LinuxCgroup=/dummy)
NUMANode L#0 (P#0 local=8386704KB total=8386704KB)
Socket L#0 (P#0)
L2Cache L#0 (1024KB line=64 ways=16)
L1Cache L#0 (64KB line=64 ways=2)
L2Cache L#0 (size=1024KB linesize=64 ways=16)
L1Cache L#0 (size=64KB linesize=64 ways=2)
Core L#0 (P#0)
PU L#0 (P#0)
L2Cache L#1 (1024KB line=64 ways=16)
L1Cache L#1 (64KB line=64 ways=2)
L2Cache L#1 (size=1024KB linesize=64 ways=16)
L1Cache L#1 (size=64KB linesize=64 ways=2)
Core L#1 (P#1)
PU L#1 (P#1)
NUMANode L#1 (P#1 local=8388608KB total=8388608KB)
Socket L#1 (P#1)
L2Cache L#2 (1024KB line=64 ways=16)
L1Cache L#2 (64KB line=64 ways=2)
L2Cache L#2 (size=1024KB linesize=64 ways=16)
L1Cache L#2 (size=64KB linesize=64 ways=2)
Core L#2 (P#0)
PU L#2 (P#2)
L2Cache L#3 (1024KB line=64 ways=16)
L1Cache L#3 (64KB line=64 ways=2)
L2Cache L#3 (size=1024KB linesize=64 ways=16)
L1Cache L#3 (size=64KB linesize=64 ways=2)
Core L#3 (P#1)
PU L#3 (P#3)
NUMANode L#2 (P#2 local=8388608KB total=8388608KB)
Socket L#2 (P#2)
L2Cache L#4 (1024KB line=64 ways=16)
L1Cache L#4 (64KB line=64 ways=2)
L2Cache L#4 (size=1024KB linesize=64 ways=16)
L1Cache L#4 (size=64KB linesize=64 ways=2)
Core L#4 (P#0)
PU L#4 (P#4)
L2Cache L#5 (1024KB line=64 ways=16)
L1Cache L#5 (64KB line=64 ways=2)
L2Cache L#5 (size=1024KB linesize=64 ways=16)
L1Cache L#5 (size=64KB linesize=64 ways=2)
Core L#5 (P#1)
PU L#5 (P#5)
NUMANode L#3 (P#3 local=8388608KB total=8388608KB)
Socket L#3 (P#3)
L2Cache L#6 (1024KB line=64 ways=16)
L1Cache L#6 (64KB line=64 ways=2)
L2Cache L#6 (size=1024KB linesize=64 ways=16)
L1Cache L#6 (size=64KB linesize=64 ways=2)
Core L#6 (P#0)
PU L#6 (P#6)
L2Cache L#7 (1024KB line=64 ways=16)
L1Cache L#7 (64KB line=64 ways=2)
L2Cache L#7 (size=1024KB linesize=64 ways=16)
L1Cache L#7 (size=64KB linesize=64 ways=2)
Core L#7 (P#1)
PU L#7 (P#7)
NUMANode L#4 (P#4 local=8388608KB total=8388608KB)
Socket L#4 (P#4)
L2Cache L#8 (1024KB line=64 ways=16)
L1Cache L#8 (64KB line=64 ways=2)
L2Cache L#8 (size=1024KB linesize=64 ways=16)
L1Cache L#8 (size=64KB linesize=64 ways=2)
Core L#8 (P#0)
PU L#8 (P#8)
L2Cache L#9 (1024KB line=64 ways=16)
L1Cache L#9 (64KB line=64 ways=2)
L2Cache L#9 (size=1024KB linesize=64 ways=16)
L1Cache L#9 (size=64KB linesize=64 ways=2)
Core L#9 (P#1)
PU L#9 (P#9)
NUMANode L#5 (P#5 local=8388608KB total=8388608KB)
Socket L#5 (P#5)
L2Cache L#10 (1024KB line=64 ways=16)
L1Cache L#10 (64KB line=64 ways=2)
L2Cache L#10 (size=1024KB linesize=64 ways=16)
L1Cache L#10 (size=64KB linesize=64 ways=2)
Core L#10 (P#0)
PU L#10 (P#10)
L2Cache L#11 (1024KB line=64 ways=16)
L1Cache L#11 (64KB line=64 ways=2)
L2Cache L#11 (size=1024KB linesize=64 ways=16)
L1Cache L#11 (size=64KB linesize=64 ways=2)
Core L#11 (P#1)
PU L#11 (P#11)
NUMANode L#6 (P#6 local=8388608KB total=8388608KB)
Socket L#6 (P#6)
L2Cache L#12 (1024KB line=64 ways=16)
L1Cache L#12 (64KB line=64 ways=2)
L2Cache L#12 (size=1024KB linesize=64 ways=16)
L1Cache L#12 (size=64KB linesize=64 ways=2)
Core L#12 (P#0)
PU L#12 (P#12)
L2Cache L#13 (1024KB line=64 ways=16)
L1Cache L#13 (64KB line=64 ways=2)
L2Cache L#13 (size=1024KB linesize=64 ways=16)
L1Cache L#13 (size=64KB linesize=64 ways=2)
Core L#13 (P#1)
PU L#13 (P#13)
NUMANode L#7 (P#7 local=8388608KB total=8388608KB)
Socket L#7 (P#7)
L2Cache L#14 (1024KB line=64 ways=16)
L1Cache L#14 (64KB line=64 ways=2)
L2Cache L#14 (size=1024KB linesize=64 ways=16)
L1Cache L#14 (size=64KB linesize=64 ways=2)
Core L#14 (P#0)
PU L#14 (P#14)
L2Cache L#15 (1024KB line=64 ways=16)
L1Cache L#15 (64KB line=64 ways=2)
L2Cache L#15 (size=1024KB linesize=64 ways=16)
L1Cache L#15 (size=64KB linesize=64 ways=2)
Core L#15 (P#1)
PU L#15 (P#15)
depth 0: 1 Machine (type #1)
......
src/pm/hydra/tools/topo/hwloc/hwloc/tests/linux/16amd64-8n2c.output
View file @ 8fc0aad8
Machine (P#0 total=67106960KB DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux)
NUMANode L#0 (P#0 local=8386704KB total=8386704KB)
Socket L#0 (P#0)
L2Cache L#0 (1024KB line=64 ways=16)
L1Cache L#0 (64KB line=64 ways=2)
L2Cache L#0 (size=1024KB linesize=64 ways=16)
L1Cache L#0 (size=64KB linesize=64 ways=2)
Core L#0 (P#0)
PU L#0 (P#0)
L2Cache L#1 (1024KB line=64 ways=16)
L1Cache L#1 (64KB line=64 ways=2)
L2Cache L#1 (size=1024KB linesize=64 ways=16)
L1Cache L#1 (size=64KB linesize=64 ways=2)
Core L#1 (P#1)
PU L#1 (P#1)
NUMANode L#1 (P#1 local=8388608KB total=8388608KB)
Socket L#1 (P#1)
L2Cache L#2 (1024KB line=64 ways=16)
L1Cache L#2 (64KB line=64 ways=2)
L2Cache L#2 (size=1024KB linesize=64 ways=16)
L1Cache L#2 (size=64KB linesize=64 ways=2)
Core L#2 (P#0)
PU L#2 (P#2)
L2Cache L#3 (1024KB line=64 ways=16)
L1Cache L#3 (64KB line=64 ways=2)
L2Cache L#3 (size=1024KB linesize=64 ways=16)
L1Cache L#3 (size=64KB linesize=64 ways=2)
Core L#3 (P#1)
PU L#3 (P#3)
NUMANode L#2 (P#2 local=8388608KB total=8388608KB)
Socket L#2 (P#2)
L2Cache L#4 (1024KB line=64 ways=16)
L1Cache L#4 (64KB line=64 ways=2)
L2Cache L#4 (size=1024KB linesize=64 ways=16)
L1Cache L#4 (size=64KB linesize=64 ways=2)
Core L#4 (P#0)
PU L#4 (P#4)
L2Cache L#5 (1024KB line=64 ways=16)
L1Cache L#5 (64KB line=64 ways=2)
L2Cache L#5 (size=1024KB linesize=64 ways=16)
L1Cache L#5 (size=64KB linesize=64 ways=2)
Core L#5 (P#1)
PU L#5 (P#5)
NUMANode L#3 (P#3 local=8388608KB total=8388608KB)
Socket L#3 (P#3)
L2Cache L#6 (1024KB line=64 ways=16)
L1Cache L#6 (64KB line=64 ways=2)
L2Cache L#6 (size=1024KB linesize=64 ways=16)
L1Cache L#6 (size=64KB linesize=64 ways=2)
Core L#6 (P#0)
PU L#6 (P#6)
L2Cache L#7 (1024KB line=64 ways=16)
L1Cache L#7 (64KB line=64 ways=2)
L2Cache L#7 (size=1024KB linesize=64 ways=16)
L1Cache L#7 (size=64KB linesize=64 ways=2)
Core L#7 (P#1)
PU L#7 (P#7)
NUMANode L#4 (P#4 local=8388608KB total=8388608KB)
Socket L#4 (P#4)
L2Cache L#8 (1024KB line=64 ways=16)
L1Cache L#8 (64KB line=64 ways=2)
L2Cache L#8 (size=1024KB linesize=64 ways=16)
L1Cache L#8 (size=64KB linesize=64 ways=2)
Core L#8 (P#0)
PU L#8 (P#8)
L2Cache L#9 (1024KB line=64 ways=16)
L1Cache L#9 (64KB line=64 ways=2)
L2Cache L#9 (size=1024KB linesize=64 ways=16)
L1Cache L#9 (size=64KB linesize=64 ways=2)
Core L#9 (P#1)
PU L#9 (P#9)
NUMANode L#5 (P#5 local=8388608KB total=8388608KB)
Socket L#5 (P#5)
L2Cache L#10 (1024KB line=64 ways=16)
L1Cache L#10 (64KB line=64 ways=2)
L2Cache L#10 (size=1024KB linesize=64 ways=16)
L1Cache L#10 (size=64KB linesize=64 ways=2)
Core L#10 (P#0)
PU L#10 (P#10)
L2Cache L#11 (1024KB line=64 ways=16)
L1Cache L#11 (64KB line=64 ways=2)
L2Cache L#11 (size=1024KB linesize=64 ways=16)
L1Cache L#11 (size=64KB linesize=64 ways=2)
Core L#11 (P#1)
PU L#11 (P#11)
NUMANode L#6 (P#6 local=8388608KB total=8388608KB)
Socket L#6 (P#6)
L2Cache L#12 (1024KB line=64 ways=16)
L1Cache L#12 (64KB line=64 ways=2)
L2Cache L#12 (size=1024KB linesize=64 ways=16)
L1Cache L#12 (size=64KB linesize=64 ways=2)
Core L#12 (P#0)
PU L#12 (P#12)
L2Cache L#13 (1024KB line=64 ways=16)
L1Cache L#13 (64KB line=64 ways=2)
L2Cache L#13 (size=1024KB linesize=64 ways=16)
L1Cache L#13 (size=64KB linesize=64 ways=2)
Core L#13 (P#1)
PU L#13 (P#13)
NUMANode L#7 (P#7 local=8388608KB total=8388608KB)
Socket L#7 (P#7)
L2Cache L#14 (1024KB line=64 ways=16)
L1Cache L#14 (64KB line=64 ways=2)
L2Cache L#14 (size=1024KB linesize=64 ways=16)
L1Cache L#14 (size=64KB linesize=64 ways=2)
Core L#14 (P#0)
PU L#14 (P#14)
L2Cache L#15 (1024KB line=64 ways=16)
L1Cache L#15 (64KB line=64 ways=2)
L2Cache L#15 (size=1024KB linesize=64 ways=16)
L1Cache L#15 (size=64KB linesize=64 ways=2)
Core L#15 (P#1)
PU L#15 (P#15)
depth 0: 1 Machine (type #1)
......
src/pm/hydra/tools/topo/hwloc/hwloc/tests/linux/16em64t-4s2c2t-offlines.output
View file @ 8fc0aad8
Machine (P#0 Backend=Linux)
Socket L#0 (P#0)
L3Cache L#0 (4096KB line=64 ways=16)
L2Cache L#0 (1024KB line=64 ways=8)
L1Cache L#0 (16KB line=64 ways=8)
L3Cache L#0 (size=4096KB linesize=64 ways=16)
L2Cache L#0 (size=1024KB linesize=64 ways=8)
L1Cache L#0 (size=16KB linesize=64 ways=8)
Core L#0 (P#0)
PU L#0 (P#0)
PU L#1 (P#8)
L2Cache L#1 (1024KB line=64 ways=8)
L1Cache L#1 (16KB line=64 ways=8)
L2Cache L#1 (size=1024KB linesize=64 ways=8)
L1Cache L#1 (size=16KB linesize=64 ways=8)
Core L#1 (P#1)
PU L#2 (P#4)
PU L#3 (P#12)
Socket L#1 (P#1)
L3Cache L#1 (4096KB line=64 ways=16)
L2Cache L#2 (1024KB line=64 ways=8)
L1Cache L#2 (16KB line=64 ways=8)
L3Cache L#1 (size=4096KB linesize=64 ways=16)
L2Cache L#2 (size=1024KB linesize=64 ways=8)
L1Cache L#2 (size=16KB linesize=64 ways=8)
Core L#2 (P#0)
PU L#4 (P#1)
PU L#5 (P#9)
Socket L#2 (P#3)
L3Cache L#2 (4096KB line=64 ways=16)
L2Cache L#3 (1024KB line=64 ways=8)
L1Cache L#3 (16KB line=64 ways=8)
L3Cache L#2 (size=4096KB linesize=64 ways=16)
L2Cache L#3 (size=1024KB linesize=64 ways=8)
L1Cache L#3 (size=16KB linesize=64 ways=8)
Core L#3 (P#0)
PU L#6 (P#3)
PU L#7 (P#11)
L2Cache L#4 (1024KB line=64 ways=8)
L1Cache L#4 (16KB line=64 ways=8)
L2Cache L#4 (size=1024KB linesize=64 ways=8)
L1Cache L#4 (size=16KB linesize=64 ways=8)
Core L#4 (P#1)
PU L#8 (P#7)
PU L#9 (P#15)
Socket L#3 (P#2)
L3Cache L#3 (4096KB line=64 ways=16)
L2Cache L#5 (1024KB line=64 ways=8)
L1Cache L#5 (16KB line=64 ways=8)
L3Cache L#3 (size=4096KB linesize=64 ways=16)
L2Cache L#5 (size=1024KB linesize=64 ways=8)
L1Cache L#5 (size=16KB linesize=64 ways=8)
Core L#5 (P#1)
PU L#10 (P#6)
L2Cache L#6 (1024KB line=64 ways=8)
L1Cache L#6 (16KB line=64 ways=8)
L2Cache L#6 (size=1024KB linesize=64 ways=8)
L1Cache L#6 (size=16KB linesize=64 ways=8)
Core L#6 (P#0)
PU L#11 (P#10)
depth 0: 1 Machine (type #1)
......
src/pm/hydra/tools/topo/hwloc/hwloc/tests/linux/16em64t-4s2c2t-offlines_noadmin.output
View file @ 8fc0aad8
Machine (P#0 Backend=Linux) cpuset=0x00009fdb
Socket L#0 (P#0) cpuset=0x00001111
L3Cache L#0 (4096KB line=64 ways=16) cpuset=0x00001111
L2Cache L#0 (1024KB line=64 ways=8) cpuset=0x00000101
L1Cache L#0 (16KB line=64 ways=8) cpuset=0x00000101
L3Cache L#0 (size=4096KB linesize=64 ways=16) cpuset=0x00001111
L2Cache L#0 (size=1024KB linesize=64 ways=8) cpuset=0x00000101
L1Cache L#0 (size=16KB linesize=64 ways=8) cpuset=0x00000101
Core L#0 (P#0) cpuset=0x00000101
PU L#0 (P#0) cpuset=0x00000001
PU L#1 (P#8) cpuset=0x00000100
L2Cache L#1 (1024KB line=64 ways=8) cpuset=0x00001010
L1Cache L#1 (16KB line=64 ways=8) cpuset=0x00001010
L2Cache L#1 (size=1024KB linesize=64 ways=8) cpuset=0x00001010
L1Cache L#1 (size=16KB linesize=64 ways=8) cpuset=0x00001010
Core L#1 (P#1) cpuset=0x00001010
PU L#2 (P#4) cpuset=0x00000010
PU L#3 (P#12) cpuset=0x00001000
Socket L#1 (P#1) cpuset=0x00000202
L3Cache L#1 (4096KB line=64 ways=16) cpuset=0x00000202
L2Cache L#2 (1024KB line=64 ways=8) cpuset=0x00000202
L1Cache L#2 (16KB line=64 ways=8) cpuset=0x00000202
L3Cache L#1 (size=4096KB linesize=64 ways=16) cpuset=0x00000202
L2Cache L#2 (size=1024KB linesize=64 ways=8) cpuset=0x00000202
L1Cache L#2 (size=16KB linesize=64 ways=8) cpuset=0x00000202
Core L#2 (P#0) cpuset=0x00000202
PU L#4 (P#1) cpuset=0x00000002
PU L#5 (P#9) cpuset=0x00000200
Socket L#2 (P#3) cpuset=0x00008888
L3Cache L#2 (4096KB line=64 ways=16) cpuset=0x00008888
L2Cache L#3 (1024KB line=64 ways=8) cpuset=0x00000808
L1Cache L#3 (16KB line=64 ways=8) cpuset=0x00000808
L3Cache L#2 (size=4096KB linesize=64 ways=16) cpuset=0x00008888
L2Cache L#3 (size=1024KB linesize=64 ways=8) cpuset=0x00000808
L1Cache L#3 (size=16KB linesize=64 ways=8) cpuset=0x00000808
Core L#3 (P#0) cpuset=0x00000808
PU L#6 (P#3) cpuset=0x00000008
PU L#7 (P#11) cpuset=0x00000800
L2Cache L#4 (1024KB line=64 ways=8) cpuset=0x00008080
L1Cache L#4 (16KB line=64 ways=8) cpuset=0x00008080
L2Cache L#4 (size=1024KB linesize=64 ways=8) cpuset=0x00008080
L1Cache L#4 (size=16KB linesize=64 ways=8) cpuset=0x00008080
Core L#4 (P#1) cpuset=0x00008080
PU L#8 (P#7) cpuset=0x00000080
PU L#9 (P#15) cpuset=0x00008000
Socket L#3 (P#2) cpuset=0x00000440
L3Cache L#3 (4096KB line=64 ways=16) cpuset=0x00000440
L2Cache L#5 (1024KB line=64 ways=8) cpuset=0x00000040
L1Cache L#5 (16KB line=64 ways=8) cpuset=0x00000040
L3Cache L#3 (size=4096KB linesize=64 ways=16) cpuset=0x00000440
L2Cache L#5 (size=1024KB linesize=64 ways=8) cpuset=0x00000040
L1Cache L#5 (size=16KB linesize=64 ways=8) cpuset=0x00000040
Core L#5 (P#1) cpuset=0x00000040
PU L#10 (P#6) cpuset=0x00000040
L2Cache L#6 (1024KB line=64 ways=8) cpuset=0x00000400
L1Cache L#6 (16KB line=64 ways=8) cpuset=0x00000400
L2Cache L#6 (size=1024KB linesize=64 ways=8) cpuset=0x00000400
L1Cache L#6 (size=16KB linesize=64 ways=8) cpuset=0x00000400
Core L#6 (P#0) cpuset=0x00000400
PU L#11 (P#10) cpuset=0x00000400
depth 0: 1 Machine (type #1)
......
src/pm/hydra/tools/topo/hwloc/hwloc/tests/linux/16em64t-4s2c2t.output
View file @ 8fc0aad8
Machine (P#0 Backend=Linux)
Socket L#0 (P#0)
L3Cache L#0 (4096KB line=64 ways=16)
L2Cache L#0 (1024KB line=64 ways=8)
L1Cache L#0 (16KB line=64 ways=8)
L3Cache L#0 (size=4096KB linesize=64 ways=16)
L2Cache L#0 (size=1024KB linesize=64 ways=8)
L1Cache L#0 (size=16KB linesize=64 ways=8)
Core L#0 (P#0)
PU L#0 (P#0)
PU L#1 (P#8)
L2Cache L#1 (1024KB line=64 ways=8)
L1Cache L#1 (16KB line=64 ways=8)
L2Cache L#1 (size=1024KB linesize=64 ways=8)
L1Cache L#1 (size=16KB linesize=64 ways=8)
Core L#1 (P#1)
PU L#2 (P#4)
PU L#3 (P#12)
Socket L#1 (P#1)
L3Cache L#1 (4096KB line=64 ways=16)
L2Cache L#2 (1024KB line=64 ways=8)
L1Cache L#2 (16KB line=64 ways=8)
L3Cache L#1 (size=4096KB linesize=64 ways=16)
L2Cache L#2 (size=1024KB linesize=64 ways=8)
L1Cache L#2 (size=16KB linesize=64 ways=8)
Core L#2 (P#0)
PU L#4 (P#1)
PU L#5 (P#9)