utils/tests: check cpukinds in hwloc-annotate

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
open-mpi · Nov 19, 2020 · 3ba45f8 · 3ba45f8
1 parent d05b252
commit 3ba45f8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/utils/hwloc/test-hwloc-annotate.output b/utils/hwloc/test-hwloc-annotate.output
@@ -164,4 +164,18 @@
   <memattr name="DummyMemattr2" flags="6">
     <memattr_value target_obj_type="PU" target_obj_gp_index="15" value="123" initiator_cpuset="0x0000000f"/>
   </memattr>
+  <cpukind cpuset="0x00000004" forced_efficiency="7">
+    <info name="foo2" value="bar3"/>
+  </cpukind>
+  <cpukind cpuset="0x00000008" forced_efficiency="7">
+    <info name="foo" value="bar"/>
+    <info name="foo2" value="bar3"/>
+  </cpukind>
+  <cpukind cpuset="0x00000001" forced_efficiency="4">
+    <info name="foo2" value="bar2"/>
+  </cpukind>
+  <cpukind cpuset="0x00000002" forced_efficiency="4">
+    <info name="foo" value="bar"/>
+    <info name="foo2" value="bar2"/>
+  </cpukind>
 </topology>
diff --git a/utils/hwloc/test-hwloc-annotate.sh.in b/utils/hwloc/test-hwloc-annotate.sh.in
@@ -62,6 +62,10 @@ $annotate $file $file -- dummy -- memattr DummyMemattr higher
 $annotate $file $file -- pu:0 -- memattr dummymemattr dummy 1234
 $annotate $file $file -- dummy -- memattr DummyMemattr2 lower,need_init
 $annotate $file $file -- pu:2 -- memattr dummymemattr2 0xf 123
+$annotate $file $file -- dummy -- cpukind 0x5 -1 0
+$annotate $file $file -- dummy -- cpukind 0xa -1 0 foo bar
+$annotate $file $file -- dummy -- cpukind 0x3 4 0 foo2 bar2
+$annotate $file $file -- dummy -- cpukind 0xc 7 0 foo2 bar3
 cat > $distances << EOF
 5
 3