truffle: graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java annotate

annotate graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java @ 11600:60f4c505993e

remove global phase metric, replaced with per-phase metrics

author	Doug Simon <doug.simon@oracle.com>
date	Tue, 10 Sep 2013 22:13:46 +0200
parents	c69df2e602f4
children	8d0303d8dbde

rev	line source
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1 /*
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	2 * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	4 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	5 * This code is free software; you can redistribute it and/or modify it
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	7 * published by the Free Software Foundation.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	8 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	13 * accompanied this code).
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	14 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	15 * You should have received a copy of the GNU General Public License version
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	18 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	20 * or visit www.oracle.com if you need additional information or have any
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	21 * questions.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	22 */
6526 ee651c726397 split phases out of graal.phases project into graal.phases.common project Doug Simon <doug.simon@oracle.com> parents: 6525 diff changeset	23 package com.oracle.graal.phases.common;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	24
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	25 import static com.oracle.graal.phases.GraalOptions.*;
9987 b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	26 import static com.oracle.graal.phases.common.InliningPhase.Options.*;
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	27
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	28 import java.util.*;
7879 1474fe91323c create debug scope for graph building during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 7827 diff changeset	29 import java.util.concurrent.*;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	30
5510 426c605c9d3c Move cri.ci to api.code. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	31 import com.oracle.graal.api.code.*;
5507 dc71b06d09f8 Moving classes from cri.ri to api.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5503 diff changeset	32 import com.oracle.graal.api.meta.*;
5060 4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	33 import com.oracle.graal.debug.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	34 import com.oracle.graal.graph.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	35 import com.oracle.graal.nodes.*;
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	36 import com.oracle.graal.nodes.java.*;
5720 46ad94a0574a moved everything from com.oracle.graal.nodes.cri into com.oracle.graal.nodes.spi Doug Simon <doug.simon@oracle.com> parents: 5718 diff changeset	37 import com.oracle.graal.nodes.spi.*;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	38 import com.oracle.graal.nodes.type.*;
9238 8f01fe16e473 refactorings and cleanups for the removal of FixedNode.probability Christian Haeubl <haeubl@ssw.jku.at> parents: 9234 diff changeset	39 import com.oracle.graal.nodes.util.*;
9855 6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	40 import com.oracle.graal.options.*;
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	41 import com.oracle.graal.phases.PhasePlan.PhasePosition;
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	42 import com.oracle.graal.phases.common.InliningUtil.InlineInfo;
9921 26785bb7006d Refactorings for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9722 diff changeset	43 import com.oracle.graal.phases.common.InliningUtil.Inlineable;
10935 2da7f2efe6e2 Move inlining phases to HighTier. Roland Schatz <roland.schatz@oracle.com> parents: 10934 diff changeset	44 import com.oracle.graal.phases.common.InliningUtil.InlineableGraph;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	45 import com.oracle.graal.phases.common.InliningUtil.InlineableMacroNode;
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	46 import com.oracle.graal.phases.common.InliningUtil.InliningPolicy;
9238 8f01fe16e473 refactorings and cleanups for the removal of FixedNode.probability Christian Haeubl <haeubl@ssw.jku.at> parents: 9234 diff changeset	47 import com.oracle.graal.phases.graph.*;
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	48 import com.oracle.graal.phases.tiers.*;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	49
10935 2da7f2efe6e2 Move inlining phases to HighTier. Roland Schatz <roland.schatz@oracle.com> parents: 10934 diff changeset	50 public class InliningPhase extends AbstractInliningPhase {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	51
9987 b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	52 static class Options {
b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	53
b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	54 // @formatter:off
b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	55 @Option(help = "Unconditionally inline intrinsics")
b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	56 public static final OptionValue<Boolean> AlwaysInlineIntrinsics = new OptionValue<>(false);
b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	57 // @formatter:on
b270f0856a39 fixed issues detected by VerifyHotSpotOptionsPhase Doug Simon <doug.simon@oracle.com> parents: 9961 diff changeset	58 }
9855 6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	59
4468 87a12a816e99 added C1 inlining policy for comparison, bugfixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4461 diff changeset	60 private final InliningPolicy inliningPolicy;
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	61 private final CanonicalizerPhase canonicalizer;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	62
8548 51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	63 private int inliningCount;
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	64 private int maxMethodPerInlining = Integer.MAX_VALUE;
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	65
4348 d49c90e641cb Remove GraalMetrics, replace with new syntax for metrics. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4205 diff changeset	66 // Metrics
4356 249752adcb8d Rename Timer DebugTimer and Metric DebugMetric. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4352 diff changeset	67 private static final DebugMetric metricInliningPerformed = Debug.metric("InliningPerformed");
249752adcb8d Rename Timer DebugTimer and Metric DebugMetric. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4352 diff changeset	68 private static final DebugMetric metricInliningConsidered = Debug.metric("InliningConsidered");
4598 6a44a26ed9e6 set default inlining policy to the greedy one Christian Haeubl <christian.haeubl@oracle.com> parents: 4594 diff changeset	69 private static final DebugMetric metricInliningStoppedByMaxDesiredSize = Debug.metric("InliningStoppedByMaxDesiredSize");
11600 60f4c505993e remove global phase metric, replaced with per-phase metrics Doug Simon <doug.simon@oracle.com> parents: 11567 diff changeset	70 private static final DebugMetric metricInliningRuns = Debug.metric("InliningRuns");
4348 d49c90e641cb Remove GraalMetrics, replace with new syntax for metrics. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4205 diff changeset	71
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	72 public InliningPhase(CanonicalizerPhase canonicalizer) {
10934 e2333d8c72b1 Make InliningPhase reentrant. Roland Schatz <roland.schatz@oracle.com> parents: 10933 diff changeset	73 this(new GreedyInliningPolicy(null), canonicalizer);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	74 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	75
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	76 public InliningPhase(Map<Invoke, Double> hints, CanonicalizerPhase canonicalizer) {
c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	77 this(new GreedyInliningPolicy(hints), canonicalizer);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	78 }
8618 832b9a115a2d style fixes Christian Haeubl <haeubl@ssw.jku.at> parents: 8617 diff changeset	79
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	80 public InliningPhase(InliningPolicy policy, CanonicalizerPhase canonicalizer) {
10934 e2333d8c72b1 Make InliningPhase reentrant. Roland Schatz <roland.schatz@oracle.com> parents: 10933 diff changeset	81 this.inliningPolicy = policy;
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	82 this.canonicalizer = canonicalizer;
8617 6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	83 }
8618 832b9a115a2d style fixes Christian Haeubl <haeubl@ssw.jku.at> parents: 8617 diff changeset	84
8617 6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	85 public void setMaxMethodsPerInlining(int max) {
6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	86 maxMethodPerInlining = max;
6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	87 }
8618 832b9a115a2d style fixes Christian Haeubl <haeubl@ssw.jku.at> parents: 8617 diff changeset	88
8548 51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	89 public int getInliningCount() {
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	90 return inliningCount;
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	91 }
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	92
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	93 public static void storeStatisticsAfterLowTier(StructuredGraph graph) {
9705 de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	94 ResolvedJavaMethod method = graph.method();
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	95 if (method != null) {
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	96 CompiledMethodInfo info = compiledMethodInfo(graph.method());
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	97 info.setLowLevelNodeCount(graph.getNodeCount());
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	98 }
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	99 }
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	100
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	101 @Override
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	102 protected void run(final StructuredGraph graph, final HighTierContext context) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	103 final InliningData data = new InliningData(graph, context.getAssumptions());
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	104
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	105 while (data.hasUnprocessedGraphs()) {
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	106 final MethodInvocation currentInvocation = data.currentInvocation();
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	107 GraphInfo graphInfo = data.currentGraph();
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	108 if (!currentInvocation.isRoot() &&
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	109 !inliningPolicy.isWorthInlining(context.getReplacements(), currentInvocation.callee(), data.inliningDepth(), currentInvocation.probability(),
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	110 currentInvocation.relevance(), false)) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	111 int remainingGraphs = currentInvocation.totalGraphs() - currentInvocation.processedGraphs();
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	112 assert remainingGraphs > 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	113 data.popGraphs(remainingGraphs);
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	114 data.popInvocation();
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	115 } else if (graphInfo.hasRemainingInvokes() && inliningPolicy.continueInlining(graphInfo.graph())) {
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	116 processNextInvoke(data, graphInfo, context);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	117 } else {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	118 data.popGraph();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	119 if (!currentInvocation.isRoot()) {
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	120 assert currentInvocation.callee().invoke().asNode().isAlive();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	121 currentInvocation.incrementProcessedGraphs();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	122 if (currentInvocation.processedGraphs() == currentInvocation.totalGraphs()) {
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	123 data.popInvocation();
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	124 final MethodInvocation parentInvoke = data.currentInvocation();
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	125 Debug.scope("Inlining", data.inliningContext(), new Runnable() {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	126
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	127 @Override
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	128 public void run() {
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	129 tryToInline(data.currentGraph(), currentInvocation, parentInvoke, data.inliningDepth() + 1, context);
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	130 }
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	131 });
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	132
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	133 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	134 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	135 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	136 }
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	137
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	138 assert data.inliningDepth() == 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	139 assert data.graphCount() == 0;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	140 }
5316 8ac40aed34bf Consistent output of inlining decisions. Make all inlining decisions be printable using -G:Log=InliningDecisions Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5299 diff changeset	141
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	142 /**
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	143 * Process the next invoke and enqueue all its graphs for processing.
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	144 */
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	145 private void processNextInvoke(InliningData data, GraphInfo graphInfo, HighTierContext context) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	146 Invoke invoke = graphInfo.popInvoke();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	147 MethodInvocation callerInvocation = data.currentInvocation();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	148 Assumptions parentAssumptions = callerInvocation.assumptions();
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	149 InlineInfo info = InliningUtil.getInlineInfo(data, invoke, maxMethodPerInlining, context.getReplacements(), parentAssumptions, context.getOptimisticOptimizations());
9234 b9cf7d0b598e removal of FixedNode.probability (draft) Christian Haeubl <haeubl@ssw.jku.at> parents: 9147 diff changeset	150
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	151 if (info != null) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	152 double invokeProbability = graphInfo.invokeProbability(invoke);
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	153 double invokeRelevance = graphInfo.invokeRelevance(invoke);
9961 a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	154 MethodInvocation calleeInvocation = data.pushInvocation(info, parentAssumptions, invokeProbability, invokeRelevance);
9234 b9cf7d0b598e removal of FixedNode.probability (draft) Christian Haeubl <haeubl@ssw.jku.at> parents: 9147 diff changeset	155
9961 a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	156 for (int i = 0; i < info.numberOfMethods(); i++) {
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	157 Inlineable elem = getInlineableElement(info.methodAt(i), info.invoke(), context.replaceAssumptions(calleeInvocation.assumptions()));
9961 a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	158 info.setInlinableElement(i, elem);
a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	159 if (elem instanceof InlineableGraph) {
a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	160 data.pushGraph(((InlineableGraph) elem).getGraph(), invokeProbability * info.probabilityAt(i), invokeRelevance * info.relevanceAt(i));
a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	161 } else {
a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	162 assert elem instanceof InlineableMacroNode;
a91b0d42917f Slightly simplified inlining policy. Christian Haeubl <haeubl@ssw.jku.at> parents: 9930 diff changeset	163 data.pushDummyGraph();
5316 8ac40aed34bf Consistent output of inlining decisions. Make all inlining decisions be printable using -G:Log=InliningDecisions Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5299 diff changeset	164 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	165 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	166 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	167 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	168
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	169 private void tryToInline(GraphInfo callerGraphInfo, MethodInvocation calleeInfo, MethodInvocation parentInvocation, int inliningDepth, HighTierContext context) {
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	170 InlineInfo callee = calleeInfo.callee();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	171 Assumptions callerAssumptions = parentInvocation.assumptions();
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	172
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	173 if (inliningPolicy.isWorthInlining(context.getReplacements(), callee, inliningDepth, calleeInfo.probability(), calleeInfo.relevance(), true)) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	174 doInline(callerGraphInfo, calleeInfo, callerAssumptions, context);
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	175 } else if (context.getOptimisticOptimizations().devirtualizeInvokes()) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	176 callee.tryToDevirtualizeInvoke(context.getRuntime(), callerAssumptions);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	177 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	178 metricInliningConsidered.increment();
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	179 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	180
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	181 private void doInline(GraphInfo callerGraphInfo, MethodInvocation calleeInfo, Assumptions callerAssumptions, HighTierContext context) {
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	182 StructuredGraph callerGraph = callerGraphInfo.graph();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	183 int markBeforeInlining = callerGraph.getMark();
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	184 InlineInfo callee = calleeInfo.callee();
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	185 try {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	186 List<Node> invokeUsages = callee.invoke().asNode().usages().snapshot();
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	187 callee.inline(context.getRuntime(), callerAssumptions, context.getReplacements());
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	188 callerAssumptions.record(calleeInfo.assumptions());
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	189 metricInliningRuns.increment();
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	190 Debug.dump(callerGraph, "after %s", callee);
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	191
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	192 if (OptCanonicalizer.getValue()) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	193 int markBeforeCanonicalization = callerGraph.getMark();
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	194 canonicalizer.applyIncremental(callerGraph, context, invokeUsages, markBeforeInlining);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	195
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	196 // process invokes that are possibly created during canonicalization
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	197 for (Node newNode : callerGraph.getNewNodes(markBeforeCanonicalization)) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	198 if (newNode instanceof Invoke) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	199 callerGraphInfo.pushInvoke((Invoke) newNode);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	200 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	201 }
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	202 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	203
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	204 callerGraphInfo.computeProbabilities();
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	205
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	206 inliningCount++;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	207 metricInliningPerformed.increment();
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	208 } catch (BailoutException bailout) {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	209 throw bailout;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	210 } catch (AssertionError \| RuntimeException e) {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	211 throw new GraalInternalError(e).addContext(callee.toString());
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	212 } catch (GraalInternalError e) {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	213 throw e.addContext(callee.toString());
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	214 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	215 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	216
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	217 private Inlineable getInlineableElement(final ResolvedJavaMethod method, Invoke invoke, HighTierContext context) {
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	218 Class<? extends FixedWithNextNode> macroNodeClass = InliningUtil.getMacroNodeClass(context.getReplacements(), method);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	219 if (macroNodeClass != null) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	220 return new InlineableMacroNode(macroNodeClass);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	221 } else {
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	222 return new InlineableGraph(buildGraph(method, invoke, context));
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	223 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	224 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	225
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	226 private StructuredGraph buildGraph(final ResolvedJavaMethod method, final Invoke invoke, final HighTierContext context) {
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	227 final StructuredGraph newGraph;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	228 final boolean parseBytecodes;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	229
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	230 // TODO (chaeubl): copying the graph is only necessary if it is modified or if it contains
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	231 // any invokes
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	232 StructuredGraph intrinsicGraph = InliningUtil.getIntrinsicGraph(context.getReplacements(), method);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	233 if (intrinsicGraph != null) {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	234 newGraph = intrinsicGraph.copy();
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	235 parseBytecodes = false;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	236 } else {
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	237 StructuredGraph cachedGraph = getCachedGraph(method, context);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	238 if (cachedGraph != null) {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	239 newGraph = cachedGraph.copy();
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	240 parseBytecodes = false;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	241 } else {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	242 newGraph = new StructuredGraph(method);
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	243 parseBytecodes = true;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	244 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	245 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	246
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	247 return Debug.scope("InlineGraph", newGraph, new Callable<StructuredGraph>() {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	248
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	249 @Override
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	250 public StructuredGraph call() throws Exception {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	251 if (parseBytecodes) {
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	252 parseBytecodes(newGraph, context);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	253 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	254
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	255 boolean callerHasMoreInformationAboutArguments = false;
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	256 NodeInputList<ValueNode> args = invoke.callTarget().arguments();
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	257 for (LocalNode localNode : newGraph.getNodes(LocalNode.class).snapshot()) {
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	258 ValueNode arg = args.get(localNode.index());
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	259 if (arg.isConstant()) {
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	260 Constant constant = arg.asConstant();
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	261 newGraph.replaceFloating(localNode, ConstantNode.forConstant(constant, context.getRuntime(), newGraph));
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	262 callerHasMoreInformationAboutArguments = true;
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	263 } else {
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	264 Stamp joinedStamp = localNode.stamp().join(arg.stamp());
9786 6c1f7b853d35 Generalize the code for detecting invalid stamps in join operations. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9722 diff changeset	265 if (joinedStamp != null && !joinedStamp.equals(localNode.stamp())) {
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	266 localNode.setStamp(joinedStamp);
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	267 callerHasMoreInformationAboutArguments = true;
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	268 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	269 }
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	270 }
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	271
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	272 if (!callerHasMoreInformationAboutArguments) {
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	273 // TODO (chaeubl): if args are not more concrete, inlining should be avoided
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	274 // in most cases or we could at least use the previous graph size + invoke
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	275 // probability to check the inlining
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	276 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	277
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	278 if (OptCanonicalizer.getValue()) {
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	279 canonicalizer.apply(newGraph, context);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	280 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	281
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	282 return newGraph;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	283 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	284 });
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	285 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	286
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	287 private static StructuredGraph getCachedGraph(ResolvedJavaMethod method, HighTierContext context) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	288 if (CacheGraphs.getValue() && context.getGraphCache() != null) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	289 StructuredGraph cachedGraph = context.getGraphCache().get(method);
6353 2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	290 if (cachedGraph != null) {
2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	291 return cachedGraph;
2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	292 }
2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	293 }
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	294 return null;
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	295 }
7879 1474fe91323c create debug scope for graph building during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 7827 diff changeset	296
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	297 private StructuredGraph parseBytecodes(StructuredGraph newGraph, HighTierContext context) {
9928 a9311ec68721 Avoid graph caching if immature or no profiling information was used for graph building. Christian Haeubl <haeubl@ssw.jku.at> parents: 9927 diff changeset	298 boolean hasMatureProfilingInfo = newGraph.method().getProfilingInfo().isMature();
a9311ec68721 Avoid graph caching if immature or no profiling information was used for graph building. Christian Haeubl <haeubl@ssw.jku.at> parents: 9927 diff changeset	299
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	300 if (context.getPhasePlan() != null) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	301 context.getPhasePlan().runPhases(PhasePosition.AFTER_PARSING, newGraph);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	302 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	303 assert newGraph.start().next() != null : "graph needs to be populated during PhasePosition.AFTER_PARSING";
5177 a26b6248d398 added graph caching (-G:+CacheGraphs) Lukas Stadler <lukas.stadler@jku.at> parents: 5114 diff changeset	304
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	305 new DeadCodeEliminationPhase().apply(newGraph);
9238 8f01fe16e473 refactorings and cleanups for the removal of FixedNode.probability Christian Haeubl <haeubl@ssw.jku.at> parents: 9234 diff changeset	306
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	307 if (OptCanonicalizer.getValue()) {
11567 c69df2e602f4 Use CanonicalizerPhase.applyIncremental in InliningPhase. Roland Schatz <roland.schatz@oracle.com> parents: 11536 diff changeset	308 canonicalizer.apply(newGraph, context);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	309 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	310
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	311 if (CacheGraphs.getValue() && context.getGraphCache() != null) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	312 context.getGraphCache().put(newGraph.copy(), hasMatureProfilingInfo);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	313 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	314 return newGraph;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	315 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	316
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	317 private static synchronized CompiledMethodInfo compiledMethodInfo(ResolvedJavaMethod m) {
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	318 CompiledMethodInfo info = (CompiledMethodInfo) m.getCompilerStorage().get(CompiledMethodInfo.class);
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	319 if (info == null) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	320 info = new CompiledMethodInfo();
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	321 m.getCompilerStorage().put(CompiledMethodInfo.class, info);
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	322 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	323 return info;
4670 41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4598 diff changeset	324 }
41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4598 diff changeset	325
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	326 private abstract static class AbstractInliningPolicy implements InliningPolicy {
4594 eb6df44a1374 bugfixes, added bytecode complexity estimation Christian Haeubl <christian.haeubl@oracle.com> parents: 4591 diff changeset	327
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	328 protected final Map<Invoke, Double> hints;
4594 eb6df44a1374 bugfixes, added bytecode complexity estimation Christian Haeubl <christian.haeubl@oracle.com> parents: 4591 diff changeset	329
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	330 public AbstractInliningPolicy(Map<Invoke, Double> hints) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	331 this.hints = hints;
4594 eb6df44a1374 bugfixes, added bytecode complexity estimation Christian Haeubl <christian.haeubl@oracle.com> parents: 4591 diff changeset	332 }
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7392 diff changeset	333
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	334 protected double computeMaximumSize(double relevance, int configuredMaximum) {
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	335 double inlineRatio = Math.min(RelevanceCapForInlining.getValue(), relevance);
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	336 return configuredMaximum * inlineRatio;
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	337 }
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	338
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	339 protected double getInliningBonus(InlineInfo info) {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	340 if (hints != null && hints.containsKey(info.invoke())) {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	341 return hints.get(info.invoke());
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	342 }
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	343 return 1;
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	344 }
cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	345
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	346 protected boolean isIntrinsic(Replacements replacements, InlineInfo info) {
9855 6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	347 if (AlwaysInlineIntrinsics.getValue()) {
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	348 return onlyIntrinsics(replacements, info);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	349 } else {
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	350 return onlyForcedIntrinsics(replacements, info);
7388 599ea4fcdb6d added flag AlwaysInlineIntrinsics Christian Haeubl <haeubl@ssw.jku.at> parents: 7256 diff changeset	351 }
4569 333ce00358f4 added another inlining policy, added option to disable propagation of loop frequencies Christian Haeubl <christian.haeubl@oracle.com> parents: 4564 diff changeset	352 }
333ce00358f4 added another inlining policy, added option to disable propagation of loop frequencies Christian Haeubl <christian.haeubl@oracle.com> parents: 4564 diff changeset	353
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	354 private static boolean onlyIntrinsics(Replacements replacements, InlineInfo info) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	355 for (int i = 0; i < info.numberOfMethods(); i++) {
8636 ac4dbfecec8f passed a Replacements object to inlining utility methods that need one instead of the GraalRuntime API Doug Simon <doug.simon@oracle.com> parents: 8618 diff changeset	356 if (!InliningUtil.canIntrinsify(replacements, info.methodAt(i))) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	357 return false;
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	358 }
7388 599ea4fcdb6d added flag AlwaysInlineIntrinsics Christian Haeubl <haeubl@ssw.jku.at> parents: 7256 diff changeset	359 }
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	360 return true;
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	361 }
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	362
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	363 private static boolean onlyForcedIntrinsics(Replacements replacements, InlineInfo info) {
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	364 for (int i = 0; i < info.numberOfMethods(); i++) {
8930 f50d10434d3e Merge Lukas Stadler <lukas.stadler@jku.at> parents: 8915 8637 diff changeset	365 if (!InliningUtil.canIntrinsify(replacements, info.methodAt(i))) {
8915 880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	366 return false;
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	367 }
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	368 if (!replacements.isForcedSubstitution(info.methodAt(i))) {
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	369 return false;
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	370 }
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	371 }
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	372 return true;
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	373 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	374
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	375 protected static int previousLowLevelGraphSize(InlineInfo info) {
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	376 int size = 0;
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	377 for (int i = 0; i < info.numberOfMethods(); i++) {
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	378 size += compiledMethodInfo(info.methodAt(i)).lowLevelNodeCount();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	379 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	380 return size;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	381 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	382
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	383 protected static int determineNodeCount(InlineInfo info) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	384 int nodes = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	385 for (int i = 0; i < info.numberOfMethods(); i++) {
9921 26785bb7006d Refactorings for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9722 diff changeset	386 Inlineable elem = info.inlineableElementAt(i);
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	387 if (elem != null) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	388 nodes += elem.getNodeCount();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	389 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	390 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	391 return nodes;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	392 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	393
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	394 protected static double determineInvokeProbability(InlineInfo info) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	395 double invokeProbability = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	396 for (int i = 0; i < info.numberOfMethods(); i++) {
9921 26785bb7006d Refactorings for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9722 diff changeset	397 Inlineable callee = info.inlineableElementAt(i);
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	398 Iterable<Invoke> invokes = callee.getInvokes();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	399 if (invokes.iterator().hasNext()) {
9921 26785bb7006d Refactorings for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9722 diff changeset	400 NodesToDoubles nodeProbabilities = new ComputeProbabilityClosure(((InlineableGraph) callee).getGraph()).apply();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	401 for (Invoke invoke : invokes) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	402 invokeProbability += nodeProbabilities.get(invoke.asNode());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	403 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	404 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	405 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	406 return invokeProbability;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	407 }
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	408 }
cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	409
10626 b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	410 private static final class GreedyInliningPolicy extends AbstractInliningPolicy {
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7392 diff changeset	411
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	412 public GreedyInliningPolicy(Map<Invoke, Double> hints) {
9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	413 super(hints);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	414 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	415
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	416 public boolean continueInlining(StructuredGraph currentGraph) {
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	417 if (currentGraph.getNodeCount() >= MaximumDesiredSize.getValue()) {
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	418 InliningUtil.logInliningDecision("inlining is cut off by MaximumDesiredSize");
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	419 metricInliningStoppedByMaxDesiredSize.increment();
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	420 return false;
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	421 }
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	422 return true;
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	423 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	424
9234 b9cf7d0b598e removal of FixedNode.probability (draft) Christian Haeubl <haeubl@ssw.jku.at> parents: 9147 diff changeset	425 @Override
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	426 public boolean isWorthInlining(Replacements replacements, InlineInfo info, int inliningDepth, double probability, double relevance, boolean fullyProcessed) {
10769 395d34c10e26 HSAIL backend changes Doug Simon <doug.simon@oracle.com> parents: 10629 diff changeset	427 if (InlineEverything.getValue()) {
395d34c10e26 HSAIL backend changes Doug Simon <doug.simon@oracle.com> parents: 10629 diff changeset	428 return InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "inline everything");
395d34c10e26 HSAIL backend changes Doug Simon <doug.simon@oracle.com> parents: 10629 diff changeset	429 }
395d34c10e26 HSAIL backend changes Doug Simon <doug.simon@oracle.com> parents: 10629 diff changeset	430
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	431 if (isIntrinsic(replacements, info)) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	432 return InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "intrinsic");
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	433 }
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	434
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	435 double inliningBonus = getInliningBonus(info);
9930 5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	436 int nodes = determineNodeCount(info);
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	437 int lowLevelGraphSize = previousLowLevelGraphSize(info);
9930 5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	438
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	439 if (SmallCompiledLowLevelGraphSize.getValue() > 0 && lowLevelGraphSize > SmallCompiledLowLevelGraphSize.getValue() * inliningBonus) {
9930 5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	440 return InliningUtil.logNotInlinedMethod(info, inliningDepth, "too large previous low-level graph (low-level-nodes: %d, relevance=%f, probability=%f, bonus=%f, nodes=%d)",
5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	441 lowLevelGraphSize, relevance, probability, inliningBonus, nodes);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	442 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	443
9915 d8a8d794f631 More precise inlining decision messages. Gilles Duboscq <duboscq@ssw.jku.at> parents: 9914 diff changeset	444 if (nodes < TrivialInliningSize.getValue() * inliningBonus) {
9930 5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	445 return InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "trivial (relevance=%f, probability=%f, bonus=%f, nodes=%d)", relevance, probability, inliningBonus, nodes);
9915 d8a8d794f631 More precise inlining decision messages. Gilles Duboscq <duboscq@ssw.jku.at> parents: 9914 diff changeset	446 }
d8a8d794f631 More precise inlining decision messages. Gilles Duboscq <duboscq@ssw.jku.at> parents: 9914 diff changeset	447
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	448 /*
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	449 * TODO (chaeubl): invoked methods that are on important paths but not yet compiled ->
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	450 * will be compiled anyways and it is likely that we are the only caller... might be
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	451 * useful to inline those methods but increases bootstrap time (maybe those methods are
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	452 * also getting queued in the compilation queue concurrently)
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	453 */
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	454 double invokes = determineInvokeProbability(info);
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	455 if (LimitInlinedInvokes.getValue() > 0 && fullyProcessed && invokes > LimitInlinedInvokes.getValue() * inliningBonus) {
9930 5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	456 return InliningUtil.logNotInlinedMethod(info, inliningDepth, "callee invoke probability is too high (invokeP=%f, relevance=%f, probability=%f, bonus=%f, nodes=%d)", invokes,
5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	457 relevance, probability, inliningBonus, nodes);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	458 }
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	459
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	460 double maximumNodes = computeMaximumSize(relevance, (int) (MaximumInliningSize.getValue() * inliningBonus));
9915 d8a8d794f631 More precise inlining decision messages. Gilles Duboscq <duboscq@ssw.jku.at> parents: 9914 diff changeset	461 if (nodes <= maximumNodes) {
9930 5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	462 return InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d <= %f)", relevance, probability,
9915 d8a8d794f631 More precise inlining decision messages. Gilles Duboscq <duboscq@ssw.jku.at> parents: 9914 diff changeset	463 inliningBonus, nodes, maximumNodes);
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	464 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	465
9930 5a4fbe932ab3 Assume that those path which end in a DeoptimizeNode are taken less frequently. Christian Haeubl <haeubl@ssw.jku.at> parents: 9928 diff changeset	466 return InliningUtil.logNotInlinedMethod(info, inliningDepth, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d > %f)", relevance, probability, inliningBonus, nodes,
9915 d8a8d794f631 More precise inlining decision messages. Gilles Duboscq <duboscq@ssw.jku.at> parents: 9914 diff changeset	467 maximumNodes);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	468 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	469 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	470
10626 b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	471 public static final class InlineEverythingPolicy implements InliningPolicy {
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	472
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	473 public boolean continueInlining(StructuredGraph graph) {
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	474 if (graph.getNodeCount() >= MaximumDesiredSize.getValue()) {
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	475 throw new BailoutException("Inline all calls failed. The resulting graph is too large.");
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	476 }
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	477 return true;
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	478 }
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	479
10933 9878214a0093 Remove fields from InliningPhase that are already available in HighTierContext. Roland Schatz <roland.schatz@oracle.com> parents: 10909 diff changeset	480 public boolean isWorthInlining(Replacements replacements, InlineInfo info, int inliningDepth, double probability, double relevance, boolean fullyProcessed) {
10626 b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	481 return true;
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	482 }
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	483 }
b02b3c6a59b6 Added an inlining policy that tries to inline all calls. Christian Haeubl <haeubl@ssw.jku.at> parents: 10051 diff changeset	484
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	485 private static class InliningIterator {
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7392 diff changeset	486
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	487 private final FixedNode start;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	488 private final Deque<FixedNode> nodeQueue;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	489 private final NodeBitMap queuedNodes;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	490
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	491 public InliningIterator(FixedNode start, NodeBitMap visitedFixedNodes) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	492 this.start = start;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	493 this.nodeQueue = new ArrayDeque<>();
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	494 this.queuedNodes = visitedFixedNodes;
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	495 assert start.isAlive();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	496 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	497
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	498 public LinkedList<Invoke> apply() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	499 LinkedList<Invoke> invokes = new LinkedList<>();
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	500 FixedNode current;
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	501 forcedQueue(start);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	502
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	503 while ((current = nextQueuedNode()) != null) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	504 assert current.isAlive();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	505
11536 9021f7761457 Inlining only needs to consider invokes of Java methods, i.e., calls with a MethodCallTargetNode Christian Wimmer <christian.wimmer@oracle.com> parents: 10935 diff changeset	506 if (current instanceof Invoke && ((Invoke) current).callTarget() instanceof MethodCallTargetNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	507 if (current != start) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	508 invokes.addLast((Invoke) current);
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	509 }
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	510 queueSuccessors(current);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	511 } else if (current instanceof LoopBeginNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	512 queueSuccessors(current);
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	513 } else if (current instanceof LoopEndNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	514 // nothing todo
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	515 } else if (current instanceof MergeNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	516 queueSuccessors(current);
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	517 } else if (current instanceof FixedWithNextNode) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	518 queueSuccessors(current);
9435 794370a64b71 Replace AbstractEndNode usages with EndNode usages wherever appropriate. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9434 diff changeset	519 } else if (current instanceof EndNode) {
794370a64b71 Replace AbstractEndNode usages with EndNode usages wherever appropriate. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9434 diff changeset	520 queueMerge((EndNode) current);
8385 85d4392b9e26 Introduce a ControlSinkNode base class. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7879 diff changeset	521 } else if (current instanceof ControlSinkNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	522 // nothing todo
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	523 } else if (current instanceof ControlSplitNode) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	524 queueSuccessors(current);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	525 } else {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	526 assert false : current;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	527 }
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	528 }
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	529
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	530 return invokes;
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	531 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	532
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	533 private void queueSuccessors(FixedNode x) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	534 for (Node node : x.successors()) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	535 queue(node);
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	536 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	537 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	538
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	539 private void queue(Node node) {
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	540 if (node != null && !queuedNodes.isMarked(node)) {
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	541 forcedQueue(node);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	542 }
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	543 }
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	544
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	545 private void forcedQueue(Node node) {
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	546 queuedNodes.mark(node);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	547 nodeQueue.addFirst((FixedNode) node);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	548 }
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	549
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	550 private FixedNode nextQueuedNode() {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	551 if (nodeQueue.isEmpty()) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	552 return null;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	553 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	554
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	555 FixedNode result = nodeQueue.removeFirst();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	556 assert queuedNodes.isMarked(result);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	557 return result;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	558 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	559
9434 50f02c7d1cec Rename EndNode => AbstractEndNode and make abstract class. Introduce concrete EndNode subclass. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9389 diff changeset	560 private void queueMerge(AbstractEndNode end) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	561 MergeNode merge = end.merge();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	562 if (!queuedNodes.isMarked(merge) && visitedAllEnds(merge)) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	563 queuedNodes.mark(merge);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	564 nodeQueue.add(merge);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	565 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	566 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	567
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	568 private boolean visitedAllEnds(MergeNode merge) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	569 for (int i = 0; i < merge.forwardEndCount(); i++) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	570 if (!queuedNodes.isMarked(merge.forwardEndAt(i))) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	571 return false;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	572 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	573 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	574 return true;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	575 }
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	576 }
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	577
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	578 /**
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	579 * Holds the data for building the callee graphs recursively: graphs and invocations (each
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	580 * invocation can have multiple graphs).
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	581 */
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	582 static class InliningData {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	583
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	584 private static final GraphInfo DummyGraphInfo = new GraphInfo(null, new LinkedList<Invoke>(), 1.0, 1.0);
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	585
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	586 /**
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	587 * Call hierarchy from outer most call (i.e., compilation unit) to inner most callee.
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	588 */
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	589 private final ArrayDeque<GraphInfo> graphQueue;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	590 private final ArrayDeque<MethodInvocation> invocationQueue;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	591
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	592 private int maxGraphs;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	593
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	594 public InliningData(StructuredGraph rootGraph, Assumptions rootAssumptions) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	595 this.graphQueue = new ArrayDeque<>();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	596 this.invocationQueue = new ArrayDeque<>();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	597 this.maxGraphs = 1;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	598
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	599 invocationQueue.push(new MethodInvocation(null, rootAssumptions, 1.0, 1.0));
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	600 pushGraph(rootGraph, 1.0, 1.0);
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	601 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	602
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	603 public int graphCount() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	604 return graphQueue.size();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	605 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	606
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	607 public void pushGraph(StructuredGraph graph, double probability, double relevance) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	608 assert !contains(graph);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	609 NodeBitMap visitedFixedNodes = graph.createNodeBitMap();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	610 LinkedList<Invoke> invokes = new InliningIterator(graph.start(), visitedFixedNodes).apply();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	611 assert invokes.size() == count(graph.getInvokes());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	612 graphQueue.push(new GraphInfo(graph, invokes, probability, relevance));
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	613 assert graphQueue.size() <= maxGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	614 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	615
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	616 public void pushDummyGraph() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	617 graphQueue.push(DummyGraphInfo);
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	618 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	619
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	620 public boolean hasUnprocessedGraphs() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	621 return !graphQueue.isEmpty();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	622 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	623
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	624 public GraphInfo currentGraph() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	625 return graphQueue.peek();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	626 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	627
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	628 public void popGraph() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	629 graphQueue.pop();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	630 assert graphQueue.size() <= maxGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	631 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	632
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	633 public void popGraphs(int count) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	634 assert count >= 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	635 for (int i = 0; i < count; i++) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	636 graphQueue.pop();
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	637 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	638 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	639
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	640 /**
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	641 * Gets the call hierarchy of this inling from outer most call to inner most callee.
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	642 */
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	643 public Object[] inliningContext() {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	644 Object[] result = new Object[graphQueue.size()];
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	645 int i = 0;
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	646 for (GraphInfo g : graphQueue) {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	647 result[i++] = g.graph.method();
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	648 }
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	649 return result;
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	650 }
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	651
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	652 public MethodInvocation currentInvocation() {
10909 2151775dfd98 Changed inlining order to bottom-up. Christian Haeubl <haeubl@ssw.jku.at> parents: 10769 diff changeset	653 return invocationQueue.peekFirst();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	654 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	655
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	656 public MethodInvocation pushInvocation(InlineInfo info, Assumptions assumptions, double probability, double relevance) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	657 MethodInvocation methodInvocation = new MethodInvocation(info, new Assumptions(assumptions.useOptimisticAssumptions()), probability, relevance);
10909 2151775dfd98 Changed inlining order to bottom-up. Christian Haeubl <haeubl@ssw.jku.at> parents: 10769 diff changeset	658 invocationQueue.addFirst(methodInvocation);
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	659 maxGraphs += info.numberOfMethods();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	660 assert graphQueue.size() <= maxGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	661 return methodInvocation;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	662 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	663
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	664 public void popInvocation() {
10909 2151775dfd98 Changed inlining order to bottom-up. Christian Haeubl <haeubl@ssw.jku.at> parents: 10769 diff changeset	665 maxGraphs -= invocationQueue.peekFirst().callee.numberOfMethods();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	666 assert graphQueue.size() <= maxGraphs;
10909 2151775dfd98 Changed inlining order to bottom-up. Christian Haeubl <haeubl@ssw.jku.at> parents: 10769 diff changeset	667 invocationQueue.removeFirst();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	668 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	669
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	670 public int countRecursiveInlining(ResolvedJavaMethod method) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	671 int count = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	672 for (GraphInfo graphInfo : graphQueue) {
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	673 if (method.equals(graphInfo.method())) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	674 count++;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	675 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	676 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	677 return count;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	678 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	679
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	680 public int inliningDepth() {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	681 assert invocationQueue.size() > 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	682 return invocationQueue.size() - 1;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	683 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	684
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	685 @Override
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	686 public String toString() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	687 StringBuilder result = new StringBuilder("Invocations: ");
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	688
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	689 for (MethodInvocation invocation : invocationQueue) {
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	690 if (invocation.callee() != null) {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	691 result.append(invocation.callee().numberOfMethods());
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	692 result.append("x ");
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	693 result.append(invocation.callee().invoke());
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	694 result.append("; ");
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	695 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	696 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	697
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	698 result.append("\nGraphs: ");
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	699 for (GraphInfo graph : graphQueue) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	700 result.append(graph.graph());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	701 result.append("; ");
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	702 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	703
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	704 return result.toString();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	705 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	706
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	707 private boolean contains(StructuredGraph graph) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	708 for (GraphInfo info : graphQueue) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	709 if (info.graph() == graph) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	710 return true;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	711 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	712 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	713 return false;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	714 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	715
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	716 private static int count(Iterable<Invoke> invokes) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	717 int count = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	718 Iterator<Invoke> iterator = invokes.iterator();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	719 while (iterator.hasNext()) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	720 iterator.next();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	721 count++;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	722 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	723 return count;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	724 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	725 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	726
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	727 private static class MethodInvocation {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	728
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	729 private final InlineInfo callee;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	730 private final Assumptions assumptions;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	731 private final double probability;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	732 private final double relevance;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	733
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	734 private int processedGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	735
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	736 public MethodInvocation(InlineInfo info, Assumptions assumptions, double probability, double relevance) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	737 this.callee = info;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	738 this.assumptions = assumptions;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	739 this.probability = probability;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	740 this.relevance = relevance;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	741 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	742
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	743 public void incrementProcessedGraphs() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	744 processedGraphs++;
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	745 assert processedGraphs <= callee.numberOfMethods();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	746 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	747
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	748 public int processedGraphs() {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	749 assert processedGraphs <= callee.numberOfMethods();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	750 return processedGraphs;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	751 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	752
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	753 public int totalGraphs() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	754 return callee.numberOfMethods();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	755 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	756
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	757 public InlineInfo callee() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	758 return callee;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	759 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	760
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	761 public Assumptions assumptions() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	762 return assumptions;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	763 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	764
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	765 public double probability() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	766 return probability;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	767 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	768
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	769 public double relevance() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	770 return relevance;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	771 }
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	772
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	773 public boolean isRoot() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	774 return callee == null;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	775 }
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	776
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	777 @Override
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	778 public String toString() {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	779 if (isRoot()) {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	780 return "<root>";
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	781 }
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	782 CallTargetNode callTarget = callee.invoke().callTarget();
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	783 if (callTarget instanceof MethodCallTargetNode) {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	784 ResolvedJavaMethod calleeMethod = ((MethodCallTargetNode) callTarget).targetMethod();
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	785 return MetaUtil.format("Invoke#%H.%n(%p)", calleeMethod);
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	786 } else {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	787 return "Invoke#" + callTarget.targetName();
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	788 }
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	789 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	790 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	791
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	792 /**
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	793 * Information about a graph that will potentially be inlined. This includes tracking the
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	794 * invocations in graph that will subject to inlining themselves.
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	795 */
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	796 private static class GraphInfo {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	797
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	798 private final StructuredGraph graph;
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	799 private final LinkedList<Invoke> remainingInvokes;
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	800 private final double probability;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	801 private final double relevance;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	802
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	803 private NodesToDoubles nodeProbabilities;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	804 private NodesToDoubles nodeRelevance;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	805
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	806 public GraphInfo(StructuredGraph graph, LinkedList<Invoke> invokes, double probability, double relevance) {
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	807 this.graph = graph;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	808 this.remainingInvokes = invokes;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	809 this.probability = probability;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	810 this.relevance = relevance;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	811
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	812 if (graph != null) {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	813 computeProbabilities();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	814 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	815 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	816
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	817 /**
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	818 * Gets the method associated with the {@linkplain #graph() graph} represented by this
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	819 * object.
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	820 */
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	821 public ResolvedJavaMethod method() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	822 return graph.method();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	823 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	824
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	825 public boolean hasRemainingInvokes() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	826 return !remainingInvokes.isEmpty();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	827 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	828
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	829 /**
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	830 * The graph about which this object contains inlining information.
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	831 */
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	832 public StructuredGraph graph() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	833 return graph;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	834 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	835
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	836 public Invoke popInvoke() {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	837 return remainingInvokes.removeFirst();
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	838 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	839
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	840 public void pushInvoke(Invoke invoke) {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	841 remainingInvokes.push(invoke);
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	842 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	843
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	844 public void computeProbabilities() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	845 nodeProbabilities = new ComputeProbabilityClosure(graph).apply();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	846 nodeRelevance = new ComputeInliningRelevanceClosure(graph, nodeProbabilities).apply();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	847 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	848
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	849 public double invokeProbability(Invoke invoke) {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	850 return probability * nodeProbabilities.get(invoke.asNode());
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	851 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	852
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	853 public double invokeRelevance(Invoke invoke) {
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	854 return Math.min(CapInheritedRelevance.getValue(), relevance) * nodeRelevance.get(invoke.asNode());
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	855 }
10607 dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	856
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	857 @Override
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	858 public String toString() {
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	859 return MetaUtil.format("%H.%n(%p)", method()) + remainingInvokes;
dd5a042811f6 enhanced debug context for inlining so that inlining hierarchy is correctly shown in IGV Doug Simon <doug.simon@oracle.com> parents: 10051 diff changeset	860 }
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	861 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	862
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	863 private static class CompiledMethodInfo {
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	864
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	865 private int lowLevelNodes;
9699 9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	866
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	867 public CompiledMethodInfo() {
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	868 }
9529ab567367 Drafted version of an inlining policy that uses the callee graph size as its metric. Christian Haeubl <haeubl@ssw.jku.at> parents: 9238 diff changeset	869
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	870 public int lowLevelNodeCount() {
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	871 return lowLevelNodes;
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	872 }
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	873
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	874 public void setLowLevelNodeCount(int lowLevelNodes) {
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	875 this.lowLevelNodes = lowLevelNodes;
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	876 }
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	877
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	878 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	879 }

Mercurial > hg > truffle

annotate graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java @ 11600:60f4c505993e