Fast-path for builtin reads, improve get/set attribute @operations fast-paths

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/test_builtin.py

@@ -7,6 +7,7 @@
 import sys
 import tempfile
 import unittest
+import io
 
 class MyIndexable(object):
     def __init__(self, value):
@@ -121,6 +122,53 @@ def test_builtin_constants(self):
         self.assertEqual(getattr(builtins, 'False'), False)
         self.assertEqual(getattr(builtins, 'True'), True)
 
+    def test_missing_builtin_lookup_after_warmup(self):
+        def read_missing_builtin():
+            return definitely_missing_builtin_for_review
+
+        for _ in range(20):
+            with self.assertRaises(NameError):
+                read_missing_builtin()
+
+    def test_instance_attr_state_machine_after_warmup(self):
+        class PaddedFile:
+            def __init__(self, fileobj, prepend=b""):
+                self._buffer = prepend
+                self._length = len(prepend)
+                self.file = fileobj
+                self._read = 0
+
+            def read(self, size):
+                if self._read is None:
+                    return self.file.read(size)
+                if self._read + size <= self._length:
+                    read = self._read
+                    self._read += size
+                    return self._buffer[read:self._read]
+                read = self._read
+                self._read = None
+                return self._buffer[read:] + self.file.read(size - self._length + read)
+
+            def prepend(self, prepend=b""):
+                if self._read is None:
+                    self._buffer = prepend
+                else:
+                    self._read -= len(prepend)
+                    return
+                self._length = len(self._buffer)
+                self._read = 0
+
+        def exercise():
+            padded = PaddedFile(io.BytesIO(b"cdef"), b"ab")
+            self.assertEqual(padded.read(1), b"a")
+            self.assertEqual(padded.read(3), b"bcd")
+            padded.prepend(b"Z")
+            self.assertEqual(padded.read(2), b"Ze")
+            self.assertEqual(padded.read(2), b"f")
+
+        for _ in range(20):
+            exercise()
+
     def test_min(self):
         self.assertEqual(min((), default=1, key="adsf"), 1)
 

graalpython/com.oracle.graal.python.test/src/tests/test_mro.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
+# Copyright (c) 2021, 2026, Oracle and/or its affiliates.
 # Copyright (C) 1996-2020 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2

graalpython/com.oracle.graal.python.test/src/tests/test_slot.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -173,5 +173,17 @@ class C:
             __slots__ = ('a', 'b')
         self.assertRaises(AttributeError, setattr, C(), 'c', 42)
 
+    def test_write_attr_without_dict_after_warmup(self):
+        class C:
+            __slots__ = ()
+
+        obj = C()
+
+        def write_attr():
+            obj.x = 42
+
+        for _ in range(20):
+            self.assertRaises(AttributeError, write_attr)
+
 if __name__ == "__main__":
     unittest.main()

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

