report polymorphism and reduce footprint for users of PythonObjectLibrary.equals and PythonObjectLibrary.isTrue

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java

@@ -62,6 +62,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -95,6 +96,7 @@ public Object iter(PGenerator self) {
 
     @Builtin(name = __NEXT__, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
+    @ReportPolymorphism
     public abstract static class NextNode extends PythonUnaryBuiltinNode {
 
         @Child private GetCaughtExceptionNode getCaughtExceptionNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java

@@ -67,7 +67,6 @@
 import com.oracle.truffle.api.library.LibraryFactory;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.profiles.BranchProfile;
 
 /**
  * The standard Python object library. This implements a general-purpose Python object interface.
@@ -249,14 +248,18 @@ public final long hash(double receiver) {
     }
 
     private static class DefaultNodes extends Node {
+        private static final byte REVERSE_COMP = 0b001;
+        private static final byte LEFT_COMPARE = 0b010;
+        private static final byte SUBT_COMPARE = 0b100;
+
         @Child private IsSubtypeNode isSubtype;
         @Child private IsSameTypeNode isSameType;
-        @CompilationFinal private BranchProfile reverseEquals;
-        @CompilationFinal private BranchProfile subtypeEquals;
+        @CompilationFinal byte state = 0;
 
         protected IsSubtypeNode getIsSubtypeNode() {
             if (isSubtype == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
+                reportPolymorphicSpecialize();
                 isSubtype = insert(IsSubtypeNode.create());
             }
             return isSubtype;
@@ -270,20 +273,28 @@ protected IsSameTypeNode getIsSameTypeNode() {
             return isSameType;
         }
 
-        protected BranchProfile getReverseProfile() {
-            if (reverseEquals == null) {
+        protected void enterReverseCompare() {
+            if ((state & REVERSE_COMP) == 0) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                reportPolymorphicSpecialize();
+                state |= REVERSE_COMP;
+            }
+        }
+
+        protected void enterLeftCompare() {
+            if ((state & LEFT_COMPARE) == 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                reverseEquals = BranchProfile.create();
+                reportPolymorphicSpecialize();
+                state |= LEFT_COMPARE;
             }
-            return reverseEquals;
         }
 
-        protected BranchProfile getSubtypeProfile() {
-            if (subtypeEquals == null) {
+        protected void enterSubtypeCompare() {
+            if ((state & SUBT_COMPARE) == 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                subtypeEquals = BranchProfile.create();
+                reportPolymorphicSpecialize();
+                state |= SUBT_COMPARE;
             }
-            return subtypeEquals;
         }
 
         private static final class Disabled extends DefaultNodes {
@@ -300,13 +311,15 @@ protected IsSameTypeNode getIsSameTypeNode() {
             }
 
             @Override
-            protected BranchProfile getReverseProfile() {
-                return BranchProfile.getUncached();
+            protected void enterReverseCompare() {
             }
 
             @Override
-            protected BranchProfile getSubtypeProfile() {
-                return BranchProfile.getUncached();
+            protected void enterLeftCompare() {
+            }
+
+            @Override
+            protected void enterSubtypeCompare() {
             }
         }
 
@@ -365,20 +378,20 @@ public boolean equalsWithState(Object receiver, Object other, PythonObjectLibrar
         int result;
         boolean isSameType = getDefaultNodes().getIsSameTypeNode().execute(leftClass, rightClass);
         if (!isSameType && getDefaultNodes().getIsSubtypeNode().execute(rightClass, leftClass)) {
-            getDefaultNodes().getSubtypeProfile().enter();
+            getDefaultNodes().enterSubtypeCompare();
             checkedReverseOp = true;
             result = otherLibrary.equalsInternal(other, receiver, threadState);
             if (result != -1) {
                 return result == 1;
             }
         }
-
+        getDefaultNodes().enterLeftCompare();
         result = equalsInternal(receiver, other, threadState);
         if (result != -1) {
             return result == 1;
         }
         if (!isSameType && !checkedReverseOp) {
-            getDefaultNodes().getReverseProfile().enter();
+            getDefaultNodes().enterReverseCompare();
             result = otherLibrary.equalsInternal(other, receiver, threadState);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/CoerceToBooleanNode.java

@@ -30,6 +30,7 @@
 import com.oracle.graal.python.nodes.expression.CoerceToBooleanNodeFactory.NotNodeGen;
 import com.oracle.graal.python.nodes.expression.CoerceToBooleanNodeFactory.YesNodeGen;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -66,6 +67,7 @@ public static CoerceToBooleanNode createIfFalseNode(ExpressionNode operand) {
     @Override
     public abstract boolean executeBoolean(VirtualFrame frame);
 
+    @ReportPolymorphism
     public abstract static class YesNode extends CoerceToBooleanNode {
         @Specialization
         boolean doBoolean(boolean operand) {
@@ -99,6 +101,7 @@ boolean doObject(VirtualFrame frame, Object object,
         }
     }
 
+    @ReportPolymorphism
     public abstract static class NotNode extends CoerceToBooleanNode {
         @Specialization
         boolean doBool(boolean operand) {