tests/fake: check a TWEAK phase in the fake component

It restricts the topology to a single PU and single NUMA.

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

Author: bgoglin

hwloc/topology-fake.c

@@ -9,6 +9,31 @@
 
 #include <stdlib.h>
 
+static int
+hwloc_look_fake(struct hwloc_backend *backend, struct hwloc_disc_status *dstatus)
+{
+  hwloc_topology_t topology = backend->topology;
+
+  assert(dstatus->phase == HWLOC_DISC_PHASE_TWEAK);
+
+  if (getenv("HWLOC_DEBUG_FAKE_COMPONENT_TWEAK")) {
+    hwloc_obj_t obj;
+    int err;
+    /* restrict to single (last) PU */
+    obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_PU)-1);
+    assert(obj);
+    err = hwloc_topology_restrict(topology, obj->cpuset, 0);
+    assert(!err);
+    /* restrict to single (first) NUMA node */
+    obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_NUMANODE, 0);
+    assert(obj);
+    err = hwloc_topology_restrict(topology, obj->nodeset, HWLOC_RESTRICT_FLAG_BYNODESET);
+    assert(!err);
+  }
+
+  return 0;
+}
+
 static struct hwloc_backend *
 hwloc_fake_component_instantiate(struct hwloc_topology *topology __hwloc_attribute_unused,
 				 struct hwloc_disc_component *component __hwloc_attribute_unused,
@@ -17,14 +42,25 @@ hwloc_fake_component_instantiate(struct hwloc_topology *topology __hwloc_attribu
 				 const void *_data2 __hwloc_attribute_unused,
 				 const void *_data3 __hwloc_attribute_unused)
 {
+  struct hwloc_backend *backend;
+
+  backend = hwloc_backend_alloc(topology, component);
+  if (!backend)
+    goto out;
+  backend->discover = hwloc_look_fake;
+
   if (getenv("HWLOC_DEBUG_FAKE_COMPONENT"))
     printf("fake component instantiated\n");
+
+  return backend;
+
+ out:
   return NULL;
 }
 
 static struct hwloc_disc_component hwloc_fake_disc_component = {
   "fake",
-  HWLOC_DISC_PHASE_MISC, /* so that it's always enabled when using the OS discovery */
+  HWLOC_DISC_PHASE_TWEAK,
   0, /* nothing to exclude */
   hwloc_fake_component_instantiate,
   100, /* make sure it's loaded before anything conflicting excludes it */

utils/hwloc/test-fake-plugin.sh.in

@@ -2,22 +2,20 @@
 #-*-sh-*-
 
 #
-# Copyright © 2009-2014 Inria.  All rights reserved.
+# Copyright © 2009-2019 Inria.  All rights reserved.
 # Copyright © 2009, 2011 Université Bordeaux
 # Copyright © 2014 Cisco Systems, Inc.  All rights reserved.
 # See COPYING in top-level directory.
 #
 
 HWLOC_top_builddir="@HWLOC_top_builddir@"
-builddir="$HWLOC_top_builddir/utils/lstopo"
-lstopo="$builddir/lstopo-no-graphics"
+builddir="$HWLOC_top_builddir"
+lstopo="$builddir/utils/lstopo/lstopo-no-graphics"
+hcalc="$builddir/utils/hwloc/hwloc-calc"
 
 HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc
 export HWLOC_PLUGINS_PATH
 
-HWLOC_DEBUG_FAKE_COMPONENT=1
-export HWLOC_DEBUG_FAKE_COMPONENT
-
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
 
@@ -35,6 +33,17 @@ file="$tmp/test-fake-plugin.output"
 
 set -e
 
+echo "Checking that the tweak phase restricts to a single PU and single NUMA"
+HWLOC_DEBUG_FAKE_COMPONENT_TWEAK=1
+export HWLOC_DEBUG_FAKE_COMPONENT_TWEAK
+
+test `$hcalc -N pu root` = 1
+test `$hcalc -N numa root` = 1
+
+echo "Checking that the init/instantiate/finalize callbacks are invoked"
+HWLOC_DEBUG_FAKE_COMPONENT=1
+export HWLOC_DEBUG_FAKE_COMPONENT
+
 $lstopo > $file
 
 grep "fake component initialized" $file \