tests: rework/cleanup some code to make changes easier

Don't hardwire types/depths,
abstract-out some checks,
use explicit types in synthetic string,
use less NUMA nodes since their modeling will change soon,
etc

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>

Author: bgoglin

tests/hwloc/hwloc_distances.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2016 Inria.  All rights reserved.
+ * Copyright © 2010-2017 Inria.  All rights reserved.
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
  */
@@ -36,13 +36,36 @@ static void print_distances(const struct hwloc_distances_s *distances)
   }
 }
 
+static void check_distances(hwloc_topology_t topology, unsigned depth, unsigned expected)
+{
+  struct hwloc_distances_s *distances[2];
+ unsigned nr = 0;
+  int err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
+  assert(!err);
+  assert(nr == expected);
+  if (!nr) {
+    printf("No distance at depth %u\n", depth);
+    return;
+  }
+  nr = 2;
+  err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
+  assert(!err);
+  printf("distance matrix for depth %u:\n", depth);
+  print_distances(distances[0]);
+  hwloc_distances_release(topology, distances[0]);
+  if (nr > 1) {
+    print_distances(distances[1]);
+    hwloc_distances_release(topology, distances[1]);
+  }
+}
+
 int main(void)
 {
   hwloc_topology_t topology;
   struct hwloc_distances_s *distances[2];
   hwloc_obj_t objs[16];
   uint64_t values[16*16];
-  unsigned depth, topodepth;
+  unsigned topodepth;
   unsigned i, j, k, nr;
   int err;
 
@@ -75,25 +98,12 @@ int main(void)
   assert(!err);
 
   topodepth = hwloc_topology_get_depth(topology);
-  for(depth=0; depth<topodepth; depth++) {
-    nr = 0;
-    err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
-    assert(!err);
-    if (depth == 2)
-      assert(nr == 1);
-    else
-      assert(!nr);
-    if (!nr) {
-      printf("No distance at depth %u\n", depth);
-      continue;
-    }
-    nr = 1;
-    err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
-    assert(!err);
-    printf("distance matrix for depth %u:\n", depth);
-    print_distances(distances[0]);
-    hwloc_distances_release(topology, distances[0]);
-  }
+  assert(topodepth == 5);
+  check_distances(topology, 0, 0);
+  check_distances(topology, 1, 0);
+  check_distances(topology, 2, 1);
+  check_distances(topology, 3, 0);
+  check_distances(topology, 4, 0);
 
   /* check numa distances */
   printf("Checking NUMA distances\n");
@@ -137,25 +147,13 @@ int main(void)
   assert(!err);
 
   topodepth = hwloc_topology_get_depth(topology);
-  for(depth=0; depth<topodepth; depth++) {
-    nr = 0;
-    err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
-    assert(!err);
-    if (depth == 2 || depth == 5)
-      assert(nr == 1);
-    else
-      assert(!nr);
-    if (!nr) {
-      printf("No distance at depth %u\n", depth);
-      continue;
-    }
-    nr = 1;
-    err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
-    assert(!err);
-    printf("distance matrix for depth %u:\n", depth);
-    print_distances(distances[0]);
-    hwloc_distances_release(topology, distances[0]);
-  }
+  assert(topodepth == 6);
+  check_distances(topology, 0, 0);
+  check_distances(topology, 1, 0);
+  check_distances(topology, 2, 1);
+  check_distances(topology, 3, 0);
+  check_distances(topology, 4, 0);
+  check_distances(topology, 5, 1);
 
   /* check PU distances */
   printf("Checking PU distances\n");
@@ -191,31 +189,13 @@ int main(void)
   assert(!err);
 
   topodepth = hwloc_topology_get_depth(topology);
-  for(depth=0; depth<topodepth; depth++) {
-    nr = 0;
-    err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
-    assert(!err);
-    if (depth == 2)
-      assert(nr == 1);
-    else if (depth == 5)
-      assert(nr == 2);
-    else
-      assert(!nr);
-    if (!nr) {
-      printf("No distance at depth %u\n", depth);
-      continue;
-    }
-    nr = 2;
-    err = hwloc_distances_get_by_depth(topology, depth, &nr, distances, 0, 0);
-    assert(!err);
-    printf("distance matrix for depth %u:\n", depth);
-    print_distances(distances[0]);
-    hwloc_distances_release(topology, distances[0]);
-    if (nr > 1) {
-      print_distances(distances[1]);
-      hwloc_distances_release(topology, distances[1]);
-    }
-  }
+  assert(topodepth == 6);
+  check_distances(topology, 0, 0);
+  check_distances(topology, 1, 0);
+  check_distances(topology, 2, 1);
+  check_distances(topology, 3, 0);
+  check_distances(topology, 4, 0);
+  check_distances(topology, 5, 2);
 
   /* check PU distances */
   printf("Checking 2nd PU distances\n");

tests/hwloc/hwloc_get_cache_covering_cpuset.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2015 Inria.  All rights reserved.
+ * Copyright © 2009-2017 Inria.  All rights reserved.
  * Copyright © 2009 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -15,7 +15,7 @@
 
 /* check hwloc_get_cache_covering_cpuset() */
 
-#define SYNTHETIC_TOPOLOGY_DESCRIPTION "6 5 4 3 2" /* 736bits wide topology */
+#define SYNTHETIC_TOPOLOGY_DESCRIPTION "numa:6 pack:5 l2:4 core:3 pu:2" /* 736bits wide topology */
 
 int main(void)
 {
@@ -30,7 +30,7 @@ int main(void)
   /* check the cache above a given cpu */
 #define CPUINDEX 180
   set = hwloc_bitmap_alloc();
-  obj = hwloc_get_obj_by_depth(topology, 5, CPUINDEX);
+  obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, CPUINDEX);
   assert(obj);
   hwloc_bitmap_or(set, set, obj->cpuset);
   cache = hwloc_get_cache_covering_cpuset(topology, set);
@@ -44,10 +44,10 @@ int main(void)
 #define CPUINDEX1 180
 #define CPUINDEX2 183
   set = hwloc_bitmap_alloc();
-  obj = hwloc_get_obj_by_depth(topology, 5, CPUINDEX1);
+  obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, CPUINDEX1);
   assert(obj);
   hwloc_bitmap_or(set, set, obj->cpuset);
