# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1379545627 -7200
# Node ID 9c9bc8c6a0dfdae9f2cc30dcf0e310c4fcebda8d
# Parent  f6f5fceef2cee6cc1636618df8cd3d139dabe50f# Parent  23d91654c363b2c05a52baad6f93d462fbb22a2f
Merge.

diff -r 23d91654c363 -r 9c9bc8c6a0df graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Wed Sep 18 21:57:23 2013 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Thu Sep 19 01:07:07 2013 +0200
@@ -258,6 +258,14 @@
                 metricTypeRegistered.increment();
             }
         }
+
+        public void clear() {
+            knownTypes.clear();
+            knownNonNull.clear();
+            knownNull.clear();
+            trueConditions.clear();
+            falseConditions.clear();
+        }
     }
 
     public static ResolvedJavaType widen(ResolvedJavaType a, ResolvedJavaType b) {
@@ -355,6 +363,9 @@
 
         private void registerControlSplitInfo(Node pred, AbstractBeginNode begin) {
             assert pred != null && begin != null;
+            if (begin instanceof LoopExitNode) {
+                state.clear();
+            }
 
             if (pred instanceof IfNode) {
                 IfNode ifNode = (IfNode) pred;
diff -r 23d91654c363 -r 9c9bc8c6a0df graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java	Wed Sep 18 21:57:23 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java	Thu Sep 19 01:07:07 2013 +0200
@@ -31,22 +31,16 @@
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.debug.*;
-import com.oracle.graal.debug.internal.*;
 import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node;
-import com.oracle.graal.graph.iterators.*;
 import com.oracle.graal.java.*;
 import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.calc.*;
 import com.oracle.graal.nodes.java.*;
 import com.oracle.graal.nodes.java.MethodCallTargetNode.InvokeKind;
 import com.oracle.graal.nodes.spi.*;
-import com.oracle.graal.nodes.type.*;
 import com.oracle.graal.phases.*;
 import com.oracle.graal.phases.common.*;
 import com.oracle.graal.phases.tiers.*;
 import com.oracle.graal.truffle.phases.*;
-import com.oracle.graal.virtual.phases.ea.*;
 import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.nodes.*;
 
@@ -60,8 +54,8 @@
     private final OptimisticOptimizations optimisticOptimizations;
     private final Replacements replacements;
 
-    private final HashMap<ResolvedJavaMethod, StructuredGraph> rawCache = new HashMap<>();
-    private final HashMap<ResolvedJavaMethod, StructuredGraph> cache = new HashMap<>();
+    private final HashMap<List<Object>, StructuredGraph> cache = new HashMap<>();
+    private final StructuredGraph markerGraph = new StructuredGraph();
 
     public TruffleCache(MetaAccessProvider metaAccessProvider, GraphBuilderConfiguration config, OptimisticOptimizations optimisticOptimizations, Replacements replacements) {
         this.metaAccessProvider = metaAccessProvider;
@@ -73,185 +67,78 @@
     @SuppressWarnings("unused")
     public StructuredGraph lookup(final ResolvedJavaMethod method, final NodeInputList<ValueNode> arguments, final Assumptions assumptions, final CanonicalizerPhase finalCanonicalizer) {
 
-        StructuredGraph resultGraph = null;
-        if (cache.containsKey(method)) {
-            StructuredGraph graph = cache.get(method);
-            if (checkArgumentStamps(graph, arguments)) {
-                resultGraph = graph;
+        List<Object> key = new ArrayList<>(arguments.size() + 1);
+        key.add(method);
+        for (ValueNode v : arguments) {
+            if (v.kind() == Kind.Object) {
+                key.add(v.stamp());
             }
         }
+        StructuredGraph resultGraph = cache.get(key);
+        if (resultGraph != null) {
+            return resultGraph;
+        }
 
-        if (resultGraph == null) {
-            resultGraph = Debug.sandbox("TruffleCache", new Object[]{metaAccessProvider, method}, DebugScope.getConfig(), new Callable<StructuredGraph>() {
-
-                public StructuredGraph call() {
-                    StructuredGraph newGraph = parseGraph(method).copy();
-
-                    // Get stamps from actual arguments.
-                    List<Stamp> stamps = new ArrayList<>();
-                    for (ValueNode arg : arguments) {
-                        stamps.add(arg.stamp());
-                    }
-
-                    if (cache.containsKey(method)) {
-                        // Make sure stamps are generalized based on previous stamps.
-                        StructuredGraph graph = cache.get(method);
-                        for (LocalNode localNode : graph.getNodes(LocalNode.class)) {
-                            int index = localNode.index();
-                            Stamp stamp = stamps.get(index);
-                            stamps.set(index, stamp.meet(localNode.stamp()));
-                        }
-                    }
-
-                    // Set stamps into graph before optimizing.
-                    List<Node> modifiedLocals = new ArrayList<>(arguments.size());
-                    for (LocalNode localNode : newGraph.getNodes(LocalNode.class)) {
-                        int index = localNode.index();
-                        Stamp stamp = stamps.get(index);
-
-                        if (!stamp.equals(localNode.stamp())) {
-                            localNode.setStamp(stamp);
-                            modifiedLocals.add(localNode);
-                        }
-                    }
-
-                    Assumptions tmpAssumptions = new Assumptions(false);
-
-                    optimizeGraph(newGraph, tmpAssumptions, newGraph.getNodes().snapshot());
-
-                    PhaseContext context = new PhaseContext(metaAccessProvider, tmpAssumptions, replacements);
-                    PartialEscapePhase partialEscapePhase = new PartialEscapePhase(false, new CanonicalizerPhase(!AOTCompilation.getValue()));
-                    partialEscapePhase.apply(newGraph, context);
-
-                    cache.put(method, newGraph);
-                    if (TruffleCompilerOptions.TraceTruffleCacheDetails.getValue()) {
-                        TTY.println(String.format("[truffle] added to graph cache method %s with %d nodes.", method, newGraph.getNodeCount()));
-                    }
-                    return newGraph;
-                }
-            });
-        }
-        return resultGraph;
-    }
-
-    private void optimizeGraph(StructuredGraph newGraph, Assumptions assumptions, Iterable<Node> changedNodes) {
-        PhaseContext context = new PhaseContext(metaAccessProvider, assumptions, replacements);
-        ConditionalEliminationPhase conditionalEliminationPhase = new ConditionalEliminationPhase(metaAccessProvider);
-        ConvertDeoptimizeToGuardPhase convertDeoptimizeToGuardPhase = new ConvertDeoptimizeToGuardPhase();
-        CanonicalizerPhase canonicalizerPhase = new CanonicalizerPhase(!AOTCompilation.getValue());
-        EarlyReadEliminationPhase readEliminationPhase = new EarlyReadEliminationPhase(canonicalizerPhase);
-
-        int maxNodes = TruffleCompilerOptions.TruffleOperationCacheMaxNodes.getValue();
-
-        contractGraph(newGraph, conditionalEliminationPhase, convertDeoptimizeToGuardPhase, canonicalizerPhase, readEliminationPhase, changedNodes, context);
-
-        while (newGraph.getNodeCount() <= maxNodes) {
-
-            int mark = newGraph.getMark();
-
-            expandGraph(newGraph, maxNodes);
-            NodeIterable<Node> newNodes = newGraph.getNewNodes(mark);
-
-            if (newNodes.isEmpty()) {
-                // No progress => exit iterative optimization.
-                break;
-            }
-
-            contractGraph(newGraph, conditionalEliminationPhase, convertDeoptimizeToGuardPhase, canonicalizerPhase, readEliminationPhase, newNodes, context);
+        if (resultGraph == markerGraph) {
+            // Avoid recursive inline.
+            return null;
         }
 
-        if (newGraph.getNodeCount() > maxNodes && (TruffleCompilerOptions.TraceTruffleCacheDetails.getValue() || TruffleCompilerOptions.TraceTrufflePerformanceWarnings.getValue())) {
-            TTY.println(String.format("[truffle] PERFORMANCE WARNING: method %s got too large with %d nodes.", newGraph.method(), newGraph.getNodeCount()));
-        }
-    }
-
-    private static void contractGraph(StructuredGraph newGraph, ConditionalEliminationPhase conditionalEliminationPhase, ConvertDeoptimizeToGuardPhase convertDeoptimizeToGuardPhase,
-                    CanonicalizerPhase canonicalizerPhase, EarlyReadEliminationPhase readEliminationPhase, Iterable<Node> newNodes, PhaseContext context) {
-
-        // Canonicalize / constant propagate.
-        canonicalizerPhase.applyIncremental(newGraph, context, newNodes);
+        cache.put(key, markerGraph);
+        resultGraph = Debug.scope("TruffleCache", new Object[]{metaAccessProvider, method}, new Callable<StructuredGraph>() {
 
-        // Early read eliminiation
-        readEliminationPhase.apply(newGraph, context);
-
-        // Convert deopt to guards.
-        convertDeoptimizeToGuardPhase.apply(newGraph);
-
-        // Conditional elimination.
-        conditionalEliminationPhase.apply(newGraph);
-    }
-
-    private void expandGraph(StructuredGraph newGraph, int maxNodes) {
-        NodeBitMap visitedNodes = newGraph.createNodeBitMap(true);
-        Queue<AbstractBeginNode> workQueue = new LinkedList<>();
-        workQueue.add(newGraph.start());
+            public StructuredGraph call() {
 
-        while (!workQueue.isEmpty() && newGraph.getNodeCount() <= maxNodes) {
-            AbstractBeginNode start = workQueue.poll();
-            expandPath(newGraph, maxNodes, visitedNodes, start, workQueue);
-        }
-    }
-
-    private void expandPath(StructuredGraph newGraph, int maxNodes, NodeBitMap visitedNodes, AbstractBeginNode start, Queue<AbstractBeginNode> workQueue) {
-        if (start.isDeleted()) {
-            return;
-        }
+                final StructuredGraph graph = new StructuredGraph(method);
+                PhaseContext context = new PhaseContext(metaAccessProvider, new Assumptions(false), replacements);
+                new GraphBuilderPhase(metaAccessProvider, config, optimisticOptimizations).apply(graph);
 
-        FixedNode next = start;
-        while (!visitedNodes.isMarked(next)) {
-            visitedNodes.mark(next);
-            if (next instanceof Invoke) {
-                Invoke invoke = (Invoke) next;
-                next = expandInvoke(invoke);
-                if (newGraph.getNodeCount() > maxNodes) {
-                    return;
-                }
-            }
-
-            if (next instanceof InvokeWithExceptionNode) {
-                InvokeWithExceptionNode invokeWithExceptionNode = (InvokeWithExceptionNode) next;
-                next = invokeWithExceptionNode.next();
-            } else if (next instanceof IfNode && isAssertionsEnabledCondition(((IfNode) next).condition())) {
-                next = ((IfNode) next).falseSuccessor();
-            } else if (next instanceof ControlSplitNode) {
-                ControlSplitNode controlSplitNode = (ControlSplitNode) next;
-                AbstractBeginNode maxProbNode = null;
-                for (Node succ : controlSplitNode.cfgSuccessors()) {
-                    AbstractBeginNode successor = (AbstractBeginNode) succ;
-                    if (maxProbNode == null || controlSplitNode.probability(successor) > controlSplitNode.probability(maxProbNode)) {
-                        maxProbNode = successor;
+                for (LocalNode l : graph.getNodes(LocalNode.class)) {
+                    if (l.kind() == Kind.Object) {
+                        ValueNode actualArgument = arguments.get(l.index());
+                        l.setStamp(l.stamp().join(actualArgument.stamp()));
                     }
                 }
-                for (Node succ : controlSplitNode.cfgSuccessors()) {
-                    AbstractBeginNode successor = (AbstractBeginNode) succ;
-                    if (successor != maxProbNode) {
-                        workQueue.add(successor);
+
+                // Intrinsify methods.
+                new ReplaceIntrinsicsPhase(replacements).apply(graph);
+
+                // Convert deopt to guards.
+                new ConvertDeoptimizeToGuardPhase().apply(graph);
+
+                CanonicalizerPhase canonicalizerPhase = new CanonicalizerPhase(!AOTCompilation.getValue());
+
+                // Canonicalize / constant propagate.
+                canonicalizerPhase.apply(graph, context);
+
+                int mark = graph.getMark();
+                for (MethodCallTargetNode methodCallTarget : graph.getNodes(MethodCallTargetNode.class)) {
+                    if (graph.getMark() != mark) {
+                        canonicalizerPhase.applyIncremental(graph, context, mark);
+                        mark = graph.getMark();
                     }
+                    String name = methodCallTarget.targetName();
+                    expandInvoke(methodCallTarget.invoke());
                 }
-                next = maxProbNode;
-            } else if (next instanceof EndNode) {
-                EndNode endNode = (EndNode) next;
-                next = endNode.merge();
-            } else if (next instanceof ControlSinkNode) {
-                return;
-            } else if (next instanceof FixedWithNextNode) {
-                FixedWithNextNode fixedWithNextNode = (FixedWithNextNode) next;
-                next = fixedWithNextNode.next();
+
+                // Convert deopt to guards.
+                new ConvertDeoptimizeToGuardPhase().apply(graph);
+
+                // Canonicalize / constant propagate.
+                canonicalizerPhase.apply(graph, context);
+
+                // Conditional elimination.
+                ConditionalEliminationPhase conditionalEliminationPhase = new ConditionalEliminationPhase(metaAccessProvider);
+                conditionalEliminationPhase.apply(graph);
+
+                if (TruffleCompilerOptions.TraceTruffleCacheDetails.getValue()) {
+                    TTY.println(String.format("[truffle] added to graph cache method %s with %d nodes.", method, graph.getNodeCount()));
+                }
+                return graph;
             }
-        }
-    }
-
-    private static boolean isAssertionsEnabledCondition(LogicNode condition) {
-        if (condition instanceof IntegerEqualsNode) {
-            IntegerEqualsNode equalsNode = (IntegerEqualsNode) condition;
-            if (equalsNode.x() instanceof LoadFieldNode && equalsNode.y().isConstant()) {
-                LoadFieldNode loadFieldNode = (LoadFieldNode) equalsNode.x();
-                if (loadFieldNode.isStatic() && loadFieldNode.field().getName().equals("$assertionsDisabled") && loadFieldNode.field().isSynthetic()) {
-                    return ((ConstantNode) equalsNode.y()).value.equals(Constant.INT_0);
-                }
-            }
-        }
-        return false;
+        });
+        cache.put(key, resultGraph);
+        return resultGraph;
     }
 
     private FixedNode expandInvoke(Invoke invoke) {
@@ -270,11 +157,15 @@
                         public StructuredGraph call() {
                             StructuredGraph inlineGraph = replacements.getMethodSubstitution(methodCallTargetNode.targetMethod());
                             if (inlineGraph == null) {
-                                inlineGraph = parseGraph(methodCallTargetNode.targetMethod());
+                                inlineGraph = TruffleCache.this.lookup(methodCallTargetNode.targetMethod(), methodCallTargetNode.arguments(), null, null);
                             }
                             return inlineGraph;
                         }
                     });
+                    if (inlinedGraph == null) {
+                        // Can happen for recursive calls.
+                        return invoke.asNode();
+                    }
                     FixedNode fixedNode = (FixedNode) invoke.predecessor();
                     InliningUtil.inline(invoke, inlinedGraph, true);
                     return fixedNode;
@@ -283,49 +174,4 @@
         }
         return invoke.asNode();
     }
-
-    private StructuredGraph parseGraph(final ResolvedJavaMethod method) {
-        if (rawCache.containsKey(method)) {
-            return rawCache.get(method);
-        }
-
-        StructuredGraph resultGraph = Debug.sandbox("InnerTruffleCache", new Object[]{metaAccessProvider, method}, DebugScope.getConfig(), new Callable<StructuredGraph>() {
-
-            public StructuredGraph call() {
-                final StructuredGraph graph = new StructuredGraph(method);
-                new GraphBuilderPhase(metaAccessProvider, config, optimisticOptimizations).apply(graph);
-                // Intrinsify methods.
-                new ReplaceIntrinsicsPhase(replacements).apply(graph);
-                for (DeoptimizeNode d : graph.getNodes(DeoptimizeNode.class)) {
-                    if (d.getDeoptimizationReason() == DeoptimizationReason.Unresolved) {
-                        // Cannot store this graph.
-                        return graph;
-                    }
-                }
-                rawCache.put(method, graph);
-                return graph;
-            }
-        });
-        return resultGraph;
-    }
-
-    private static boolean checkArgumentStamps(StructuredGraph graph, NodeInputList<ValueNode> arguments) {
-        assert graph.getNodes(LocalNode.class).count() <= arguments.count();
-        FrameState startState = graph.start().stateAfter();
-        for (int i = 0; i < arguments.size(); i++) {
-            ValueNode localNode = startState.localAt(i);
-            if (localNode != null) {
-                Stamp newStamp = localNode.stamp().meet(arguments.get(i).stamp());
-                if (!newStamp.equals(localNode.stamp())) {
-                    if (TruffleCompilerOptions.TraceTruffleCacheDetails.getValue()) {
-                        TTY.println(String.format("[truffle] graph cache entry too specific for method %s argument %s previous stamp %s new stamp %s.", graph.method(), localNode, localNode.stamp(),
-                                        newStamp));
-                    }
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
 }
diff -r 23d91654c363 -r 9c9bc8c6a0df graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java	Wed Sep 18 21:57:23 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java	Thu Sep 19 01:07:07 2013 +0200
@@ -77,7 +77,7 @@
         this.graalRuntime = HotSpotGraalRuntime.graalRuntime();
         this.skippedExceptionTypes = getSkippedExceptionTypes(metaAccessProvider);
 
-        final GraphBuilderConfiguration config = GraphBuilderConfiguration.getDefault();
+        final GraphBuilderConfiguration config = GraphBuilderConfiguration.getEagerDefault();
         config.setSkippedExceptionTypes(skippedExceptionTypes);
         this.truffleCache = new TruffleCache(this.runtime, config, TruffleCompilerImpl.Optimizations, this.replacements);