Skip to content

Commit

Permalink
tests/xml: add a testcase import from current v3
Browse files Browse the repository at this point in the history 
It's identical to XMLs found in git master branch except the removal
of the prog_if attribute in the pci_busid field (itdidn't exist in v2).
v3 exports it to v2 because v2 can ignore it.

It may be removed from the v3 export to v2 with
 sed -r -e 's/(\] [0-9]{2}) [0-9]{2}\"/\1\"/' -i cxlmem+dax.v2.xml

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
@bgoglin
bgoglin committed Oct 30, 2023
1 parent 04f429e commit 00a0861
Show file tree
Hide file tree
Showing 4 changed files with 366 additions and 2 deletions.
7 changes: 5 additions & 2 deletions tests/hwloc/xml/Makefile.am
View file
Expand Up @@ -46,7 +46,8 @@ xml_outputs = \
8intel64-fakeKNL-A2A-hybrid.rootattachednumas.v1tov2.xml \
8intel64-fakeKNL-A2A-hybrid.rootattachednumas.v2tov1.xml \
64intel64-fakeKNL-SNC4-hybrid.v1tov2.xml \
64intel64-fakeKNL-SNC4-hybrid.v2tov1.xml
64intel64-fakeKNL-SNC4-hybrid.v2tov1.xml \
cxlmem+dax.v2.xml

# Each output `xyz.xml' may have a corresponding `xyz.source' file specifying
# its source file.
Expand Down Expand Up @@ -76,7 +77,9 @@ xml_source = \
8intel64-fakeKNL-A2A-hybrid.rootattachednumas.v1tov2.source \
8intel64-fakeKNL-A2A-hybrid.rootattachednumas.v2tov1.source \
64intel64-fakeKNL-SNC4-hybrid.v1tov2.source \
64intel64-fakeKNL-SNC4-hybrid.v2tov1.source
64intel64-fakeKNL-SNC4-hybrid.v2tov1.source \
cxlmem+dax.v2.source \
cxlmem+dax.v3.xml

# Each output `xyz.xml' or `xyz.output' may have a corresponding `xyz.options'
# file modifying the behavior of lstopo
Expand Down
1 change: 1 addition & 0 deletions tests/hwloc/xml/cxlmem+dax.v2.source
View file
@@ -0,0 +1 @@
cxlmem+dax.v3.xml
180 changes: 180 additions & 0 deletions tests/hwloc/xml/cxlmem+dax.v2.xml
View file
@@ -0,0 +1,180 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE topology SYSTEM "hwloc2.dtd">
<topology version="2.0">
<object type="Machine" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" allowed_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" gp_index="1">
<info name="DMIProductName" value="Standard PC (Q35 + ICH9, 2009)"/>
<info name="DMIProductVersion" value="pc-q35-7.2"/>
<info name="DMIProductSerial" value=""/>
<info name="DMIChassisVendor" value="QEMU"/>
<info name="DMIChassisType" value="1"/>
<info name="DMIChassisVersion" value="pc-q35-7.2"/>
<info name="DMIChassisSerial" value=""/>
<info name="DMIChassisAssetTag" value=""/>
<info name="DMIBIOSVendor" value="EFI Development Kit II / OVMF"/>
<info name="DMIBIOSVersion" value="0.0.0"/>
<info name="DMIBIOSDate" value="02/06/2015"/>
<info name="DMISysVendor" value="QEMU"/>
<info name="Backend" value="Linux"/>
<info name="LinuxCgroup" value="/"/>
<info name="OSName" value="Linux"/>
<info name="OSRelease" value="6.1.0-rc4+"/>
<info name="OSVersion" value="#1 SMP PREEMPT_DYNAMIC Thu Dec 1 15:21:30 CET 2022"/>
<info name="HostName" value="efi"/>
<info name="Architecture" value="x86_64"/>
<object type="Package" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="3">
<info name="CPUVendor" value="GenuineIntel"/>
<info name="CPUFamilyNumber" value="15"/>
<info name="CPUModelNumber" value="107"/>
<info name="CPUModel" value="QEMU Virtual CPU version 2.5+"/>
<info name="CPUStepping" value="1"/>
<object type="NUMANode" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="24" local_memory="3061719040">
<page_type size="4096" count="747490"/>
<page_type size="2097152" count="0"/>
</object>
<object type="L3Cache" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="8" cache_size="16777216" depth="3" cache_linesize="64" cache_associativity="16" cache_type="0">
<object type="L2Cache" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="7" cache_size="4194304" depth="2" cache_linesize="64" cache_associativity="16" cache_type="0">
<object type="L1Cache" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="5" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
<object type="L1iCache" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="6" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
<object type="Core" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="2">
<object type="PU" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="4"/>
</object>
</object>
</object>
</object>
<object type="L2Cache" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="13" cache_size="4194304" depth="2" cache_linesize="64" cache_associativity="16" cache_type="0">
<object type="L1Cache" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="11" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
<object type="L1iCache" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="12" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
<object type="Core" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="9">
<object type="PU" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="10"/>
</object>
</object>
</object>
</object>
<object type="L2Cache" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="18" cache_size="4194304" depth="2" cache_linesize="64" cache_associativity="16" cache_type="0">
<object type="L1Cache" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="16" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
<object type="L1iCache" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="17" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
<object type="Core" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="14">
<object type="PU" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="15"/>
</object>
</object>
</object>
</object>
<object type="L2Cache" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="23" cache_size="4194304" depth="2" cache_linesize="64" cache_associativity="16" cache_type="0">
<object type="L1Cache" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="21" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
<object type="L1iCache" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="22" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
<object type="Core" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="19">
<object type="PU" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="20"/>
</object>
</object>
</object>
</object>
</object>
<object type="OSDev" gp_index="48" name="dax0.0" subtype="SPM" osdev_type="0">
<info name="DAXType" value="SPM"/>
<info name="DAXParent" value="hmem.0"/>
<info name="Size" value="1048576"/>
<info name="LinuxDeviceID" value="253:0"/>
</object>
</object>
<object type="Bridge" gp_index="44" bridge_type="0-1" depth="0" bridge_pci="0000:[00-00]">
<object type="PCIDev" gp_index="28" pci_busid="0000:00:01.0" pci_type="0300 [1234:1111] [1af4:1100] 02" pci_link_speed="0.000000"/>
<object type="PCIDev" gp_index="31" pci_busid="0000:00:02.0" pci_type="0200 [8086:10d3] [8086:0000] 00" pci_link_speed="0.250000">
<info name="PCIVendor" value="Intel Corporation"/>
<info name="PCIDevice" value="82574L Gigabit Network Connection"/>
<object type="OSDev" gp_index="49" name="enp0s2" osdev_type="2">
<info name="Address" value="52:54:00:12:34:56"/>
</object>
</object>
<object type="PCIDev" gp_index="26" pci_busid="0000:00:1f.2" pci_type="0106 [8086:2922] [1af4:1100] 02" pci_link_speed="0.000000">
<info name="PCIVendor" value="Intel Corporation"/>
<info name="PCIDevice" value="82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode]"/>
<object type="OSDev" gp_index="46" name="sr0" subtype="Removable Media Device" osdev_type="0">
<info name="Size" value="1048575"/>
<info name="SectorSize" value="512"/>
<info name="LinuxDeviceID" value="11:0"/>
<info name="Model" value="QEMU_DVD-ROM"/>
<info name="Revision" value="2.5+"/>
<info name="SerialNumber" value="QM00005"/>
</object>
<object type="OSDev" gp_index="47" name="sda" subtype="Disk" osdev_type="0">
<info name="Size" value="10485760"/>
<info name="SectorSize" value="512"/>
<info name="LinuxDeviceID" value="8:0"/>
<info name="Model" value="QEMU_HARDDISK"/>
<info name="Revision" value="2.5+"/>
<info name="SerialNumber" value="QM00001"/>
</object>
</object>
</object>
<object type="Bridge" gp_index="45" bridge_type="0-1" depth="0" bridge_pci="0000:[0c-16]">
<object type="Bridge" gp_index="39" bridge_type="1-1" depth="1" bridge_pci="0000:[0d-16]" pci_busid="0000:0c:00.0" pci_type="0604 [8086:7075] [8086:0000] 00" pci_link_speed="0.250000">
<info name="PCIVendor" value="Intel Corporation"/>
<object type="Bridge" gp_index="34" bridge_type="1-1" depth="2" bridge_pci="0000:[0e-16]" pci_busid="0000:0d:00.0" pci_type="0604 [19e5:a128] [0000:0000] 00" pci_link_speed="0.250000">
<info name="PCISlot" value="0"/>
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="Bridge" gp_index="38" bridge_type="1-1" depth="3" bridge_pci="0000:[0f-12]" pci_busid="0000:0e:00.0" pci_type="0604 [19e5:a129] [0000:0000] 00" pci_link_speed="0.000000">
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="Bridge" gp_index="40" bridge_type="1-1" depth="4" bridge_pci="0000:[10-12]" pci_busid="0000:0f:00.0" pci_type="0604 [19e5:a128] [0000:0000] 00" pci_link_speed="0.250000">
<info name="PCISlot" value="1"/>
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="Bridge" gp_index="33" bridge_type="1-1" depth="5" bridge_pci="0000:[11-11]" pci_busid="0000:10:00.0" pci_type="0604 [19e5:a129] [0000:0000] 00" pci_link_speed="0.000000">
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="PCIDev" gp_index="42" pci_busid="0000:11:00.0" pci_type="0502 [8086:0d93] [1af4:1100] 01" pci_link_speed="0.250000">
<info name="PCISlot" value="4"/>
<info name="PCIVendor" value="Intel Corporation"/>
<object type="OSDev" gp_index="52" name="mem2" subtype="CXLMem" osdev_type="0">
<info name="CXLRAMSize" value="262144"/>
</object>
</object>
</object>
<object type="Bridge" gp_index="43" bridge_type="1-1" depth="5" bridge_pci="0000:[12-12]" pci_busid="0000:10:01.0" pci_type="0604 [19e5:a129] [0000:0000] 00" pci_link_speed="0.000000">
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="PCIDev" gp_index="25" pci_busid="0000:12:00.0" pci_type="0502 [8086:0d93] [1af4:1100] 01" pci_link_speed="0.250000">
<info name="PCISlot" value="5"/>
<info name="PCIVendor" value="Intel Corporation"/>
<object type="OSDev" gp_index="51" name="mem0" subtype="CXLMem" osdev_type="0">
<info name="CXLPMEMSize" value="262144"/>
</object>
</object>
</object>
</object>
</object>
<object type="Bridge" gp_index="29" bridge_type="1-1" depth="3" bridge_pci="0000:[13-16]" pci_busid="0000:0e:01.0" pci_type="0604 [19e5:a129] [0000:0000] 00" pci_link_speed="0.000000">
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="Bridge" gp_index="27" bridge_type="1-1" depth="4" bridge_pci="0000:[14-16]" pci_busid="0000:13:00.0" pci_type="0604 [19e5:a128] [0000:0000] 00" pci_link_speed="0.250000">
<info name="PCISlot" value="2"/>
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="Bridge" gp_index="37" bridge_type="1-1" depth="5" bridge_pci="0000:[15-15]" pci_busid="0000:14:00.0" pci_type="0604 [19e5:a129] [0000:0000] 00" pci_link_speed="0.000000">
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="PCIDev" gp_index="30" pci_busid="0000:15:00.0" pci_type="0502 [8086:0d93] [1af4:1100] 01" pci_link_speed="0.250000">
<info name="PCISlot" value="6"/>
<info name="PCIVendor" value="Intel Corporation"/>
<object type="OSDev" gp_index="53" name="mem3" subtype="CXLMem" osdev_type="0">
<info name="CXLRAMSize" value="262144"/>
</object>
</object>
</object>
<object type="Bridge" gp_index="32" bridge_type="1-1" depth="5" bridge_pci="0000:[16-16]" pci_busid="0000:14:01.0" pci_type="0604 [19e5:a129] [0000:0000] 00" pci_link_speed="0.000000">
<info name="PCIVendor" value="Huawei Technologies Co., Ltd."/>
<object type="PCIDev" gp_index="36" pci_busid="0000:16:00.0" pci_type="0502 [8086:0d93] [1af4:1100] 01" pci_link_speed="0.250000">
<info name="PCISlot" value="7"/>
<info name="PCIVendor" value="Intel Corporation"/>
<object type="OSDev" gp_index="50" name="mem1" subtype="CXLMem" osdev_type="0">
<info name="CXLRAMSize" value="262144"/>
<info name="CXLPMEMSize" value="262144"/>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
<support name="discovery.pu"/>
<support name="discovery.numa"/>
<support name="discovery.numa_memory"/>
<support name="discovery.disallowed_pu"/>
<support name="discovery.disallowed_numa"/>
<support name="custom.exported_support"/>
</topology>

0 comments on commit 00a0861

Please sign in to comment.