-  obj = hwloc_get_obj_by_depth(topology, 5, CPUINDEX2);
+  obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, CPUINDEX2);
   assert(obj);
   hwloc_bitmap_or(set, set, obj->cpuset);
   cache = hwloc_get_cache_covering_cpuset(topology, set);
@@ -62,10 +62,10 @@ int main(void)
 #undef CPUINDEX1
 #define CPUINDEX1 300
   set = hwloc_bitmap_alloc();
-  obj = hwloc_get_obj_by_depth(topology, 5, CPUINDEX1);
+  obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, CPUINDEX1);
   assert(obj);
   hwloc_bitmap_or(set, set, obj->cpuset);
-  obj = hwloc_get_obj_by_depth(topology, 5, CPUINDEX2);
+  obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, CPUINDEX2);
   assert(obj);
   hwloc_bitmap_or(set, set, obj->cpuset);
   cache = hwloc_get_cache_covering_cpuset(topology, set);
@@ -74,7 +74,7 @@ int main(void)
 
   /* check no cache above higher level */
   set = hwloc_bitmap_alloc();
-  obj = hwloc_get_obj_by_depth(topology, 2, 0);
+  obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PACKAGE, 0);
   assert(obj);
   hwloc_bitmap_or(set, set, obj->cpuset);
   cache = hwloc_get_cache_covering_cpuset(topology, set);

tests/hwloc/hwloc_get_largest_objs_inside_cpuset.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2010 inria.  All rights reserved.
+ * Copyright © 2009-2017 Inria.  All rights reserved.
  * Copyright © 2009 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -17,7 +17,7 @@
  * and hwloc_get_first_largest_obj_inside_cpuset()
  */
 
-#define SYNTHETIC_TOPOLOGY_DESCRIPTION "6 5 4 3 2" /* 736bits wide topology */
+#define SYNTHETIC_TOPOLOGY_DESCRIPTION "numa:6 pack:5 l2:4 core:3 pu:2" /* 736bits wide topology */
 
 #define GIVEN_LARGESPLIT_CPUSET_STRING "8000,,,,,,,,,,,,,,,,,,,,,,1" /* first and last(735th) bit set */
 #define GIVEN_TOOLARGE_CPUSET_STRING "10000,,,,,,,,,,,,,,,,,,,,,,0" /* 736th bit is too large for the 720-wide topology */
