[PATCH v1 10/10] vircaps2xmltest: Introduce HMAT test case

[Michal Privoznik]

This test was generated on a guest with the following NUMA
configuration:

    <numa>
      <cell id='0' cpus='0-23' memory='4194304' unit='KiB' discard='yes'>
        <cache level='1' associativity='direct' policy='writeback'>
          <size value='10' unit='KiB'/>
          <line value='8' unit='B'/>
        </cache>
        <cache level='2' associativity='full' policy='writethrough'>
          <size value='128' unit='KiB'/>
          <line value='16' unit='B'/>
        </cache>
      </cell>
      <cell id='1' memory='2097152' unit='KiB'>
        <cache level='1' associativity='direct' policy='writeback'>
          <size value='10' unit='KiB'/>
          <line value='8' unit='B'/>
        </cache>
      </cell>
      <interconnects>
        <latency initiator='0' target='0' type='access' value='5'/>
        <latency initiator='0' target='0' type='read' value='6'/>
        <latency initiator='0' target='0' type='write' value='7'/>
        <latency initiator='0' target='1' type='access' value='10'/>
        <latency initiator='0' target='1' type='read' value='11'/>
        <latency initiator='0' target='1' type='write' value='12'/>
        <bandwidth initiator='0' target='0' type='access' value='204800' unit='KiB'/>
        <bandwidth initiator='0' target='0' type='read' value='205824' unit='KiB'/>
        <bandwidth initiator='0' target='0' type='write' value='206848' unit='KiB'/>
        <bandwidth initiator='0' target='0' cache='1' type='access' value='208896' unit='KiB'/>
        <bandwidth initiator='0' target='0' cache='1' type='read' value='209920' unit='KiB'/>
        <bandwidth initiator='0' target='0' cache='1' type='write' value='210944' unit='KiB'/>
        <bandwidth initiator='0' target='1' type='access' value='102400' unit='KiB'/>
        <bandwidth initiator='0' target='1' type='read' value='103424' unit='KiB'/>
        <bandwidth initiator='0' target='1' type='write' value='104448' unit='KiB'/>
        <bandwidth initiator='0' target='1' cache='1' type='access' value='105472' unit='KiB'/>
        <bandwidth initiator='0' target='1' cache='1' type='read' value='106496' unit='KiB'/>
        <bandwidth initiator='0' target='1' cache='1' type='write' value='107520' unit='KiB'/>
      </interconnects>
    </numa>

