forked from oracle/graal
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GR-15757] Record speculations for TruffleBoundary methods assumed no…
…t to throw. PullRequest: graal/3567
- Loading branch information
Showing
16 changed files
with
293 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
...piler/src/org/graalvm/compiler/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright (c) 2019, 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. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * 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 org.graalvm.compiler.truffle.compiler.nodes; | ||
|
|
||
| import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; | ||
| import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; | ||
|
|
||
| import org.graalvm.compiler.core.common.type.StampFactory; | ||
| import org.graalvm.compiler.graph.Node; | ||
| import org.graalvm.compiler.graph.NodeClass; | ||
| import org.graalvm.compiler.graph.spi.Canonicalizable; | ||
| import org.graalvm.compiler.graph.spi.CanonicalizerTool; | ||
| import org.graalvm.compiler.nodeinfo.NodeInfo; | ||
| import org.graalvm.compiler.nodes.DeoptimizeNode; | ||
| import org.graalvm.compiler.nodes.FixedWithNextNode; | ||
| import org.graalvm.compiler.truffle.compiler.PartialEvaluator; | ||
|
|
||
| import jdk.vm.ci.meta.DeoptimizationAction; | ||
| import jdk.vm.ci.meta.DeoptimizationReason; | ||
| import jdk.vm.ci.meta.ResolvedJavaMethod; | ||
| import jdk.vm.ci.meta.SpeculationLog; | ||
| import jdk.vm.ci.meta.SpeculationLog.Speculation; | ||
| import jdk.vm.ci.meta.SpeculationLog.SpeculationReason; | ||
|
|
||
| /** | ||
| * A speculation-less node that is inserted into the exception branch of TruffleBoundary calls | ||
| * during parsing (graph encoding). During partial evaluation (graph decoding) when a speculation | ||
| * log is available, it will speculate that TruffleBoundary method will not throw and either becomes | ||
| * a control-flow sink {@link DeoptimizeNode} with the {@link Speculation} in order to off the | ||
| * branch, or if the speculation has already failed for this compilation root, disappears. | ||
| */ | ||
| @NodeInfo(cycles = CYCLES_0, size = SIZE_0) | ||
| public final class SpeculativeExceptionAnchorNode extends FixedWithNextNode implements Canonicalizable { | ||
|
|
||
| public static final NodeClass<SpeculativeExceptionAnchorNode> TYPE = NodeClass.create(SpeculativeExceptionAnchorNode.class); | ||
|
|
||
| private final DeoptimizationReason reason; | ||
| private final DeoptimizationAction action; | ||
| private final ResolvedJavaMethod targetMethod; | ||
|
|
||
| public SpeculativeExceptionAnchorNode(DeoptimizationReason reason, DeoptimizationAction action, ResolvedJavaMethod targetMethod) { | ||
| super(TYPE, StampFactory.forVoid()); | ||
| this.reason = reason; | ||
| this.action = action; | ||
| this.targetMethod = targetMethod; | ||
| } | ||
|
|
||
| @Override | ||
| public Node canonical(CanonicalizerTool tool) { | ||
| SpeculationLog speculationLog = graph().getSpeculationLog(); | ||
| if (speculationLog != null) { | ||
| SpeculationReason speculationReason = PartialEvaluator.createTruffleBoundaryExceptionSpeculation(targetMethod); | ||
| if (speculationLog.maySpeculate(speculationReason)) { | ||
| Speculation exceptionSpeculation = speculationLog.speculate(speculationReason); | ||
| return new DeoptimizeNode(action, reason, exceptionSpeculation); | ||
| } | ||
| return null; | ||
| } | ||
| return this; | ||
| } | ||
| } |
68 changes: 68 additions & 0 deletions
68
...compiler/src/org/graalvm/compiler/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright (c) 2019, 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. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * 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 org.graalvm.compiler.truffle.compiler.phases; | ||
|
|
||
| import java.util.function.Predicate; | ||
|
|
||
| import org.graalvm.compiler.nodes.AbstractBeginNode; | ||
| import org.graalvm.compiler.nodes.FixedWithNextNode; | ||
| import org.graalvm.compiler.nodes.Invoke; | ||
| import org.graalvm.compiler.nodes.InvokeWithExceptionNode; | ||
| import org.graalvm.compiler.nodes.StructuredGraph; | ||
| import org.graalvm.compiler.phases.Phase; | ||
| import org.graalvm.compiler.truffle.compiler.nodes.SpeculativeExceptionAnchorNode; | ||
|
|
||
| import jdk.vm.ci.meta.DeoptimizationAction; | ||
| import jdk.vm.ci.meta.DeoptimizationReason; | ||
| import jdk.vm.ci.meta.ResolvedJavaMethod; | ||
|
|
||
| /** | ||
| * Instruments the exception edge of TruffleBoundary method calls with a speculative transfer to | ||
| * interpreter. | ||
| */ | ||
| public class DeoptimizeOnExceptionPhase extends Phase { | ||
| private final Predicate<ResolvedJavaMethod> deoptimizeOnExceptionPredicate; | ||
|
|
||
| public DeoptimizeOnExceptionPhase(Predicate<ResolvedJavaMethod> deoptimizeOnExceptionPredicate) { | ||
| this.deoptimizeOnExceptionPredicate = deoptimizeOnExceptionPredicate; | ||
| } | ||
|
|
||
| @Override | ||
| protected void run(StructuredGraph graph) { | ||
| for (Invoke invoke : graph.getInvokes()) { | ||
| if (invoke instanceof InvokeWithExceptionNode) { | ||
| InvokeWithExceptionNode invokeWithException = (InvokeWithExceptionNode) invoke; | ||
| ResolvedJavaMethod targetMethod = invokeWithException.callTarget().targetMethod(); | ||
| if (deoptimizeOnExceptionPredicate.test(targetMethod)) { | ||
| // Method has @TruffleBoundary(transferToInterpreterOnException=true) | ||
| // Note: Speculation is inserted during PE. | ||
| AbstractBeginNode exceptionEdge = invokeWithException.exceptionEdge(); | ||
| FixedWithNextNode newNode = graph.add(new SpeculativeExceptionAnchorNode(DeoptimizationReason.TransferToInterpreter, DeoptimizationAction.InvalidateRecompile, targetMethod)); | ||
| graph.addAfterFixed(exceptionEdge, newNode); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.