# HG changeset patch # User Lukas Stadler # Date 1374146257 -7200 # Node ID d3a677910eea410cc39539c4f750e1b7d82c24ec # Parent f272fe8a2f9a3ea74236693ca4e5a40efef64bfa new ValueAnchorCleanupPhase to make lock elimination work again, tests for lock elimination diff -r f272fe8a2f9a -r d3a677910eea graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LockEliminationTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LockEliminationTest.java Thu Jul 18 13:17:37 2013 +0200 @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2011, 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.compiler.test; + +import java.lang.reflect.*; + +import org.junit.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.spi.Lowerable.LoweringType; +import com.oracle.graal.phases.*; +import com.oracle.graal.phases.common.*; +import com.oracle.graal.phases.tiers.*; + +public class LockEliminationTest extends GraalCompilerTest { + + static class A { + + int value; + + public synchronized int getValue() { + return value; + } + } + + static int field1; + static int field2; + + public static void testSynchronizedSnippet(A x, A y) { + synchronized (x) { + field1 = x.value; + } + synchronized (x) { + field2 = y.value; + } + } + + @Test + public void testLock() { + test("testSynchronizedSnippet", new A(), new A()); + + StructuredGraph graph = getGraph("testSynchronizedSnippet"); + new CanonicalizerPhase.Instance(runtime(), null, true).apply(graph); + new LockEliminationPhase().apply(graph); + assertEquals(1, graph.getNodes().filter(MonitorEnterNode.class).count()); + assertEquals(1, graph.getNodes().filter(MonitorExitNode.class).count()); + } + + public static void testSynchronizedMethodSnippet(A x) { + int value1 = x.getValue(); + int value2 = x.getValue(); + field1 = value1; + field2 = value2; + } + + @Test + public void testSynchronizedMethod() { + test("testSynchronizedMethodSnippet", new A()); + + StructuredGraph graph = getGraph("testSynchronizedMethodSnippet"); + new CanonicalizerPhase.Instance(runtime(), null, true).apply(graph); + new LockEliminationPhase().apply(graph); + assertEquals(1, graph.getNodes().filter(MonitorEnterNode.class).count()); + assertEquals(1, graph.getNodes().filter(MonitorExitNode.class).count()); + } + + private StructuredGraph getGraph(String snippet) { + Method method = getMethod(snippet); + StructuredGraph graph = parse(method); + PhasePlan phasePlan = getDefaultPhasePlan(); + Assumptions assumptions = new Assumptions(true); + new CanonicalizerPhase.Instance(runtime(), assumptions, true).apply(graph); + new InliningPhase(runtime(), null, replacements, assumptions, null, phasePlan, OptimisticOptimizations.ALL).apply(graph); + new CanonicalizerPhase.Instance(runtime(), assumptions, true).apply(graph); + new DeadCodeEliminationPhase().apply(graph); + new LoweringPhase(LoweringType.BEFORE_GUARDS).apply(graph, new PhaseContext(runtime, assumptions, replacements)); + new ValueAnchorCleanupPhase().apply(graph); + new LockEliminationPhase().apply(graph); + return graph; + } + +} diff -r f272fe8a2f9a -r d3a677910eea 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 Jul 18 13:16:37 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java Thu Jul 18 13:17:37 2013 +0200 @@ -42,6 +42,7 @@ appendPhase(canonicalizer); } + appendPhase(new ValueAnchorCleanupPhase()); appendPhase(new LockEliminationPhase()); if (OptFloatingReads.getValue()) { diff -r f272fe8a2f9a -r d3a677910eea graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Thu Jul 18 13:16:37 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Thu Jul 18 13:17:37 2013 +0200 @@ -24,10 +24,8 @@ import static com.oracle.graal.graph.iterators.NodePredicates.*; -import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; @@ -65,6 +63,14 @@ this.anchored.remove(value); } + public NodeInputList getAnchoredNodes() { + return anchored; + } + + public boolean isPermanent() { + return permanent; + } + @Override public ValueNode canonical(CanonicalizerTool tool) { if (permanent) { diff -r f272fe8a2f9a -r d3a677910eea graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ValueAnchorCleanupPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ValueAnchorCleanupPhase.java Thu Jul 18 13:17:37 2013 +0200 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 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.graph.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.phases.*; +import com.oracle.graal.phases.graph.*; + +/** + * This phase performs a bit of hygiene on {@link ValueAnchorNode} by removing inputs that have + * already been anchored in a dominating value anchor. Value anchors that lose their last input, + * have no usages and are not marked as permanent are removed. + */ +public class ValueAnchorCleanupPhase extends Phase { + + private static class State extends MergeableState { + + private final HashSet anchoredValues; + + public State() { + anchoredValues = new HashSet<>(); + } + + public State(State other) { + anchoredValues = new HashSet<>(other.anchoredValues); + } + + @Override + public boolean merge(MergeNode merge, List withStates) { + for (State other : withStates) { + anchoredValues.retainAll(other.anchoredValues); + } + return true; + } + + @Override + public State clone() { + return new State(this); + } + } + + private static class CleanupValueAnchorsClosure extends PostOrderNodeIterator { + + public CleanupValueAnchorsClosure(FixedNode start) { + super(start, new State()); + } + + @Override + protected void node(FixedNode node) { + if (node instanceof ValueAnchorNode) { + ValueAnchorNode anchor = (ValueAnchorNode) node; + for (ValueNode anchored : anchor.getAnchoredNodes().snapshot()) { + if (state.anchoredValues.contains(anchored)) { + anchor.removeAnchoredNode(anchored); + } else { + state.anchoredValues.add(anchored); + } + } + if (!anchor.isPermanent() && anchor.getAnchoredNodes().isEmpty() && anchor.usages().isEmpty()) { + node.graph().removeFixed(anchor); + } + } + } + } + + @Override + protected void run(StructuredGraph graph) { + CleanupValueAnchorsClosure closure = new CleanupValueAnchorsClosure(graph.start()); + closure.apply(); + } +}