# HG changeset patch # User Gilles Duboscq # Date 1379585696 -7200 # Node ID 45570e4fe8a9353638c7e57d26d3ae4e258502cb # Parent c8d0d5ff846e74de2147a280766607874593f9b9 Group Deoptimization which have the same FrameState diff -r c8d0d5ff846e -r 45570e4fe8a9 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java Thu Sep 19 10:51:30 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java Thu Sep 19 12:14:56 2013 +0200 @@ -89,6 +89,8 @@ appendPhase(new FrameStateAssignmentPhase()); + appendPhase(new DeoptimizationGroupingPhase()); + if (OptCanonicalizer.getValue()) { appendPhase(canonicalizer); } diff -r c8d0d5ff846e -r 45570e4fe8a9 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeoptimizationGroupingPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeoptimizationGroupingPhase.java Thu Sep 19 12:14:56 2013 +0200 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2013, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.phases.common; + +import java.util.*; + +import com.oracle.graal.nodes.*; +import com.oracle.graal.phases.*; + +/** + * This phase tries to find {@link DeoptimizeNode DeoptimizeNodes} which use the same + * {@link FrameState} and merges them together. + */ +public class DeoptimizationGroupingPhase extends Phase { + + @Override + protected void run(StructuredGraph graph) { + for (FrameState fs : graph.getNodes(FrameState.class)) { + FixedNode target = null; + List obsoletes = null; + for (DeoptimizeNode deopt : fs.usages().filter(DeoptimizeNode.class)) { + if (target == null) { + target = deopt; + } else { + MergeNode merge; + if (target instanceof DeoptimizeNode) { + merge = graph.add(new MergeNode()); + EndNode firstEnd = graph.add(new EndNode()); + merge.addForwardEnd(firstEnd); + target.predecessor().replaceFirstSuccessor(target, firstEnd); + merge.setNext(target); + obsoletes = new LinkedList<>(); + target = merge; + } else { + merge = (MergeNode) target; + } + EndNode newEnd = graph.add(new EndNode()); + merge.addForwardEnd(newEnd); + deopt.predecessor().replaceFirstSuccessor(deopt, newEnd); + obsoletes.add(deopt); + } + } + if (obsoletes != null) { + for (DeoptimizeNode obsolete : obsoletes) { + obsolete.safeDelete(); + } + } + } + } +}