Fix spacing in the Top 10 {origins of code area,object types in image heap} section

* The extra 'i' in the unit means we need one more for the width.
* It also means we should compare to multiples of 1000 to avoid increasing the width further.

Author: eregon

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ByteFormattingUtil.java

@@ -25,29 +25,45 @@
 package com.oracle.svm.hosted;
 
 public class ByteFormattingUtil {
-    private static final long KiB_TO_BYTES = 1024L;
-    private static final long MiB_TO_BYTES = 1024L * KiB_TO_BYTES;
-    private static final long GiB_TO_BYTES = 1024L * MiB_TO_BYTES;
+    // "123.12KiB".length() = 9, holds as long as it's not >= 1000GiB
+    private static final int MAX_WIDTH = 9;
+    public static final String RIGHT_ALIGNED_FORMAT = "%" + MAX_WIDTH + "s";
 
+    private enum Unit {
+        KiB(1024L),
+        MiB(1024L * 1024L),
+        GiB(1024L * 1024L * 1024L);
+
+        private final long value;
+
+        Unit(long value) {
+            this.value = value;
+        }
+    }
+
+    // We want to respect MAX_WIDTH and keep it concise,
+    // so we prefer to show 0.99MiB than 1010.00KiB (length 10).
     public static String bytesToHuman(long bytes) {
         assert bytes >= 0;
-        if (bytes < KiB_TO_BYTES) {
+        if (bytes < 1_000) {
             return bytes + "B";
-        } else if (bytes < MiB_TO_BYTES) {
-            return toHuman((double) bytes / KiB_TO_BYTES, "KiB");
-        } else if (bytes < GiB_TO_BYTES) {
-            return toHuman((double) bytes / MiB_TO_BYTES, "MiB");
+        } else if (bytes < 1_000 * Unit.KiB.value) {
+            return toHuman(bytes, Unit.KiB);
+        } else if (bytes < 1_000 * Unit.MiB.value) {
+            return toHuman(bytes, Unit.MiB);
         } else {
             return bytesToHumanGB(bytes);
         }
     }
 
     public static String bytesToHumanGB(long bytes) {
-        return toHuman((double) bytes / GiB_TO_BYTES, "GiB");
+        return toHuman(bytes, Unit.GiB);
     }
 
-    private static String toHuman(double value, String unit) {
-        return "%.2f%s".formatted(value, unit);
+    private static String toHuman(long value, Unit unit) {
+        String string = "%.2f%s".formatted((double) value / unit.value, unit);
+        assert string.length() <= MAX_WIDTH || value >= 1000L * Unit.GiB.value;
+        return string;
     }
 
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java

@@ -123,6 +123,8 @@ public class ProgressReporter {
     public static final String DOCS_BASE_URL = "https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/BuildOutput.md";
     private static final double EXCESSIVE_GC_MIN_THRESHOLD_MILLIS = TimeUtils.secondsToMillis(15);
     private static final double EXCESSIVE_GC_RATIO = 0.5;
+    // Use a leading space like in the rest of Native Image output
+    private static final String BYTES_TO_HUMAN_FORMAT = " " + ByteFormattingUtil.RIGHT_ALIGNED_FORMAT;
 
     private final NativeImageSystemIOWrappers builderIO;
 
@@ -598,7 +600,7 @@ public void printCreationEnd(int imageFileSize, int heapObjectCount, long imageH
         Timer archiveTimer = getTimer(TimerCollection.Registry.ARCHIVE_LAYER);
         stagePrinter.end(imageTimer.getTotalTime() + writeTimer.getTotalTime() + archiveTimer.getTotalTime());
         creationStageEndCompleted = true;
-        String format = "%9s (%5.2f%%) for ";
+        String format = BYTES_TO_HUMAN_FORMAT + " (%5.2f%%) for ";
         l().a(format, ByteFormattingUtil.bytesToHuman(codeAreaSize), ProgressReporterUtils.toPercentage(codeAreaSize, imageFileSize))
                         .doclink("code area", "#glossary-code-area").a(":%,10d compilation units", numCompilations).println();
         int numResources = 0;
@@ -632,7 +634,7 @@ public void printCreationEnd(int imageFileSize, int heapObjectCount, long imageH
         recordJsonMetric(ImageDetailKey.NUM_COMP_UNITS, numCompilations);
         l().a(format, ByteFormattingUtil.bytesToHuman(otherBytes), ProgressReporterUtils.toPercentage(otherBytes, imageFileSize))
                         .doclink("other data", "#glossary-other-data").println();
-        l().a("%9s in total image size", ByteFormattingUtil.bytesToHuman(imageFileSize));
+        l().a(BYTES_TO_HUMAN_FORMAT + " in total image size", ByteFormattingUtil.bytesToHuman(imageFileSize));
         if (imageDiskFileSize >= 0) {
             l().a(", %s in total file size", ByteFormattingUtil.bytesToHuman(imageDiskFileSize));
         }
@@ -723,14 +725,15 @@ private void printBreakdowns() {
         int numHeapItems = heapBreakdown.getSortedBreakdownEntries().size();
         long totalCodeBytes = codeBreakdown.values().stream().mapToLong(Long::longValue).sum();
 
-        p.l().a(String.format("%9s for %s more packages", ByteFormattingUtil.bytesToHuman(totalCodeBytes - printedCodeBytes), numCodeItems - printedCodeItems))
+        p.l().a(String.format(BYTES_TO_HUMAN_FORMAT + " for %s more packages", ByteFormattingUtil.bytesToHuman(totalCodeBytes - printedCodeBytes), numCodeItems - printedCodeItems))
                         .jumpToMiddle()
-                        .a(String.format("%9s for %s more object types", ByteFormattingUtil.bytesToHuman(heapBreakdown.getTotalHeapSize() - printedHeapBytes), numHeapItems - printedHeapItems))
+                        .a(String.format(BYTES_TO_HUMAN_FORMAT + " for %s more object types", ByteFormattingUtil.bytesToHuman(heapBreakdown.getTotalHeapSize() - printedHeapBytes),
+                                        numHeapItems - printedHeapItems))
                         .flushln();
     }
 
     private static String getBreakdownSizeString(long sizeInBytes) {
-        return String.format("%9s ", ByteFormattingUtil.bytesToHuman(sizeInBytes));
+        return String.format(BYTES_TO_HUMAN_FORMAT + " ", ByteFormattingUtil.bytesToHuman(sizeInBytes));
     }
 
     private void printRecommendations() {