utils/tests: check location filters in calc and info tests

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

utils/hwloc/test-hwloc-calc.output

@@ -76,6 +76,15 @@ Group0:1.Group2:2 Group0:1.Group2:3
 # Number of objects at depth 3 in a NUMA Node
 16
 
+# Number of MCDRAM subtype NUMA Nodes
+4
+
+# List of MCDRAM subtype NUMA Nodes near 2 L3
+3,5
+
+# Hierarchical list of MCDRAM subtype NUMA nodes within Package
+Package:0.NUMANode:1 Package:0.NUMANode:7
+
 # List of Machine objects
 0
 

utils/hwloc/test-hwloc-calc.sh.in

@@ -120,6 +120,15 @@ set -e
   echo "# Number of objects at depth 3 in a NUMA Node"
   $calc --if synthetic --input "node:4 core:4 pu:4" node:2 -N 3
   echo
+  echo "# Number of MCDRAM subtype NUMA Nodes"
+  $calc --if xml --input $xmldir/64intel64-fakeKNL-SNC4-hybrid.xml -N 'numa[mcdram]' all
+  echo
+  echo "# List of MCDRAM subtype NUMA Nodes near 2 L3"
+  $calc --if xml --input $xmldir/64intel64-fakeKNL-SNC4-hybrid.xml -I 'numa[mcdram]' l3:1-2
+  echo
+  echo "# Hierarchical list of MCDRAM subtype NUMA nodes within Package"
+  $calc --if xml --input $xmldir/64intel64-fakeKNL-SNC4-hybrid.xml -H 'pack.numa[mcdram]' 'numa[mcdram]:0' 'numa[mcdram]:3'
+  echo
 
   echo "# List of Machine objects"
   $calc --if synthetic --input "node:4 core:4 pu:4" root --intersect Machine

utils/hwloc/test-hwloc-info.output

@@ -504,6 +504,22 @@ NUMANode:10
 NUMANode:11
 
 
+# MCDRAM subtype NUMA filter
+NUMANode:3
+NUMANode:5
+
+# NVML subtype OSdev type filter
+OSDev[Co-Processor,GPU]:2
+OSDev[Co-Processor,GPU]:5
+OSDev[Co-Processor,GPU]:8
+OSDev[Co-Processor,GPU]:11
+
+# GPU OSdev type filter
+OSDev[Co-Processor,GPU]:3
+OSDev[Co-Processor,GPU]:4
+OSDev[Co-Processor,GPU]:5
+
+
 # cpukinds for the entire machine
 Machine L#0
  type = Machine

utils/hwloc/test-hwloc-info.sh.in

@@ -15,6 +15,7 @@ srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
 info="$builddir/hwloc-info"
 linuxdir="$HWLOC_top_srcdir/tests/hwloc/linux"
+xmldir="$HWLOC_top_srcdir/tests/hwloc/xml"
 
 HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
 export HWLOC_PLUGINS_PATH
@@ -119,6 +120,17 @@ set -e
   $info --if synthetic --input "pack:4 [numa(memory=1000000)] l3:2 [numa(memory=1000)] core:4 pu:2" --local-memory-flags larger --best-memattr capacity -s pu:63
   echo
 
+  echo
+  echo "# MCDRAM subtype NUMA filter"
+  $info --if xml --input $xmldir/64intel64-fakeKNL-SNC4-hybrid.xml -s 'numa[mcdram]:1-2'
+  echo
+  echo "# NVML subtype OSdev type filter"
+  $info --if xml --input $xmldir/power8gpudistances.xml -s 'os[nvml]:all'
+  echo
+  echo "# GPU OSdev type filter"
+  $info --if xml --input $xmldir/power8gpudistances.xml -s 'os[gpu]:3-5'
+  echo
+
   echo
   echo "# cpukinds for the entire machine"
   $info --if xml --input $linuxdir/fakeheterocpunuma.xml all