[GR-20416] Refactor allocation snippets.

PullRequest: graal/7061

Author: Christian Wimmer

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java

@@ -474,7 +474,7 @@ protected final int getMinimalBulkZeroingSize() {
     }
 
     @Override
-    protected final void initializeObjectHeader(Word memory, Word hub, Word prototypeMarkWord, boolean isArray) {
+    public final void initializeObjectHeader(Word memory, Word hub, Word prototypeMarkWord, boolean isArray) {
         KlassPointer klassPtr = KlassPointer.fromWord(hub);
         Word markWord = prototypeMarkWord;
         if (!isArray && HotSpotReplacementsUtil.useBiasedLocking(INJECTED_VMCONFIG)) {
@@ -490,7 +490,7 @@ protected final int instanceHeaderSize() {
     }
 
     @Override
-    protected final int arrayLengthOffset() {
+    public final int arrayLengthOffset() {
         return HotSpotReplacementsUtil.arrayLengthOffset(INJECTED_VMCONFIG);
     }
 
@@ -500,7 +500,7 @@ protected final int objectAlignment() {
     }
 
     @Override
-    protected final boolean useTLAB() {
+    public final boolean useTLAB() {
         return HotSpotReplacementsUtil.useTLAB(INJECTED_VMCONFIG);
     }
 
@@ -516,7 +516,7 @@ protected final boolean shouldAllocateInTLAB(UnsignedWord allocationSize, boolea
     }
 
     @Override
-    protected final Word getTLABInfo() {
+    public final Word getTLABInfo() {
         return getThread();
     }
 
@@ -525,17 +525,17 @@ private Word getThread() {
     }
 
     @Override
-    protected final Word readTlabEnd(Word thread) {
+    public final Word readTlabEnd(Word thread) {
         return HotSpotReplacementsUtil.readTlabEnd(thread);
     }
 
     @Override
-    protected final Word readTlabTop(Word thread) {
+    public final Word readTlabTop(Word thread) {
         return HotSpotReplacementsUtil.readTlabTop(thread);
     }
 
     @Override
-    protected final void writeTlabTop(Word thread, Word newTop) {
+    public final void writeTlabTop(Word thread, Word newTop) {
         HotSpotReplacementsUtil.writeTlabTop(thread, newTop);
     }
 

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

@@ -104,7 +104,7 @@ public void virtualize(VirtualizerTool tool) {
             VirtualArrayNode virtual = (VirtualArrayNode) alias;
             if (idx >= 0 && idx < virtual.entryCount()) {
                 ResolvedJavaType componentType = virtual.type().getComponentType();
-                if (componentType.isPrimitive() || StampTool.isPointerAlwaysNull(value) || componentType.isJavaLangObject() ||
+                if (elementKind.isPrimitive() || StampTool.isPointerAlwaysNull(value) || componentType.isJavaLangObject() ||
                                 (StampTool.typeReferenceOrNull(value) != null && componentType.isAssignableFrom(StampTool.typeOrNull(value)))) {
                     tool.setVirtualEntry(virtual, idx, value());
                     tool.delete();

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

@@ -285,7 +285,7 @@ protected Object formatArray(Word hub,
         return memory.toObjectNonNull();
     }
 
-    protected void emitPrefetchAllocate(Word address, boolean isArray) {
+    public void emitPrefetchAllocate(Word address, boolean isArray) {
         if (getPrefetchStyle() > 0) {
             // Insert a prefetch for each allocation only on the fast-path
             // Generate several prefetch instructions.
@@ -308,21 +308,21 @@ protected void emitPrefetchAllocate(Word address, boolean isArray) {
 
     protected abstract int getPrefetchDistance();
 
-    protected abstract boolean useTLAB();
+    public abstract boolean useTLAB();
 
     protected abstract boolean shouldAllocateInTLAB(UnsignedWord allocationSize, boolean isArray);
 
-    protected abstract Word getTLABInfo();
+    public abstract Word getTLABInfo();
 
-    protected abstract Word readTlabTop(Word tlabInfo);
+    public abstract Word readTlabTop(Word tlabInfo);
 
-    protected abstract Word readTlabEnd(Word tlabInfo);
+    public abstract Word readTlabEnd(Word tlabInfo);
 
-    protected abstract void writeTlabTop(Word tlabInfo, Word newTop);
+    public abstract void writeTlabTop(Word tlabInfo, Word newTop);
 
     protected abstract int instanceHeaderSize();
 
-    protected abstract void initializeObjectHeader(Word memory, Word hub, Word prototypeMarkWord, boolean isArray);
+    public abstract void initializeObjectHeader(Word memory, Word hub, Word prototypeMarkWord, boolean isArray);
 
     protected abstract Object callNewInstanceStub(Word hub);
 
@@ -336,7 +336,7 @@ protected void emitPrefetchAllocate(Word address, boolean isArray) {
 
     protected abstract Object verifyOop(Object obj);
 
-    protected abstract int arrayLengthOffset();
+    public abstract int arrayLengthOffset();
 
     protected abstract int objectAlignment();
 

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

@@ -166,6 +166,7 @@
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -458,7 +459,11 @@ public AddressNode createFieldAddress(StructuredGraph graph, ValueNode object, R
     }
 
     public final JavaKind getStorageKind(ResolvedJavaField field) {
-        return metaAccessExtensionProvider.getStorageKind(field.getType());
+        return getStorageKind(field.getType());
+    }
+
+    public final JavaKind getStorageKind(JavaType type) {
+        return metaAccessExtensionProvider.getStorageKind(type);
     }
 
     protected void lowerLoadFieldNode(LoadFieldNode loadField, LoweringTool tool) {

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java

@@ -42,6 +42,7 @@
 import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
 import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
 import org.graalvm.compiler.word.Word;
+import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
 
@@ -71,7 +72,7 @@ public static void registerForeignCalls(Providers providers, SubstrateForeignCal
 
     public static void registerLowering(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection,
                     Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings) {
-        GenScavengeAllocationSnippets snippetReceiver = new GenScavengeAllocationSnippets();
+        SubstrateAllocationSnippets snippetReceiver = ImageSingletons.lookup(SubstrateAllocationSnippets.class);
         GenScavengeAllocationSnippets.Templates allocationSnippets = new GenScavengeAllocationSnippets.Templates(
                         snippetReceiver, options, factories, SnippetCounter.Group.NullFactory, providers, snippetReflection);
         allocationSnippets.registerLowerings(lowerings);
@@ -104,12 +105,12 @@ private static Word encodeAsObjectHeader(DynamicHub hub, boolean rememberedSet,
     }
 
     @Override
-    protected void initializeObjectHeader(Word memory, Word objectHeader, Word prototypeMarkWord, boolean isArray) {
+    public void initializeObjectHeader(Word memory, Word objectHeader, Word prototypeMarkWord, boolean isArray) {
         ObjectHeaderImpl.initializeHeaderOfNewObject(memory, objectHeader, isArray);
     }
 
     @Override
-    protected boolean useTLAB() {
+    public boolean useTLAB() {
         return true;
     }
 
@@ -119,22 +120,22 @@ protected boolean shouldAllocateInTLAB(UnsignedWord size, boolean isArray) {
     }
 
     @Override
-    protected Word getTLABInfo() {
+    public Word getTLABInfo() {
         return (Word) ThreadLocalAllocation.regularTLAB.getAddress();
     }
 
     @Override
-    protected Word readTlabTop(Word tlabInfo) {
+    public Word readTlabTop(Word tlabInfo) {
         return ((Descriptor) tlabInfo).getAllocationTop(TLAB_TOP_IDENTITY);
     }
 
     @Override
-    protected Word readTlabEnd(Word tlabInfo) {
+    public Word readTlabEnd(Word tlabInfo) {
         return ((Descriptor) tlabInfo).getAllocationEnd(TLAB_END_IDENTITY);
     }
 
     @Override
-    protected void writeTlabTop(Word tlabInfo, Word newTop) {
+    public void writeTlabTop(Word tlabInfo, Word newTop) {
         ((Descriptor) tlabInfo).setAllocationTop(newTop, TLAB_TOP_IDENTITY);
     }
 
@@ -152,7 +153,7 @@ public static class Templates extends SubstrateAllocationSnippets.Templates {
         private final SnippetInfo formatObject;
         private final SnippetInfo formatArray;
 
-        Templates(GenScavengeAllocationSnippets receiver, OptionValues options, Iterable<DebugHandlersFactory> factories,
+        Templates(SubstrateAllocationSnippets receiver, OptionValues options, Iterable<DebugHandlersFactory> factories,
                         SnippetCounter.Group.Factory groupFactory, Providers providers, SnippetReflectionProvider snippetReflection) {
             super(receiver, options, factories, groupFactory, providers, snippetReflection);
 

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/HeapFeature.java

@@ -49,6 +49,7 @@
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
+import com.oracle.svm.core.graal.snippets.SubstrateAllocationSnippets;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.image.ImageHeapLayouter;
 import com.oracle.svm.core.jdk.RuntimeFeature;
@@ -71,6 +72,7 @@ public List<Class<? extends Feature>> getRequiredFeatures() {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         ImageSingletons.add(Heap.class, new HeapImpl(access));
+        ImageSingletons.add(SubstrateAllocationSnippets.class, new GenScavengeAllocationSnippets());
 
         ManagementSupport managementSupport = ManagementSupport.getSingleton();
         managementSupport.addPlatformManagedObjectSingleton(java.lang.management.MemoryMXBean.class, new HeapImplMemoryMXBean());

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java

@@ -201,7 +201,7 @@ private static Object newMultiArrayRecursion(DynamicHub hub, int rank, Word dime
         return result;
     }
 
-    private static DynamicHub checkHub(DynamicHub hub) {
+    public static DynamicHub checkHub(DynamicHub hub) {
         if (probability(LUDICROUSLY_FAST_PATH_PROBABILITY, hub != null)) {
             DynamicHub nonNullHub = (DynamicHub) PiNode.piCastNonNull(hub, SnippetAnchorNode.anchor());
             if (probability(LUDICROUSLY_FAST_PATH_PROBABILITY, nonNullHub.isInstantiated())) {
@@ -283,7 +283,6 @@ protected final int getPrefetchStyle() {
         return SubstrateOptions.AllocatePrefetchStyle.getValue();
     }
 
-    @Fold
     @Override
     protected int getPrefetchLines(boolean isArray) {
         if (isArray) {
@@ -330,7 +329,7 @@ protected final Object verifyOop(Object obj) {
     }
 
     @Override
-    protected final int arrayLengthOffset() {
+    public final int arrayLengthOffset() {
         return ConfigurationValues.getObjectLayout().getArrayLengthOffset();
     }
 
@@ -343,7 +342,7 @@ protected static int getArrayBaseOffset(int layoutEncoding) {
         return (int) LayoutEncoding.getArrayBaseOffset(layoutEncoding).rawValue();
     }
 
-    private static Word encodeAsTLABObjectHeader(DynamicHub hub) {
+    public static Word encodeAsTLABObjectHeader(DynamicHub hub) {
         return Heap.getHeap().getObjectHeader().encodeAsTLABObjectHeader(hub);
     }