[GR-50468] Record partition information for each object type in the heap breakdown

PullRequest: graal/21712

Author: pdekanov

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapPartition.java

@@ -169,7 +169,8 @@ public String getName() {
         return name;
     }
 
-    boolean isWritable() {
+    @Override
+    public boolean isWritable() {
         return writable;
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/image/ImageHeapPartition.java

@@ -32,6 +32,9 @@ public interface ImageHeapPartition {
     /** Returns the name of the partition. */
     String getName();
 
+    /** Returns true if the partition is writable. */
+    boolean isWritable();
+
     /** Returns the offset at which this partition is allocated. */
     long getStartOffset();
 

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

@@ -40,6 +40,7 @@
 import com.oracle.svm.core.code.RuntimeMetadataEncoding;
 import com.oracle.svm.core.config.ObjectLayout;
 import com.oracle.svm.core.configure.ConditionalRuntimeValue;
+import com.oracle.svm.core.image.ImageHeapPartition;
 import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
 import com.oracle.svm.core.jdk.Resources;
 import com.oracle.svm.core.jdk.resources.ResourceStorageEntryBase;
@@ -105,6 +106,7 @@ protected void setTotalHeapSize(long totalHeapSize) {
     protected void calculate(BeforeImageWriteAccessImpl access, boolean resourcesAreReachable) {
         HostedMetaAccess metaAccess = access.getHostedMetaAccess();
         ObjectLayout objectLayout = ImageSingletons.lookup(ObjectLayout.class);
+        HeapBreakdownEntry.imageHeapPartitions = access.getImage().getHeap().getLayouter().getPartitions();
 
         Map<HostedClass, HeapBreakdownEntry> classToDataMap = new HashMap<>();
 
@@ -119,7 +121,9 @@ protected void calculate(BeforeImageWriteAccessImpl access, boolean resourcesAre
             }
             long objectSize = o.getSize();
             totalObjectSize += objectSize;
-            classToDataMap.computeIfAbsent(o.getClazz(), HeapBreakdownEntry::of).add(objectSize);
+            HeapBreakdownEntry heapBreakdownEntry = classToDataMap.computeIfAbsent(o.getClazz(), HeapBreakdownEntry::of);
+            heapBreakdownEntry.add(objectSize);
+            heapBreakdownEntry.addPartition(o.getPartition());
             if (reportStringBytesConstant && o.getObject() instanceof String string) {
                 byte[] bytes = getInternalByteArray(string);
                 /* Ensure every byte[] is counted only once. */
@@ -201,6 +205,8 @@ protected void calculate(BeforeImageWriteAccessImpl access, boolean resourcesAre
 
     private static void addEntry(List<HeapBreakdownEntry> entries, HeapBreakdownEntry byteArrayEntry, HeapBreakdownEntry newData, long byteSize, int count) {
         newData.add(byteSize, count);
+        // Assign byte[] entry's partitions to the new more specific byte[] entry.
+        newData.copyPartitions(byteArrayEntry);
         entries.add(newData);
         byteArrayEntry.remove(byteSize, count);
         assert byteArrayEntry.byteSize >= 0 && byteArrayEntry.count >= 0;
@@ -215,14 +221,18 @@ private static byte[] getInternalByteArray(String string) {
     }
 
     public abstract static class HeapBreakdownEntry {
+        public static ImageHeapPartition[] imageHeapPartitions;
+
         long byteSize;
         int count;
+        int partitions = 0;
 
         public static HeapBreakdownEntry of(HostedClass hostedClass) {
             return new HeapBreakdownEntryForClass(hostedClass.getJavaClass());
         }
 
         public static HeapBreakdownEntry of(String name) {
+
             return new HeapBreakdownEntryFixed(new SimpleHeapObjectKindName(name));
         }
 
@@ -232,6 +242,22 @@ public static HeapBreakdownEntry of(String prefix, String name, String htmlAncho
 
         public abstract HeapBreakdownLabel getLabel(int maxLength);
 
+        public ImageHeapPartition[] getPartitions() {
+            ImageHeapPartition[] entryPartitions = new ImageHeapPartition[Integer.bitCount(partitions)];
+            int i = 0;
+            for (int j = 0; j < imageHeapPartitions.length; j++) {
+                if (((partitions >> j) & 1) == 1) {
+                    entryPartitions[i] = imageHeapPartitions[j];
+                    i++;
+                }
+            }
+            return entryPartitions;
+        }
+
+        public HeapBreakdownLabel getLabel() {
+            return getLabel(-1);
+        }
+
         public long getByteSize() {
             return byteSize;
         }
@@ -253,6 +279,21 @@ void remove(long subByteSize, int subCount) {
             this.byteSize -= subByteSize;
             this.count -= subCount;
         }
+
+        void addPartition(ImageHeapPartition newPartition) {
+            int newPartitionMask = 1;
+            for (ImageHeapPartition partition : imageHeapPartitions) {
+                if (partition.equals(newPartition)) {
+                    break;
+                }
+                newPartitionMask <<= 1;
+            }
+            this.partitions |= newPartitionMask;
+        }
+
+        public void copyPartitions(HeapBreakdownEntry sourceEntry) {
+            this.partitions = sourceEntry.partitions;
+        }
     }
 
     static class HeapBreakdownEntryFixed extends HeapBreakdownEntry {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java

@@ -1200,6 +1200,11 @@ public String getName() {
         throw VMError.shouldNotReachHereAtRuntime(); // ExcludeFromJacocoGeneratedReport
     }
 
+    @Override
+    public boolean isWritable() {
+        return false;
+    }
+
     @Override
     public long getSize() {
         throw VMError.shouldNotReachHereAtRuntime(); // ExcludeFromJacocoGeneratedReport

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageJSHeapBreakdownProvider.java

@@ -53,6 +53,7 @@ public class WebImageJSHeapBreakdownProvider extends HeapBreakdownProvider {
      */
     @Override
     protected void calculate(FeatureImpl.BeforeImageWriteAccessImpl access, boolean resourcesAreReachable) {
+        HeapBreakdownEntry.imageHeapPartitions = access.getImage().getHeap().getLayouter().getPartitions();
         long totalByteSize = 0;
         WebImageJSProviders providers = (WebImageJSProviders) ImageSingletons.lookup(WebImageProviders.class);
         ConstantIdentityMapping identityMapping = providers.typeControl().getConstantMap().identityMapping;

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasmgc/image/WasmGCPartition.java

@@ -71,6 +71,11 @@ public String getName() {
         return name;
     }
 
+    @Override
+    public boolean isWritable() {
+        return true;
+    }
+
     public boolean isPseudo() {
         return isPseudo;
     }