[GR-67626] Optimize host inlining of attribute lookup in GraalPy

ci/graal/common.json

@@ -53,13 +53,13 @@
     "labsjdk-ee-25Debug": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
     "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+7", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+7-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+7-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+7-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+7-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+7-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+7-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+8", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+8-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+8-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+8-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+8-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+8-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+8-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

docs/contributor/CONTRIBUTING.md

@@ -127,10 +127,10 @@ If the IDE was initialized properly by using the command mentioned above, the ex
 
 Both of these commands also work when you have a `graalpy` executable, e.g. inside a `venv`.
 
-For debugging the C API and native extensions, first make sure you rebuild (`mx clean` first!) graalpything with the environment variable `CFLAGS=-g` set.
+For debugging the C API and native extensions, first make sure you rebuild (`mx clean` first!) graalpython with the environment variable `CFLAGS=-g` set.
 This will keep debug symbols in our C API implementation which should allow you to use `gdb` or [`rr`](https://rr-project.org/) to debug.
 When you build an SVM image, debugging the entire application is possible, and there are [docs](https://www.graalvm.org/reference-manual/native-image/guides/debug-native-image-process/) to see Java code when inside the native debugger.
-Make sure you find and keep the `libpythonvm.so.debug` file around next to your GraalPy build, you can find it somewhere under `graal/sdk/mxbuild`.
+Make sure you find and keep the `libpythonvm.so.debug` file around next to your GraalPy build, you can find it under `mxbuild/*/libpythonvm`.
 
 ## Advanced Commands to Develop and Debug
 
@@ -149,6 +149,7 @@ mx python-gate --tags python-unittest
 
 If some of the tests fail, you can re-run just a single test like this, substituting TEST-SELECTOR with the test you want to run. You can use the whole failed test name including the path as the selector.
 Note that you can insert `-d` to debug on the Java level or use `--inspect` to debug in the Chrome debugger.
+Use `com.oracle.graal.python.runtime.exception.ExceptionUtils.printPythonLikeStackTrace()` in the Java debugger to print the current Python traceback on `stderr`.
 
 ```bash
 mx [-d] graalpytest [--inspect] TEST-SELECTOR

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -616,10 +616,6 @@ PyAPI_FUNC(void*) GraalPyPrivate_PointerAddOffset(void* x, Py_ssize_t y) {
     return (char *)x + y;
 }
 
-PyAPI_FUNC(int) GraalPyPrivate_SubclassCheck(PyObject* type) {
-    return PyType_FastSubclass(Py_TYPE(type), Py_TPFLAGS_TYPE_SUBCLASS);
-}
-
 // Implements the basesisze check in typeobject.c:_PyObject_GetState
 PyAPI_FUNC(int) GraalPyPrivate_CheckBasicsizeForGetstate(PyTypeObject* type, int slot_num) {
     Py_ssize_t basicsize = PyBaseObject_Type.tp_basicsize;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -82,7 +82,6 @@
 import com.oracle.graal.python.compiler.ParserCallbacksImpl;
 import com.oracle.graal.python.compiler.bytecode_dsl.BytecodeDSLCompiler;
 import com.oracle.graal.python.compiler.bytecode_dsl.BytecodeDSLCompiler.BytecodeDSLCompilerResult;
-import com.oracle.graal.python.nodes.HiddenAttr;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.bytecode_dsl.BytecodeDSLCodeUnit;
 import com.oracle.graal.python.nodes.call.CallDispatchers;
@@ -1043,7 +1042,7 @@ public Shape getEmptyShape() {
 
     public Shape getShapeForClass(PythonAbstractClass klass) {
         if (isSingleContext()) {
-            return Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttr.getClassHiddenKey(), klass, 0).build();
+            return Shape.newBuilder(getEmptyShape()).dynamicType(klass).build();
         } else {
             return getEmptyShape();
         }
@@ -1065,7 +1064,7 @@ public Shape getBuiltinTypeInstanceShape(PythonBuiltinClassType type) {
 
     private Shape createBuiltinShape(PythonBuiltinClassType type, int ordinal) {
         Shape shape;
-        Shape.DerivedBuilder shapeBuilder = Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttr.getClassHiddenKey(), type, 0);
+        Shape.DerivedBuilder shapeBuilder = Shape.newBuilder(getEmptyShape()).dynamicType(type);
         if (!type.isBuiltinWithDict()) {
             shapeBuilder.shapeFlags(PythonObject.HAS_SLOTS_BUT_NO_DICT_FLAG);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/AsyncioModuleBuiltins.java

@@ -72,7 +72,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
-import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.attributes.GetFixedAttributeNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -178,8 +178,8 @@ static Object getCurrentLoop(VirtualFrame frame, Object ignored,
                         @Cached CallNode callGetPolicy,
                         @Cached CallNode callGetLoop,
                         @Cached AbstractImportNode.ImportName importName,
-                        @Cached(parameters = "T_GET_EVENT_LOOP") GetAttributeNode.GetFixedAttributeNode getGetLoop,
-                        @Cached(parameters = "T_GET_EVENT_LOOP_POLICY") GetAttributeNode.GetFixedAttributeNode getGetLoopPolicy) {
+                        @Cached(parameters = "T_GET_EVENT_LOOP") GetFixedAttributeNode getGetLoop,
+                        @Cached(parameters = "T_GET_EVENT_LOOP_POLICY") GetFixedAttributeNode getGetLoopPolicy) {
             Object eventLoop = context.getThreadState(context.getLanguage(inliningTarget)).getRunningEventLoop();
             if (eventLoop == null) {
                 Object asyncio = importName.execute(frame, context, context.getBuiltins(), T_ASYNCIO_EVENTS, PNone.NONE, PythonUtils.EMPTY_TRUFFLESTRING_ARRAY, 0);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -208,7 +208,8 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.StringLiterals;
 import com.oracle.graal.python.nodes.argument.ReadArgumentNode;
-import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.attributes.GetFixedAttributeNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes;
 import com.oracle.graal.python.nodes.builtins.ListNodes.ConstructListNode;
@@ -1730,7 +1731,7 @@ static Object ord(@SuppressWarnings("unused") Object obj,
                     "flush: whether to forcibly flush the stream.")
     @GenerateNodeFactory
     public abstract static class PrintNode extends PythonBuiltinNode {
-        @Child private ReadAttributeFromObjectNode readStdout;
+        @Child private ReadAttributeFromModuleNode readStdout;
         @CompilationFinal private PythonModule cachedSys;
 
         @Specialization
@@ -1836,7 +1837,7 @@ private Object getStdout() {
             }
             if (readStdout == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                readStdout = insert(ReadAttributeFromObjectNode.create());
+                readStdout = insert(ReadAttributeFromModuleNode.create());
             }
             Object stdout = readStdout.execute(sys, T_STDOUT);
             if (stdout == NO_VALUE) {
@@ -2435,7 +2436,7 @@ protected Object doItNonFunction(VirtualFrame frame, Object function, Object[] a
                         @Cached CastToTruffleStringNode castToTruffleStringNode,
                         @Cached("createFor($node)") IndirectCallData indirectCallData,
                         @Cached CalculateMetaclassNode calculateMetaClass,
-                        @Cached("create(T___PREPARE__)") GetAttributeNode getPrepare,
+                        @Cached("create(T___PREPARE__)") GetFixedAttributeNode getPrepare,
                         @Cached PyMappingCheckNode pyMappingCheckNode,
                         @Cached CallNode callPrep,
                         @Cached CallNode callType,
@@ -2527,7 +2528,7 @@ class InitializeBuildClass {
 
             Object ns;
             try {
-                Object prep = getPrepare.executeObject(frame, init.meta);
+                Object prep = getPrepare.execute(frame, init.meta);
                 ns = callPrep.execute(frame, prep, new Object[]{name, init.bases}, init.mkw);
             } catch (PException p) {
                 p.expectAttributeError(inliningTarget, noAttributeProfile);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PolyglotModuleBuiltins.java

@@ -102,7 +102,7 @@
 import com.oracle.graal.python.nodes.HiddenAttr;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
-import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.attributes.GetFixedAttributeNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonClinicBuiltinNode;
@@ -352,10 +352,10 @@ Object exportSymbol(PBuiltinFunction fun, @SuppressWarnings("unused") PNone name
         @Specialization(guards = "isModuleMethod(fun)")
         static Object exportSymbol(VirtualFrame frame, Object fun, @SuppressWarnings("unused") PNone name,
                         @Bind Node inliningTarget,
-                        @Cached("create(T___NAME__)") GetAttributeNode.GetFixedAttributeNode getNameAttributeNode,
+                        @Cached("create(T___NAME__)") GetFixedAttributeNode getNameAttributeNode,
                         @Cached CastToJavaStringNode castToStringNode,
                         @Cached PRaiseNode raiseNode) {
-            Object attrNameValue = getNameAttributeNode.executeObject(frame, fun);
+            Object attrNameValue = getNameAttributeNode.execute(frame, fun);
             String methodName;
             try {
                 methodName = castToStringNode.execute(attrNameValue);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java

@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import org.graalvm.collections.EconomicMap;
 
 import com.oracle.graal.python.builtins.Builtin;
@@ -79,8 +80,7 @@
 import com.oracle.graal.python.nodes.HiddenAttr;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
-import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
+import com.oracle.graal.python.nodes.attributes.GetFixedAttributeNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonSenaryBuiltinNode;
@@ -622,7 +622,7 @@ static Object doSingleContext(
             @Specialization(replaces = "doSingleContext")
             static Object doRead(
                             @Bind PythonContext context,
-                            @Cached ReadAttributeFromObjectNode read) {
+                            @Cached ReadAttributeFromModuleNode read) {
                 PythonModule module = context.lookupBuiltinModule(BuiltinNames.T__SRE);
                 return read.execute(module, T_MATCH_CONSTRUCTOR);
             }
@@ -643,7 +643,7 @@ abstract static class TRegexSearch extends PythonSenaryBuiltinNode {
         protected static final TruffleString T__PATTERN__FALLBACK_COMPILE = tsLiteral("_Pattern__fallback_compile");
 
         @Child private HiddenAttr.ReadNode readCacheNode = HiddenAttr.ReadNode.create();
-        @Child private GetAttributeNode getFallbackCompileNode;
+        @Child private GetFixedAttributeNode getFallbackCompileNode;
         @Child private CallNode callFallbackCompileNode;
         @Child private CallNode callFallbackMethodNode;
         @Child private SliceNodes.CreateSliceNode createSliceNode;
@@ -666,7 +666,7 @@ protected Object doCached(VirtualFrame frame, PythonObject pattern, Object input
                         @Cached @Shared PyNumberAsSizeNode asSizeNode,
                         @Cached @Shared PyObjectSizeNode lengthNode,
                         @CachedLibrary(limit = "1") @Shared InteropLibrary libCompiledRegex,
-                        @Cached("create(method.getMethodName())") GetAttributeNode getFallbackMethodNode,
+                        @Cached("create(method.getMethodName())") GetFixedAttributeNode getFallbackMethodNode,
                         @Cached @Shared TRegexCallExec tRegexCallExec,
                         @Cached @Shared CreateMatchFromTRegexResultNode createMatchFromTRegexResultNode) {
             int pos = asSizeNode.executeExact(frame, inliningTarget, indexNode.execute(frame, inliningTarget, posArg));
@@ -686,8 +686,9 @@ protected Object doCached(VirtualFrame frame, PythonObject pattern, Object input
             reCheckInputTypeNode.execute(frame, input, tRegexCache.isBinary());
 
             if (fallbackProfile.profile(inliningTarget, libCompiledRegex.isNull(compiledRegex))) {
-                Object fallbackRegex = getCallFallbackCompileNode().executeWithoutFrame(getGetFallbackCompileNode().executeObject(frame, pattern));
-                return getCallFallbackMethodNode().executeWithoutFrame(getFallbackMethodNode.executeObject(frame, fallbackRegex), input, pos, endPos);
+                GetFixedAttributeNode getFixedAttributeNode = getGetFallbackCompileNode();
+                Object fallbackRegex = getCallFallbackCompileNode().executeWithoutFrame(getFixedAttributeNode.execute(frame, pattern));
+                return getCallFallbackMethodNode().executeWithoutFrame(getFallbackMethodNode.execute(frame, fallbackRegex), input, pos, endPos);
             }
 
             Object truncatedInput = input;
@@ -716,7 +717,7 @@ protected Object doCachedRegex(VirtualFrame frame, PythonObject pattern, Object
                         @Cached @Shared PyNumberAsSizeNode asSizeNode,
                         @Cached @Shared PyObjectSizeNode lengthNode,
                         @CachedLibrary(limit = "1") @Shared InteropLibrary libCompiledRegex,
-                        @Cached("create(method.getMethodName())") GetAttributeNode getFallbackMethodNode,
+                        @Cached("create(method.getMethodName())") GetFixedAttributeNode getFallbackMethodNode,
                         @Cached @Shared TRegexCallExec tRegexCallExec,
                         @Cached @Shared CreateMatchFromTRegexResultNode createMatchFromTRegexResultNode) {
             return doCached(frame, pattern, input, posArg, endPosArg, method, mustAdvance, inliningTarget, pattern, cachedMethod, mustAdvance, tRegexCompileNode, tRegexCache,
@@ -738,7 +739,7 @@ protected Object doDynamic(VirtualFrame frame, PythonObject pattern, Object inpu
                         @Cached @Shared InlinedConditionProfile fallbackProfile,
                         @Cached @Shared InlinedConditionProfile truncatingInputProfile,
                         @CachedLibrary(limit = "1") @Shared InteropLibrary libCompiledRegex,
-                        @Cached("create(method.getMethodName())") GetAttributeNode getFallbackMethodNode,
+                        @Cached("create(method.getMethodName())") GetFixedAttributeNode getFallbackMethodNode,
                         @Cached @Shared TRegexCallExec tRegexCallExec,
                         @Cached @Shared CreateMatchFromTRegexResultNode createMatchFromTRegexResultNode) {
             TRegexCache tRegexCache = getTRegexCache(pattern);
@@ -752,10 +753,10 @@ protected TRegexCache getTRegexCache(PythonObject pattern) {
             return (TRegexCache) readCacheNode.executeCached(pattern, HiddenAttr.TREGEX_CACHE, null);
         }
 
-        private GetAttributeNode getGetFallbackCompileNode() {
+        private GetFixedAttributeNode getGetFallbackCompileNode() {
             if (getFallbackCompileNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                getFallbackCompileNode = insert(GetAttributeNode.create(T__PATTERN__FALLBACK_COMPILE));
+                getFallbackCompileNode = insert(GetFixedAttributeNode.create(T__PATTERN__FALLBACK_COMPILE));
             }
             return getFallbackCompileNode;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java

@@ -1001,7 +1001,7 @@ Object doWarn(VirtualFrame frame, PythonModule mod, Object message, Object categ
                         @Bind Node inliningTarget,
                         @Cached("createFor($node)") IndirectCallData indirectCallData,
                         @Cached SequenceStorageNodes.GetItemScalarNode getItemScalarNode,
-                        @Cached StringNodes.CastToTruffleStringCheckedNode castToStringChecked,
+                        @Cached StringNodes.CastToTruffleStringChecked1Node castToStringChecked,
                         @Cached PRaiseNode raiseNode,
                         @Cached WarningsModuleNode moduleFunctionsNode) {
             // warnings_warn_impl

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

@@ -1014,19 +1014,19 @@ abstract static class PyObjectSetAttrNode extends PNodeWithContext {
 
         @Specialization
         static void doBuiltinClass(PythonBuiltinClass object, TruffleString key, Object value,
-                        @Exclusive @Cached(value = "createForceType()", inline = false) WriteAttributeToObjectNode writeAttrNode) {
+                        @Exclusive @Cached WriteAttributeToObjectNode writeAttrNode) {
             writeAttrNode.execute(object, key, value);
         }
 
         @Specialization
         static void doNativeClass(PythonNativeClass object, TruffleString key, Object value,
-                        @Exclusive @Cached(value = "createForceType()", inline = false) WriteAttributeToObjectNode writeAttrNode) {
+                        @Exclusive @Cached WriteAttributeToObjectNode writeAttrNode) {
             writeAttrNode.execute(object, key, value);
         }
 
         @Specialization(guards = {"!isPythonBuiltinClass(object)"})
         static void doObject(PythonObject object, TruffleString key, Object value,
-                        @Exclusive @Cached(inline = false) WriteAttributeToPythonObjectNode writeAttrToPythonObjectNode) {
+                        @Exclusive @Cached WriteAttributeToPythonObjectNode writeAttrToPythonObjectNode) {
             writeAttrToPythonObjectNode.execute(object, key, value);
         }
     }