@@ -28,16 +28,17 @@
 int main(void)
 {
   hwloc_topology_t topology;
-  unsigned depth;
   hwloc_obj_t objs[OBJ_MAX];
   hwloc_obj_t obj;
   hwloc_bitmap_t set;
+  unsigned pus;
   int ret;
 
   hwloc_topology_init(&topology);
   hwloc_topology_set_synthetic(topology, SYNTHETIC_TOPOLOGY_DESCRIPTION);
   hwloc_topology_load(topology);
-  depth = hwloc_topology_get_depth(topology);
+
+  pus = hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_PU);
 
   /* just get the system object */
   obj = hwloc_get_root_obj(topology);
@@ -48,7 +49,7 @@ int main(void)
   assert(objs[0] == obj);
 
   /* just get the very last object */
-  obj = hwloc_get_obj_by_depth(topology, depth-1, hwloc_get_nbobjs_by_depth(topology, depth-1)-1);
+  obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, pus-1);
   ret = hwloc_get_largest_objs_inside_cpuset(topology, obj->cpuset, objs, 1);
   assert(ret == 1);
   assert(objs[0] == obj);
@@ -75,21 +76,21 @@ int main(void)
   hwloc_bitmap_sscanf(set, GIVEN_LARGESPLIT_CPUSET_STRING);
   ret = hwloc_get_largest_objs_inside_cpuset(topology, set, objs, 1);
   assert(ret == 1);
-  assert(objs[0] == hwloc_get_obj_by_depth(topology, depth-1, 0));
+  assert(objs[0] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, 0));
   objs[0] = hwloc_get_first_largest_obj_inside_cpuset(topology, set);
-  assert(objs[0] == hwloc_get_obj_by_depth(topology, depth-1, 0));
+  assert(objs[0] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, 0));
   /* try a harder one with lots of objs instead of 2 needed */
   ret = hwloc_get_largest_objs_inside_cpuset(topology, set, objs, 2);
   assert(ret == 2);
-  assert(objs[0] == hwloc_get_obj_by_depth(topology, depth-1, 0));
-  assert(objs[1] == hwloc_get_obj_by_depth(topology, depth-1, hwloc_get_nbobjs_by_depth(topology, depth-1)-1));
+  assert(objs[0] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, 0));
+  assert(objs[1] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, pus-1));
   objs[0] = hwloc_get_first_largest_obj_inside_cpuset(topology, set);
   hwloc_bitmap_andnot(set, set, objs[0]->cpuset);
   objs[1] = hwloc_get_first_largest_obj_inside_cpuset(topology, set);
   hwloc_bitmap_andnot(set, set, objs[1]->cpuset);
   objs[2] = hwloc_get_first_largest_obj_inside_cpuset(topology, set);
-  assert(objs[0] == hwloc_get_obj_by_depth(topology, depth-1, 0));
-  assert(objs[1] == hwloc_get_obj_by_depth(topology, depth-1, hwloc_get_nbobjs_by_depth(topology, depth-1)-1));
+  assert(objs[0] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, 0));
+  assert(objs[1] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, pus-1));
   assert(objs[2] == NULL);
   assert(hwloc_bitmap_iszero(set));
   hwloc_bitmap_free(set);
@@ -98,13 +99,13 @@ int main(void)
   set = hwloc_bitmap_alloc();
   hwloc_bitmap_sscanf(set, GIVEN_HARD_CPUSET_STRING);
   ret = hwloc_get_largest_objs_inside_cpuset(topology, set, objs, OBJ_MAX);
-  assert(objs[0] == hwloc_get_obj_by_depth(topology, 5, 29));
-  assert(objs[1] == hwloc_get_obj_by_depth(topology, 3, 5));
-  assert(objs[2] == hwloc_get_obj_by_depth(topology, 3, 6));
-  assert(objs[3] == hwloc_get_obj_by_depth(topology, 3, 7));
-  assert(objs[4] == hwloc_get_obj_by_depth(topology, 2, 2));
-  assert(objs[5] == hwloc_get_obj_by_depth(topology, 4, 36));
-  assert(objs[6] == hwloc_get_obj_by_depth(topology, 5, 74));
+  assert(objs[0] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, 29));
+  assert(objs[1] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_L2CACHE, 5));
+  assert(objs[2] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_L2CACHE, 6));
+  assert(objs[3] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_L2CACHE, 7));
+  assert(objs[4] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PACKAGE, 2));
+  assert(objs[5] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_CORE, 36));
+  assert(objs[6] == hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, 74));
   hwloc_bitmap_free(set);
 
   hwloc_topology_destroy(topology);

