synthetic: accept memory/cache size as GiB/KiB and handle GB/kB correctly

Refs #519

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

Author: bgoglin

doc/hwloc.doxy

@@ -2537,11 +2537,11 @@ space-separated attributes. For instance:
 <li>
  <tt>L2iCache:2(size=32kB)</tt> specifies 2 children
  of 32kB level-2 instruction caches.
- The size may be specified in bytes (without any unit suffix) or as TB, GB, MB or kB.
+ The size may be specified in bytes (without any unit suffix) or as kB, KiB, MB, MiB, etc.
 </li>
 <li>
  <tt>NUMANode:3(memory=16MB)</tt> specifies 3 NUMA nodes with 16MB each.
- The size may be specified in bytes (without any unit suffix) or as TB, GB, MB or kB.
+ The size may be specified in bytes (without any unit suffix) or as GB, GiB, TB, TiB, etc.
 </li>
 <li>
  <tt>PU:2(indexes=0,2,1,3)</tt> specifies 2 PU children and the

hwloc/topology-synthetic.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2020 Inria.  All rights reserved.
+ * Copyright © 2009-2022 Inria.  All rights reserved.
  * Copyright © 2009-2010 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -323,17 +323,29 @@ hwloc_synthetic_parse_memory_attr(const char *attr, const char **endp)
   hwloc_uint64_t size;
   size = strtoull(attr, (char **) &endptr, 0);
   if (!hwloc_strncasecmp(endptr, "TB", 2)) {
-    size <<= 40;
+    size *= 1000ULL*1000ULL*1000ULL*1000ULL;
     endptr += 2;
+  } else if (!hwloc_strncasecmp(endptr, "TiB", 3)) {
+    size <<= 40;
+    endptr += 3;
   } else if (!hwloc_strncasecmp(endptr, "GB", 2)) {
-    size <<= 30;
+    size *= 1000ULL*1000ULL*1000ULL;
     endptr += 2;
+  } else if (!hwloc_strncasecmp(endptr, "GiB", 3)) {
+    size <<= 30;
+    endptr += 3;
   } else if (!hwloc_strncasecmp(endptr, "MB", 2)) {
-    size <<= 20;
+    size *= 1000ULL*1000ULL;
     endptr += 2;
+  } else if (!hwloc_strncasecmp(endptr, "MiB", 3)) {
+    size <<= 20;
+    endptr += 3;
   } else if (!hwloc_strncasecmp(endptr, "kB", 2)) {
-    size <<= 10;
+    size *= 1000ULL;
     endptr += 2;
+  } else if (!hwloc_strncasecmp(endptr, "kiB", 3)) {
+    size <<= 10;
+    endptr += 3;
   }
   *endp = endptr;
   return size;
@@ -802,15 +814,15 @@ hwloc_backend_synthetic_init(struct hwloc_synthetic_backend_data_s *data,
     } else if (hwloc__obj_type_is_cache(type)) {
       if (!curlevel->attr.memorysize) {
 	if (1 == curlevel->attr.depth)
-	  /* 32Kb in L1 */
+	  /* 32KiB in L1 */
 	  curlevel->attr.memorysize = 32*1024;
 	else
-	  /* *4 at each level, starting from 1MB for L2, unified */
+	  /* *4 at each level, starting from 1MiB for L2, unified */
 	  curlevel->attr.memorysize = 256ULL*1024 << (2*curlevel->attr.depth);
       }
 
     } else if (type == HWLOC_OBJ_NUMANODE && !curlevel->attr.memorysize) {
-      /* 1GB in memory nodes. */
+      /* 1GiB in memory nodes. */
       curlevel->attr.memorysize = 1024*1024*1024;
     }