[GR-37943] Refactorings and cleanups.

PullRequest: graal/11571

Author: christianhaeubl

compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/MetaAccessExtensionProvider.java

@@ -57,4 +57,10 @@ public interface MetaAccessExtensionProvider {
      *            contain a safepoint.
      */
     boolean isGuaranteedSafepoint(ResolvedJavaMethod method, boolean isDirect);
+
+    /**
+     * Returns true if the partial escape analysis is allowed to virtualize object allocations of a
+     * given type.
+     */
+    boolean canVirtualize(ResolvedJavaType instanceType);
 }

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java

@@ -51,4 +51,9 @@ public boolean canConstantFoldDynamicAllocation(ResolvedJavaType type) {
     public boolean isGuaranteedSafepoint(ResolvedJavaMethod method, boolean isDirect) {
         return true;
     }
+
+    @Override
+    public boolean canVirtualize(ResolvedJavaType instanceType) {
+        return true;
+    }
 }

compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java

@@ -80,7 +80,8 @@ public void virtualize(VirtualizerTool tool) {
          * Reference objects can escape into their ReferenceQueue at any safepoint, therefore
          * they're excluded from escape analysis.
          */
-        if (!tool.getMetaAccess().lookupJavaType(Reference.class).isAssignableFrom(instanceClass)) {
+        if (!tool.getMetaAccess().lookupJavaType(Reference.class).isAssignableFrom(instanceClass) &&
+                        tool.getMetaAccessExtensionProvider().canVirtualize(instanceClass)) {
             VirtualInstanceNode virtualObject = new VirtualInstanceNode(instanceClass(), true);
             ResolvedJavaField[] fields = virtualObject.getFields();
             ValueNode[] state = new ValueNode[fields.length];

compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java

@@ -68,7 +68,7 @@ protected Object allocateInstanceImpl(Word hub,
         return verifyOop(result);
     }
 
-    protected Object allocateArrayImpl(Word hub,
+    public Object allocateArrayImpl(Word hub,
                     int length,
                     int arrayBaseOffset,
                     int log2ElementSize,
@@ -259,7 +259,7 @@ private void fillWithGarbage(Word memory,
     /**
      * Formats some allocated memory with an object header and zeroes out the rest.
      */
-    protected Object formatObject(Word hub,
+    public Object formatObject(Word hub,
                     UnsignedWord size,
                     Word memory,
                     FillContent fillContents,
@@ -280,7 +280,7 @@ protected Object formatObject(Word hub,
     /**
      * Formats some allocated memory with an object header and zeroes out the rest.
      */
-    protected Object formatArray(Word hub,
+    public Object formatArray(Word hub,
                     UnsignedWord allocationSize,
                     int length,
                     Word memory,
@@ -304,7 +304,7 @@ protected Object formatArray(Word hub,
         return memory.toObjectNonNull();
     }
 
-    protected void emitMemoryBarrierIf(boolean emitMemoryBarrier) {
+    public void emitMemoryBarrierIf(boolean emitMemoryBarrier) {
         if (emitMemoryBarrier) {
             MembarNode.memoryBarrier(MembarNode.FenceKind.ALLOCATION_INIT, LocationIdentity.init());
         }
@@ -386,7 +386,7 @@ public AllocationProfilingData(AllocationSnippetCounters snippetCounters) {
         }
     }
 
-    protected static class AllocationSnippetCounters {
+    public static class AllocationSnippetCounters {
         public AllocationSnippetCounters(SnippetCounter.Group.Factory factory) {
             Group allocations = factory.createSnippetCounterGroup("Allocations");
             unrolledInit = new SnippetCounter(allocations, "tlabSeqInit", "TLAB alloc with unrolled zeroing");

compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java

@@ -205,6 +205,16 @@ public ValueNode getLength() {
         return length;
     }
 
+    public void setSource(ValueNode value) {
+        updateUsages(this.src, value);
+        this.src = value;
+    }
+
+    public void setSourcePosition(ValueNode value) {
+        updateUsages(this.srcPos, value);
+        this.srcPos = value;
+    }
+
     public static boolean checkBounds(int position, int length, VirtualObjectNode virtualObject) {
         assert length >= 0;
         return position >= 0 && position <= virtualObject.entryCount() - length;

docs/reference-manual/native-image/BuildOutput.md

@@ -29,7 +29,7 @@ GraalVM Native Image: Generating 'helloworld' (executable)...
 [6/7] Compiling methods...    [**]                               (3.7s @ 2.38GB)
 [7/7] Creating image...                                          (2.1s @ 1.04GB)
    3.69MB (27.19%) for code area:    6,955 compilation units
-   5.86MB (43.18%) for image heap:   1,545 classes and 80,528 objects
+   5.86MB (43.18%) for image heap:   80,528 objects
    3.05MB (22.46%) for debug info generated in 1.0s
  997.25KB ( 7.18%) for other data
   13.57MB in total

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMetaAccessExtensionProvider.java

@@ -50,4 +50,9 @@ public boolean canConstantFoldDynamicAllocation(ResolvedJavaType type) {
     public boolean isGuaranteedSafepoint(ResolvedJavaMethod method, boolean isDirect) {
         throw GraalError.shouldNotReachHere();
     }
+
+    @Override
+    public boolean canVirtualize(ResolvedJavaType instanceType) {
+        return true;
+    }
 }

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

@@ -35,6 +35,7 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.struct.RawField;
+import org.graalvm.nativeimage.c.struct.RawFieldOffset;
 import org.graalvm.nativeimage.c.struct.RawStructure;
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.nativeimage.c.struct.UniqueLocationIdentity;
@@ -109,11 +110,21 @@ public interface Descriptor extends PointerBase {
         @RawField
         void setAllocationTop(Pointer top, LocationIdentity topIdentity);
 
+        @RawFieldOffset
+        static int offsetOfAllocationTop() {
+            throw VMError.unimplemented(); // replaced
+        }
+
         @RawField
         Word getAllocationEnd(LocationIdentity endIdentity);
 
         @RawField
         void setAllocationEnd(Pointer end, LocationIdentity endIdentity);
+
+        @RawFieldOffset
+        static int offsetOfAllocationEnd() {
+            throw VMError.unimplemented(); // replaced
+        }
     }
 
     /*