use a counting profile instead of just a branch profile for custom locals to avoid path duplication if there are always custom locals

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java

@@ -52,8 +52,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.junit.Test;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
@@ -119,9 +117,11 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.Source;
 
+import org.junit.Test;
+
 public class TestParserTranslator {
     PythonContext context;
 
@@ -131,7 +131,7 @@ public TestParserTranslator() {
     }
 
     private static class JUnitRootNode extends PRootNode {
-        private final BranchProfile profile = BranchProfile.create();
+        private final ConditionProfile profile = ConditionProfile.createCountingProfile();
         @Child private ExpressionNode body;
         @Child private CalleeContext calleeContext = CalleeContext.create();
 

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

@@ -743,7 +743,7 @@ public TruffleObject getCallable() {
 
         @Specialization
         Object doIt(VirtualFrame frame,
-                        @Cached BranchProfile customLocalsProfile,
+                        @Cached("createCountingProfile()") ConditionProfile customLocalsProfile,
                         @Cached CExtNodes.AsPythonObjectNode asPythonObjectNode,
                         @CachedContext(PythonLanguage.class) PythonContext ctx,
                         @Cached PRaiseNode raiseNode) {
@@ -1475,7 +1475,7 @@ abstract static class MethodDescriptorRoot extends PRootNode {
         @Child protected ReadIndexedArgumentNode readSelfNode;
         @Child private CalleeContext calleeContext = CalleeContext.create();
 
-        private final BranchProfile customLocalsProfile = BranchProfile.create();
+        private final ConditionProfile customLocalsProfile = ConditionProfile.createCountingProfile();
         protected final PythonObjectFactory factory;
 
         @TruffleBoundary

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

@@ -84,7 +84,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
-import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
 @ExportLibrary(InteropLibrary.class)
@@ -481,7 +481,7 @@ protected GetTracebackRootNode(TruffleLanguage<?> language) {
         @Child private GetTracebackNode getTracebackNode;
         @Child private CalleeContext calleeContext = CalleeContext.create();
 
-        private final BranchProfile profile = BranchProfile.create();
+        private final ConditionProfile profile = ConditionProfile.createCountingProfile();
 
         @Override
         public Object execute(VirtualFrame frame) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ModuleRootNode.java

@@ -38,14 +38,14 @@
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
 public class ModuleRootNode extends PClosureRootNode {
     private static final Signature SIGNATURE = new Signature(false, -1, false, new String[0], new String[0]);
     private final String name;
     private final String doc;
-    private final BranchProfile customLocalsProfile = BranchProfile.create();
+    private final ConditionProfile customLocalsProfile = ConditionProfile.createCountingProfile();
     @Child private ExpressionNode body;
     @Child private WriteGlobalNode writeModuleDoc;
     @Child private CalleeContext calleeContext = CalleeContext.create();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/BuiltinFunctionRootNode.java

@@ -48,15 +48,15 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public final class BuiltinFunctionRootNode extends PRootNode {
     private final Signature signature;
     private final Builtin builtin;
     private final String name;
     private final NodeFactory<? extends PythonBuiltinBaseNode> factory;
     private final boolean declaresExplicitSelf;
-    private final BranchProfile customLocalsProfile = BranchProfile.create();
+    private final ConditionProfile customLocalsProfile = ConditionProfile.createCountingProfile();
     @Child private BuiltinCallNode body;
     @Child private CalleeContext calleeContext = CalleeContext.create();
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/FunctionRootNode.java

@@ -44,7 +44,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeUtil;
-import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -59,7 +59,7 @@ public class FunctionRootNode extends PClosureFunctionRootNode {
     private final SourceSection sourceSection;
     private final boolean isGenerator;
     private final ValueProfile generatorFrameProfile;
-    private final BranchProfile customLocalsProfile = BranchProfile.create();
+    private final ConditionProfile customLocalsProfile = ConditionProfile.createCountingProfile();
 
     @Child private ExpressionNode body;
     @Child private CalleeContext calleeContext = CalleeContext.create();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/AsyncHandler.java

@@ -67,7 +67,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.Node.Child;
-import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 /**
  * A handler for asynchronous actions events that need to be handled on a main thread of execution,
@@ -142,7 +142,7 @@ private static class CallRootNode extends PRootNode {
         @Child private ReadCallerFrameNode readCallerFrameNode = ReadCallerFrameNode.create();
         @Child private CalleeContext calleeContext = CalleeContext.create();
 
-        private final BranchProfile profile = BranchProfile.create();
+        private final ConditionProfile profile = ConditionProfile.createCountingProfile();
 
         protected CallRootNode(TruffleLanguage<?> language) {
             super(language);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ExecutionContext.java

@@ -58,7 +58,6 @@
 import com.oracle.truffle.api.frame.FrameInstance;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 /**
@@ -179,16 +178,15 @@ public static final class CalleeContext extends Node {
         /**
          * Wrap the execution of a Python callee called from a Python frame.
          */
-        public static void enter(VirtualFrame frame, BranchProfile profile) {
+        public static void enter(VirtualFrame frame, ConditionProfile profile) {
             // tfel: Create our frame reference here and store it so that
             // there's no reference to it from the caller side.
             PFrame.Reference thisFrameRef = new PFrame.Reference(PArguments.getCallerFrameInfo(frame));
             Object customLocals = PArguments.getCustomLocals(frame);
             PArguments.setCurrentFrameInfo(frame, thisFrameRef);
             // tfel: If there are custom locals, write them into an (incomplete)
             // PFrame here
-            if (customLocals != null && !(customLocals instanceof PFrame.Reference)) {
-                profile.enter();
+            if (profile.profile(customLocals != null && !(customLocals instanceof PFrame.Reference))) {
                 thisFrameRef.setCustomLocals(customLocals);
             }
         }