improve branch profiling for ObjectBuiltins.overridesBuiltinMethod in multi-context case

Author: timfel

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

@@ -98,6 +98,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
@@ -1592,6 +1593,8 @@ public abstract static class ObjectNode extends PythonVarargsBuiltinNode {
         @Child private LookupAttributeInMRONode lookupNew;
         @CompilationFinal private ValueProfile profileInit;
         @CompilationFinal private ValueProfile profileNew;
+        @CompilationFinal private ValueProfile profileInitFactory;
+        @CompilationFinal private ValueProfile profileNewFactory;
 
         @Override
         public final Object varArgExecute(VirtualFrame frame, @SuppressWarnings("unused") Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
@@ -1680,16 +1683,31 @@ private void checkExcessArgs(Object type, Object[] varargs, PKeyword[] kwargs) {
                 }
                 if (profileNew == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    profileNew = ValueProfile.createIdentityProfile();
+                    if (PythonLanguage.getCurrent().singleContextAssumption.isValid()) {
+                        profileNew = ValueProfile.createIdentityProfile();
+                    } else {
+                        profileNew = ValueProfile.createClassProfile();
+                    }
                 }
                 if (profileInit == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    profileInit = ValueProfile.createIdentityProfile();
+                    if (PythonLanguage.getCurrent().singleContextAssumption.isValid()) {
+                        profileInit = ValueProfile.createIdentityProfile();
+                    } else {
+                        profileInit = ValueProfile.createClassProfile();
+                    }
+                }
+                if (profileNewFactory == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    profileNewFactory = ValueProfile.createIdentityProfile();
+                }
+                if (profileInitFactory == null) {
+                    profileInitFactory = ValueProfile.createIdentityProfile();
                 }
-                if (ObjectBuiltins.InitNode.overridesBuiltinMethod(type, profileNew, lookupNew, BuiltinConstructorsFactory.ObjectNodeFactory.class)) {
+                if (ObjectBuiltins.InitNode.overridesBuiltinMethod(type, profileNew, lookupNew, profileNewFactory, BuiltinConstructorsFactory.ObjectNodeFactory.class)) {
                     throw raise(TypeError, ErrorMessages.NEW_TAKES_ONE_ARG);
                 }
-                if (!ObjectBuiltins.InitNode.overridesBuiltinMethod(type, profileInit, lookupInit, ObjectBuiltinsFactory.InitNodeFactory.class)) {
+                if (!ObjectBuiltins.InitNode.overridesBuiltinMethod(type, profileInit, lookupInit, profileInitFactory, ObjectBuiltinsFactory.InitNodeFactory.class)) {
                     throw raise(TypeError, ErrorMessages.NEW_TAKES_NO_ARGS, type);
                 }
             }

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

@@ -232,28 +232,44 @@ public PNone initNoArgs(Object self, Object[] arguments, PKeyword[] keywords) {
         @SuppressWarnings("unused")
         public PNone init(Object self, Object[] arguments, PKeyword[] keywords,
                         @CachedLibrary("self") PythonObjectLibrary lib,
+                        @Cached ConditionProfile overridesNew,
+                        @Cached ConditionProfile overridesInit,
                         @Cached("create(__INIT__)") LookupAttributeInMRONode lookupInit,
-                        @Cached("createIdentityProfile()") ValueProfile profileInit,
+                        @Cached("createLookupProfile()") ValueProfile profileInit,
+                        @Cached("createIdentityProfile()") ValueProfile profileInitFactory,
                         @Cached("create(__NEW__)") LookupAttributeInMRONode lookupNew,
-                        @Cached("createIdentityProfile()") ValueProfile profileNew) {
+                        @Cached("createLookupProfile()") ValueProfile profileNew,
+                        @Cached("createIdentityProfile()") ValueProfile profileNewFactory) {
             if (arguments.length != 0 || keywords.length != 0) {
                 Object type = lib.getLazyPythonClass(self);
-                if (overridesBuiltinMethod(type, profileInit, lookupInit, ObjectBuiltinsFactory.InitNodeFactory.class)) {
+                if (overridesNew.profile(overridesBuiltinMethod(type, profileInit, lookupInit, profileInitFactory, ObjectBuiltinsFactory.InitNodeFactory.class))) {
                     throw raise(TypeError, ErrorMessages.INIT_TAKES_ONE_ARG_OBJECT);
                 }
 
-                if (!overridesBuiltinMethod(type, profileInit, lookupNew, BuiltinConstructorsFactory.ObjectNodeFactory.class)) {
+                if (overridesInit.profile(!overridesBuiltinMethod(type, profileInit, lookupNew, profileNewFactory, BuiltinConstructorsFactory.ObjectNodeFactory.class))) {
                     throw raise(TypeError, ErrorMessages.INIT_TAKES_ONE_ARG, type);
                 }
             }
             return PNone.NONE;
         }
 
+        protected static ValueProfile createLookupProfile() {
+            if (PythonLanguage.getCurrent().singleContextAssumption.isValid()) {
+                return ValueProfile.createIdentityProfile();
+            } else {
+                return ValueProfile.createClassProfile();
+            }
+        }
+
+        /**
+         * Simple utility method to check if a method was overridden. The {@code profile} parameter
+         * must {@emph not} be an identity profile when AST sharing is enabled.
+         */
         public static <T extends NodeFactory<? extends PythonBuiltinBaseNode>> boolean overridesBuiltinMethod(Object type, ValueProfile profile, LookupAttributeInMRONode lookup,
-                        Class<T> builtinNodeFactoryClass) {
+                        ValueProfile factoryProfile, Class<T> builtinNodeFactoryClass) {
             Object method = profile.profile(lookup.execute(type));
             if (method instanceof PBuiltinFunction) {
-                NodeFactory<? extends PythonBuiltinBaseNode> factory = ((PBuiltinFunction) method).getBuiltinNodeFactory();
+                NodeFactory<? extends PythonBuiltinBaseNode> factory = factoryProfile.profile(((PBuiltinFunction) method).getBuiltinNodeFactory());
                 return !builtinNodeFactoryClass.isInstance(factory);
             }
             return true;