tests/hwloc/hwloc_get_obj_below_array_by_type.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2014 Inria.  All rights reserved.
+ * Copyright © 2009-2017 Inria.  All rights reserved.
  * Copyright © 2009 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -30,49 +30,49 @@ main (void)
   if (err)
     return EXIT_FAILURE;
 
-  hwloc_topology_set_synthetic (topology, "node:3 pack:3 core:3 pu:3");
+  hwloc_topology_set_synthetic (topology, "numa:1 pack:3 l2:3 core:3 pu:3");
 
   err = hwloc_topology_load (topology);
   if (err)
     return EXIT_FAILURE;
 
 
   /* find the first thread */
-  typev[0] = HWLOC_OBJ_NUMANODE;   idxv[0] = 0;
-  typev[1] = HWLOC_OBJ_PACKAGE; idxv[1] = 0;
+  typev[0] = HWLOC_OBJ_PACKAGE;   idxv[0] = 0;
+  typev[1] = HWLOC_OBJ_L2CACHE; idxv[1] = 0;
   typev[2] = HWLOC_OBJ_CORE;   idxv[2] = 0;
   typev[3] = HWLOC_OBJ_PU;   idxv[3] = 0;
   obj = hwloc_get_obj_below_array_by_type(topology, 4, typev, idxv);
-  assert(obj == hwloc_get_obj_by_depth(topology, 4, 0));
+  assert(obj == hwloc_get_obj_by_depth(topology, 5, 0));
 
   /* find the last core */
-  typev[0] = HWLOC_OBJ_NUMANODE;   idxv[0] = 2;
-  typev[1] = HWLOC_OBJ_PACKAGE; idxv[1] = 2;
+  typev[0] = HWLOC_OBJ_PACKAGE;   idxv[0] = 2;
+  typev[1] = HWLOC_OBJ_L2CACHE; idxv[1] = 2;
   typev[2] = HWLOC_OBJ_CORE;   idxv[2] = 2;
   obj = hwloc_get_obj_below_array_by_type(topology, 3, typev, idxv);
-  assert(obj == hwloc_get_obj_by_depth(topology, 3, 26));
+  assert(obj == hwloc_get_obj_by_depth(topology, 4, 26));
 
   /* misc tests */
 
-  typev[0] = HWLOC_OBJ_PACKAGE; idxv[0] = 2;
+  typev[0] = HWLOC_OBJ_L2CACHE; idxv[0] = 2;
   obj = hwloc_get_obj_below_array_by_type(topology, 1, typev, idxv);
-  assert(obj == hwloc_get_obj_by_depth(topology, 2, 2));
+  assert(obj == hwloc_get_obj_by_depth(topology, 3, 2));
 
-  typev[0] = HWLOC_OBJ_NUMANODE;   idxv[0] = 2;
+  typev[0] = HWLOC_OBJ_PACKAGE;   idxv[0] = 2;
   typev[1] = HWLOC_OBJ_CORE;   idxv[1] = 2;
   obj = hwloc_get_obj_below_array_by_type(topology, 2, typev, idxv);
-  assert(obj == hwloc_get_obj_by_depth(topology, 3, 20));
+  assert(obj == hwloc_get_obj_by_depth(topology, 4, 20));
   /* check that hwloc_get_obj_below_by_type works as well */
   obj = hwloc_get_obj_below_by_type(topology, typev[0], idxv[0], typev[1], idxv[1]);
-  assert(obj == hwloc_get_obj_by_depth(topology, 3, 20));
+  assert(obj == hwloc_get_obj_by_depth(topology, 4, 20));
 
-  typev[0] = HWLOC_OBJ_PACKAGE; idxv[0] = 1;
+  typev[0] = HWLOC_OBJ_L2CACHE; idxv[0] = 1;
   typev[1] = HWLOC_OBJ_PU;   idxv[1] = 1;
   obj = hwloc_get_obj_below_array_by_type(topology, 2, typev, idxv);
-  assert(obj == hwloc_get_obj_by_depth(topology, 4, 10));
+  assert(obj == hwloc_get_obj_by_depth(topology, 5, 10));
   /* check that hwloc_get_obj_below_by_type works as well */
   obj = hwloc_get_obj_below_by_type(topology, typev[0], idxv[0], typev[1], idxv[1]);
-  assert(obj == hwloc_get_obj_by_depth(topology, 4, 10));
+  assert(obj == hwloc_get_obj_by_depth(topology, 5, 10));
 
 
   hwloc_topology_destroy (topology);