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

Refs #519

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

Author: bgoglin

utils/hwloc/hwloc-annotate.1in

@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.\" Copyright © 2013-2021 Inria.  All rights reserved.
+.\" Copyright © 2013-2022 Inria.  All rights reserved.
 .\" See COPYING in top-level directory.
 .TH HWLOC-ANNOTATE "1" "%HWLOC_DATE%" "%PACKAGE_VERSION%" "%PACKAGE_NAME%"
 .SH NAME
@@ -87,7 +87,8 @@ If an empty string is given, the subtype is removed.
 .TP
 .B size <size>
 Specifies the size of a cache or NUMA node.
-The value may be suffixed with \fBkB\fR, \fBMB\fR, \fBGB\fR or \fBTB\fR.
+The value may be suffixed with \fBkB\fR, \fBKiB\fR, \fBMB\fR, \fBMiB\fR,
+\fBGB\fR, \fBGiB\fR, etc.
 .TP
 .B misc <name>
 Specifies a new Misc object name.

utils/hwloc/hwloc-annotate.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2021 Inria.  All rights reserved.
+ * Copyright © 2012-2022 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -601,12 +601,20 @@ int main(int argc, char *argv[])
 		sizevalue = strtoull(argv[1], &end, 0);
                 if (end) {
                   if (!strcasecmp(end, "kB"))
+                    sizevalue *= 1024ULL;
+                  else if (!strcasecmp(end, "kiB"))
                     sizevalue <<= 10;
                   else if (!strcasecmp(end, "MB"))
+                    sizevalue *= 1024ULL*1024ULL;
+                  else if (!strcasecmp(end, "MiB"))
                     sizevalue <<= 20;
-                  if (!strcasecmp(end, "GB"))
+                  else if (!strcasecmp(end, "GB"))
+                    sizevalue *= 1024ULL*1024ULL*1024ULL;
+                  else if (!strcasecmp(end, "GiB"))
                     sizevalue <<= 30;
-                  if (!strcasecmp(end, "TB"))
+                  else if (!strcasecmp(end, "TB"))
+                    sizevalue *= 1024ULL*1024ULL*1024ULL*1024ULL;
+                  else if (!strcasecmp(end, "TiB"))
                     sizevalue <<= 40;
                 }