The sysfs content was also copied over from the VM but only those
files which are accessed in the test are stored in the repo.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 build-aux/syntax-check.mk                     |   2 +-
 .../system/cpu/cpu0/cache/index0/level        |   1 +
 .../system/cpu/cpu0/cache/index1/level        |   1 +
 .../system/cpu/cpu0/cache/index2/level        |   1 +
 .../system/cpu/cpu0/cache/index3/id           |   1 +
 .../system/cpu/cpu0/cache/index3/level        |   1 +
 .../cpu/cpu0/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu0/cache/index3/size         |   1 +
 .../system/cpu/cpu0/cache/index3/type         |   1 +
 .../system/cpu/cpu0/topology/core_id          |   1 +
 .../system/cpu/cpu0/topology/die_id           |   1 +
 .../cpu/cpu0/topology/physical_package_id     |   1 +
 .../cpu/cpu0/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu1/cache/index0/level        |   1 +
 .../system/cpu/cpu1/cache/index1/level        |   1 +
 .../system/cpu/cpu1/cache/index2/level        |   1 +
 .../system/cpu/cpu1/cache/index3/id           |   1 +
 .../system/cpu/cpu1/cache/index3/level        |   1 +
 .../cpu/cpu1/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu1/cache/index3/size         |   1 +
 .../system/cpu/cpu1/cache/index3/type         |   1 +
 .../system/cpu/cpu1/topology/core_id          |   1 +
 .../system/cpu/cpu1/topology/die_id           |   1 +
 .../cpu/cpu1/topology/physical_package_id     |   1 +
 .../cpu/cpu1/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu10/cache/index0/level       |   1 +
 .../system/cpu/cpu10/cache/index1/level       |   1 +
 .../system/cpu/cpu10/cache/index2/level       |   1 +
 .../system/cpu/cpu10/cache/index3/id          |   1 +
 .../system/cpu/cpu10/cache/index3/level       |   1 +
 .../cpu/cpu10/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu10/cache/index3/size        |   1 +
 .../system/cpu/cpu10/cache/index3/type        |   1 +
 .../system/cpu/cpu10/topology/core_id         |   1 +
 .../system/cpu/cpu10/topology/die_id          |   1 +
 .../cpu/cpu10/topology/physical_package_id    |   1 +
 .../cpu/cpu10/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu11/cache/index0/level       |   1 +
 .../system/cpu/cpu11/cache/index1/level       |   1 +
 .../system/cpu/cpu11/cache/index2/level       |   1 +
 .../system/cpu/cpu11/cache/index3/id          |   1 +
 .../system/cpu/cpu11/cache/index3/level       |   1 +
 .../cpu/cpu11/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu11/cache/index3/size        |   1 +
 .../system/cpu/cpu11/cache/index3/type        |   1 +
 .../system/cpu/cpu11/topology/core_id         |   1 +
 .../system/cpu/cpu11/topology/die_id          |   1 +
 .../cpu/cpu11/topology/physical_package_id    |   1 +
 .../cpu/cpu11/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu12/cache/index0/level       |   1 +
 .../system/cpu/cpu12/cache/index1/level       |   1 +
 .../system/cpu/cpu12/cache/index2/level       |   1 +
 .../system/cpu/cpu12/cache/index3/id          |   1 +
 .../system/cpu/cpu12/cache/index3/level       |   1 +
 .../cpu/cpu12/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu12/cache/index3/size        |   1 +
 .../system/cpu/cpu12/cache/index3/type        |   1 +
 .../system/cpu/cpu12/topology/core_id         |   1 +
 .../system/cpu/cpu12/topology/die_id          |   1 +
 .../cpu/cpu12/topology/physical_package_id    |   1 +
 .../cpu/cpu12/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu13/cache/index0/level       |   1 +
 .../system/cpu/cpu13/cache/index1/level       |   1 +
 .../system/cpu/cpu13/cache/index2/level       |   1 +
 .../system/cpu/cpu13/cache/index3/id          |   1 +
 .../system/cpu/cpu13/cache/index3/level       |   1 +
 .../cpu/cpu13/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu13/cache/index3/size        |   1 +
 .../system/cpu/cpu13/cache/index3/type        |   1 +
 .../system/cpu/cpu13/topology/core_id         |   1 +
 .../system/cpu/cpu13/topology/die_id          |   1 +
 .../cpu/cpu13/topology/physical_package_id    |   1 +
 .../cpu/cpu13/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu14/cache/index0/level       |   1 +
 .../system/cpu/cpu14/cache/index1/level       |   1 +
 .../system/cpu/cpu14/cache/index2/level       |   1 +
 .../system/cpu/cpu14/cache/index3/id          |   1 +
 .../system/cpu/cpu14/cache/index3/level       |   1 +
 .../cpu/cpu14/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu14/cache/index3/size        |   1 +
 .../system/cpu/cpu14/cache/index3/type        |   1 +
 .../system/cpu/cpu14/topology/core_id         |   1 +
 .../system/cpu/cpu14/topology/die_id          |   1 +
 .../cpu/cpu14/topology/physical_package_id    |   1 +
 .../cpu/cpu14/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu15/cache/index0/level       |   1 +
 .../system/cpu/cpu15/cache/index1/level       |   1 +
 .../system/cpu/cpu15/cache/index2/level       |   1 +
 .../system/cpu/cpu15/cache/index3/id          |   1 +
 .../system/cpu/cpu15/cache/index3/level       |   1 +
 .../cpu/cpu15/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu15/cache/index3/size        |   1 +
 .../system/cpu/cpu15/cache/index3/type        |   1 +
 .../system/cpu/cpu15/topology/core_id         |   1 +
 .../system/cpu/cpu15/topology/die_id          |   1 +
 .../cpu/cpu15/topology/physical_package_id    |   1 +
 .../cpu/cpu15/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu16/cache/index0/level       |   1 +
 .../system/cpu/cpu16/cache/index1/level       |   1 +
 .../system/cpu/cpu16/cache/index2/level       |   1 +
 .../system/cpu/cpu16/cache/index3/id          |   1 +
 .../system/cpu/cpu16/cache/index3/level       |   1 +
 .../cpu/cpu16/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu16/cache/index3/size        |   1 +
 .../system/cpu/cpu16/cache/index3/type        |   1 +
 .../system/cpu/cpu16/topology/core_id         |   1 +
 .../system/cpu/cpu16/topology/die_id          |   1 +
 .../cpu/cpu16/topology/physical_package_id    |   1 +
 .../cpu/cpu16/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu17/cache/index0/level       |   1 +
 .../system/cpu/cpu17/cache/index1/level       |   1 +
 .../system/cpu/cpu17/cache/index2/level       |   1 +
 .../system/cpu/cpu17/cache/index3/id          |   1 +
 .../system/cpu/cpu17/cache/index3/level       |   1 +
 .../cpu/cpu17/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu17/cache/index3/size        |   1 +
 .../system/cpu/cpu17/cache/index3/type        |   1 +
 .../system/cpu/cpu17/topology/core_id         |   1 +
 .../system/cpu/cpu17/topology/die_id          |   1 +
 .../cpu/cpu17/topology/physical_package_id    |   1 +
 .../cpu/cpu17/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu18/cache/index0/level       |   1 +
 .../system/cpu/cpu18/cache/index1/level       |   1 +
 .../system/cpu/cpu18/cache/index2/level       |   1 +
 .../system/cpu/cpu18/cache/index3/id          |   1 +
 .../system/cpu/cpu18/cache/index3/level       |   1 +
 .../cpu/cpu18/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu18/cache/index3/size        |   1 +
 .../system/cpu/cpu18/cache/index3/type        |   1 +
 .../system/cpu/cpu18/topology/core_id         |   1 +
 .../system/cpu/cpu18/topology/die_id          |   1 +
 .../cpu/cpu18/topology/physical_package_id    |   1 +
 .../cpu/cpu18/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu19/cache/index0/level       |   1 +
 .../system/cpu/cpu19/cache/index1/level       |   1 +
 .../system/cpu/cpu19/cache/index2/level       |   1 +
 .../system/cpu/cpu19/cache/index3/id          |   1 +
 .../system/cpu/cpu19/cache/index3/level       |   1 +
 .../cpu/cpu19/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu19/cache/index3/size        |   1 +
 .../system/cpu/cpu19/cache/index3/type        |   1 +
 .../system/cpu/cpu19/topology/core_id         |   1 +
 .../system/cpu/cpu19/topology/die_id          |   1 +
 .../cpu/cpu19/topology/physical_package_id    |   1 +
 .../cpu/cpu19/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu2/cache/index0/level        |   1 +
 .../system/cpu/cpu2/cache/index1/level        |   1 +
 .../system/cpu/cpu2/cache/index2/level        |   1 +
 .../system/cpu/cpu2/cache/index3/id           |   1 +
 .../system/cpu/cpu2/cache/index3/level        |   1 +
 .../cpu/cpu2/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu2/cache/index3/size         |   1 +
 .../system/cpu/cpu2/cache/index3/type         |   1 +
 .../system/cpu/cpu2/topology/core_id          |   1 +
 .../system/cpu/cpu2/topology/die_id           |   1 +
 .../cpu/cpu2/topology/physical_package_id     |   1 +
 .../cpu/cpu2/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu20/cache/index0/level       |   1 +
 .../system/cpu/cpu20/cache/index1/level       |   1 +
 .../system/cpu/cpu20/cache/index2/level       |   1 +
 .../system/cpu/cpu20/cache/index3/id          |   1 +
 .../system/cpu/cpu20/cache/index3/level       |   1 +
 .../cpu/cpu20/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu20/cache/index3/size        |   1 +
 .../system/cpu/cpu20/cache/index3/type        |   1 +
 .../system/cpu/cpu20/topology/core_id         |   1 +
 .../system/cpu/cpu20/topology/die_id          |   1 +
 .../cpu/cpu20/topology/physical_package_id    |   1 +
 .../cpu/cpu20/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu21/cache/index0/level       |   1 +
 .../system/cpu/cpu21/cache/index1/level       |   1 +
 .../system/cpu/cpu21/cache/index2/level       |   1 +
 .../system/cpu/cpu21/cache/index3/id          |   1 +
 .../system/cpu/cpu21/cache/index3/level       |   1 +
 .../cpu/cpu21/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu21/cache/index3/size        |   1 +
 .../system/cpu/cpu21/cache/index3/type        |   1 +
 .../system/cpu/cpu21/topology/core_id         |   1 +
 .../system/cpu/cpu21/topology/die_id          |   1 +
 .../cpu/cpu21/topology/physical_package_id    |   1 +
 .../cpu/cpu21/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu22/cache/index0/level       |   1 +
 .../system/cpu/cpu22/cache/index1/level       |   1 +
 .../system/cpu/cpu22/cache/index2/level       |   1 +
 .../system/cpu/cpu22/cache/index3/id          |   1 +
 .../system/cpu/cpu22/cache/index3/level       |   1 +
 .../cpu/cpu22/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu22/cache/index3/size        |   1 +
 .../system/cpu/cpu22/cache/index3/type        |   1 +
 .../system/cpu/cpu22/topology/core_id         |   1 +
 .../system/cpu/cpu22/topology/die_id          |   1 +
 .../cpu/cpu22/topology/physical_package_id    |   1 +
 .../cpu/cpu22/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu23/cache/index0/level       |   1 +
 .../system/cpu/cpu23/cache/index1/level       |   1 +
 .../system/cpu/cpu23/cache/index2/level       |   1 +
 .../system/cpu/cpu23/cache/index3/id          |   1 +
 .../system/cpu/cpu23/cache/index3/level       |   1 +
 .../cpu/cpu23/cache/index3/shared_cpu_list    |   1 +
 .../system/cpu/cpu23/cache/index3/size        |   1 +
 .../system/cpu/cpu23/cache/index3/type        |   1 +
 .../system/cpu/cpu23/topology/core_id         |   1 +
 .../system/cpu/cpu23/topology/die_id          |   1 +
 .../cpu/cpu23/topology/physical_package_id    |   1 +
 .../cpu/cpu23/topology/thread_siblings_list   |   1 +
 .../system/cpu/cpu3/cache/index0/level        |   1 +
 .../system/cpu/cpu3/cache/index1/level        |   1 +
 .../system/cpu/cpu3/cache/index2/level        |   1 +
 .../system/cpu/cpu3/cache/index3/id           |   1 +
 .../system/cpu/cpu3/cache/index3/level        |   1 +
 .../cpu/cpu3/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu3/cache/index3/size         |   1 +
 .../system/cpu/cpu3/cache/index3/type         |   1 +
 .../system/cpu/cpu3/topology/core_id          |   1 +
 .../system/cpu/cpu3/topology/die_id           |   1 +
 .../cpu/cpu3/topology/physical_package_id     |   1 +
 .../cpu/cpu3/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu4/cache/index0/level        |   1 +
 .../system/cpu/cpu4/cache/index1/level        |   1 +
 .../system/cpu/cpu4/cache/index2/level        |   1 +
 .../system/cpu/cpu4/cache/index3/id           |   1 +
 .../system/cpu/cpu4/cache/index3/level        |   1 +
 .../cpu/cpu4/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu4/cache/index3/size         |   1 +
 .../system/cpu/cpu4/cache/index3/type         |   1 +
 .../system/cpu/cpu4/topology/core_id          |   1 +
 .../system/cpu/cpu4/topology/die_id           |   1 +
 .../cpu/cpu4/topology/physical_package_id     |   1 +
 .../cpu/cpu4/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu5/cache/index0/level        |   1 +
 .../system/cpu/cpu5/cache/index1/level        |   1 +
 .../system/cpu/cpu5/cache/index2/level        |   1 +
 .../system/cpu/cpu5/cache/index3/id           |   1 +
 .../system/cpu/cpu5/cache/index3/level        |   1 +
 .../cpu/cpu5/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu5/cache/index3/size         |   1 +
 .../system/cpu/cpu5/cache/index3/type         |   1 +
 .../system/cpu/cpu5/topology/core_id          |   1 +
 .../system/cpu/cpu5/topology/die_id           |   1 +
 .../cpu/cpu5/topology/physical_package_id     |   1 +
 .../cpu/cpu5/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu6/cache/index0/level        |   1 +
 .../system/cpu/cpu6/cache/index1/level        |   1 +
 .../system/cpu/cpu6/cache/index2/level        |   1 +
 .../system/cpu/cpu6/cache/index3/id           |   1 +
 .../system/cpu/cpu6/cache/index3/level        |   1 +
 .../cpu/cpu6/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu6/cache/index3/size         |   1 +
 .../system/cpu/cpu6/cache/index3/type         |   1 +
 .../system/cpu/cpu6/topology/core_id          |   1 +
 .../system/cpu/cpu6/topology/die_id           |   1 +
 .../cpu/cpu6/topology/physical_package_id     |   1 +
 .../cpu/cpu6/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu7/cache/index0/level        |   1 +
 .../system/cpu/cpu7/cache/index1/level        |   1 +
 .../system/cpu/cpu7/cache/index2/level        |   1 +
 .../system/cpu/cpu7/cache/index3/id           |   1 +
 .../system/cpu/cpu7/cache/index3/level        |   1 +
 .../cpu/cpu7/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu7/cache/index3/size         |   1 +
 .../system/cpu/cpu7/cache/index3/type         |   1 +
 .../system/cpu/cpu7/topology/core_id          |   1 +
 .../system/cpu/cpu7/topology/die_id           |   1 +
 .../cpu/cpu7/topology/physical_package_id     |   1 +
 .../cpu/cpu7/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu8/cache/index0/level        |   1 +
 .../system/cpu/cpu8/cache/index1/level        |   1 +
 .../system/cpu/cpu8/cache/index2/level        |   1 +
 .../system/cpu/cpu8/cache/index3/id           |   1 +
 .../system/cpu/cpu8/cache/index3/level        |   1 +
 .../cpu/cpu8/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu8/cache/index3/size         |   1 +
 .../system/cpu/cpu8/cache/index3/type         |   1 +
 .../system/cpu/cpu8/topology/core_id          |   1 +
 .../system/cpu/cpu8/topology/die_id           |   1 +
 .../cpu/cpu8/topology/physical_package_id     |   1 +
 .../cpu/cpu8/topology/thread_siblings_list    |   1 +
 .../system/cpu/cpu9/cache/index0/level        |   1 +
 .../system/cpu/cpu9/cache/index1/level        |   1 +
 .../system/cpu/cpu9/cache/index2/level        |   1 +
 .../system/cpu/cpu9/cache/index3/id           |   1 +
 .../system/cpu/cpu9/cache/index3/level        |   1 +
 .../cpu/cpu9/cache/index3/shared_cpu_list     |   1 +
 .../system/cpu/cpu9/cache/index3/size         |   1 +
 .../system/cpu/cpu9/cache/index3/type         |   1 +
 .../system/cpu/cpu9/topology/core_id          |   1 +
 .../system/cpu/cpu9/topology/die_id           |   1 +
 .../cpu/cpu9/topology/physical_package_id     |   1 +
 .../cpu/cpu9/topology/thread_siblings_list    |   1 +
 .../linux-hmat/system/cpu/online              |   1 +
 .../node/node0/access0/initiators/node0       |   1 +
 .../node0/access0/initiators/read_bandwidth   |   1 +
 .../node0/access0/initiators/read_latency     |   1 +
 .../node0/access0/initiators/write_bandwidth  |   1 +
 .../node0/access0/initiators/write_latency    |   1 +
 .../system/node/node0/access0/targets/node0   |   1 +
 .../system/node/node0/access0/targets/node1   |   1 +
 .../node/node0/access1/initiators/node0       |   1 +
 .../node0/access1/initiators/read_bandwidth   |   1 +
 .../node0/access1/initiators/read_latency     |   1 +
 .../node0/access1/initiators/write_bandwidth  |   1 +
 .../node0/access1/initiators/write_latency    |   1 +
 .../system/node/node0/access1/targets/node0   |   1 +
 .../system/node/node0/access1/targets/node1   |   1 +
 .../linux-hmat/system/node/node0/cpulist      |   1 +
 .../linux-hmat/system/node/node0/distance     |   1 +
 .../hugepages-1048576kB/free_hugepages        |   1 +
 .../hugepages-1048576kB/nr_hugepages          |   1 +
 .../hugepages-1048576kB/surplus_hugepages     |   1 +
 .../hugepages/hugepages-2048kB/free_hugepages |   1 +
 .../hugepages/hugepages-2048kB/nr_hugepages   |   1 +
 .../hugepages-2048kB/surplus_hugepages        |   1 +
 .../node0/memory_side_cache/index1/indexing   |   1 +
 .../node0/memory_side_cache/index1/line_size  |   1 +
 .../node/node0/memory_side_cache/index1/size  |   1 +
 .../memory_side_cache/index1/write_policy     |   1 +
 .../node0/memory_side_cache/index2/indexing   |   1 +
 .../node0/memory_side_cache/index2/line_size  |   1 +
 .../node/node0/memory_side_cache/index2/size  |   1 +
 .../memory_side_cache/index2/write_policy     |   1 +
 .../node/node1/access0/initiators/node0       |   1 +
 .../node1/access0/initiators/read_bandwidth   |   1 +
 .../node1/access0/initiators/read_latency     |   1 +
 .../node1/access0/initiators/write_bandwidth  |   1 +
 .../node1/access0/initiators/write_latency    |   1 +
 .../node/node1/access1/initiators/node0       |   1 +
 .../node1/access1/initiators/read_bandwidth   |   1 +
 .../node1/access1/initiators/read_latency     |   1 +
 .../node1/access1/initiators/write_bandwidth  |   1 +
 .../node1/access1/initiators/write_latency    |   1 +
 .../linux-hmat/system/node/node1/cpulist      |   1 +
 .../linux-hmat/system/node/node1/distance     |   1 +
 .../hugepages-1048576kB/free_hugepages        |   1 +
 .../hugepages-1048576kB/nr_hugepages          |   1 +
 .../hugepages-1048576kB/surplus_hugepages     |   1 +
 .../hugepages/hugepages-2048kB/free_hugepages |   1 +
 .../hugepages/hugepages-2048kB/nr_hugepages   |   1 +
 .../hugepages-2048kB/surplus_hugepages        |   1 +
 .../node1/memory_side_cache/index1/indexing   |   1 +
 .../node1/memory_side_cache/index1/line_size  |   1 +
 .../node/node1/memory_side_cache/index1/size  |   1 +
 .../memory_side_cache/index1/write_policy     |   1 +
 .../linux-hmat/system/node/online             |   1 +
 tests/vircaps2xmldata/vircaps-x86_64-hmat.xml | 105 ++++++++++++++++++
 tests/vircaps2xmltest.c                       |   2 +
 345 files changed, 450 insertions(+), 1 deletion(-)
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index0/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index1/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index2/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/level
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/shared_cpu_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/type
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/core_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/die_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/physical_package_id
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/thread_siblings_list
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/cpu/online
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/node0
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_latency
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_latency
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node0
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node1
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/node0
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_latency
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_latency
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node0
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node1
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/cpulist
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/distance
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/indexing
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/line_size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/write_policy
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/indexing
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/line_size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/write_policy
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/node0
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_latency
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_latency
 create mode 120000 tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/node0
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_latency
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_bandwidth
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_latency
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/cpulist
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/distance
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/indexing
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/line_size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/size
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/write_policy
 create mode 100644 tests/vircaps2xmldata/linux-hmat/system/node/online
 create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-hmat.xml

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 552d639119..be55f26e19 100644
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1835,7 +1835,7 @@ exclude_file_name_regexp--sc_prohibit_mixed_case_abbreviations = \
   ^src/(vbox/vbox_CAPI.*.h|esx/esx_vi.(c|h)|esx/esx_storage_backend_iscsi.c)$$
 
 exclude_file_name_regexp--sc_prohibit_empty_first_line = \
