tests/linux: update fakeheterocpunuma to use cpu_capacity instead of …

…cpu_types This reverts ee7b0dc and adds capacities. Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
open-mpi · Jun 30, 2021 · e688667 · e688667
1 parent 6ed7e9d
commit e688667
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tests/hwloc/linux/fakeheterocpunuma.output b/tests/hwloc/linux/fakeheterocpunuma.output
@@ -91,16 +91,19 @@
     <u64values length="30">50 10 20 30 40 40 50 20 10 30 </u64values>
     <u64values length="18">40 40 50 30 30 10 </u64values>
   </distances2>
-  <cpukind cpuset="0x00fff000">
+  <cpukind cpuset="0x00fff000" forced_efficiency="1">
     <info name="FrequencyMaxMHz" value="2000"/>
     <info name="FrequencyBaseMHz" value="1200"/>
+    <info name="LinuxCapacity" value="1025"/>
   </cpukind>
-  <cpukind cpuset="0x000000ff">
+  <cpukind cpuset="0x000000ff" forced_efficiency="0">
     <info name="FrequencyMaxMHz" value="3000"/>
     <info name="FrequencyBaseMHz" value="2500"/>
+    <info name="LinuxCapacity" value="234"/>
   </cpukind>
-  <cpukind cpuset="0x00000f00">
+  <cpukind cpuset="0x00000f00" forced_efficiency="0">
     <info name="FrequencyMaxMHz" value="3000"/>
     <info name="FrequencyBaseMHz" value="1200"/>
+    <info name="LinuxCapacity" value="234"/>
   </cpukind>
 </topology>
diff --git a/tests/hwloc/linux/fakeheterocpunuma.tar.bz2 b/tests/hwloc/linux/fakeheterocpunuma.tar.bz2
diff --git a/utils/hwloc/test-hwloc-info.output b/utils/hwloc/test-hwloc-info.output
@@ -485,12 +485,15 @@ Machine L#0
  cpukind = 0 (partially)
  cpukind info FrequencyMaxMHz = 2000
  cpukind info FrequencyBaseMHz = 1200
+ cpukind info LinuxCapacity = 1025
  cpukind = 1 (partially)
  cpukind info FrequencyMaxMHz = 3000
  cpukind info FrequencyBaseMHz = 2500
+ cpukind info LinuxCapacity = 234
  cpukind = 2 (partially)
  cpukind info FrequencyMaxMHz = 3000
  cpukind info FrequencyBaseMHz = 1200
+ cpukind info LinuxCapacity = 234
 
 # cpukind for a single PU
 PU L#15
@@ -515,4 +518,5 @@ PU L#15
  cpukind = 0
  cpukind info FrequencyMaxMHz = 2000
  cpukind info FrequencyBaseMHz = 1200
+ cpukind info LinuxCapacity = 1025