For machines that don't expose useful information through sysfs, the dummy ID 0 is used. https://issues.redhat.com/browse/RHEL-7043 Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> --- src/conf/capabilities.c | 5 +- src/conf/capabilities.h | 1 + src/conf/schemas/capability.rng | 3 + src/libvirt_linux.syms | 1 + src/util/virhostcpu.c | 22 + src/util/virhostcpu.h | 1 + tests/capabilityschemadata/caps-qemu-kvm.xml | 32 +- .../vircaps-aarch64-basic-clusters.xml | 448 +++++++++--------- .../vircaps2xmldata/vircaps-aarch64-basic.xml | 32 +- .../vircaps-x86_64-basic-dies.xml | 24 +- .../vircaps2xmldata/vircaps-x86_64-basic.xml | 32 +- .../vircaps2xmldata/vircaps-x86_64-caches.xml | 16 +- tests/vircaps2xmldata/vircaps-x86_64-hmat.xml | 48 +- .../vircaps-x86_64-resctrl-cdp.xml | 24 +- .../vircaps-x86_64-resctrl-cmt.xml | 24 +- .../vircaps-x86_64-resctrl-fake-feature.xml | 24 +- .../vircaps-x86_64-resctrl-skx-twocaches.xml | 2 +- .../vircaps-x86_64-resctrl-skx.xml | 2 +- .../vircaps-x86_64-resctrl.xml | 24 +- 19 files changed, 398 insertions(+), 367 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 32badee7b3..02298e40a3 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -811,9 +811,10 @@ virCapsHostNUMACellCPUFormat(virBuffer *buf, return -1; virBufferAsprintf(&childBuf, - " socket_id='%d' die_id='%d' core_id='%d' siblings='%s'", + " socket_id='%d' die_id='%d' cluster_id='%d' core_id='%d' siblings='%s'", cpus[j].socket_id, cpus[j].die_id, + cpus[j].cluster_id, cpus[j].core_id, siblings); } @@ -1453,6 +1454,7 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED, if (virHostCPUGetSocket(cpu_id, &cpu->socket_id) < 0 || virHostCPUGetDie(cpu_id, &cpu->die_id) < 0 || + virHostCPUGetCluster(cpu_id, &cpu->cluster_id) < 0 || virHostCPUGetCore(cpu_id, &cpu->core_id) < 0) return -1; @@ -1712,6 +1714,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps) if (tmp) { cpus[cid].id = id; cpus[cid].die_id = 0; + cpus[cid].cluster_id = 0; cpus[cid].socket_id = s; cpus[cid].core_id = c; cpus[cid].siblings = virBitmapNewCopy(siblings); diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e2807..52e395de14 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -89,6 +89,7 @@ struct _virCapsHostNUMACellCPU { unsigned int id; unsigned int socket_id; unsigned int die_id; + unsigned int cluster_id; unsigned int core_id; virBitmap *siblings; }; diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng index b1968df258..a1606941e7 100644 --- a/src/conf/schemas/capability.rng +++ b/src/conf/schemas/capability.rng @@ -201,6 +201,9 @@ <attribute name="die_id"> <ref name="unsignedInt"/> </attribute> + <attribute name="cluster_id"> + <ref name="unsignedInt"/> + </attribute> <attribute name="core_id"> <ref name="unsignedInt"/> </attribute> diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms index 55649ae39c..004cbfee97 100644 --- a/src/libvirt_linux.syms +++ b/src/libvirt_linux.syms @@ -3,6 +3,7 @@ # # util/virhostcpu.h +virHostCPUGetCluster; virHostCPUGetCore; virHostCPUGetDie; virHostCPUGetInfoPopulateLinux; diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 4027547e1e..a3781ca870 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -232,6 +232,28 @@ virHostCPUGetDie(unsigned int cpu, unsigned int *die) return 0; } +int +virHostCPUGetCluster(unsigned int cpu, unsigned int *cluster) +{ + int cluster_id; + int ret = virFileReadValueInt(&cluster_id, + "%s/cpu/cpu%u/topology/cluster_id", + SYSFS_SYSTEM_PATH, cpu); + + if (ret == -1) + return -1; + + /* If the file doesn't exists (old kernel) or the value contained + * in it is -1 (architecture without CPU clusters), report 0 to + * indicate the lack of information */ + if (ret == -2 || cluster_id < 0) + cluster_id = 0; + + *cluster = cluster_id; + + return 0; +} + int virHostCPUGetCore(unsigned int cpu, unsigned int *core) { diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 5f0d43e069..d7e09bff22 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -68,6 +68,7 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param, #ifdef __linux__ int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket); int virHostCPUGetDie(unsigned int cpu, unsigned int *die); +int virHostCPUGetCluster(unsigned int cpu, unsigned int *cluster); int virHostCPUGetCore(unsigned int cpu, unsigned int *core); virBitmap *virHostCPUGetSiblingsList(unsigned int cpu); diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index acdbb362cc..317fa0885f 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -64,14 +64,14 @@ <sibling id='1' value='21'/> </distances> <cpus num='8'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='2' socket_id='0' die_id='0' core_id='1' siblings='2'/> - <cpu id='4' socket_id='0' die_id='0' core_id='2' siblings='4'/> - <cpu id='6' socket_id='0' die_id='0' core_id='3' siblings='6'/> - <cpu id='8' socket_id='0' die_id='0' core_id='4' siblings='8'/> - <cpu id='10' socket_id='0' die_id='0' core_id='5' siblings='10'/> - <cpu id='12' socket_id='0' die_id='0' core_id='6' siblings='12'/> - <cpu id='14' socket_id='0' die_id='0' core_id='7' siblings='14'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='2'/> + <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='4'/> + <cpu id='6' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='6'/> + <cpu id='8' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='8'/> + <cpu id='10' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='10'/> + <cpu id='12' socket_id='0' die_id='0' cluster_id='0' core_id='6' siblings='12'/> + <cpu id='14' socket_id='0' die_id='0' cluster_id='0' core_id='7' siblings='14'/> </cpus> </cell> <cell id='1'> @@ -84,14 +84,14 @@ <sibling id='1' value='10'/> </distances> <cpus num='8'> - <cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/> - <cpu id='3' socket_id='1' die_id='0' core_id='1' siblings='3'/> - <cpu id='5' socket_id='1' die_id='0' core_id='2' siblings='5'/> - <cpu id='7' socket_id='1' die_id='0' core_id='3' siblings='7'/> - <cpu id='9' socket_id='1' die_id='0' core_id='4' siblings='9'/> - <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> - <cpu id='13' socket_id='1' die_id='0' core_id='6' siblings='13'/> - <cpu id='15' socket_id='1' die_id='0' core_id='7' siblings='15'/> + <cpu id='1' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='1'/> + <cpu id='3' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='3'/> + <cpu id='5' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='5'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='7'/> + <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='9'/> + <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/> + <cpu id='13' socket_id='1' die_id='0' cluster_id='0' core_id='6' siblings='13'/> + <cpu id='15' socket_id='1' die_id='0' cluster_id='0' core_id='7' siblings='15'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml index 886779636a..55b4b6ca90 100644 --- a/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml +++ b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml @@ -14,118 +14,118 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='112'> - <cpu id='0' socket_id='36' die_id='0' core_id='0' siblings='0,28,56,84'/> - <cpu id='1' socket_id='36' die_id='0' core_id='1' siblings='1,29,57,85'/> - <cpu id='2' socket_id='36' die_id='0' core_id='2' siblings='2,30,58,86'/> - <cpu id='3' socket_id='36' die_id='0' core_id='3' siblings='3,31,59,87'/> - <cpu id='4' socket_id='36' die_id='0' core_id='4' siblings='4,32,60,88'/> - <cpu id='5' socket_id='36' die_id='0' core_id='5' siblings='5,33,61,89'/> - <cpu id='6' socket_id='36' die_id='0' core_id='6' siblings='6,34,62,90'/> - <cpu id='7' socket_id='36' die_id='0' core_id='7' siblings='7,35,63,91'/> - <cpu id='8' socket_id='36' die_id='0' core_id='8' siblings='8,36,64,92'/> - <cpu id='9' socket_id='36' die_id='0' core_id='9' siblings='9,37,65,93'/> - <cpu id='10' socket_id='36' die_id='0' core_id='10' siblings='10,38,66,94'/> - <cpu id='11' socket_id='36' die_id='0' core_id='11' siblings='11,39,67,95'/> - <cpu id='12' socket_id='36' die_id='0' core_id='12' siblings='12,40,68,96'/> - <cpu id='13' socket_id='36' die_id='0' core_id='13' siblings='13,41,69,97'/> - <cpu id='14' socket_id='36' die_id='0' core_id='14' siblings='14,42,70,98'/> - <cpu id='15' socket_id='36' die_id='0' core_id='15' siblings='15,43,71,99'/> - <cpu id='16' socket_id='36' die_id='0' core_id='16' siblings='16,44,72,100'/> - <cpu id='17' socket_id='36' die_id='0' core_id='17' siblings='17,45,73,101'/> - <cpu id='18' socket_id='36' die_id='0' core_id='18' siblings='18,46,74,102'/> - <cpu id='19' socket_id='36' die_id='0' core_id='19' siblings='19,47,75,103'/> - <cpu id='20' socket_id='36' die_id='0' core_id='20' siblings='20,48,76,104'/> - <cpu id='21' socket_id='36' die_id='0' core_id='21' siblings='21,49,77,105'/> - <cpu id='22' socket_id='36' die_id='0' core_id='22' siblings='22,50,78,106'/> - <cpu id='23' socket_id='36' die_id='0' core_id='23' siblings='23,51,79,107'/> - <cpu id='24' socket_id='36' die_id='0' core_id='24' siblings='24,52,80,108'/> - <cpu id='25' socket_id='36' die_id='0' core_id='25' siblings='25,53,81,109'/> - <cpu id='26' socket_id='36' die_id='0' core_id='26' siblings='26,54,82,110'/> - <cpu id='27' socket_id='36' die_id='0' core_id='27' siblings='27,55,83,111'/> - <cpu id='28' socket_id='36' die_id='0' core_id='0' siblings='0,28,56,84'/> - <cpu id='29' socket_id='36' die_id='0' core_id='1' siblings='1,29,57,85'/> - <cpu id='30' socket_id='36' die_id='0' core_id='2' siblings='2,30,58,86'/> - <cpu id='31' socket_id='36' die_id='0' core_id='3' siblings='3,31,59,87'/> - <cpu id='32' socket_id='36' die_id='0' core_id='4' siblings='4,32,60,88'/> - <cpu id='33' socket_id='36' die_id='0' core_id='5' siblings='5,33,61,89'/> - <cpu id='34' socket_id='36' die_id='0' core_id='6' siblings='6,34,62,90'/> - <cpu id='35' socket_id='36' die_id='0' core_id='7' siblings='7,35,63,91'/> - <cpu id='36' socket_id='36' die_id='0' core_id='8' siblings='8,36,64,92'/> - <cpu id='37' socket_id='36' die_id='0' core_id='9' siblings='9,37,65,93'/> - <cpu id='38' socket_id='36' die_id='0' core_id='10' siblings='10,38,66,94'/> - <cpu id='39' socket_id='36' die_id='0' core_id='11' siblings='11,39,67,95'/> - <cpu id='40' socket_id='36' die_id='0' core_id='12' siblings='12,40,68,96'/> - <cpu id='41' socket_id='36' die_id='0' core_id='13' siblings='13,41,69,97'/> - <cpu id='42' socket_id='36' die_id='0' core_id='14' siblings='14,42,70,98'/> - <cpu id='43' socket_id='36' die_id='0' core_id='15' siblings='15,43,71,99'/> - <cpu id='44' socket_id='36' die_id='0' core_id='16' siblings='16,44,72,100'/> - <cpu id='45' socket_id='36' die_id='0' core_id='17' siblings='17,45,73,101'/> - <cpu id='46' socket_id='36' die_id='0' core_id='18' siblings='18,46,74,102'/> - <cpu id='47' socket_id='36' die_id='0' core_id='19' siblings='19,47,75,103'/> - <cpu id='48' socket_id='36' die_id='0' core_id='20' siblings='20,48,76,104'/> - <cpu id='49' socket_id='36' die_id='0' core_id='21' siblings='21,49,77,105'/> - <cpu id='50' socket_id='36' die_id='0' core_id='22' siblings='22,50,78,106'/> - <cpu id='51' socket_id='36' die_id='0' core_id='23' siblings='23,51,79,107'/> - <cpu id='52' socket_id='36' die_id='0' core_id='24' siblings='24,52,80,108'/> - <cpu id='53' socket_id='36' die_id='0' core_id='25' siblings='25,53,81,109'/> - <cpu id='54' socket_id='36' die_id='0' core_id='26' siblings='26,54,82,110'/> - <cpu id='55' socket_id='36' die_id='0' core_id='27' siblings='27,55,83,111'/> - <cpu id='56' socket_id='36' die_id='0' core_id='0' siblings='0,28,56,84'/> - <cpu id='57' socket_id='36' die_id='0' core_id='1' siblings='1,29,57,85'/> - <cpu id='58' socket_id='36' die_id='0' core_id='2' siblings='2,30,58,86'/> - <cpu id='59' socket_id='36' die_id='0' core_id='3' siblings='3,31,59,87'/> - <cpu id='60' socket_id='36' die_id='0' core_id='4' siblings='4,32,60,88'/> - <cpu id='61' socket_id='36' die_id='0' core_id='5' siblings='5,33,61,89'/> - <cpu id='62' socket_id='36' die_id='0' core_id='6' siblings='6,34,62,90'/> - <cpu id='63' socket_id='36' die_id='0' core_id='7' siblings='7,35,63,91'/> - <cpu id='64' socket_id='36' die_id='0' core_id='8' siblings='8,36,64,92'/> - <cpu id='65' socket_id='36' die_id='0' core_id='9' siblings='9,37,65,93'/> - <cpu id='66' socket_id='36' die_id='0' core_id='10' siblings='10,38,66,94'/> - <cpu id='67' socket_id='36' die_id='0' core_id='11' siblings='11,39,67,95'/> - <cpu id='68' socket_id='36' die_id='0' core_id='12' siblings='12,40,68,96'/> - <cpu id='69' socket_id='36' die_id='0' core_id='13' siblings='13,41,69,97'/> - <cpu id='70' socket_id='36' die_id='0' core_id='14' siblings='14,42,70,98'/> - <cpu id='71' socket_id='36' die_id='0' core_id='15' siblings='15,43,71,99'/> - <cpu id='72' socket_id='36' die_id='0' core_id='16' siblings='16,44,72,100'/> - <cpu id='73' socket_id='36' die_id='0' core_id='17' siblings='17,45,73,101'/> - <cpu id='74' socket_id='36' die_id='0' core_id='18' siblings='18,46,74,102'/> - <cpu id='75' socket_id='36' die_id='0' core_id='19' siblings='19,47,75,103'/> - <cpu id='76' socket_id='36' die_id='0' core_id='20' siblings='20,48,76,104'/> - <cpu id='77' socket_id='36' die_id='0' core_id='21' siblings='21,49,77,105'/> - <cpu id='78' socket_id='36' die_id='0' core_id='22' siblings='22,50,78,106'/> - <cpu id='79' socket_id='36' die_id='0' core_id='23' siblings='23,51,79,107'/> - <cpu id='80' socket_id='36' die_id='0' core_id='24' siblings='24,52,80,108'/> - <cpu id='81' socket_id='36' die_id='0' core_id='25' siblings='25,53,81,109'/> - <cpu id='82' socket_id='36' die_id='0' core_id='26' siblings='26,54,82,110'/> - <cpu id='83' socket_id='36' die_id='0' core_id='27' siblings='27,55,83,111'/> - <cpu id='84' socket_id='36' die_id='0' core_id='0' siblings='0,28,56,84'/> - <cpu id='85' socket_id='36' die_id='0' core_id='1' siblings='1,29,57,85'/> - <cpu id='86' socket_id='36' die_id='0' core_id='2' siblings='2,30,58,86'/> - <cpu id='87' socket_id='36' die_id='0' core_id='3' siblings='3,31,59,87'/> - <cpu id='88' socket_id='36' die_id='0' core_id='4' siblings='4,32,60,88'/> - <cpu id='89' socket_id='36' die_id='0' core_id='5' siblings='5,33,61,89'/> - <cpu id='90' socket_id='36' die_id='0' core_id='6' siblings='6,34,62,90'/> - <cpu id='91' socket_id='36' die_id='0' core_id='7' siblings='7,35,63,91'/> - <cpu id='92' socket_id='36' die_id='0' core_id='8' siblings='8,36,64,92'/> - <cpu id='93' socket_id='36' die_id='0' core_id='9' siblings='9,37,65,93'/> - <cpu id='94' socket_id='36' die_id='0' core_id='10' siblings='10,38,66,94'/> - <cpu id='95' socket_id='36' die_id='0' core_id='11' siblings='11,39,67,95'/> - <cpu id='96' socket_id='36' die_id='0' core_id='12' siblings='12,40,68,96'/> - <cpu id='97' socket_id='36' die_id='0' core_id='13' siblings='13,41,69,97'/> - <cpu id='98' socket_id='36' die_id='0' core_id='14' siblings='14,42,70,98'/> - <cpu id='99' socket_id='36' die_id='0' core_id='15' siblings='15,43,71,99'/> - <cpu id='100' socket_id='36' die_id='0' core_id='16' siblings='16,44,72,100'/> - <cpu id='101' socket_id='36' die_id='0' core_id='17' siblings='17,45,73,101'/> - <cpu id='102' socket_id='36' die_id='0' core_id='18' siblings='18,46,74,102'/> - <cpu id='103' socket_id='36' die_id='0' core_id='19' siblings='19,47,75,103'/> - <cpu id='104' socket_id='36' die_id='0' core_id='20' siblings='20,48,76,104'/> - <cpu id='105' socket_id='36' die_id='0' core_id='21' siblings='21,49,77,105'/> - <cpu id='106' socket_id='36' die_id='0' core_id='22' siblings='22,50,78,106'/> - <cpu id='107' socket_id='36' die_id='0' core_id='23' siblings='23,51,79,107'/> - <cpu id='108' socket_id='36' die_id='0' core_id='24' siblings='24,52,80,108'/> - <cpu id='109' socket_id='36' die_id='0' core_id='25' siblings='25,53,81,109'/> - <cpu id='110' socket_id='36' die_id='0' core_id='26' siblings='26,54,82,110'/> - <cpu id='111' socket_id='36' die_id='0' core_id='27' siblings='27,55,83,111'/> + <cpu id='0' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0,28,56,84'/> + <cpu id='1' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='1,29,57,85'/> + <cpu id='2' socket_id='36' die_id='0' cluster_id='2' core_id='2' siblings='2,30,58,86'/> + <cpu id='3' socket_id='36' die_id='0' cluster_id='3' core_id='3' siblings='3,31,59,87'/> + <cpu id='4' socket_id='36' die_id='0' cluster_id='4' core_id='4' siblings='4,32,60,88'/> + <cpu id='5' socket_id='36' die_id='0' cluster_id='5' core_id='5' siblings='5,33,61,89'/> + <cpu id='6' socket_id='36' die_id='0' cluster_id='6' core_id='6' siblings='6,34,62,90'/> + <cpu id='7' socket_id='36' die_id='0' cluster_id='7' core_id='7' siblings='7,35,63,91'/> + <cpu id='8' socket_id='36' die_id='0' cluster_id='8' core_id='8' siblings='8,36,64,92'/> + <cpu id='9' socket_id='36' die_id='0' cluster_id='9' core_id='9' siblings='9,37,65,93'/> + <cpu id='10' socket_id='36' die_id='0' cluster_id='10' core_id='10' siblings='10,38,66,94'/> + <cpu id='11' socket_id='36' die_id='0' cluster_id='11' core_id='11' siblings='11,39,67,95'/> + <cpu id='12' socket_id='36' die_id='0' cluster_id='12' core_id='12' siblings='12,40,68,96'/> + <cpu id='13' socket_id='36' die_id='0' cluster_id='13' core_id='13' siblings='13,41,69,97'/> + <cpu id='14' socket_id='36' die_id='0' cluster_id='14' core_id='14' siblings='14,42,70,98'/> + <cpu id='15' socket_id='36' die_id='0' cluster_id='15' core_id='15' siblings='15,43,71,99'/> + <cpu id='16' socket_id='36' die_id='0' cluster_id='16' core_id='16' siblings='16,44,72,100'/> + <cpu id='17' socket_id='36' die_id='0' cluster_id='17' core_id='17' siblings='17,45,73,101'/> + <cpu id='18' socket_id='36' die_id='0' cluster_id='18' core_id='18' siblings='18,46,74,102'/> + <cpu id='19' socket_id='36' die_id='0' cluster_id='19' core_id='19' siblings='19,47,75,103'/> + <cpu id='20' socket_id='36' die_id='0' cluster_id='20' core_id='20' siblings='20,48,76,104'/> + <cpu id='21' socket_id='36' die_id='0' cluster_id='21' core_id='21' siblings='21,49,77,105'/> + <cpu id='22' socket_id='36' die_id='0' cluster_id='22' core_id='22' siblings='22,50,78,106'/> + <cpu id='23' socket_id='36' die_id='0' cluster_id='23' core_id='23' siblings='23,51,79,107'/> + <cpu id='24' socket_id='36' die_id='0' cluster_id='24' core_id='24' siblings='24,52,80,108'/> + <cpu id='25' socket_id='36' die_id='0' cluster_id='25' core_id='25' siblings='25,53,81,109'/> + <cpu id='26' socket_id='36' die_id='0' cluster_id='26' core_id='26' siblings='26,54,82,110'/> + <cpu id='27' socket_id='36' die_id='0' cluster_id='27' core_id='27' siblings='27,55,83,111'/> + <cpu id='28' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0,28,56,84'/> + <cpu id='29' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='1,29,57,85'/> + <cpu id='30' socket_id='36' die_id='0' cluster_id='2' core_id='2' siblings='2,30,58,86'/> + <cpu id='31' socket_id='36' die_id='0' cluster_id='3' core_id='3' siblings='3,31,59,87'/> + <cpu id='32' socket_id='36' die_id='0' cluster_id='4' core_id='4' siblings='4,32,60,88'/> + <cpu id='33' socket_id='36' die_id='0' cluster_id='5' core_id='5' siblings='5,33,61,89'/> + <cpu id='34' socket_id='36' die_id='0' cluster_id='6' core_id='6' siblings='6,34,62,90'/> + <cpu id='35' socket_id='36' die_id='0' cluster_id='7' core_id='7' siblings='7,35,63,91'/> + <cpu id='36' socket_id='36' die_id='0' cluster_id='8' core_id='8' siblings='8,36,64,92'/> + <cpu id='37' socket_id='36' die_id='0' cluster_id='9' core_id='9' siblings='9,37,65,93'/> + <cpu id='38' socket_id='36' die_id='0' cluster_id='10' core_id='10' siblings='10,38,66,94'/> + <cpu id='39' socket_id='36' die_id='0' cluster_id='11' core_id='11' siblings='11,39,67,95'/> + <cpu id='40' socket_id='36' die_id='0' cluster_id='12' core_id='12' siblings='12,40,68,96'/> + <cpu id='41' socket_id='36' die_id='0' cluster_id='13' core_id='13' siblings='13,41,69,97'/> + <cpu id='42' socket_id='36' die_id='0' cluster_id='14' core_id='14' siblings='14,42,70,98'/> + <cpu id='43' socket_id='36' die_id='0' cluster_id='15' core_id='15' siblings='15,43,71,99'/> + <cpu id='44' socket_id='36' die_id='0' cluster_id='16' core_id='16' siblings='16,44,72,100'/> + <cpu id='45' socket_id='36' die_id='0' cluster_id='17' core_id='17' siblings='17,45,73,101'/> + <cpu id='46' socket_id='36' die_id='0' cluster_id='18' core_id='18' siblings='18,46,74,102'/> + <cpu id='47' socket_id='36' die_id='0' cluster_id='19' core_id='19' siblings='19,47,75,103'/> + <cpu id='48' socket_id='36' die_id='0' cluster_id='20' core_id='20' siblings='20,48,76,104'/> + <cpu id='49' socket_id='36' die_id='0' cluster_id='21' core_id='21' siblings='21,49,77,105'/> + <cpu id='50' socket_id='36' die_id='0' cluster_id='22' core_id='22' siblings='22,50,78,106'/> + <cpu id='51' socket_id='36' die_id='0' cluster_id='23' core_id='23' siblings='23,51,79,107'/> + <cpu id='52' socket_id='36' die_id='0' cluster_id='24' core_id='24' siblings='24,52,80,108'/> + <cpu id='53' socket_id='36' die_id='0' cluster_id='25' core_id='25' siblings='25,53,81,109'/> + <cpu id='54' socket_id='36' die_id='0' cluster_id='26' core_id='26' siblings='26,54,82,110'/> + <cpu id='55' socket_id='36' die_id='0' cluster_id='27' core_id='27' siblings='27,55,83,111'/> + <cpu id='56' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0,28,56,84'/> + <cpu id='57' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='1,29,57,85'/> + <cpu id='58' socket_id='36' die_id='0' cluster_id='2' core_id='2' siblings='2,30,58,86'/> + <cpu id='59' socket_id='36' die_id='0' cluster_id='3' core_id='3' siblings='3,31,59,87'/> + <cpu id='60' socket_id='36' die_id='0' cluster_id='4' core_id='4' siblings='4,32,60,88'/> + <cpu id='61' socket_id='36' die_id='0' cluster_id='5' core_id='5' siblings='5,33,61,89'/> + <cpu id='62' socket_id='36' die_id='0' cluster_id='6' core_id='6' siblings='6,34,62,90'/> + <cpu id='63' socket_id='36' die_id='0' cluster_id='7' core_id='7' siblings='7,35,63,91'/> + <cpu id='64' socket_id='36' die_id='0' cluster_id='8' core_id='8' siblings='8,36,64,92'/> + <cpu id='65' socket_id='36' die_id='0' cluster_id='9' core_id='9' siblings='9,37,65,93'/> + <cpu id='66' socket_id='36' die_id='0' cluster_id='10' core_id='10' siblings='10,38,66,94'/> + <cpu id='67' socket_id='36' die_id='0' cluster_id='11' core_id='11' siblings='11,39,67,95'/> + <cpu id='68' socket_id='36' die_id='0' cluster_id='12' core_id='12' siblings='12,40,68,96'/> + <cpu id='69' socket_id='36' die_id='0' cluster_id='13' core_id='13' siblings='13,41,69,97'/> + <cpu id='70' socket_id='36' die_id='0' cluster_id='14' core_id='14' siblings='14,42,70,98'/> + <cpu id='71' socket_id='36' die_id='0' cluster_id='15' core_id='15' siblings='15,43,71,99'/> + <cpu id='72' socket_id='36' die_id='0' cluster_id='16' core_id='16' siblings='16,44,72,100'/> + <cpu id='73' socket_id='36' die_id='0' cluster_id='17' core_id='17' siblings='17,45,73,101'/> + <cpu id='74' socket_id='36' die_id='0' cluster_id='18' core_id='18' siblings='18,46,74,102'/> + <cpu id='75' socket_id='36' die_id='0' cluster_id='19' core_id='19' siblings='19,47,75,103'/> + <cpu id='76' socket_id='36' die_id='0' cluster_id='20' core_id='20' siblings='20,48,76,104'/> + <cpu id='77' socket_id='36' die_id='0' cluster_id='21' core_id='21' siblings='21,49,77,105'/> + <cpu id='78' socket_id='36' die_id='0' cluster_id='22' core_id='22' siblings='22,50,78,106'/> + <cpu id='79' socket_id='36' die_id='0' cluster_id='23' core_id='23' siblings='23,51,79,107'/> + <cpu id='80' socket_id='36' die_id='0' cluster_id='24' core_id='24' siblings='24,52,80,108'/> + <cpu id='81' socket_id='36' die_id='0' cluster_id='25' core_id='25' siblings='25,53,81,109'/> + <cpu id='82' socket_id='36' die_id='0' cluster_id='26' core_id='26' siblings='26,54,82,110'/> + <cpu id='83' socket_id='36' die_id='0' cluster_id='27' core_id='27' siblings='27,55,83,111'/> + <cpu id='84' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0,28,56,84'/> + <cpu id='85' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='1,29,57,85'/> + <cpu id='86' socket_id='36' die_id='0' cluster_id='2' core_id='2' siblings='2,30,58,86'/> + <cpu id='87' socket_id='36' die_id='0' cluster_id='3' core_id='3' siblings='3,31,59,87'/> + <cpu id='88' socket_id='36' die_id='0' cluster_id='4' core_id='4' siblings='4,32,60,88'/> + <cpu id='89' socket_id='36' die_id='0' cluster_id='5' core_id='5' siblings='5,33,61,89'/> + <cpu id='90' socket_id='36' die_id='0' cluster_id='6' core_id='6' siblings='6,34,62,90'/> + <cpu id='91' socket_id='36' die_id='0' cluster_id='7' core_id='7' siblings='7,35,63,91'/> + <cpu id='92' socket_id='36' die_id='0' cluster_id='8' core_id='8' siblings='8,36,64,92'/> + <cpu id='93' socket_id='36' die_id='0' cluster_id='9' core_id='9' siblings='9,37,65,93'/> + <cpu id='94' socket_id='36' die_id='0' cluster_id='10' core_id='10' siblings='10,38,66,94'/> + <cpu id='95' socket_id='36' die_id='0' cluster_id='11' core_id='11' siblings='11,39,67,95'/> + <cpu id='96' socket_id='36' die_id='0' cluster_id='12' core_id='12' siblings='12,40,68,96'/> + <cpu id='97' socket_id='36' die_id='0' cluster_id='13' core_id='13' siblings='13,41,69,97'/> + <cpu id='98' socket_id='36' die_id='0' cluster_id='14' core_id='14' siblings='14,42,70,98'/> + <cpu id='99' socket_id='36' die_id='0' cluster_id='15' core_id='15' siblings='15,43,71,99'/> + <cpu id='100' socket_id='36' die_id='0' cluster_id='16' core_id='16' siblings='16,44,72,100'/> + <cpu id='101' socket_id='36' die_id='0' cluster_id='17' core_id='17' siblings='17,45,73,101'/> + <cpu id='102' socket_id='36' die_id='0' cluster_id='18' core_id='18' siblings='18,46,74,102'/> + <cpu id='103' socket_id='36' die_id='0' cluster_id='19' core_id='19' siblings='19,47,75,103'/> + <cpu id='104' socket_id='36' die_id='0' cluster_id='20' core_id='20' siblings='20,48,76,104'/> + <cpu id='105' socket_id='36' die_id='0' cluster_id='21' core_id='21' siblings='21,49,77,105'/> + <cpu id='106' socket_id='36' die_id='0' cluster_id='22' core_id='22' siblings='22,50,78,106'/> + <cpu id='107' socket_id='36' die_id='0' cluster_id='23' core_id='23' siblings='23,51,79,107'/> + <cpu id='108' socket_id='36' die_id='0' cluster_id='24' core_id='24' siblings='24,52,80,108'/> + <cpu id='109' socket_id='36' die_id='0' cluster_id='25' core_id='25' siblings='25,53,81,109'/> + <cpu id='110' socket_id='36' die_id='0' cluster_id='26' core_id='26' siblings='26,54,82,110'/> + <cpu id='111' socket_id='36' die_id='0' cluster_id='27' core_id='27' siblings='27,55,83,111'/> </cpus> </cell> <cell id='1'> @@ -134,118 +134,118 @@ <pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='1048576'>8192</pages> <cpus num='112'> - <cpu id='112' socket_id='3180' die_id='0' core_id='256' siblings='112,140,168,196'/> - <cpu id='113' socket_id='3180' die_id='0' core_id='257' siblings='113,141,169,197'/> - <cpu id='114' socket_id='3180' die_id='0' core_id='258' siblings='114,142,170,198'/> - <cpu id='115' socket_id='3180' die_id='0' core_id='259' siblings='115,143,171,199'/> - <cpu id='116' socket_id='3180' die_id='0' core_id='260' siblings='116,144,172,200'/> - <cpu id='117' socket_id='3180' die_id='0' core_id='261' siblings='117,145,173,201'/> - <cpu id='118' socket_id='3180' die_id='0' core_id='262' siblings='118,146,174,202'/> - <cpu id='119' socket_id='3180' die_id='0' core_id='263' siblings='119,147,175,203'/> - <cpu id='120' socket_id='3180' die_id='0' core_id='264' siblings='120,148,176,204'/> - <cpu id='121' socket_id='3180' die_id='0' core_id='265' siblings='121,149,177,205'/> - <cpu id='122' socket_id='3180' die_id='0' core_id='266' siblings='122,150,178,206'/> - <cpu id='123' socket_id='3180' die_id='0' core_id='267' siblings='123,151,179,207'/> - <cpu id='124' socket_id='3180' die_id='0' core_id='268' siblings='124,152,180,208'/> - <cpu id='125' socket_id='3180' die_id='0' core_id='269' siblings='125,153,181,209'/> - <cpu id='126' socket_id='3180' die_id='0' core_id='270' siblings='126,154,182,210'/> - <cpu id='127' socket_id='3180' die_id='0' core_id='271' siblings='127,155,183,211'/> - <cpu id='128' socket_id='3180' die_id='0' core_id='272' siblings='128,156,184,212'/> - <cpu id='129' socket_id='3180' die_id='0' core_id='273' siblings='129,157,185,213'/> - <cpu id='130' socket_id='3180' die_id='0' core_id='274' siblings='130,158,186,214'/> - <cpu id='131' socket_id='3180' die_id='0' core_id='275' siblings='131,159,187,215'/> - <cpu id='132' socket_id='3180' die_id='0' core_id='276' siblings='132,160,188,216'/> - <cpu id='133' socket_id='3180' die_id='0' core_id='277' siblings='133,161,189,217'/> - <cpu id='134' socket_id='3180' die_id='0' core_id='278' siblings='134,162,190,218'/> - <cpu id='135' socket_id='3180' die_id='0' core_id='279' siblings='135,163,191,219'/> - <cpu id='136' socket_id='3180' die_id='0' core_id='280' siblings='136,164,192,220'/> - <cpu id='137' socket_id='3180' die_id='0' core_id='281' siblings='137,165,193,221'/> - <cpu id='138' socket_id='3180' die_id='0' core_id='282' siblings='138,166,194,222'/> - <cpu id='139' socket_id='3180' die_id='0' core_id='283' siblings='139,167,195,223'/> - <cpu id='140' socket_id='3180' die_id='0' core_id='256' siblings='112,140,168,196'/> - <cpu id='141' socket_id='3180' die_id='0' core_id='257' siblings='113,141,169,197'/> - <cpu id='142' socket_id='3180' die_id='0' core_id='258' siblings='114,142,170,198'/> - <cpu id='143' socket_id='3180' die_id='0' core_id='259' siblings='115,143,171,199'/> - <cpu id='144' socket_id='3180' die_id='0' core_id='260' siblings='116,144,172,200'/> - <cpu id='145' socket_id='3180' die_id='0' core_id='261' siblings='117,145,173,201'/> - <cpu id='146' socket_id='3180' die_id='0' core_id='262' siblings='118,146,174,202'/> - <cpu id='147' socket_id='3180' die_id='0' core_id='263' siblings='119,147,175,203'/> - <cpu id='148' socket_id='3180' die_id='0' core_id='264' siblings='120,148,176,204'/> - <cpu id='149' socket_id='3180' die_id='0' core_id='265' siblings='121,149,177,205'/> - <cpu id='150' socket_id='3180' die_id='0' core_id='266' siblings='122,150,178,206'/> - <cpu id='151' socket_id='3180' die_id='0' core_id='267' siblings='123,151,179,207'/> - <cpu id='152' socket_id='3180' die_id='0' core_id='268' siblings='124,152,180,208'/> - <cpu id='153' socket_id='3180' die_id='0' core_id='269' siblings='125,153,181,209'/> - <cpu id='154' socket_id='3180' die_id='0' core_id='270' siblings='126,154,182,210'/> - <cpu id='155' socket_id='3180' die_id='0' core_id='271' siblings='127,155,183,211'/> - <cpu id='156' socket_id='3180' die_id='0' core_id='272' siblings='128,156,184,212'/> - <cpu id='157' socket_id='3180' die_id='0' core_id='273' siblings='129,157,185,213'/> - <cpu id='158' socket_id='3180' die_id='0' core_id='274' siblings='130,158,186,214'/> - <cpu id='159' socket_id='3180' die_id='0' core_id='275' siblings='131,159,187,215'/> - <cpu id='160' socket_id='3180' die_id='0' core_id='276' siblings='132,160,188,216'/> - <cpu id='161' socket_id='3180' die_id='0' core_id='277' siblings='133,161,189,217'/> - <cpu id='162' socket_id='3180' die_id='0' core_id='278' siblings='134,162,190,218'/> - <cpu id='163' socket_id='3180' die_id='0' core_id='279' siblings='135,163,191,219'/> - <cpu id='164' socket_id='3180' die_id='0' core_id='280' siblings='136,164,192,220'/> - <cpu id='165' socket_id='3180' die_id='0' core_id='281' siblings='137,165,193,221'/> - <cpu id='166' socket_id='3180' die_id='0' core_id='282' siblings='138,166,194,222'/> - <cpu id='167' socket_id='3180' die_id='0' core_id='283' siblings='139,167,195,223'/> - <cpu id='168' socket_id='3180' die_id='0' core_id='256' siblings='112,140,168,196'/> - <cpu id='169' socket_id='3180' die_id='0' core_id='257' siblings='113,141,169,197'/> - <cpu id='170' socket_id='3180' die_id='0' core_id='258' siblings='114,142,170,198'/> - <cpu id='171' socket_id='3180' die_id='0' core_id='259' siblings='115,143,171,199'/> - <cpu id='172' socket_id='3180' die_id='0' core_id='260' siblings='116,144,172,200'/> - <cpu id='173' socket_id='3180' die_id='0' core_id='261' siblings='117,145,173,201'/> - <cpu id='174' socket_id='3180' die_id='0' core_id='262' siblings='118,146,174,202'/> - <cpu id='175' socket_id='3180' die_id='0' core_id='263' siblings='119,147,175,203'/> - <cpu id='176' socket_id='3180' die_id='0' core_id='264' siblings='120,148,176,204'/> - <cpu id='177' socket_id='3180' die_id='0' core_id='265' siblings='121,149,177,205'/> - <cpu id='178' socket_id='3180' die_id='0' core_id='266' siblings='122,150,178,206'/> - <cpu id='179' socket_id='3180' die_id='0' core_id='267' siblings='123,151,179,207'/> - <cpu id='180' socket_id='3180' die_id='0' core_id='268' siblings='124,152,180,208'/> - <cpu id='181' socket_id='3180' die_id='0' core_id='269' siblings='125,153,181,209'/> - <cpu id='182' socket_id='3180' die_id='0' core_id='270' siblings='126,154,182,210'/> - <cpu id='183' socket_id='3180' die_id='0' core_id='271' siblings='127,155,183,211'/> - <cpu id='184' socket_id='3180' die_id='0' core_id='272' siblings='128,156,184,212'/> - <cpu id='185' socket_id='3180' die_id='0' core_id='273' siblings='129,157,185,213'/> - <cpu id='186' socket_id='3180' die_id='0' core_id='274' siblings='130,158,186,214'/> - <cpu id='187' socket_id='3180' die_id='0' core_id='275' siblings='131,159,187,215'/> - <cpu id='188' socket_id='3180' die_id='0' core_id='276' siblings='132,160,188,216'/> - <cpu id='189' socket_id='3180' die_id='0' core_id='277' siblings='133,161,189,217'/> - <cpu id='190' socket_id='3180' die_id='0' core_id='278' siblings='134,162,190,218'/> - <cpu id='191' socket_id='3180' die_id='0' core_id='279' siblings='135,163,191,219'/> - <cpu id='192' socket_id='3180' die_id='0' core_id='280' siblings='136,164,192,220'/> - <cpu id='193' socket_id='3180' die_id='0' core_id='281' siblings='137,165,193,221'/> - <cpu id='194' socket_id='3180' die_id='0' core_id='282' siblings='138,166,194,222'/> - <cpu id='195' socket_id='3180' die_id='0' core_id='283' siblings='139,167,195,223'/> - <cpu id='196' socket_id='3180' die_id='0' core_id='256' siblings='112,140,168,196'/> - <cpu id='197' socket_id='3180' die_id='0' core_id='257' siblings='113,141,169,197'/> - <cpu id='198' socket_id='3180' die_id='0' core_id='258' siblings='114,142,170,198'/> - <cpu id='199' socket_id='3180' die_id='0' core_id='259' siblings='115,143,171,199'/> - <cpu id='200' socket_id='3180' die_id='0' core_id='260' siblings='116,144,172,200'/> - <cpu id='201' socket_id='3180' die_id='0' core_id='261' siblings='117,145,173,201'/> - <cpu id='202' socket_id='3180' die_id='0' core_id='262' siblings='118,146,174,202'/> - <cpu id='203' socket_id='3180' die_id='0' core_id='263' siblings='119,147,175,203'/> - <cpu id='204' socket_id='3180' die_id='0' core_id='264' siblings='120,148,176,204'/> - <cpu id='205' socket_id='3180' die_id='0' core_id='265' siblings='121,149,177,205'/> - <cpu id='206' socket_id='3180' die_id='0' core_id='266' siblings='122,150,178,206'/> - <cpu id='207' socket_id='3180' die_id='0' core_id='267' siblings='123,151,179,207'/> - <cpu id='208' socket_id='3180' die_id='0' core_id='268' siblings='124,152,180,208'/> - <cpu id='209' socket_id='3180' die_id='0' core_id='269' siblings='125,153,181,209'/> - <cpu id='210' socket_id='3180' die_id='0' core_id='270' siblings='126,154,182,210'/> - <cpu id='211' socket_id='3180' die_id='0' core_id='271' siblings='127,155,183,211'/> - <cpu id='212' socket_id='3180' die_id='0' core_id='272' siblings='128,156,184,212'/> - <cpu id='213' socket_id='3180' die_id='0' core_id='273' siblings='129,157,185,213'/> - <cpu id='214' socket_id='3180' die_id='0' core_id='274' siblings='130,158,186,214'/> - <cpu id='215' socket_id='3180' die_id='0' core_id='275' siblings='131,159,187,215'/> - <cpu id='216' socket_id='3180' die_id='0' core_id='276' siblings='132,160,188,216'/> - <cpu id='217' socket_id='3180' die_id='0' core_id='277' siblings='133,161,189,217'/> - <cpu id='218' socket_id='3180' die_id='0' core_id='278' siblings='134,162,190,218'/> - <cpu id='219' socket_id='3180' die_id='0' core_id='279' siblings='135,163,191,219'/> - <cpu id='220' socket_id='3180' die_id='0' core_id='280' siblings='136,164,192,220'/> - <cpu id='221' socket_id='3180' die_id='0' core_id='281' siblings='137,165,193,221'/> - <cpu id='222' socket_id='3180' die_id='0' core_id='282' siblings='138,166,194,222'/> - <cpu id='223' socket_id='3180' die_id='0' core_id='283' siblings='139,167,195,223'/> + <cpu id='112' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='112,140,168,196'/> + <cpu id='113' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='113,141,169,197'/> + <cpu id='114' socket_id='3180' die_id='0' cluster_id='258' core_id='258' siblings='114,142,170,198'/> + <cpu id='115' socket_id='3180' die_id='0' cluster_id='259' core_id='259' siblings='115,143,171,199'/> + <cpu id='116' socket_id='3180' die_id='0' cluster_id='260' core_id='260' siblings='116,144,172,200'/> + <cpu id='117' socket_id='3180' die_id='0' cluster_id='261' core_id='261' siblings='117,145,173,201'/> + <cpu id='118' socket_id='3180' die_id='0' cluster_id='262' core_id='262' siblings='118,146,174,202'/> + <cpu id='119' socket_id='3180' die_id='0' cluster_id='263' core_id='263' siblings='119,147,175,203'/> + <cpu id='120' socket_id='3180' die_id='0' cluster_id='264' core_id='264' siblings='120,148,176,204'/> + <cpu id='121' socket_id='3180' die_id='0' cluster_id='265' core_id='265' siblings='121,149,177,205'/> + <cpu id='122' socket_id='3180' die_id='0' cluster_id='266' core_id='266' siblings='122,150,178,206'/> + <cpu id='123' socket_id='3180' die_id='0' cluster_id='267' core_id='267' siblings='123,151,179,207'/> + <cpu id='124' socket_id='3180' die_id='0' cluster_id='268' core_id='268' siblings='124,152,180,208'/> + <cpu id='125' socket_id='3180' die_id='0' cluster_id='269' core_id='269' siblings='125,153,181,209'/> + <cpu id='126' socket_id='3180' die_id='0' cluster_id='270' core_id='270' siblings='126,154,182,210'/> + <cpu id='127' socket_id='3180' die_id='0' cluster_id='271' core_id='271' siblings='127,155,183,211'/> + <cpu id='128' socket_id='3180' die_id='0' cluster_id='272' core_id='272' siblings='128,156,184,212'/> + <cpu id='129' socket_id='3180' die_id='0' cluster_id='273' core_id='273' siblings='129,157,185,213'/> + <cpu id='130' socket_id='3180' die_id='0' cluster_id='274' core_id='274' siblings='130,158,186,214'/> + <cpu id='131' socket_id='3180' die_id='0' cluster_id='275' core_id='275' siblings='131,159,187,215'/> + <cpu id='132' socket_id='3180' die_id='0' cluster_id='276' core_id='276' siblings='132,160,188,216'/> + <cpu id='133' socket_id='3180' die_id='0' cluster_id='277' core_id='277' siblings='133,161,189,217'/> + <cpu id='134' socket_id='3180' die_id='0' cluster_id='278' core_id='278' siblings='134,162,190,218'/> + <cpu id='135' socket_id='3180' die_id='0' cluster_id='279' core_id='279' siblings='135,163,191,219'/> + <cpu id='136' socket_id='3180' die_id='0' cluster_id='280' core_id='280' siblings='136,164,192,220'/> + <cpu id='137' socket_id='3180' die_id='0' cluster_id='281' core_id='281' siblings='137,165,193,221'/> + <cpu id='138' socket_id='3180' die_id='0' cluster_id='282' core_id='282' siblings='138,166,194,222'/> + <cpu id='139' socket_id='3180' die_id='0' cluster_id='283' core_id='283' siblings='139,167,195,223'/> + <cpu id='140' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='112,140,168,196'/> + <cpu id='141' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='113,141,169,197'/> + <cpu id='142' socket_id='3180' die_id='0' cluster_id='258' core_id='258' siblings='114,142,170,198'/> + <cpu id='143' socket_id='3180' die_id='0' cluster_id='259' core_id='259' siblings='115,143,171,199'/> + <cpu id='144' socket_id='3180' die_id='0' cluster_id='260' core_id='260' siblings='116,144,172,200'/> + <cpu id='145' socket_id='3180' die_id='0' cluster_id='261' core_id='261' siblings='117,145,173,201'/> + <cpu id='146' socket_id='3180' die_id='0' cluster_id='262' core_id='262' siblings='118,146,174,202'/> + <cpu id='147' socket_id='3180' die_id='0' cluster_id='263' core_id='263' siblings='119,147,175,203'/> + <cpu id='148' socket_id='3180' die_id='0' cluster_id='264' core_id='264' siblings='120,148,176,204'/> + <cpu id='149' socket_id='3180' die_id='0' cluster_id='265' core_id='265' siblings='121,149,177,205'/> + <cpu id='150' socket_id='3180' die_id='0' cluster_id='266' core_id='266' siblings='122,150,178,206'/> + <cpu id='151' socket_id='3180' die_id='0' cluster_id='267' core_id='267' siblings='123,151,179,207'/> + <cpu id='152' socket_id='3180' die_id='0' cluster_id='268' core_id='268' siblings='124,152,180,208'/> + <cpu id='153' socket_id='3180' die_id='0' cluster_id='269' core_id='269' siblings='125,153,181,209'/> + <cpu id='154' socket_id='3180' die_id='0' cluster_id='270' core_id='270' siblings='126,154,182,210'/> + <cpu id='155' socket_id='3180' die_id='0' cluster_id='271' core_id='271' siblings='127,155,183,211'/> + <cpu id='156' socket_id='3180' die_id='0' cluster_id='272' core_id='272' siblings='128,156,184,212'/> + <cpu id='157' socket_id='3180' die_id='0' cluster_id='273' core_id='273' siblings='129,157,185,213'/> + <cpu id='158' socket_id='3180' die_id='0' cluster_id='274' core_id='274' siblings='130,158,186,214'/> + <cpu id='159' socket_id='3180' die_id='0' cluster_id='275' core_id='275' siblings='131,159,187,215'/> + <cpu id='160' socket_id='3180' die_id='0' cluster_id='276' core_id='276' siblings='132,160,188,216'/> + <cpu id='161' socket_id='3180' die_id='0' cluster_id='277' core_id='277' siblings='133,161,189,217'/> + <cpu id='162' socket_id='3180' die_id='0' cluster_id='278' core_id='278' siblings='134,162,190,218'/> + <cpu id='163' socket_id='3180' die_id='0' cluster_id='279' core_id='279' siblings='135,163,191,219'/> + <cpu id='164' socket_id='3180' die_id='0' cluster_id='280' core_id='280' siblings='136,164,192,220'/> + <cpu id='165' socket_id='3180' die_id='0' cluster_id='281' core_id='281' siblings='137,165,193,221'/> + <cpu id='166' socket_id='3180' die_id='0' cluster_id='282' core_id='282' siblings='138,166,194,222'/> + <cpu id='167' socket_id='3180' die_id='0' cluster_id='283' core_id='283' siblings='139,167,195,223'/> + <cpu id='168' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='112,140,168,196'/> + <cpu id='169' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='113,141,169,197'/> + <cpu id='170' socket_id='3180' die_id='0' cluster_id='258' core_id='258' siblings='114,142,170,198'/> + <cpu id='171' socket_id='3180' die_id='0' cluster_id='259' core_id='259' siblings='115,143,171,199'/> + <cpu id='172' socket_id='3180' die_id='0' cluster_id='260' core_id='260' siblings='116,144,172,200'/> + <cpu id='173' socket_id='3180' die_id='0' cluster_id='261' core_id='261' siblings='117,145,173,201'/> + <cpu id='174' socket_id='3180' die_id='0' cluster_id='262' core_id='262' siblings='118,146,174,202'/> + <cpu id='175' socket_id='3180' die_id='0' cluster_id='263' core_id='263' siblings='119,147,175,203'/> + <cpu id='176' socket_id='3180' die_id='0' cluster_id='264' core_id='264' siblings='120,148,176,204'/> + <cpu id='177' socket_id='3180' die_id='0' cluster_id='265' core_id='265' siblings='121,149,177,205'/> + <cpu id='178' socket_id='3180' die_id='0' cluster_id='266' core_id='266' siblings='122,150,178,206'/> + <cpu id='179' socket_id='3180' die_id='0' cluster_id='267' core_id='267' siblings='123,151,179,207'/> + <cpu id='180' socket_id='3180' die_id='0' cluster_id='268' core_id='268' siblings='124,152,180,208'/> + <cpu id='181' socket_id='3180' die_id='0' cluster_id='269' core_id='269' siblings='125,153,181,209'/> + <cpu id='182' socket_id='3180' die_id='0' cluster_id='270' core_id='270' siblings='126,154,182,210'/> + <cpu id='183' socket_id='3180' die_id='0' cluster_id='271' core_id='271' siblings='127,155,183,211'/> + <cpu id='184' socket_id='3180' die_id='0' cluster_id='272' core_id='272' siblings='128,156,184,212'/> + <cpu id='185' socket_id='3180' die_id='0' cluster_id='273' core_id='273' siblings='129,157,185,213'/> + <cpu id='186' socket_id='3180' die_id='0' cluster_id='274' core_id='274' siblings='130,158,186,214'/> + <cpu id='187' socket_id='3180' die_id='0' cluster_id='275' core_id='275' siblings='131,159,187,215'/> + <cpu id='188' socket_id='3180' die_id='0' cluster_id='276' core_id='276' siblings='132,160,188,216'/> + <cpu id='189' socket_id='3180' die_id='0' cluster_id='277' core_id='277' siblings='133,161,189,217'/> + <cpu id='190' socket_id='3180' die_id='0' cluster_id='278' core_id='278' siblings='134,162,190,218'/> + <cpu id='191' socket_id='3180' die_id='0' cluster_id='279' core_id='279' siblings='135,163,191,219'/> + <cpu id='192' socket_id='3180' die_id='0' cluster_id='280' core_id='280' siblings='136,164,192,220'/> + <cpu id='193' socket_id='3180' die_id='0' cluster_id='281' core_id='281' siblings='137,165,193,221'/> + <cpu id='194' socket_id='3180' die_id='0' cluster_id='282' core_id='282' siblings='138,166,194,222'/> + <cpu id='195' socket_id='3180' die_id='0' cluster_id='283' core_id='283' siblings='139,167,195,223'/> + <cpu id='196' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='112,140,168,196'/> + <cpu id='197' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='113,141,169,197'/> + <cpu id='198' socket_id='3180' die_id='0' cluster_id='258' core_id='258' siblings='114,142,170,198'/> + <cpu id='199' socket_id='3180' die_id='0' cluster_id='259' core_id='259' siblings='115,143,171,199'/> + <cpu id='200' socket_id='3180' die_id='0' cluster_id='260' core_id='260' siblings='116,144,172,200'/> + <cpu id='201' socket_id='3180' die_id='0' cluster_id='261' core_id='261' siblings='117,145,173,201'/> + <cpu id='202' socket_id='3180' die_id='0' cluster_id='262' core_id='262' siblings='118,146,174,202'/> + <cpu id='203' socket_id='3180' die_id='0' cluster_id='263' core_id='263' siblings='119,147,175,203'/> + <cpu id='204' socket_id='3180' die_id='0' cluster_id='264' core_id='264' siblings='120,148,176,204'/> + <cpu id='205' socket_id='3180' die_id='0' cluster_id='265' core_id='265' siblings='121,149,177,205'/> + <cpu id='206' socket_id='3180' die_id='0' cluster_id='266' core_id='266' siblings='122,150,178,206'/> + <cpu id='207' socket_id='3180' die_id='0' cluster_id='267' core_id='267' siblings='123,151,179,207'/> + <cpu id='208' socket_id='3180' die_id='0' cluster_id='268' core_id='268' siblings='124,152,180,208'/> + <cpu id='209' socket_id='3180' die_id='0' cluster_id='269' core_id='269' siblings='125,153,181,209'/> + <cpu id='210' socket_id='3180' die_id='0' cluster_id='270' core_id='270' siblings='126,154,182,210'/> + <cpu id='211' socket_id='3180' die_id='0' cluster_id='271' core_id='271' siblings='127,155,183,211'/> + <cpu id='212' socket_id='3180' die_id='0' cluster_id='272' core_id='272' siblings='128,156,184,212'/> + <cpu id='213' socket_id='3180' die_id='0' cluster_id='273' core_id='273' siblings='129,157,185,213'/> + <cpu id='214' socket_id='3180' die_id='0' cluster_id='274' core_id='274' siblings='130,158,186,214'/> + <cpu id='215' socket_id='3180' die_id='0' cluster_id='275' core_id='275' siblings='131,159,187,215'/> + <cpu id='216' socket_id='3180' die_id='0' cluster_id='276' core_id='276' siblings='132,160,188,216'/> + <cpu id='217' socket_id='3180' die_id='0' cluster_id='277' core_id='277' siblings='133,161,189,217'/> + <cpu id='218' socket_id='3180' die_id='0' cluster_id='278' core_id='278' siblings='134,162,190,218'/> + <cpu id='219' socket_id='3180' die_id='0' cluster_id='279' core_id='279' siblings='135,163,191,219'/> + <cpu id='220' socket_id='3180' die_id='0' cluster_id='280' core_id='280' siblings='136,164,192,220'/> + <cpu id='221' socket_id='3180' die_id='0' cluster_id='281' core_id='281' siblings='137,165,193,221'/> + <cpu id='222' socket_id='3180' die_id='0' cluster_id='282' core_id='282' siblings='138,166,194,222'/> + <cpu id='223' socket_id='3180' die_id='0' cluster_id='283' core_id='283' siblings='139,167,195,223'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml index 0a04052c40..5533ae0586 100644 --- a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml +++ b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml @@ -16,10 +16,10 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='4'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/> </cpus> </cell> <cell id='1'> @@ -28,10 +28,10 @@ <pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='1048576'>8192</pages> <cpus num='4'> - <cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/> - <cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/> - <cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/> - <cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/> + <cpu id='4' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='5'/> + <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='6' siblings='6'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='7' siblings='7'/> </cpus> </cell> <cell id='2'> @@ -40,10 +40,10 @@ <pages unit='KiB' size='2048'>8192</pages> <pages unit='KiB' size='1048576'>10240</pages> <cpus num='4'> - <cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/> - <cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/> - <cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/> - <cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/> + <cpu id='8' socket_id='2' die_id='0' cluster_id='0' core_id='8' siblings='8'/> + <cpu id='9' socket_id='2' die_id='0' cluster_id='0' core_id='9' siblings='9'/> + <cpu id='10' socket_id='2' die_id='0' cluster_id='0' core_id='10' siblings='10'/> + <cpu id='11' socket_id='2' die_id='0' cluster_id='0' core_id='11' siblings='11'/> </cpus> </cell> <cell id='3'> @@ -52,10 +52,10 @@ <pages unit='KiB' size='2048'>10240</pages> <pages unit='KiB' size='1048576'>12288</pages> <cpus num='4'> - <cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/> - <cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/> - <cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/> - <cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/> + <cpu id='12' socket_id='3' die_id='0' cluster_id='0' core_id='12' siblings='12'/> + <cpu id='13' socket_id='3' die_id='0' cluster_id='0' core_id='13' siblings='13'/> + <cpu id='14' socket_id='3' die_id='0' cluster_id='0' core_id='14' siblings='14'/> + <cpu id='15' socket_id='3' die_id='0' cluster_id='0' core_id='15' siblings='15'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml index 8a3ca2d13c..c86dc4defc 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml @@ -14,18 +14,18 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='12'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> - <cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/> - <cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/> - <cpu id='4' socket_id='0' die_id='2' core_id='0' siblings='4'/> - <cpu id='5' socket_id='0' die_id='2' core_id='1' siblings='5'/> - <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> - <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> - <cpu id='8' socket_id='1' die_id='1' core_id='0' siblings='8'/> - <cpu id='9' socket_id='1' die_id='1' core_id='1' siblings='9'/> - <cpu id='10' socket_id='1' die_id='2' core_id='0' siblings='10'/> - <cpu id='11' socket_id='1' die_id='2' core_id='1' siblings='11'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' die_id='1' cluster_id='0' core_id='0' siblings='2'/> + <cpu id='3' socket_id='0' die_id='1' cluster_id='0' core_id='1' siblings='3'/> + <cpu id='4' socket_id='0' die_id='2' cluster_id='0' core_id='0' siblings='4'/> + <cpu id='5' socket_id='0' die_id='2' cluster_id='0' core_id='1' siblings='5'/> + <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' die_id='1' cluster_id='0' core_id='0' siblings='8'/> + <cpu id='9' socket_id='1' die_id='1' cluster_id='0' core_id='1' siblings='9'/> + <cpu id='10' socket_id='1' die_id='2' cluster_id='0' core_id='0' siblings='10'/> + <cpu id='11' socket_id='1' die_id='2' cluster_id='0' core_id='1' siblings='11'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml index 4da09f889c..9ae155d571 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml @@ -14,10 +14,10 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='4'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/> </cpus> </cell> <cell id='1'> @@ -26,10 +26,10 @@ <pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='1048576'>8192</pages> <cpus num='4'> - <cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/> - <cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/> - <cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/> - <cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/> + <cpu id='4' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='5'/> + <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='6' siblings='6'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='7' siblings='7'/> </cpus> </cell> <cell id='2'> @@ -38,10 +38,10 @@ <pages unit='KiB' size='2048'>8192</pages> <pages unit='KiB' size='1048576'>10240</pages> <cpus num='4'> - <cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/> - <cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/> - <cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/> - <cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/> + <cpu id='8' socket_id='2' die_id='0' cluster_id='0' core_id='8' siblings='8'/> + <cpu id='9' socket_id='2' die_id='0' cluster_id='0' core_id='9' siblings='9'/> + <cpu id='10' socket_id='2' die_id='0' cluster_id='0' core_id='10' siblings='10'/> + <cpu id='11' socket_id='2' die_id='0' cluster_id='0' core_id='11' siblings='11'/> </cpus> </cell> <cell id='3'> @@ -50,10 +50,10 @@ <pages unit='KiB' size='2048'>10240</pages> <pages unit='KiB' size='1048576'>12288</pages> <cpus num='4'> - <cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/> - <cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/> - <cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/> - <cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/> + <cpu id='12' socket_id='3' die_id='0' cluster_id='0' core_id='12' siblings='12'/> + <cpu id='13' socket_id='3' die_id='0' cluster_id='0' core_id='13' siblings='13'/> + <cpu id='14' socket_id='3' die_id='0' cluster_id='0' core_id='14' siblings='14'/> + <cpu id='15' socket_id='3' die_id='0' cluster_id='0' core_id='15' siblings='15'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml index 28f00c0a90..05b33147b7 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml @@ -17,14 +17,14 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='8'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0,4'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1,5'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2,6'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3,7'/> - <cpu id='4' socket_id='0' die_id='0' core_id='0' siblings='0,4'/> - <cpu id='5' socket_id='0' die_id='0' core_id='1' siblings='1,5'/> - <cpu id='6' socket_id='0' die_id='0' core_id='2' siblings='2,6'/> - <cpu id='7' socket_id='0' die_id='0' core_id='3' siblings='3,7'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/> + <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/> + <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/> + <cpu id='6' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/> + <cpu id='7' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml index 6fe5751666..2b97354bf3 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml @@ -25,30 +25,30 @@ <line value='16' unit='B'/> </cache> <cpus num='24'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/> - <cpu id='2' socket_id='2' die_id='0' core_id='0' siblings='2'/> - <cpu id='3' socket_id='3' die_id='0' core_id='0' siblings='3'/> - <cpu id='4' socket_id='4' die_id='0' core_id='0' siblings='4'/> - <cpu id='5' socket_id='5' die_id='0' core_id='0' siblings='5'/> - <cpu id='6' socket_id='6' die_id='0' core_id='0' siblings='6'/> - <cpu id='7' socket_id='7' die_id='0' core_id='0' siblings='7'/> - <cpu id='8' socket_id='8' die_id='0' core_id='0' siblings='8'/> - <cpu id='9' socket_id='9' die_id='0' core_id='0' siblings='9'/> - <cpu id='10' socket_id='10' die_id='0' core_id='0' siblings='10'/> - <cpu id='11' socket_id='11' die_id='0' core_id='0' siblings='11'/> - <cpu id='12' socket_id='12' die_id='0' core_id='0' siblings='12'/> - <cpu id='13' socket_id='13' die_id='0' core_id='0' siblings='13'/> - <cpu id='14' socket_id='14' die_id='0' core_id='0' siblings='14'/> - <cpu id='15' socket_id='15' die_id='0' core_id='0' siblings='15'/> - <cpu id='16' socket_id='16' die_id='0' core_id='0' siblings='16'/> - <cpu id='17' socket_id='17' die_id='0' core_id='0' siblings='17'/> - <cpu id='18' socket_id='18' die_id='0' core_id='0' siblings='18'/> - <cpu id='19' socket_id='19' die_id='0' core_id='0' siblings='19'/> - <cpu id='20' socket_id='20' die_id='0' core_id='0' siblings='20'/> - <cpu id='21' socket_id='21' die_id='0' core_id='0' siblings='21'/> - <cpu id='22' socket_id='22' die_id='0' core_id='0' siblings='22'/> - <cpu id='23' socket_id='23' die_id='0' core_id='0' siblings='23'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='1'/> + <cpu id='2' socket_id='2' die_id='0' cluster_id='0' core_id='0' siblings='2'/> + <cpu id='3' socket_id='3' die_id='0' cluster_id='0' core_id='0' siblings='3'/> + <cpu id='4' socket_id='4' die_id='0' cluster_id='0' core_id='0' siblings='4'/> + <cpu id='5' socket_id='5' die_id='0' cluster_id='0' core_id='0' siblings='5'/> + <cpu id='6' socket_id='6' die_id='0' cluster_id='0' core_id='0' siblings='6'/> + <cpu id='7' socket_id='7' die_id='0' cluster_id='0' core_id='0' siblings='7'/> + <cpu id='8' socket_id='8' die_id='0' cluster_id='0' core_id='0' siblings='8'/> + <cpu id='9' socket_id='9' die_id='0' cluster_id='0' core_id='0' siblings='9'/> + <cpu id='10' socket_id='10' die_id='0' cluster_id='0' core_id='0' siblings='10'/> + <cpu id='11' socket_id='11' die_id='0' cluster_id='0' core_id='0' siblings='11'/> + <cpu id='12' socket_id='12' die_id='0' cluster_id='0' core_id='0' siblings='12'/> + <cpu id='13' socket_id='13' die_id='0' cluster_id='0' core_id='0' siblings='13'/> + <cpu id='14' socket_id='14' die_id='0' cluster_id='0' core_id='0' siblings='14'/> + <cpu id='15' socket_id='15' die_id='0' cluster_id='0' core_id='0' siblings='15'/> + <cpu id='16' socket_id='16' die_id='0' cluster_id='0' core_id='0' siblings='16'/> + <cpu id='17' socket_id='17' die_id='0' cluster_id='0' core_id='0' siblings='17'/> + <cpu id='18' socket_id='18' die_id='0' cluster_id='0' core_id='0' siblings='18'/> + <cpu id='19' socket_id='19' die_id='0' cluster_id='0' core_id='0' siblings='19'/> + <cpu id='20' socket_id='20' die_id='0' cluster_id='0' core_id='0' siblings='20'/> + <cpu id='21' socket_id='21' die_id='0' cluster_id='0' core_id='0' siblings='21'/> + <cpu id='22' socket_id='22' die_id='0' cluster_id='0' core_id='0' siblings='22'/> + <cpu id='23' socket_id='23' die_id='0' cluster_id='0' core_id='0' siblings='23'/> </cpus> </cell> <cell id='1'> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml index ee26fe9464..167b217d8e 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -17,12 +17,12 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='6'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> - <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> - <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/> </cpus> </cell> <cell id='1'> @@ -31,12 +31,12 @@ <pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='1048576'>8192</pages> <cpus num='6'> - <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> - <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> - <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> - <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> - <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> - <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> + <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml index acdd97ec58..311bb58e6a 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml @@ -17,12 +17,12 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='6'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> - <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> - <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/> </cpus> </cell> <cell id='1'> @@ -31,12 +31,12 @@ <pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='1048576'>8192</pages> <cpus num='6'> - <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> - <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> - <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> - <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> - <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> - <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> + <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml index 1327d85c98..d85407f0b1 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml @@ -17,12 +17,12 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='6'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> - <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> - <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/> </cpus> </cell> <cell id='1'> @@ -31,12 +31,12 @@ <pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='1048576'>8192</pages> <cpus num='6'> - <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> - <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> - <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> - <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> - <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> - <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> + <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml index 6769bd0591..eb53eb2142 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml @@ -17,7 +17,7 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='1'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml index bc52480905..38ea0bdc27 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml @@ -17,7 +17,7 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='1'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> </cpus> </cell> </cells> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index b638bbd1c9..fd854ee91e 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -17,12 +17,12 @@ <pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='1048576'>6144</pages> <cpus num='6'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> - <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> - <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/> </cpus> </cell> <cell id='1'> @@ -31,12 +31,12 @@ <pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='1048576'>8192</pages> <cpus num='6'> - <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> - <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> - <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> - <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> - <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> - <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> + <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/> </cpus> </cell> </cells> -- 2.43.0 _______________________________________________ Devel mailing list -- devel@xxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