-  ^(src/esx/README|tests/(vmwarever|virhostcpu)data/.*)$$
+  ^(src/esx/README|tests/(vmwarever|virhostcpu|vircaps2xml)data/.*)$$
 
 exclude_file_name_regexp--sc_prohibit_useless_translation = \
   ^tests/virpolkittest.c
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/physical_package_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/thread_siblings_list
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu0/topology/thread_siblings_list
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/physical_package_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/thread_siblings_list
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu1/topology/thread_siblings_list
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/id
new file mode 100644
index 0000000000..f599e28b8a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/id
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..f599e28b8a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/physical_package_id
new file mode 100644
index 0000000000..f599e28b8a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/physical_package_id
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/thread_siblings_list
new file mode 100644
index 0000000000..f599e28b8a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu10/topology/thread_siblings_list
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/id
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/id
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/physical_package_id
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/physical_package_id
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/thread_siblings_list
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu11/topology/thread_siblings_list
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/id
new file mode 100644
index 0000000000..48082f72f0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/id
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..48082f72f0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/physical_package_id
new file mode 100644
index 0000000000..48082f72f0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/physical_package_id
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/thread_siblings_list
new file mode 100644
index 0000000000..48082f72f0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu12/topology/thread_siblings_list
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/id
new file mode 100644
index 0000000000..b1bd38b62a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/id
@@ -0,0 +1 @@
+13
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..b1bd38b62a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+13
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/physical_package_id
new file mode 100644
index 0000000000..b1bd38b62a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/physical_package_id
@@ -0,0 +1 @@
+13
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/thread_siblings_list
new file mode 100644
index 0000000000..b1bd38b62a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu13/topology/thread_siblings_list
@@ -0,0 +1 @@
+13
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/id
new file mode 100644
index 0000000000..8351c19397
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/id
@@ -0,0 +1 @@
+14
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..8351c19397
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+14
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/physical_package_id
new file mode 100644
index 0000000000..8351c19397
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/physical_package_id
@@ -0,0 +1 @@
+14
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/thread_siblings_list
new file mode 100644
index 0000000000..8351c19397
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu14/topology/thread_siblings_list
@@ -0,0 +1 @@
+14
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/id
new file mode 100644
index 0000000000..60d3b2f4a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/id
@@ -0,0 +1 @@
+15
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..60d3b2f4a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+15
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/physical_package_id
new file mode 100644
index 0000000000..60d3b2f4a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/physical_package_id
@@ -0,0 +1 @@
+15
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/thread_siblings_list
new file mode 100644
index 0000000000..60d3b2f4a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu15/topology/thread_siblings_list
@@ -0,0 +1 @@
+15
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/id
new file mode 100644
index 0000000000..b6a7d89c68
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/id
@@ -0,0 +1 @@
+16
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..b6a7d89c68
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+16
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/physical_package_id
new file mode 100644
index 0000000000..b6a7d89c68
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/physical_package_id
@@ -0,0 +1 @@
+16
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/thread_siblings_list
new file mode 100644
index 0000000000..b6a7d89c68
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu16/topology/thread_siblings_list
@@ -0,0 +1 @@
+16
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/id
new file mode 100644
index 0000000000..98d9bcb75a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/id
@@ -0,0 +1 @@
+17
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..98d9bcb75a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+17
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/physical_package_id
new file mode 100644
index 0000000000..98d9bcb75a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/physical_package_id
@@ -0,0 +1 @@
+17
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/thread_siblings_list
new file mode 100644
index 0000000000..98d9bcb75a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu17/topology/thread_siblings_list
@@ -0,0 +1 @@
+17
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/id
new file mode 100644
index 0000000000..3c032078a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/id
@@ -0,0 +1 @@
+18
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..3c032078a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+18
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/physical_package_id
new file mode 100644
index 0000000000..3c032078a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/physical_package_id
@@ -0,0 +1 @@
+18
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/thread_siblings_list
new file mode 100644
index 0000000000..3c032078a4
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu18/topology/thread_siblings_list
@@ -0,0 +1 @@
+18
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/id
new file mode 100644
index 0000000000..d6b24041cf
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/id
@@ -0,0 +1 @@
+19
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..d6b24041cf
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+19
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/physical_package_id
new file mode 100644
index 0000000000..d6b24041cf
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/physical_package_id
@@ -0,0 +1 @@
+19
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/thread_siblings_list
new file mode 100644
index 0000000000..d6b24041cf
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu19/topology/thread_siblings_list
@@ -0,0 +1 @@
+19
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/physical_package_id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/physical_package_id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/thread_siblings_list
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu2/topology/thread_siblings_list
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/id
new file mode 100644
index 0000000000..209e3ef4b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/id
@@ -0,0 +1 @@
+20
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..209e3ef4b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+20
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/physical_package_id
new file mode 100644
index 0000000000..209e3ef4b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/physical_package_id
@@ -0,0 +1 @@
+20
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/thread_siblings_list
new file mode 100644
index 0000000000..209e3ef4b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu20/topology/thread_siblings_list
@@ -0,0 +1 @@
+20
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/id
new file mode 100644
index 0000000000..aabe6ec390
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/id
@@ -0,0 +1 @@
+21
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..aabe6ec390
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+21
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/physical_package_id
new file mode 100644
index 0000000000..aabe6ec390
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/physical_package_id
@@ -0,0 +1 @@
+21
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/thread_siblings_list
new file mode 100644
index 0000000000..aabe6ec390
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu21/topology/thread_siblings_list
@@ -0,0 +1 @@
+21
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/id
new file mode 100644
index 0000000000..2bd5a0a98a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/id
@@ -0,0 +1 @@
+22
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..2bd5a0a98a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+22
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/physical_package_id
new file mode 100644
index 0000000000..2bd5a0a98a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/physical_package_id
@@ -0,0 +1 @@
+22
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/thread_siblings_list
new file mode 100644
index 0000000000..2bd5a0a98a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu22/topology/thread_siblings_list
@@ -0,0 +1 @@
+22
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/id
new file mode 100644
index 0000000000..409940768f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/id
@@ -0,0 +1 @@
+23
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..409940768f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+23
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/physical_package_id
new file mode 100644
index 0000000000..409940768f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/physical_package_id
@@ -0,0 +1 @@
+23
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/thread_siblings_list
new file mode 100644
index 0000000000..409940768f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu23/topology/thread_siblings_list
@@ -0,0 +1 @@
+23
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/physical_package_id
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/physical_package_id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/thread_siblings_list
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu3/topology/thread_siblings_list
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/id
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/id
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/physical_package_id
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/physical_package_id
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/thread_siblings_list
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu4/topology/thread_siblings_list
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/id
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/id
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/physical_package_id
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/physical_package_id
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/thread_siblings_list
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu5/topology/thread_siblings_list
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/id
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/id
@@ -0,0 +1 @@
+6
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+6
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/physical_package_id
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/physical_package_id
@@ -0,0 +1 @@
+6
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/thread_siblings_list
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu6/topology/thread_siblings_list
@@ -0,0 +1 @@
+6
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/id
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/id
@@ -0,0 +1 @@
+7
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+7
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/physical_package_id
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/physical_package_id
@@ -0,0 +1 @@
+7
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/thread_siblings_list
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu7/topology/thread_siblings_list
@@ -0,0 +1 @@
+7
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/id
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/id
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/physical_package_id
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/physical_package_id
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/thread_siblings_list
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu8/topology/thread_siblings_list
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index0/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index0/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index1/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index1/level
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index2/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index2/level
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/id
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/id
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/level b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/level
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/shared_cpu_list
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/size b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/size
new file mode 100644
index 0000000000..e7252eb3b6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/size
@@ -0,0 +1 @@
+16384K
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/type b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/type
new file mode 100644
index 0000000000..e4fd9dccda
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/core_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/die_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/physical_package_id b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/physical_package_id
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/physical_package_id
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/thread_siblings_list
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/cpu9/topology/thread_siblings_list
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-hmat/system/cpu/online b/tests/vircaps2xmldata/linux-hmat/system/cpu/online
new file mode 100644
index 0000000000..bb381c7835
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/cpu/online
@@ -0,0 +1 @@
+0-23
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/node0
new file mode 120000
index 0000000000..3fb87f360e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/node0
@@ -0,0 +1 @@
+../../../node0
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_bandwidth
new file mode 100644
index 0000000000..3bc92d44ac
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_bandwidth
@@ -0,0 +1 @@
+201
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_latency
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/read_latency
@@ -0,0 +1 @@
+6
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_bandwidth
new file mode 100644
index 0000000000..8f897c857d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_bandwidth
@@ -0,0 +1 @@
+202
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_latency
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/initiators/write_latency
@@ -0,0 +1 @@
+7
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node0
new file mode 120000
index 0000000000..3fb87f360e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node0
@@ -0,0 +1 @@
+../../../node0
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node1 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node1
new file mode 120000
index 0000000000..f0a5ec8766
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access0/targets/node1
@@ -0,0 +1 @@
+../../../node1
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/node0
new file mode 120000
index 0000000000..3fb87f360e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/node0
@@ -0,0 +1 @@
+../../../node0
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_bandwidth
new file mode 100644
index 0000000000..3bc92d44ac
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_bandwidth
@@ -0,0 +1 @@
+201
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_latency
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/read_latency
@@ -0,0 +1 @@
+6
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_bandwidth
new file mode 100644
index 0000000000..8f897c857d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_bandwidth
@@ -0,0 +1 @@
+202
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_latency
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/initiators/write_latency
@@ -0,0 +1 @@
+7
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node0
new file mode 120000
index 0000000000..3fb87f360e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node0
@@ -0,0 +1 @@
+../../../node0
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node1 b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node1
new file mode 120000
index 0000000000..f0a5ec8766
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node1
@@ -0,0 +1 @@
+../../../node1
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/cpulist b/tests/vircaps2xmldata/linux-hmat/system/node/node0/cpulist
new file mode 100644
index 0000000000..bb381c7835
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/cpulist
@@ -0,0 +1 @@
+0-23
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/distance b/tests/vircaps2xmldata/linux-hmat/system/node/node0/distance
new file mode 100644
index 0000000000..ed40cec79b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/distance
@@ -0,0 +1 @@
+10 20
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/indexing b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/indexing
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/indexing
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/line_size b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/line_size
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/line_size
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/size b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/size
new file mode 100644
index 0000000000..7b16a10f97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/size
@@ -0,0 +1 @@
+10240
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/write_policy b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/write_policy
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index1/write_policy
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/indexing b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/indexing
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/indexing
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/line_size b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/line_size
new file mode 100644
index 0000000000..b6a7d89c68
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/line_size
@@ -0,0 +1 @@
+16
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/size b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/size
new file mode 100644
index 0000000000..b71078fd07
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/size
@@ -0,0 +1 @@
+131072
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/write_policy b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/write_policy
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node0/memory_side_cache/index2/write_policy
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/node0
new file mode 120000
index 0000000000..3fb87f360e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/node0
@@ -0,0 +1 @@
+../../../node0
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_bandwidth
new file mode 100644
index 0000000000..398050c62c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_bandwidth
@@ -0,0 +1 @@
+101
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_latency
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/read_latency
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_bandwidth
new file mode 100644
index 0000000000..257e563266
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_bandwidth
@@ -0,0 +1 @@
+102
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_latency
new file mode 100644
index 0000000000..48082f72f0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access0/initiators/write_latency
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/node0 b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/node0
new file mode 120000
index 0000000000..3fb87f360e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/node0
@@ -0,0 +1 @@
+../../../node0
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_bandwidth
new file mode 100644
index 0000000000..398050c62c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_bandwidth
@@ -0,0 +1 @@
+101
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_latency
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/read_latency
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_bandwidth b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_bandwidth
new file mode 100644
index 0000000000..257e563266
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_bandwidth
@@ -0,0 +1 @@
+102
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_latency b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_latency
new file mode 100644
index 0000000000..48082f72f0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/access1/initiators/write_latency
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/cpulist b/tests/vircaps2xmldata/linux-hmat/system/node/node1/cpulist
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/cpulist
@@ -0,0 +1 @@
+
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/distance b/tests/vircaps2xmldata/linux-hmat/system/node/node1/distance
new file mode 100644
index 0000000000..df502ea951
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/distance
@@ -0,0 +1 @@
+20 10
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/free_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/indexing b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/indexing
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/indexing
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/line_size b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/line_size
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/line_size
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/size b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/size
new file mode 100644
index 0000000000..7b16a10f97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/size
@@ -0,0 +1 @@
+10240
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/write_policy b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/write_policy
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/node1/memory_side_cache/index1/write_policy
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-hmat/system/node/online b/tests/vircaps2xmldata/linux-hmat/system/node/online
new file mode 100644
index 0000000000..8b0fab869c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-hmat/system/node/online
@@ -0,0 +1 @@
+0-1
diff --git a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml
new file mode 100644
index 0000000000..6fe5751666
--- /dev/null
+++ b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml
@@ -0,0 +1,105 @@
+<capabilities>
+
+  <host>
+    <cpu>
+      <arch>x86_64</arch>
+    </cpu>
+    <power_management/>
+    <iommu support='no'/>
+    <migration_features>
+      <live/>
+    </migration_features>
+    <topology>
+      <cells num='2'>
+        <cell id='0'>
+          <memory unit='KiB'>1048576</memory>
+          <pages unit='KiB' size='4'>2048</pages>
+          <pages unit='KiB' size='2048'>4096</pages>
+          <pages unit='KiB' size='1048576'>6144</pages>
+          <cache level='1' associativity='direct' policy='writeback'>
+            <size value='10' unit='KiB'/>
+            <line value='8' unit='B'/>
+          </cache>
+          <cache level='2' associativity='full' policy='writethrough'>
+            <size value='128' unit='KiB'/>
+            <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'/>
+          </cpus>
+        </cell>
+        <cell id='1'>
+          <memory unit='KiB'>2097152</memory>
+          <pages unit='KiB' size='4'>4096</pages>
+          <pages unit='KiB' size='2048'>6144</pages>
+          <pages unit='KiB' size='1048576'>8192</pages>
+          <cache level='1' associativity='direct' policy='writeback'>
+            <size value='10' unit='KiB'/>
+            <line value='8' unit='B'/>
+          </cache>
+          <cpus num='0'/>
+        </cell>
+      </cells>
+      <interconnects>
+        <latency initiator='0' target='0' type='read' value='6'/>
+        <latency initiator='0' target='0' type='write' value='7'/>
+        <latency initiator='0' target='1' type='read' value='11'/>
+        <latency initiator='0' target='1' type='write' value='12'/>
+        <bandwidth initiator='0' target='0' type='read' value='205824' unit='KiB'/>
+        <bandwidth initiator='0' target='0' type='write' value='206848' unit='KiB'/>
+        <bandwidth initiator='0' target='1' type='read' value='103424' unit='KiB'/>
+        <bandwidth initiator='0' target='1' type='write' value='104448' unit='KiB'/>
+      </interconnects>
+    </topology>
+    <cache>
+      <bank id='0' level='3' type='both' size='16' unit='MiB' cpus='0'/>
+      <bank id='1' level='3' type='both' size='16' unit='MiB' cpus='1'/>
+      <bank id='2' level='3' type='both' size='16' unit='MiB' cpus='2'/>
+      <bank id='3' level='3' type='both' size='16' unit='MiB' cpus='3'/>
+      <bank id='4' level='3' type='both' size='16' unit='MiB' cpus='4'/>
+      <bank id='5' level='3' type='both' size='16' unit='MiB' cpus='5'/>
+      <bank id='6' level='3' type='both' size='16' unit='MiB' cpus='6'/>
+      <bank id='7' level='3' type='both' size='16' unit='MiB' cpus='7'/>
+      <bank id='8' level='3' type='both' size='16' unit='MiB' cpus='8'/>
+      <bank id='9' level='3' type='both' size='16' unit='MiB' cpus='9'/>
+      <bank id='10' level='3' type='both' size='16' unit='MiB' cpus='10'/>
+      <bank id='11' level='3' type='both' size='16' unit='MiB' cpus='11'/>
+      <bank id='12' level='3' type='both' size='16' unit='MiB' cpus='12'/>
+      <bank id='13' level='3' type='both' size='16' unit='MiB' cpus='13'/>
+      <bank id='14' level='3' type='both' size='16' unit='MiB' cpus='14'/>
+      <bank id='15' level='3' type='both' size='16' unit='MiB' cpus='15'/>
+      <bank id='16' level='3' type='both' size='16' unit='MiB' cpus='16'/>
+      <bank id='17' level='3' type='both' size='16' unit='MiB' cpus='17'/>
+      <bank id='18' level='3' type='both' size='16' unit='MiB' cpus='18'/>
+      <bank id='19' level='3' type='both' size='16' unit='MiB' cpus='19'/>
+      <bank id='20' level='3' type='both' size='16' unit='MiB' cpus='20'/>
+      <bank id='21' level='3' type='both' size='16' unit='MiB' cpus='21'/>
+      <bank id='22' level='3' type='both' size='16' unit='MiB' cpus='22'/>
+      <bank id='23' level='3' type='both' size='16' unit='MiB' cpus='23'/>
+    </cache>
+  </host>
+
+</capabilities>
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 1e6c113c77..b143f873a1 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -97,6 +97,8 @@ mymain(void)
 
     DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);
 
+    DO_TEST_FULL("hmat", VIR_ARCH_X86_64, true, true);
+
     DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true);
     DO_TEST_FULL("resctrl-cmt", VIR_ARCH_X86_64, true, true);
     DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true);
-- 
2.31.1