Unify ReadAttributeFromObjectNode 2 subclasses into ReadAttributeFromObjectNode

* So the correct semantics and the native type optimization is always used,
  reviewing usages revealed several incorrect usages.
* Subclasses make host inlining unable to see through any `@Cached ReadAttributeFromObjectNode`.
* Add ReadAttributeFromModuleNode for the simple case of reading from a PythonModule.
* Remove extra specialization for PythonModule in ReadAttributeFromObjectNode:
  * The specialization below readObjectAttribute() does exactly the same optimization,
    so it is redundant.
  * Also checked by running micro/function-call-sized.py on jvm-ce-libgraal
    with and without --engine.Compilation=false that the performance is the same.
* Add execute() overloads for ReadAttributeFromObjectNode, more efficent and also clearer which kind of input is passed.

Author: eregon

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

@@ -209,6 +209,7 @@
 import com.oracle.graal.python.nodes.StringLiterals;
 import com.oracle.graal.python.nodes.argument.ReadArgumentNode;
 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) {

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;
@@ -80,7 +81,6 @@
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.GetFixedAttributeNode;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 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);
             }

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

@@ -85,7 +85,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.StringLiterals;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
@@ -172,7 +172,7 @@ static Object getName(PythonModule module,
                         @Cached PythonCextBuiltins.PromoteBorrowedValue promoteBorrowedValue,
                         @Cached PyUnicodeCheckNode pyUnicodeCheckNode,
                         // CPython reads from the module dict directly
-                        @Cached ReadAttributeFromObjectNode read,
+                        @Cached ReadAttributeFromModuleNode read,
                         @Cached WriteAttributeToObjectNode write) {
             /*
              * Even thought the function returns a new reference, CPython assumes that the unicode
@@ -308,7 +308,7 @@ abstract static class PyModule_GetFilenameObject extends CApiUnaryBuiltinNode {
         @Specialization
         static Object getFilename(PythonModule module,
                         @Bind Node inliningTarget,
-                        @Cached ReadAttributeFromObjectNode read,
+                        @Cached ReadAttributeFromModuleNode read,
                         @Cached PyUnicodeCheckNode check,
                         @Cached PRaiseNode raiseNode) {
             Object file = read.execute(module, T___FILE__);

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

@@ -74,6 +74,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
@@ -137,7 +138,7 @@ abstract static class GraalPyPrivate_StructSequence_NewType extends CApiQuaterna
         @TruffleBoundary
         Object doGeneric(TruffleString typeName, TruffleString typeDoc, Object fields, int nInSequence,
                         @Cached GraalPyPrivate_StructSequence_InitType2 initNode,
-                        @Cached ReadAttributeFromObjectNode readTypeBuiltinNode,
+                        @Cached ReadAttributeFromModuleNode readTypeBuiltinNode,
                         @CachedLibrary(limit = "1") DynamicObjectLibrary dylib,
                         @Cached CallNode callTypeNewNode,
                         @Bind PythonLanguage language) {
@@ -159,7 +160,7 @@ abstract static class PyStructSequence_New extends CApiUnaryBuiltinNode {
         @Specialization
         static Object doGeneric(Object cls,
                         @Bind Node inliningTarget,
-                        @Cached("createForceType()") ReadAttributeFromObjectNode readRealSizeNode,
+                        @Cached ReadAttributeFromObjectNode readRealSizeNode,
                         @Cached CastToJavaIntExactNode castToIntNode,
                         @Bind PythonLanguage language,
                         @Cached TypeNodes.GetInstanceShape getInstanceShape,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/csv/CSVModuleBuiltins.java

@@ -74,7 +74,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -134,7 +134,7 @@ public abstract static class CSVRegisterDialectNode extends PythonBuiltinNode {
         static PNone register(VirtualFrame frame, PythonModule module, Object nameObj, Object dialectObj, PKeyword[] keywords,
                         @Bind Node inliningTarget,
                         @Cached CastToTruffleStringNode nameNode,
-                        @Cached ReadAttributeFromObjectNode readNode,
+                        @Cached ReadAttributeFromModuleNode readNode,
                         @Cached CallNode callNode,
                         @Cached PyDictSetItem setItem,
                         @Cached PRaiseNode raiseNode) {
@@ -164,7 +164,7 @@ public abstract static class CSVUnregisterDialectNode extends PythonBuiltinNode
         @Specialization
         static PNone unregister(VirtualFrame frame, PythonModule module, Object nameObj,
                         @Bind Node inliningTarget,
-                        @Cached ReadAttributeFromObjectNode readNode,
+                        @Cached ReadAttributeFromModuleNode readNode,
                         @Cached PyDictDelItem delItem,
                         @Cached HashingStorageGetItem getItem,
                         @Cached PRaiseNode raiseNode) {
@@ -198,7 +198,7 @@ protected static CSVGetDialectNode create() {
         static CSVDialect get(VirtualFrame frame, PythonModule module, Object nameObj,
                         @Bind Node inliningTarget,
                         @Cached PyDictGetItem getItemNode,
-                        @Cached ReadAttributeFromObjectNode readNode,
+                        @Cached ReadAttributeFromModuleNode readNode,
                         @Cached PRaiseNode raiseNode) {
 
             // TODO GR-38165: unchecked cast to PDict
@@ -220,7 +220,7 @@ static CSVDialect get(VirtualFrame frame, PythonModule module, Object nameObj,
     public abstract static class CSVListDialectsNode extends PythonBuiltinNode {
         @Specialization
         PList listDialects(VirtualFrame frame, PythonModule module,
-                        @Cached ReadAttributeFromObjectNode readNode,
+                        @Cached ReadAttributeFromModuleNode readNode,
                         @Cached ListNodes.ConstructListNode constructListNode) {
 
             Object dialects = readNode.execute(module, T__DIALECTS);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java

@@ -145,7 +145,7 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.StringLiterals;
 import com.oracle.graal.python.nodes.attributes.GetFixedAttributeNode;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
@@ -269,7 +269,7 @@ public void postInitialize(Python3Core core) {
             handle = DlOpenNode.loadNFILibrary(context, NFIBackend.NATIVE, J_DEFAULT_LIBRARY, rtldLocal);
             if (PythonOS.getPythonOS() == PythonOS.PLATFORM_WIN32) {
                 PythonModule sysModule = context.getSysModule();
-                Object loadLibraryMethod = ReadAttributeFromObjectNode.getUncached().execute(ctypesModule, toTruffleStringUncached("LoadLibrary"));
+                Object loadLibraryMethod = ReadAttributeFromModuleNode.getUncached().execute(ctypesModule, toTruffleStringUncached("LoadLibrary"));
                 Object pythonLib = CallNode.executeUncached(loadLibraryMethod, toTruffleStringUncached(PythonContext.getSupportLibName("python-native")), 0);
                 WriteAttributeToPythonObjectNode.getUncached().execute(sysModule, toTruffleStringUncached("dllhandle"), pythonLib);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -126,6 +126,7 @@
 import com.oracle.graal.python.nodes.argument.keywords.NonMappingException;
 import com.oracle.graal.python.nodes.argument.keywords.SameDictKeyException;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
@@ -1165,7 +1166,7 @@ public abstract static class PKeyInfoNode extends Node {
         @Specialization
         static boolean access(Object object, TruffleString attrKeyName, int type,
                         @Bind Node inliningTarget,
-                        @Cached("createForceType()") ReadAttributeFromObjectNode readTypeAttrNode,
+                        @Cached ReadAttributeFromObjectNode readTypeAttrNode,
                         @Cached ReadAttributeFromObjectNode readObjectAttrNode,
                         @Cached PyCallableCheckNode callableCheck,
                         @Cached LookupInheritedAttributeNode.Dynamic getGetNode,
@@ -1477,7 +1478,7 @@ public abstract static class ToDisplaySideEffectingNode extends Node {
 
         @Specialization
         public static TruffleString doDefault(Node inliningTarget, PythonAbstractObject receiver,
-                        @Cached(inline = false) ReadAttributeFromObjectNode readStr,
+                        @Cached ReadAttributeFromModuleNode readStr,
                         @Cached(inline = false) CallNode callNode,
                         @Cached CastToTruffleStringNode castStr,
                         @Cached InlinedConditionProfile toStringUsed) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

@@ -943,7 +943,7 @@ public static long lookupNativeI64MemberInMRO(Object cls, CFields nativeMemberNa
                 if (managedMemberName instanceof HiddenAttr ha) {
                     attr = HiddenAttr.ReadNode.executeUncached((PythonAbstractObject) mroCls, ha, NO_VALUE);
                 } else {
-                    attr = ReadAttributeFromObjectNode.getUncachedForceType().execute(mroCls, CompilerDirectives.castExact(managedMemberName, TruffleString.class));
+                    attr = ReadAttributeFromObjectNode.getUncached().execute(mroCls, CompilerDirectives.castExact(managedMemberName, TruffleString.class));
                 }
                 if (attr != NO_VALUE) {
                     return PyNumberAsSizeNode.executeExactUncached(attr);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/MemberDescriptorBuiltins.java

@@ -63,7 +63,7 @@
 import com.oracle.graal.python.builtins.objects.type.slots.TpSlotDescrGet.DescrGetBuiltinNode;
 import com.oracle.graal.python.builtins.objects.type.slots.TpSlotDescrSet.DescrSetBuiltinNode;
 import com.oracle.graal.python.nodes.BuiltinNames;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.object.PFactory;
@@ -107,7 +107,7 @@ static TruffleString repr(GetSetDescriptor descr,
     abstract static class MemberDescriptorReduceNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object doGeneric(GetSetDescriptor descr,
-                        @Cached ReadAttributeFromObjectNode readAttributeFromObjectNode,
+                        @Cached ReadAttributeFromModuleNode readAttributeFromObjectNode,
                         @Cached GetIdNode getIdNode,
                         @Bind PythonLanguage language) {
             Object getattr = readAttributeFromObjectNode.execute(getContext().getBuiltins(), BuiltinNames.T_GETATTR);

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

@@ -86,6 +86,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromModuleNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes;
@@ -290,7 +291,8 @@ public final Object execute(VirtualFrame frame, PythonModule self, TruffleString
         static Object getattribute(VirtualFrame frame, PythonModule self, TruffleString key, PException e,
                         @Bind Node inliningTarget,
                         @Cached IsBuiltinObjectProfile isAttrError,
-                        @Cached ReadAttributeFromObjectNode readGetattr,
+                        @Cached ReadAttributeFromModuleNode readGetattr,
+                        @Cached ReadAttributeFromObjectNode readInitializing,
                         @Cached InlinedConditionProfile customGetAttr,
                         @Cached CallNode callNode,
                         @Cached PyObjectIsTrueNode castToBooleanNode,
@@ -311,7 +313,7 @@ static Object getattribute(VirtualFrame frame, PythonModule self, TruffleString
                 if (moduleName != null) {
                     Object moduleSpec = readGetattr.execute(self, T___SPEC__);
                     if (moduleSpec != PNone.NO_VALUE) {
-                        Object isInitializing = readGetattr.execute(moduleSpec, T__INITIALIZING);
+                        Object isInitializing = readInitializing.execute(moduleSpec, T__INITIALIZING);
                         if (isInitializing != PNone.NO_VALUE && castToBooleanNode.execute(frame, isInitializing)) {
                             throw raiseNode.raise(inliningTarget, AttributeError, ErrorMessages.MODULE_PARTIALLY_INITIALIZED_S_HAS_NO_ATTR_S, moduleName, key);
                         }