DynamicObjectStorage: cache keys in non-explode-loop variants of the messages

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java

@@ -84,6 +84,7 @@
 @ExportLibrary(HashingStorageLibrary.class)
 public final class DynamicObjectStorage extends HashingStorage {
     public static final int SIZE_THRESHOLD = 100;
+    public static final int EXPLODE_LOOP_SIZE_LIMIT = 16;
 
     final DynamicObject store;
     private final MroSequenceStorage mro;
@@ -136,7 +137,7 @@ private static List<Object> filter(List<Object> l) {
     @ExportMessage
     static class Length {
 
-        @Specialization(guards = {"cachedShape == self.store.getShape()", "keys.length < 16"}, limit = "3")
+        @Specialization(guards = {"cachedShape == self.store.getShape()", "keys.length < EXPLODE_LOOP_SIZE_LIMIT"}, limit = "2")
         @ExplodeLoop
         static int cachedLen(DynamicObjectStorage self,
                         @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
@@ -150,18 +151,25 @@ static int cachedLen(DynamicObjectStorage self,
             return len;
         }
 
-        @Specialization(replaces = "cachedLen")
-        static int length(DynamicObjectStorage self,
-                        @Exclusive @Cached ReadAttributeFromDynamicObjectNode readNode) {
+        @Specialization(replaces = "cachedLen", guards = {"cachedShape == self.store.getShape()"}, limit = "3")
+        static int cachedKeys(DynamicObjectStorage self,
+                        @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
+                        @Cached(value = "keyArray(self)", dimensions = 1) Object[] keys,
+                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
             int len = 0;
-            Object[] keys = keyArray(self);
             for (int i = 0; i < keys.length; i++) {
                 Object key = keys[i];
                 len = incrementLen(self, readNode, len, key);
             }
             return len;
         }
 
+        @Specialization(replaces = "cachedKeys")
+        static int length(DynamicObjectStorage self,
+                        @Exclusive @Cached ReadAttributeFromDynamicObjectNode readNode) {
+            return cachedKeys(self, self.store.getShape(), keyArray(self), readNode);
+        }
+
         private static boolean hasStringKey(DynamicObjectStorage self, String key, ReadAttributeFromDynamicObjectNode readNode) {
             return readNode.execute(self.store, key) != PNone.NO_VALUE;
         }
@@ -197,7 +205,7 @@ static Object pstring(DynamicObjectStorage self, PString key, ThreadState state,
             return string(self, castStr.execute(key), state, readKey, noValueProfile);
         }
 
-        @Specialization(guards = {"cachedShape == self.store.getShape()", "keyList.length < 16", "!isBuiltinString(key, profile)"}, limit = "1")
+        @Specialization(guards = {"cachedShape == self.store.getShape()", "keyList.length < EXPLODE_LOOP_SIZE_LIMIT", "!isBuiltinString(key, profile)"}, limit = "1")
         @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
         static Object notString(DynamicObjectStorage self, Object key, ThreadState state,
                         @Shared("readKey") @Cached ReadAttributeFromDynamicObjectNode readKey,
@@ -366,12 +374,12 @@ public HashingStorage delItemWithState(Object key, ThreadState state,
 
     @ExportMessage
     static class ForEachUntyped {
-        @Specialization(guards = {"cachedShape == self.store.getShape()", "keys.length < 16"}, limit = "1")
+        @Specialization(guards = {"cachedShape == self.store.getShape()", "keys.length < EXPLODE_LOOP_SIZE_LIMIT"}, limit = "2")
         @ExplodeLoop
         static Object cachedLen(DynamicObjectStorage self, ForEachNode<Object> node, Object firstValue,
                         @Exclusive @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
                         @Cached(value = "keyArray(self)", dimensions = 1) Object[] keys,
-                        @Shared("readNodeInject") @Cached ReadAttributeFromDynamicObjectNode readNode) {
+                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
             Object result = firstValue;
             for (int i = 0; i < keys.length; i++) {
                 Object key = keys[i];
@@ -380,10 +388,11 @@ static Object cachedLen(DynamicObjectStorage self, ForEachNode<Object> node, Obj
             return result;
         }
 
-        @Specialization(replaces = "cachedLen")
-        static Object addAll(DynamicObjectStorage self, ForEachNode<Object> node, Object firstValue,
-                        @Shared("readNodeInject") @Cached ReadAttributeFromDynamicObjectNode readNode) {
-            Object[] keys = keyArray(self);
+        @Specialization(replaces = "cachedLen", guards = {"cachedShape == self.store.getShape()"}, limit = "3")
+        static Object cachedKeys(DynamicObjectStorage self, ForEachNode<Object> node, Object firstValue,
+                        @Exclusive @SuppressWarnings("unused") @Cached("self.store.getShape()") Shape cachedShape,
+                        @Cached(value = "keyArray(self)", dimensions = 1) Object[] keys,
+                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
             Object result = firstValue;
             for (int i = 0; i < keys.length; i++) {
                 Object key = keys[i];
@@ -392,6 +401,12 @@ static Object addAll(DynamicObjectStorage self, ForEachNode<Object> node, Object
             return result;
         }
 
+        @Specialization(replaces = "cachedKeys")
+        static Object addAll(DynamicObjectStorage self, ForEachNode<Object> node, Object firstValue,
+                        @Cached ReadAttributeFromDynamicObjectNode readNode) {
+            return cachedKeys(self, node, firstValue, self.store.getShape(), keyArray(self), readNode);
+        }
+
         private static Object runNode(DynamicObjectStorage self, Object key, Object acc, ReadAttributeFromDynamicObjectNode readNode, ForEachNode<Object> node) {
             if (key instanceof String) {
                 Object value = readNode.execute(self.store, key);