@@ -75,13 +75,18 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Shape;
-import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 
 /**
  * This storage keeps a reference to the MRO when used for a type dict. Writing to this storage will
  * cause the appropriate <it>attribute final</it> assumptions to be invalidated.
+ * <p/>
+ * This storage may wrap a {@link PythonObject}; in that case the storage and the object can be
+ * used interchangeably. If the storage is transformed to other storage, or for some other reason
+ * requires that all accesses are routed through the {@link DynamicObjectStorage}, then the
+ * {@link PythonObject}'s {@link Shape} flags must be updated to include
+ * {@link PythonObject#HAS_MATERIALIZED_DICT}.
  */
 public final class DynamicObjectStorage extends HashingStorage {
     public static final int SIZE_THRESHOLD = 100;
@@ -268,6 +273,10 @@ void setStringKey(TruffleString key, Object value, DynamicObject.PutNode putNode
         putNode.execute(store, key, assertNoJavaString(value));
     }
 
+    boolean setStringKeyIfPresent(TruffleString key, Object value, DynamicObject.PutNode putNode) {
+        return putNode.executeIfPresent(store, key, assertNoJavaString(value));
+    }
+
     boolean shouldTransitionOnPut() {
         // For now, we do not use SIZE_THRESHOLD condition to transition storages that wrap
         // dictionaries retrieved via object's __dict__
@@ -332,8 +341,7 @@ public static DynamicObjectStorage copy(DynamicObjectStorage receiver,
     public abstract static class DynamicObjectStorageSetStringKey extends SpecializedSetStringKey {
         @Specialization
         static void doIt(Node inliningTarget, HashingStorage self, TruffleString key, Object value,
-                        @Cached DynamicObject.PutNode putNode,
-                        @Cached InlinedBranchProfile invalidateMro) {
+                        @Cached DynamicObject.PutNode putNode) {
             ((DynamicObjectStorage) self).setStringKey(key, value, putNode);
         }
     }

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

@@ -605,11 +605,11 @@ static Object domStringKey(Frame frame, Node inliningTarget, DynamicObjectStorag
                 if (val == PNone.NO_VALUE) {
                     return null;
                 } else {
-                    putNode.execute(store, key, PNone.NO_VALUE);
+                    self.setStringKey(key, PNone.NO_VALUE, putNode);
                     return val;
                 }
             } else {
-                return putNode.executeIfPresent(store, key, PNone.NO_VALUE);
+                return self.setStringKeyIfPresent(key, PNone.NO_VALUE, putNode);
             }
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/PythonModule.java

@@ -89,7 +89,7 @@ public PythonModule(Object clazz, Shape instanceShape) {
         setAttribute(T___SPEC__, PNone.NO_VALUE);
         setAttribute(T___CACHED__, PNone.NO_VALUE);
         setAttribute(T___FILE__, PNone.NO_VALUE);
-        GetOrCreateDictNode.executeUncached(this);
+        GetOrCreateDictNode.ensureModuleDict(this);
     }
 
     /**
@@ -105,7 +105,7 @@ private PythonModule(PythonLanguage lang, TruffleString moduleName) {
         setAttribute(T___SPEC__, PNone.NONE);
         setAttribute(T___CACHED__, PNone.NO_VALUE);
         setAttribute(T___FILE__, PNone.NO_VALUE);
-        GetOrCreateDictNode.executeUncached(this);
+        GetOrCreateDictNode.ensureModuleDict(lang, this);
     }
 
     /**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/HiddenAttr.java

@@ -72,6 +72,8 @@
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.HiddenKey;
+import com.oracle.truffle.api.object.PropertyGetter;
+import com.oracle.truffle.api.object.Shape;
 
 public final class HiddenAttr {
 
@@ -127,6 +129,10 @@ boolean hasLongValue() {
                         this == METHOD_DEF_PTR;
     }
 
+    public PropertyGetter createPropertyGetter(Shape shape) {
+        return shape.makePropertyGetter(key);
+    }
+
     @Override
     public String toString() {
         return getName();
@@ -192,10 +198,7 @@ static void doPythonObjectDict(PythonObject self, HiddenAttr attr, Object value,
         }
 
         private static boolean isGenericDict(PythonObject self, Object value) {
-            if (value instanceof PDict dict && dict.getDictStorage() instanceof DynamicObjectStorage dynamicStorage) {
-                return dynamicStorage.getStore() != self;
-            }
-            return true;
+            return !(value instanceof PDict dict && dict.getDictStorage() instanceof DynamicObjectStorage dom && dom.getStore() == self);
         }
 
         @Specialization(guards = "attr != DICT || !isPythonObject(self)")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PGuards.java

@@ -109,6 +109,7 @@
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
+import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.api.strings.TruffleString.CodeRange;
@@ -127,6 +128,7 @@ public static boolean isNone(Object value) {
         return value == PNone.NONE;
     }
 
+    @Idempotent
     public static boolean isNoValue(Object object) {
         return object == PNone.NO_VALUE;
     }
@@ -531,4 +533,8 @@ public static boolean hasBuiltinDictIter(Node inliningTarget, PDict dict, GetPyt
         return isBuiltinDict(dict) || getSlots.execute(inliningTarget, getClassNode.execute(inliningTarget, dict)).tp_iter() == DictBuiltins.SLOTS.tp_iter();
     }
 
+    @Idempotent
+    public static boolean hasMaterializedDict(Shape s) {
+        return (s.getFlags() & PythonObject.HAS_MATERIALIZED_DICT) != 0;
+    }
 }