[GR-53442] Split nodes that use inline caching

PullRequest: truffleruby/4274

Author: andrykonchin

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -1074,7 +1074,7 @@ Object rbGvGet(VirtualFrame frame, String name,
     }
 
 
-    @ReportPolymorphism
+    @ReportPolymorphism // inline cache
     @GenerateInline
     @GenerateCached(false)
     public abstract static class RbGvGetInnerNode extends RubyBaseNode {
@@ -1990,7 +1990,7 @@ RubyArray rbAryNewFromValues(Object cArray,
     }
 
     @CoreMethod(names = "rb_tr_sprintf_types", onSingleton = true, required = 1)
-    @ReportPolymorphism
+    @ReportPolymorphism // inline cache (but not working due to single call site in C)
     public abstract static class RBSprintfFormatNode extends CoreMethodArrayArgumentsNode {
 
         @Child protected TruffleString.GetInternalByteArrayNode byteArrayNode = TruffleString.GetInternalByteArrayNode
@@ -2001,7 +2001,6 @@ public abstract static class RBSprintfFormatNode extends CoreMethodArrayArgument
                         "libFormat.isRubyString(format)",
                         "equalNode.execute(node, libFormat, format, cachedFormat, cachedEncoding)" },
                 limit = "2")
-
         static Object typesCached(VirtualFrame frame, Object format,
                 @Cached @Shared RubyStringLibrary libFormat,
                 @Cached("asTruffleStringUncached(format)") TruffleString cachedFormat,
@@ -2069,7 +2068,7 @@ static RubyString format(Object format, Object stringReader, RubyArray argArray,
 
     @GenerateInline
     @GenerateCached(false)
-    @ReportPolymorphism
+    @ReportPolymorphism // inline cache, CallTarget cache (but not working due to single call site in C)
     public abstract static class RBSprintfInnerNode extends RubyBaseNode {
 
         public abstract BytesResult execute(Node node, AbstractTruffleString format, RubyEncoding encoding,

src/main/java/org/truffleruby/cext/IDToSymbolNode.java

@@ -20,11 +20,9 @@
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
-import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 
 @GenerateUncached
-@ReportPolymorphism
 public abstract class IDToSymbolNode extends RubyBaseNode {
 
     public abstract RubySymbol execute(Object value);

src/main/java/org/truffleruby/cext/SymbolToIDNode.java

@@ -20,7 +20,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 
 @GenerateUncached
-@ReportPolymorphism
+@ReportPolymorphism // inline cache (but not working due to single call site in C)
 public abstract class SymbolToIDNode extends RubyBaseNode {
 
     public abstract Object execute(Object value);

src/main/java/org/truffleruby/core/TruffleSystemNodes.java

@@ -43,14 +43,12 @@
 import java.lang.management.ManagementFactory;
 import java.nio.file.NoSuchFileException;
 import java.util.Set;
-import java.util.logging.Level;
 
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 import com.sun.management.ThreadMXBean;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.CoreMethod;
 import org.truffleruby.annotations.SuppressFBWarnings;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
@@ -63,7 +61,6 @@
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringUtils;
-import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.interop.FromJavaStringNode;
 import org.truffleruby.interop.ToJavaStringNode;
 import org.truffleruby.language.RubyGuards;
@@ -74,7 +71,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Specialization;
 
 @CoreModule("Truffle::System")
@@ -230,45 +226,6 @@ RubyString hostOS() {
 
     }
 
-    @CoreMethod(names = "log", onSingleton = true, required = 2)
-    public abstract static class LogNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization(guards = { "strings.isRubyString(message)", "level == cachedLevel" }, limit = "3")
-        Object logCached(RubySymbol level, Object message,
-                @Cached @Shared RubyStringLibrary strings,
-                @Cached @Shared ToJavaStringNode toJavaStringNode,
-                @Cached("level") RubySymbol cachedLevel,
-                @Cached("getLevel(cachedLevel)") Level javaLevel) {
-            log(javaLevel, toJavaStringNode.execute(this, message));
-            return nil;
-        }
-
-        @Specialization(guards = "strings.isRubyString(message)", replaces = "logCached")
-        Object log(RubySymbol level, Object message,
-                @Cached @Shared RubyStringLibrary strings,
-                @Cached @Shared ToJavaStringNode toJavaStringNode) {
-            log(getLevel(level), toJavaStringNode.execute(this, message));
-            return nil;
-        }
-
-        @TruffleBoundary
-        protected Level getLevel(RubySymbol level) {
-            try {
-                return Level.parse(level.getString());
-            } catch (IllegalArgumentException e) {
-                throw new RaiseException(getContext(), getContext().getCoreExceptions().argumentError(
-                        "Could not find log level for: " + level,
-                        this));
-            }
-        }
-
-        @TruffleBoundary
-        public static void log(Level level, String message) {
-            RubyLanguage.LOGGER.log(level, message);
-        }
-
-    }
-
     @CoreMethod(names = "available_processors", onSingleton = true)
     public abstract static class AvailableProcessorsNode extends CoreMethodNode {
 

src/main/java/org/truffleruby/core/array/ArrayAppendOneNode.java

@@ -30,7 +30,7 @@
 @NodeChild(value = "arrayNode", type = RubyNode.class)
 @NodeChild(value = "valueNode", type = RubyNode.class)
 @ImportStatic(ArrayGuards.class)
-@ReportPolymorphism
+@ReportPolymorphism // for ArrayStoreLibrary
 public abstract class ArrayAppendOneNode extends RubyContextSourceNode {
 
     @NeverDefault

src/main/java/org/truffleruby/core/array/ArrayCopyCompatibleRangeNode.java

@@ -27,7 +27,7 @@
  * <p>
  * Typically only called after {@link ArrayPrepareForCopyNode} has been invoked on the destination. */
 @ImportStatic(ArrayGuards.class)
-@ReportPolymorphism
+@ReportPolymorphism // for ArrayStoreLibrary
 public abstract class ArrayCopyCompatibleRangeNode extends RubyBaseNode {
 
     public static ArrayCopyCompatibleRangeNode create() {
@@ -49,7 +49,6 @@ void noop(Object dstStore, Object srcStore, int dstStart, int srcStart, int leng
             limit = "storageStrategyLimit()")
     void copy(Object dstStore, Object srcStore, int dstStart, int srcStart, int length,
             @CachedLibrary("srcStore") ArrayStoreLibrary stores) {
-
         stores.copyContents(srcStore, srcStart, dstStore, dstStart, length);
     }
 }

src/main/java/org/truffleruby/core/array/ArrayEachIteratorNode.java

@@ -28,7 +28,7 @@
 import org.truffleruby.language.yield.CallBlockNode;
 
 @ImportStatic(ArrayGuards.class)
-@ReportPolymorphism
+@ReportPolymorphism // for ArrayStoreLibrary
 @GenerateInline(inlineByDefault = true)
 public abstract class ArrayEachIteratorNode extends RubyBaseNode {
 

src/main/java/org/truffleruby/core/array/ArrayIndexNodes.java

@@ -31,7 +31,7 @@ public abstract class ArrayIndexNodes {
 
     @NodeChild(value = "arrayNode", type = RubyNode.class)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class ReadConstantIndexNode extends RubyContextSourceNode {
 
         private final int index;
@@ -71,7 +71,7 @@ public RubyNode cloneUninitialized() {
     }
 
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class ReadNormalizedNode extends PrimitiveArrayArgumentsNode {
 
         @NeverDefault

src/main/java/org/truffleruby/core/array/ArrayNodes.java

@@ -132,7 +132,7 @@ RubyArray allocate(RubyClass rubyClass) {
 
     @CoreMethod(names = "+", required = 1)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class AddNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization(
@@ -160,7 +160,7 @@ static RubyArray addGeneralize(RubyArray a, Object bObject,
 
     @Primitive(name = "array_mul", lowerFixnum = 1)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class MulNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "count < 0")
@@ -347,7 +347,6 @@ public static SetIndexNode create() {
         // array[index] = object
 
         @Specialization
-        @ReportPolymorphism.Exclude
         Object set(RubyArray array, int index, Object value, NotProvided unused,
                 @Cached ArrayWriteNormalizedNode writeNode,
                 @Cached @Shared ConditionProfile negativeDenormalizedIndex,
@@ -484,9 +483,10 @@ RubyArray clear(RubyArray array,
 
     @CoreMethod(names = "compact")
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class CompactNode extends ArrayCoreMethodNode {
 
+        @ReportPolymorphism.Exclude
         @Specialization(guards = "stores.isPrimitive(store)", limit = "storageStrategyLimit()")
         RubyArray compactPrimitive(RubyArray array,
                 @Bind("array.getStore()") Object store,
@@ -527,11 +527,11 @@ Object compactObjects(RubyArray array,
     }
 
     @CoreMethod(names = "compact!", raiseIfFrozenSelf = true)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class CompactBangNode extends ArrayCoreMethodNode {
 
-        @Specialization(guards = "stores.isPrimitive(store)", limit = "storageStrategyLimit()")
         @ReportPolymorphism.Exclude
+        @Specialization(guards = "stores.isPrimitive(store)", limit = "storageStrategyLimit()")
         Object compactNotObjects(RubyArray array,
                 @Bind("array.getStore()") Object store,
                 @CachedLibrary("store") ArrayStoreLibrary stores) {
@@ -582,6 +582,7 @@ Object compactObjects(RubyArray array,
     }
 
     @CoreMethod(names = "concat", optional = 1, rest = true, raiseIfFrozenSelf = true)
+    @ReportPolymorphism // inline cache
     @ImportStatic(ArrayGuards.class)
     public abstract static class ConcatNode extends CoreMethodArrayArgumentsNode {
 
@@ -751,7 +752,7 @@ private Object delete(RubyArray array, Object value, Object maybeBlock,
 
     @CoreMethod(names = "delete_at", required = 1, raiseIfFrozenSelf = true, lowerFixnum = 1)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class DeleteAtNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization(limit = "storageStrategyLimit()")
@@ -1060,7 +1061,7 @@ static long hash(RubyArray array,
     }
 
     @CoreMethod(names = "include?", required = 1)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class IncludeNode extends ArrayCoreMethodNode {
 
         @Specialization(limit = "storageStrategyLimit()")
@@ -1513,7 +1514,7 @@ RubyString pack(RubyArray array, Object format, Object buffer,
 
     @GenerateCached(false)
     @GenerateInline
-    @ReportPolymorphism
+    @ReportPolymorphism // inline cache, CallTarget cache
     public abstract static class PackNode extends RubyBaseNode {
 
         public abstract RubyString execute(Node node, RubyArray array, Object format, Object buffer);
@@ -1633,7 +1634,7 @@ protected int getCacheLimit() {
     }
 
     @CoreMethod(names = "pop", raiseIfFrozenSelf = true, optional = 1, lowerFixnum = 1)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class PopNode extends ArrayCoreMethodNode {
 
         public abstract Object executePop(RubyArray array, Object n);
@@ -1835,7 +1836,7 @@ RubyArray replace(RubyArray array, Object otherObject,
 
     @Primitive(name = "array_rotate", lowerFixnum = 1)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class RotateNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(limit = "storageStrategyLimit()")
@@ -1862,7 +1863,7 @@ protected static void rotateArrayCopy(int rotation, int size, ArrayStoreLibrary
 
     @Primitive(name = "array_rotate_inplace", lowerFixnum = 1)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class RotateInplaceNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(
@@ -2012,7 +2013,7 @@ public void accept(Node node, CallBlockNode yieldNode, RubyArray array, Object s
 
     @CoreMethod(names = "shift", raiseIfFrozenSelf = true, optional = 1, lowerFixnum = 1)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class ShiftNode extends CoreMethodArrayArgumentsNode {
 
         public abstract Object executeShift(RubyArray array, Object n);
@@ -2238,7 +2239,7 @@ static RubyArray stealStorage(RubyArray array, RubyArray other,
 
     @Primitive(name = "array_zip")
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
+    @ReportPolymorphism // for ArrayStoreLibrary
     public abstract static class ZipNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(limit = "storageStrategyLimit()")

src/main/java/org/truffleruby/core/array/ArrayPrepareForCopyNode.java

@@ -30,7 +30,7 @@
  * <p>
  * The copy itself can then be performed with {@link ArrayCopyCompatibleRangeNode}. In fact it MUST be performed, as the
  * array may otherwise contain uninitialized elements (in particular, {@code null} values in {@code Object} arrays). */
-@ReportPolymorphism
+@ReportPolymorphism // for ArrayStoreLibrary
 @ImportStatic(ArrayGuards.class)
 public abstract class ArrayPrepareForCopyNode extends RubyBaseNode {