Add Uncached variant to LookupSpecialMethodSlotNode

msimacek · msimacek · commit 697eeef4390b · 2021-05-25T16:48:09.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupCallableSlotInMRONode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupCallableSlotInMRONode.java
@@ -50,6 +50,7 @@
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
+import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
@@ -184,6 +185,7 @@ public static LookupCallableSlotInMRONode create(SpecialMethodSlot slot) {
 
     protected static final class UncachedLookup extends LookupCallableSlotInMRONode {
 
+        private final TruffleLanguage.ContextReference<PythonContext> contextRef = lookupContextReference(PythonLanguage.class);
         private final SpecialMethodSlot slot;
 
         private UncachedLookup(SpecialMethodSlot slot) {
@@ -193,7 +195,11 @@ private UncachedLookup(SpecialMethodSlot slot) {
         @Override
         public final Object execute(Object klass) {
             if (klass instanceof PythonBuiltinClassType) {
-                return slot.getValue(lookupContextReference(PythonLanguage.class).get().getCore().lookupType((PythonBuiltinClassType) klass));
+                Object result = slot.getValue((PythonBuiltinClassType) klass);
+                if (result == null) {
+                    result = slot.getValue(contextRef.get().getCore().lookupType((PythonBuiltinClassType) klass));
+                }
+                return result;
             } else if (klass instanceof PythonManagedClass) {
                 return slot.getValue((PythonManagedClass) klass);
             } else {
@@ -202,6 +208,11 @@ public final Object execute(Object klass) {
             }
         }
 
+        @Override
+        public boolean isAdoptable() {
+            return false;
+        }
+
         private static final UncachedLookup[] UNCACHEDS = new UncachedLookup[SpecialMethodSlot.values().length];
         static {
             SpecialMethodSlot[] values = SpecialMethodSlot.values();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallBinaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallBinaryMethodNode.java
@@ -47,7 +47,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptorNode.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallQuaternaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallQuaternaryMethodNode.java
@@ -44,7 +44,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptorNode.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryBuiltinNode;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallTernaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallTernaryMethodNode.java
@@ -46,7 +46,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptorNode.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.runtime.PythonContext;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallUnaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallUnaryMethodNode.java
@@ -47,7 +47,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptorNode.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.PythonContext;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallVarargsMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallVarargsMethodNode.java
@@ -45,7 +45,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptorNode.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode.VarargsBuiltinDirectInvocationNotSupported;
 import com.oracle.graal.python.util.PythonUtils;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialBaseNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialBaseNode.java
@@ -41,11 +41,11 @@
 package com.oracle.graal.python.nodes.call.special;
 
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
-import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.nodes.Node;
 
 public abstract class LookupSpecialBaseNode extends Node {
-    public abstract Object execute(VirtualFrame frame, Object type, Object receiver);
+    public abstract Object execute(Frame frame, Object type, Object receiver);
 
     public static LookupSpecialBaseNode create(String key) {
         SpecialMethodSlot slot = SpecialMethodSlot.findSpecialSlot(key);
@@ -54,5 +54,4 @@ public static LookupSpecialBaseNode create(String key) {
         }
         return LookupSpecialMethodNode.create(key);
     }
-
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java
@@ -75,8 +75,8 @@ public static LookupSpecialMethodNode create(String name) {
     @Specialization
     Object lookup(VirtualFrame frame, Object type, Object receiver,
                     @Cached(parameters = "name") LookupAttributeInMRONode lookupMethod,
-                    @Cached MaybeBindDescriptor bind) {
-        return bind.execute(frame, lookupMethod.execute(type), receiver);
+                    @Cached MaybeBindDescriptorNode bind) {
+        return bind.execute(frame, lookupMethod.execute(type), receiver, type);
     }
 
     @GenerateUncached
@@ -104,10 +104,10 @@ Object lookup(VirtualFrame frame, Object type, String name, Object receiver,
             }
             Object getMethod = lookupGet.execute(descriptor, SpecialMethodNames.__GET__);
             if (getMethod != PNone.NO_VALUE) {
-                return new MaybeBindDescriptor.BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));
+                return new MaybeBindDescriptorNode.BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));
             }
             // CPython considers non-descriptors already bound
-            return new MaybeBindDescriptor.BoundDescriptor(descriptor);
+            return new MaybeBindDescriptorNode.BoundDescriptor(descriptor);
         }
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodSlotNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodSlotNode.java
@@ -45,6 +45,7 @@
 import com.oracle.graal.python.nodes.attributes.LookupCallableSlotInMRONode;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /**
@@ -54,20 +55,53 @@
  * handle as well.
  */
 public abstract class LookupSpecialMethodSlotNode extends LookupSpecialBaseNode {
-    protected final SpecialMethodSlot slot;
+    protected static abstract class CachedLookup extends LookupSpecialMethodSlotNode {
+        protected final SpecialMethodSlot slot;
 
-    public LookupSpecialMethodSlotNode(SpecialMethodSlot slot) {
-        this.slot = slot;
+        public CachedLookup(SpecialMethodSlot slot) {
+            this.slot = slot;
+        }
+
+        @Specialization
+        Object lookup(VirtualFrame frame, Object type, Object receiver,
+                        @Cached(parameters = "slot") LookupCallableSlotInMRONode lookupSlot,
+                        @Cached MaybeBindDescriptorNode bind) {
+            return bind.execute(frame, lookupSlot.execute(type), receiver, type);
+        }
     }
 
     public static LookupSpecialMethodSlotNode create(SpecialMethodSlot slot) {
-        return LookupSpecialMethodSlotNodeGen.create(slot);
+        return LookupSpecialMethodSlotNodeFactory.CachedLookupNodeGen.create(slot);
+    }
+
+    private final static class UncachedLookup extends LookupSpecialMethodSlotNode {
+        protected final LookupCallableSlotInMRONode lookup;
+
+        public UncachedLookup(SpecialMethodSlot slot) {
+            this.lookup = LookupCallableSlotInMRONode.getUncached(slot);
+        }
+
+        @Override
+        public Object execute(@SuppressWarnings("unused") Frame frame, Object type, Object receiver) {
+            return MaybeBindDescriptorNode.getUncached().execute(frame, lookup.execute(type), receiver, type);
+        }
+
+        @Override
+        public boolean isAdoptable() {
+            return false;
+        }
+
+        private static final UncachedLookup[] UNCACHEDS = new UncachedLookup[SpecialMethodSlot.values().length];
+        static {
+            SpecialMethodSlot[] values = SpecialMethodSlot.values();
+            for (int i = 0; i < values.length; i++) {
+                SpecialMethodSlot slot = values[i];
+                UNCACHEDS[i] = new UncachedLookup(slot);
+            }
+        }
     }
 
-    @Specialization
-    Object lookup(VirtualFrame frame, Object type, Object receiver,
-                    @Cached(parameters = "slot") LookupCallableSlotInMRONode lookupSlot,
-                    @Cached MaybeBindDescriptor bind) {
-        return bind.execute(frame, lookupSlot.execute(type), receiver);
+    public static LookupSpecialMethodSlotNode getUncached(SpecialMethodSlot slot) {
+        return UncachedLookup.UNCACHEDS[slot.ordinal()];
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/MaybeBindDescriptorNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/MaybeBindDescriptorNode.java
@@ -4,12 +4,13 @@
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
-import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
+import com.oracle.graal.python.nodes.attributes.LookupCallableSlotInMRONode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -19,7 +20,8 @@
  * nodes handle unbound.
  */
 @GenerateUncached
-public abstract class MaybeBindDescriptor extends PNodeWithContext {
+@ImportStatic(SpecialMethodSlot.class)
+public abstract class MaybeBindDescriptorNode extends PNodeWithContext {
 
     /**
      * Wrapper for bound descriptor cases, just to be able to distinguish them from unbound
@@ -33,25 +35,25 @@ public BoundDescriptor(Object descriptor) {
         }
     }
 
-    public abstract Object execute(Frame frame, Object descriptor, Object receiver);
+    public abstract Object execute(Frame frame, Object descriptor, Object receiver, Object receiverType);
 
     @Specialization(guards = "isNoValue(descriptor)")
-    static Object doNoValue(Object descriptor, @SuppressWarnings("unused") Object receiver) {
+    static Object doNoValue(Object descriptor, @SuppressWarnings("unused") Object receiver, @SuppressWarnings("unused") Object receiverType) {
         return descriptor;
     }
 
     @Specialization
-    static Object doBuiltin(BuiltinMethodDescriptor descriptor, @SuppressWarnings("unused") Object receiver) {
+    static Object doBuiltin(BuiltinMethodDescriptor descriptor, @SuppressWarnings("unused") Object receiver, @SuppressWarnings("unused") Object receiverType) {
         return descriptor;
     }
 
     @Specialization
-    static Object doBuiltin(PBuiltinFunction descriptor, @SuppressWarnings("unused") Object receiver) {
+    static Object doBuiltin(PBuiltinFunction descriptor, @SuppressWarnings("unused") Object receiver, @SuppressWarnings("unused") Object receiverType) {
         return descriptor;
     }
 
     @Specialization
-    static Object doFunction(PFunction descriptor, @SuppressWarnings("unused") Object receiver) {
+    static Object doFunction(PFunction descriptor, @SuppressWarnings("unused") Object receiver, @SuppressWarnings("unused") Object receiverType) {
         return descriptor;
     }
 
@@ -60,15 +62,23 @@ protected static boolean needsToBind(Object descriptor) {
     }
 
     @Specialization(guards = "needsToBind(descriptor)")
-    static Object doBind(VirtualFrame frame, Object descriptor, Object receiver,
+    static Object doBind(VirtualFrame frame, Object descriptor, Object receiver, Object receiverType,
                     @Cached GetClassNode getClassNode,
-                    @Cached LookupAttributeInMRONode.Dynamic lookupGet,
+                    @Cached(parameters = "Get") LookupCallableSlotInMRONode lookupGet,
                     @Cached CallTernaryMethodNode callGet) {
-        Object getMethod = lookupGet.execute(descriptor, SpecialMethodNames.__GET__);
+        Object getMethod = lookupGet.execute(getClassNode.execute(descriptor));
         if (getMethod != PNone.NO_VALUE) {
-            return new BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, getClassNode.execute(receiver)));
+            return new BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, receiverType));
         }
         // CPython considers non-descriptors already bound
         return new BoundDescriptor(descriptor);
     }
+
+    public static MaybeBindDescriptorNode create() {
+        return MaybeBindDescriptorNodeGen.create();
+    }
+
+    public static MaybeBindDescriptorNode getUncached() {
+        return MaybeBindDescriptorNodeGen.getUncached();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@`
`41`	`41`	`package com.oracle.graal.python.nodes.call.special;`
`42`	`42`
`43`	`43`	`import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;`
`44`		`-import com.oracle.truffle.api.frame.VirtualFrame;`
	`44`	`+import com.oracle.truffle.api.frame.Frame;`
`45`	`45`	`import com.oracle.truffle.api.nodes.Node;`
`46`	`46`
`47`	`47`	`public abstract class LookupSpecialBaseNode extends Node {`
`48`		`- public abstract Object execute(VirtualFrame frame, Object type, Object receiver);`
	`48`	`+ public abstract Object execute(Frame frame, Object type, Object receiver);`
`49`	`49`
`50`	`50`	`public static LookupSpecialBaseNode create(String key) {`
`51`	`51`	`SpecialMethodSlot slot = SpecialMethodSlot.findSpecialSlot(key);`
`@@ -54,5 +54,4 @@ public static LookupSpecialBaseNode create(String key) {`
`54`	`54`	`}`
`55`	`55`	`return LookupSpecialMethodNode.create(key);`
`56`	`56`	`}`
`57`		`-`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ public static LookupSpecialMethodNode create(String name) {`
`75`	`75`	`@Specialization`
`76`	`76`	`Object lookup(VirtualFrame frame, Object type, Object receiver,`
`77`	`77`	`@Cached(parameters = "name") LookupAttributeInMRONode lookupMethod,`
`78`		`- @Cached MaybeBindDescriptor bind) {`
`79`		`- return bind.execute(frame, lookupMethod.execute(type), receiver);`
	`78`	`+ @Cached MaybeBindDescriptorNode bind) {`
	`79`	`+ return bind.execute(frame, lookupMethod.execute(type), receiver, type);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@GenerateUncached`
`@@ -104,10 +104,10 @@ Object lookup(VirtualFrame frame, Object type, String name, Object receiver,`
`104`	`104`	`}`
`105`	`105`	`Object getMethod = lookupGet.execute(descriptor, SpecialMethodNames.__GET__);`
`106`	`106`	`if (getMethod != PNone.NO_VALUE) {`
`107`		`- return new MaybeBindDescriptor.BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));`
	`107`	`+ return new MaybeBindDescriptorNode.BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));`
`108`	`108`	`}`
`109`	`109`	`// CPython considers non-descriptors already bound`
`110`		`- return new MaybeBindDescriptor.BoundDescriptor(descriptor);`
	`110`	`+ return new MaybeBindDescriptorNode.BoundDescriptor(descriptor);`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`}`