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 @ 9914:84890660eefb

cleaner implementation of stable options

author	Doug Simon <doug.simon@oracle.com>
date	Thu, 06 Jun 2013 17:29:08 +0200
parents	fbad7372eccd
children	d8a8d794f631

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.*;
063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	26
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	27 import java.util.*;
7879 1474fe91323c create debug scope for graph building during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 7827 diff changeset	28 import java.util.concurrent.*;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	29
5510 426c605c9d3c Move cri.ci to api.code. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	30 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	31 import com.oracle.graal.api.meta.*;
5060 4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	32 import com.oracle.graal.debug.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	33 import com.oracle.graal.graph.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	34 import com.oracle.graal.nodes.*;
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	35 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	36 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	37 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	38 import com.oracle.graal.options.*;
6525 2c913b643422 rename packages in graal.phases to match project name Doug Simon <doug.simon@oracle.com> parents: 6522 diff changeset	39 import com.oracle.graal.phases.*;
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	40 import com.oracle.graal.phases.PhasePlan.PhasePosition;
7307 dc3e86fd3be1 Introduce cutomization capability for canonicalizer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7256 diff changeset	41 import com.oracle.graal.phases.common.CanonicalizerPhase.CustomCanonicalizer;
7684 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;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	43 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	44 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	45 import com.oracle.graal.phases.graph.*;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	46
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	47 public class InliningPhase extends Phase {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	48
9855 6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	49 // @formatter:off
6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	50 @Option(help = "Unconditionally inline intrinsics")
9914 84890660eefb cleaner implementation of stable options Doug Simon <doug.simon@oracle.com> parents: 9912 diff changeset	51 public static final OptionValue<Boolean> AlwaysInlineIntrinsics = new OptionValue<>(false);
9855 6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	52 // @formatter:on
6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	53
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	54 private final PhasePlan plan;
8608 056966f39a36 changed parameters of InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 8385 diff changeset	55 private final MetaAccessProvider runtime;
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	56 private final Assumptions compilationAssumptions;
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	57 private final Replacements replacements;
5718 10341299528c renamings: ExtendedRiRuntime -> GraalCodeCacheProvider, CiLoweringTool -> LoweringTool, RiGraphCache -> GraphCache Doug Simon <doug.simon@oracle.com> parents: 5674 diff changeset	58 private final GraphCache cache;
4468 87a12a816e99 added C1 inlining policy for comparison, bugfixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4461 diff changeset	59 private final InliningPolicy inliningPolicy;
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	60 private final OptimisticOptimizations optimisticOpts;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	61
7307 dc3e86fd3be1 Introduce cutomization capability for canonicalizer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7256 diff changeset	62 private CustomCanonicalizer customCanonicalizer;
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");
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	70 private static final DebugMetric metricInliningRuns = Debug.metric("Runs");
4348 d49c90e641cb Remove GraalMetrics, replace with new syntax for metrics. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4205 diff changeset	71
8930 f50d10434d3e Merge Lukas Stadler <lukas.stadler@jku.at> parents: 8915 8637 diff changeset	72 public InliningPhase(MetaAccessProvider runtime, Map<Invoke, Double> hints, Replacements replacements, Assumptions assumptions, GraphCache cache, PhasePlan plan,
f50d10434d3e Merge Lukas Stadler <lukas.stadler@jku.at> parents: 8915 8637 diff changeset	73 OptimisticOptimizations optimisticOpts) {
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	74 this(runtime, replacements, assumptions, cache, plan, optimisticOpts, hints);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	75 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	76
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	77 private InliningPhase(MetaAccessProvider runtime, Replacements replacements, Assumptions assumptions, GraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts,
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	78 Map<Invoke, Double> hints) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	79 this.runtime = runtime;
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	80 this.replacements = replacements;
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	81 this.compilationAssumptions = assumptions;
5177 a26b6248d398 added graph caching (-G:+CacheGraphs) Lukas Stadler <lukas.stadler@jku.at> parents: 5114 diff changeset	82 this.cache = cache;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	83 this.plan = plan;
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	84 this.inliningPolicy = new GreedyInliningPolicy(replacements, hints);
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	85 this.optimisticOpts = optimisticOpts;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	86 }
8618 832b9a115a2d style fixes Christian Haeubl <haeubl@ssw.jku.at> parents: 8617 diff changeset	87
8617 6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	88 public void setCustomCanonicalizer(CustomCanonicalizer customCanonicalizer) {
6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	89 this.customCanonicalizer = customCanonicalizer;
6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	90 }
8618 832b9a115a2d style fixes Christian Haeubl <haeubl@ssw.jku.at> parents: 8617 diff changeset	91
8617 6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	92 public void setMaxMethodsPerInlining(int max) {
6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	93 maxMethodPerInlining = max;
6d884611d4c1 Merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 8608 8552 diff changeset	94 }
8618 832b9a115a2d style fixes Christian Haeubl <haeubl@ssw.jku.at> parents: 8617 diff changeset	95
8548 51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	96 public int getInliningCount() {
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	97 return inliningCount;
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	98 }
51d5999900e2 simple iterative inlining, simple read elimination in PEA Lukas Stadler <lukas.stadler@jku.at> parents: 8385 diff changeset	99
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	100 public static void storeStatisticsAfterLowTier(StructuredGraph graph) {
9705 de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	101 ResolvedJavaMethod method = graph.method();
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	102 if (method != null) {
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	103 CompiledMethodInfo info = compiledMethodInfo(graph.method());
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	104 info.setLowLevelNodeCount(graph.getNodeCount());
de7319e48e48 Temporary fixes for the merge. Christian Haeubl <haeubl@ssw.jku.at> parents: 9704 diff changeset	105 }
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	106 }
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	107
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	108 @Override
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	109 protected void run(final StructuredGraph graph) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	110 InliningData data = new InliningData(graph, compilationAssumptions);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	111
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	112 while (data.hasUnprocessedGraphs()) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	113 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	114 GraphInfo graphInfo = data.currentGraph();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	115 if (!currentInvocation.isRoot() && !inliningPolicy.isWorthInlining(currentInvocation.callee(), data.inliningDepth(), currentInvocation.probability(), currentInvocation.relevance(), false)) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	116 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	117 assert remainingGraphs > 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	118 data.popGraphs(remainingGraphs);
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	119 data.popInvocation();
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	120 } else if (graphInfo.hasRemainingInvokes() && inliningPolicy.continueInlining(graphInfo.graph())) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	121 processNextInvoke(data, graphInfo);
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	122 } 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	123 data.popGraph();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	124 if (!currentInvocation.isRoot()) {
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	125 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	126 currentInvocation.incrementProcessedGraphs();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	127 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	128 data.popInvocation();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	129 MethodInvocation parentInvoke = data.currentInvocation();
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	130 tryToInline(data.currentGraph(), currentInvocation, parentInvoke, data.inliningDepth() + 1);
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	131 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	132 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	133 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	134 }
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	135
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	136 assert data.inliningDepth() == 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	137 assert data.graphCount() == 0;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	138 }
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	139
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	140 /**
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	141 * 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	142 */
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	143 private void processNextInvoke(InliningData data, GraphInfo graphInfo) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	144 Invoke invoke = graphInfo.popInvoke();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	145 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	146 Assumptions parentAssumptions = callerInvocation.assumptions();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	147 InlineInfo info = InliningUtil.getInlineInfo(data, invoke, maxMethodPerInlining, replacements, parentAssumptions, optimisticOpts);
9234 b9cf7d0b598e removal of FixedNode.probability (draft) Christian Haeubl <haeubl@ssw.jku.at> parents: 9147 diff changeset	148
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	149 if (info != null) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	150 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	151 double invokeRelevance = graphInfo.invokeRelevance(invoke);
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	152
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	153 if (inliningPolicy.isWorthInlining(info, data.inliningDepth(), invokeProbability, invokeRelevance, false)) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 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
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	156 for (int i = 0; i < info.numberOfMethods(); i++) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	157 InlineableElement elem = getInlineableElement(info.methodAt(i), info.invoke(), calleeInvocation.assumptions());
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	158 info.setInlinableElement(i, elem);
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	159 if (elem instanceof StructuredGraph) {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	160 data.pushGraph((StructuredGraph) elem, invokeProbability * info.probabilityAt(i), invokeRelevance * info.relevanceAt(i));
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	161 } else {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	162 assert elem instanceof InlineableMacroNode;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	163 data.pushDummyGraph();
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	164 }
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	165 }
3733 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 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	169
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	170 private void tryToInline(GraphInfo callerGraphInfo, MethodInvocation calleeInfo, MethodInvocation parentInvocation, int inliningDepth) {
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	171 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	172 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	173
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	174 if (inliningPolicy.isWorthInlining(callee, inliningDepth, calleeInfo.probability(), calleeInfo.relevance(), 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	175 doInline(callerGraphInfo, calleeInfo, callerAssumptions);
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	176 } else if (optimisticOpts.devirtualizeInvokes()) {
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 callee.tryToDevirtualizeInvoke(runtime, callerAssumptions);
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 }
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 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	180 }
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	181
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 private void doInline(GraphInfo callerGraphInfo, MethodInvocation calleeInfo, Assumptions callerAssumptions) {
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	183 StructuredGraph callerGraph = callerGraphInfo.graph();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	184 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	185 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	186 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	187 List<Node> invokeUsages = callee.invoke().asNode().usages().snapshot();
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	188 callee.inline(runtime, callerAssumptions, replacements);
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	189 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	190 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	191 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	192
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	193 if (OptCanonicalizer.getValue()) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	194 int markBeforeCanonicalization = callerGraph.getMark();
9908 91295caf53b6 CanonicalizerPhase: add OptCanonicalizeReads option (GRAAL-290) Bernhard Urban <bernhard.urban@jku.at> parents: 9864 diff changeset	195 new CanonicalizerPhase.Instance(runtime, callerAssumptions, OptCanonicalizeReads.getValue(), invokeUsages, markBeforeInlining, customCanonicalizer).apply(callerGraph);
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	196
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	197 // 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	198 for (Node newNode : callerGraph.getNewNodes(markBeforeCanonicalization)) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	199 if (newNode instanceof Invoke) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	200 callerGraphInfo.pushInvoke((Invoke) newNode);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	201 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	202 }
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	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
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 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	206
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 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	208 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	209 } 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	210 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	211 } 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	212 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	213 } 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	214 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	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 }
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	217
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	218 private InlineableElement getInlineableElement(final ResolvedJavaMethod method, Invoke invoke, Assumptions 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	219 Class<? extends FixedWithNextNode> macroNodeClass = InliningUtil.getMacroNodeClass(replacements, 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	220 if (macroNodeClass != null) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	221 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	222 } 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	223 return buildGraph(method, invoke, 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	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 }
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	226
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 private StructuredGraph buildGraph(final ResolvedJavaMethod method, final Invoke invoke, final Assumptions 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	228 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	229 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	230
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	231 // 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	232 // any invokes
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 StructuredGraph intrinsicGraph = InliningUtil.getIntrinsicGraph(replacements, 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	234 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	235 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	236 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	237 } 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	238 StructuredGraph cachedGraph = getCachedGraph(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	239 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	240 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	241 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	242 } 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	243 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	244 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	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
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 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	249
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 @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	251 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	252 if (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	253 parseBytecodes(newGraph, 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	254 }
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	255
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	256 boolean callerHasMoreInformationAboutArguments = false;
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	257 NodeInputList<ValueNode> args = invoke.callTarget().arguments();
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	258 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	259 ValueNode arg = args.get(localNode.index());
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	260 if (arg.isConstant()) {
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	261 Constant constant = arg.asConstant();
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	262 newGraph.replaceFloating(localNode, ConstantNode.forConstant(constant, runtime, newGraph));
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	263 callerHasMoreInformationAboutArguments = true;
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	264 } else {
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	265 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	266 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	267 localNode.setStamp(joinedStamp);
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	268 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	269 }
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	270 }
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	271 }
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	272
9706 f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	273 if (!callerHasMoreInformationAboutArguments) {
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	274 // 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	275 // 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	276 // probability to check the inlining
f44d7e24cebd Fixes for the merge and inlining cleanups. Christian Haeubl <haeubl@ssw.jku.at> parents: 9705 diff changeset	277 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	278
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	279 if (OptCanonicalizer.getValue()) {
9908 91295caf53b6 CanonicalizerPhase: add OptCanonicalizeReads option (GRAAL-290) Bernhard Urban <bernhard.urban@jku.at> parents: 9864 diff changeset	280 new CanonicalizerPhase.Instance(runtime, assumptions, OptCanonicalizeReads.getValue()).apply(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	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
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 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	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 }
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	287
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	288 private StructuredGraph getCachedGraph(ResolvedJavaMethod method) {
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	289 if (CacheGraphs.getValue() && cache != null) {
6353 2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	290 StructuredGraph cachedGraph = cache.get(method);
2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	291 if (cachedGraph != null) {
2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	292 return cachedGraph;
2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	293 }
2590d9cc3b6d remove unnecessary debug scope during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 5788 diff changeset	294 }
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	295 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	296 }
7879 1474fe91323c create debug scope for graph building during inlining Lukas Stadler <lukas.stadler@jku.at> parents: 7827 diff changeset	297
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	298 private StructuredGraph parseBytecodes(StructuredGraph newGraph, Assumptions 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	299 if (plan != 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	300 plan.runPhases(PhasePosition.AFTER_PARSING, 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	301 }
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 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	303
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	304 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	305
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	306 if (OptCanonicalizer.getValue()) {
9908 91295caf53b6 CanonicalizerPhase: add OptCanonicalizeReads option (GRAAL-290) Bernhard Urban <bernhard.urban@jku.at> parents: 9864 diff changeset	307 new CanonicalizerPhase.Instance(runtime, assumptions, OptCanonicalizeReads.getValue()).apply(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	308 }
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
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	310 if (CullFrameStates.getValue()) {
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	311 new CullFrameStatesPhase().apply(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	312 }
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	313 if (CacheGraphs.getValue() && cache != null) {
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	314 cache.put(newGraph.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	315 }
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	316 return newGraph;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	317 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	318
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	319 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	320 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	321 if (info == null) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	322 info = new CompiledMethodInfo();
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	323 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	324 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	325 return info;
4670 41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4598 diff changeset	326 }
41034914e2ee add MethodContents assumption to fix debbugging issue Lukas Stadler <lukas.stadler@jku.at> parents: 4598 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 private abstract static class AbstractInliningPolicy implements InliningPolicy {
4594 eb6df44a1374 bugfixes, added bytecode complexity estimation Christian Haeubl <christian.haeubl@oracle.com> parents: 4591 diff changeset	329
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	330 protected final Replacements replacements;
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	331 protected final Map<Invoke, Double> hints;
4594 eb6df44a1374 bugfixes, added bytecode complexity estimation Christian Haeubl <christian.haeubl@oracle.com> parents: 4591 diff changeset	332
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	333 public AbstractInliningPolicy(Replacements replacements, Map<Invoke, Double> hints) {
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	334 this.replacements = replacements;
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	335 this.hints = hints;
4594 eb6df44a1374 bugfixes, added bytecode complexity estimation Christian Haeubl <christian.haeubl@oracle.com> parents: 4591 diff changeset	336 }
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7392 diff changeset	337
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	338 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	339 double inlineRatio = Math.min(RelevanceCapForInlining.getValue(), relevance);
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	340 return configuredMaximum * inlineRatio;
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	341 }
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 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 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	344 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	345 return hints.get(info.invoke());
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	346 }
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	347 return 1;
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	348 }
cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	349
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	350 protected boolean isIntrinsic(InlineInfo info) {
9855 6898d8995866 converted more options from GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9786 diff changeset	351 if (AlwaysInlineIntrinsics.getValue()) {
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	352 return onlyIntrinsics(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	353 } 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	354 return onlyForcedIntrinsics(info);
7388 599ea4fcdb6d added flag AlwaysInlineIntrinsics Christian Haeubl <haeubl@ssw.jku.at> parents: 7256 diff changeset	355 }
4569 333ce00358f4 added another inlining policy, added option to disable propagation of loop frequencies Christian Haeubl <christian.haeubl@oracle.com> parents: 4564 diff changeset	356 }
333ce00358f4 added another inlining policy, added option to disable propagation of loop frequencies Christian Haeubl <christian.haeubl@oracle.com> parents: 4564 diff changeset	357
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	358 private boolean onlyIntrinsics(InlineInfo info) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	359 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	360 if (!InliningUtil.canIntrinsify(replacements, info.methodAt(i))) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	361 return false;
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	362 }
7388 599ea4fcdb6d added flag AlwaysInlineIntrinsics Christian Haeubl <haeubl@ssw.jku.at> parents: 7256 diff changeset	363 }
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	364 return true;
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	365 }
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
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	367 private boolean onlyForcedIntrinsics(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	368 for (int i = 0; i < info.numberOfMethods(); i++) {
8930 f50d10434d3e Merge Lukas Stadler <lukas.stadler@jku.at> parents: 8915 8637 diff changeset	369 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	370 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	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 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	373 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	374 }
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	375 }
880619fd6a67 allow MethodSubstitutions and MacroSubstitutions to be forced (instead of depending on inlining) Lukas Stadler <lukas.stadler@jku.at> parents: 8618 diff changeset	376 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	377 }
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	378
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	379 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	380 int size = 0;
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	381 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	382 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	383 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	384 return size;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	385 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	386
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	387 protected static int determineNodeCount(InlineInfo info) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	388 int nodes = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	389 for (int i = 0; i < info.numberOfMethods(); i++) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	390 InlineableElement elem = info.inlineableElementAt(i);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	391 if (elem != null) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	392 nodes += elem.getNodeCount();
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 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	395 return nodes;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	396 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	397
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	398 protected static double determineInvokeProbability(InlineInfo info) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	399 double invokeProbability = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	400 for (int i = 0; i < info.numberOfMethods(); i++) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	401 InlineableElement callee = info.inlineableElementAt(i);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	402 Iterable<Invoke> invokes = callee.getInvokes();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	403 if (invokes.iterator().hasNext()) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	404 NodesToDoubles nodeProbabilities = new ComputeProbabilityClosure((StructuredGraph) callee).apply();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	405 for (Invoke invoke : invokes) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	406 invokeProbability += nodeProbabilities.get(invoke.asNode());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	407 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	408 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	409 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	410 return invokeProbability;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	411 }
7065 cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	412 }
cfacf5d5bade fixed logging of inlining decisions Christian Haeubl <haeubl@ssw.jku.at> parents: 7064 diff changeset	413
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	414 private static class GreedyInliningPolicy extends AbstractInliningPolicy {
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7392 diff changeset	415
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	416 public GreedyInliningPolicy(Replacements replacements, Map<Invoke, Double> hints) {
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	417 super(replacements, hints);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	418 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	419
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	420 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	421 if (currentGraph.getNodeCount() >= MaximumDesiredSize.getValue()) {
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	422 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	423 metricInliningStoppedByMaxDesiredSize.increment();
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	424 return false;
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	425 }
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	426 return true;
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	427 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	428
9234 b9cf7d0b598e removal of FixedNode.probability (draft) Christian Haeubl <haeubl@ssw.jku.at> parents: 9147 diff changeset	429 @Override
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	430 public boolean isWorthInlining(InlineInfo info, int inliningDepth, double probability, double relevance, boolean fullyProcessed) {
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	431 if (isIntrinsic(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);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	436
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);
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	438 if (SmallCompiledLowLevelGraphSize.getValue() > 0 && lowLevelGraphSize > SmallCompiledLowLevelGraphSize.getValue() * inliningBonus) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	439 return InliningUtil.logNotInlinedMethod(info, inliningDepth, "too large previous low-level graph: %d", lowLevelGraphSize);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	440 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	441
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	442 /*
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	443 * 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	444 * 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	445 * 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	446 * 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	447 */
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 int nodes = determineNodeCount(info);
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	450 if (nodes < TrivialInliningSize.getValue() * inliningBonus) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	451 return InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "trivial (nodes=%d)", nodes);
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	452 }
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	453
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	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) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	456 return InliningUtil.logNotInlinedMethod(info, inliningDepth, "invoke probability is too high (%f)", invokes);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	457 }
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	458
9864 063a712fe8d8 converted remaining options in GraalOptions to new system (GRAAL-27) Doug Simon <doug.simon@oracle.com> parents: 9855 diff changeset	459 double maximumNodes = computeMaximumSize(relevance, (int) (MaximumInliningSize.getValue() * inliningBonus));
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	460 if (nodes < maximumNodes) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	461 return InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "relevance-based (relevance=%f, nodes=%d)", relevance, nodes);
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	462 }
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	463
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	464 return InliningUtil.logNotInlinedMethod(info, inliningDepth, "(relevance=%f, probability=%f, bonus=%f)", relevance, probability, inliningBonus);
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	465 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	466 }
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	467
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	468 private static class InliningIterator {
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7392 diff changeset	469
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	470 private final FixedNode start;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	471 private final Deque<FixedNode> nodeQueue;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	472 private final NodeBitMap queuedNodes;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	473
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	474 public InliningIterator(FixedNode start, NodeBitMap visitedFixedNodes) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	475 this.start = start;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	476 this.nodeQueue = new ArrayDeque<>();
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	477 this.queuedNodes = visitedFixedNodes;
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	478 assert start.isAlive();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	479 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	480
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	481 public LinkedList<Invoke> apply() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	482 LinkedList<Invoke> invokes = new LinkedList<>();
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	483 FixedNode current;
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	484 forcedQueue(start);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	485
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	486 while ((current = nextQueuedNode()) != null) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	487 assert current.isAlive();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	488
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	489 if (current instanceof Invoke) {
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	490 if (current != start) {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	491 invokes.addLast((Invoke) current);
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	492 }
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	493 queueSuccessors(current);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	494 } else if (current instanceof LoopBeginNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	495 queueSuccessors(current);
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	496 } else if (current instanceof LoopEndNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	497 // nothing todo
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	498 } else if (current instanceof MergeNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	499 queueSuccessors(current);
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	500 } else if (current instanceof FixedWithNextNode) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	501 queueSuccessors(current);
9435 794370a64b71 Replace AbstractEndNode usages with EndNode usages wherever appropriate. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9434 diff changeset	502 } else if (current instanceof EndNode) {
794370a64b71 Replace AbstractEndNode usages with EndNode usages wherever appropriate. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9434 diff changeset	503 queueMerge((EndNode) current);
8385 85d4392b9e26 Introduce a ControlSinkNode base class. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7879 diff changeset	504 } else if (current instanceof ControlSinkNode) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	505 // nothing todo
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	506 } else if (current instanceof ControlSplitNode) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	507 queueSuccessors(current);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	508 } else {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	509 assert false : current;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	510 }
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	511 }
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	512
8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	513 return invokes;
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	514 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	515
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	516 private void queueSuccessors(FixedNode x) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	517 for (Node node : x.successors()) {
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	518 queue(node);
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	519 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	520 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	521
7684 bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	522 private void queue(Node node) {
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	523 if (node != null && !queuedNodes.isMarked(node)) {
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	524 forcedQueue(node);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	525 }
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	526 }
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	527
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	528 private void forcedQueue(Node node) {
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	529 queuedNodes.mark(node);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	530 nodeQueue.addFirst((FixedNode) node);
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	531 }
bbf97d6688d3 cleanup for the inlining policies Christian Haeubl <haeubl@ssw.jku.at> parents: 7392 diff changeset	532
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	533 private FixedNode nextQueuedNode() {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	534 if (nodeQueue.isEmpty()) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	535 return null;
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 FixedNode result = nodeQueue.removeFirst();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	539 assert queuedNodes.isMarked(result);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	540 return result;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	541 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	542
9434 50f02c7d1cec Rename EndNode => AbstractEndNode and make abstract class. Introduce concrete EndNode subclass. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9389 diff changeset	543 private void queueMerge(AbstractEndNode end) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	544 MergeNode merge = end.merge();
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	545 if (!queuedNodes.isMarked(merge) && visitedAllEnds(merge)) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	546 queuedNodes.mark(merge);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	547 nodeQueue.add(merge);
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	548 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	549 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	550
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	551 private boolean visitedAllEnds(MergeNode merge) {
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	552 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	553 if (!queuedNodes.isMarked(merge.forwardEndAt(i))) {
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	554 return false;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	555 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	556 }
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	557 return true;
0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	558 }
7064 8d16b9b2c51e first part of refactoring the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 7063 diff changeset	559 }
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	560
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	561 /**
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	562 * 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	563 * invocation can have multiple graphs).
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	564 */
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	565 static class InliningData {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	566
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	567 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	568
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	569 private final ArrayDeque<GraphInfo> graphQueue;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	570 private final ArrayDeque<MethodInvocation> invocationQueue;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	571
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	572 private int maxGraphs;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	573
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	574 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	575 this.graphQueue = new ArrayDeque<>();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	576 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	577 this.maxGraphs = 1;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	578
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	579 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	580 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	581 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	582
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	583 public int graphCount() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	584 return graphQueue.size();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	585 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	586
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	587 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	588 assert !contains(graph);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	589 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	590 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	591 assert invokes.size() == count(graph.getInvokes());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	592 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	593 assert graphQueue.size() <= maxGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	594 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	595
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	596 public void pushDummyGraph() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	597 graphQueue.push(DummyGraphInfo);
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	598 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	599
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	600 public boolean hasUnprocessedGraphs() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	601 return !graphQueue.isEmpty();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	602 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	603
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	604 public GraphInfo currentGraph() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	605 return graphQueue.peek();
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
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	608 public void popGraph() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	609 graphQueue.pop();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	610 assert graphQueue.size() <= maxGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	611 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	612
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	613 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	614 assert count >= 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	615 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	616 graphQueue.pop();
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	617 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	618 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	619
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	620 public MethodInvocation currentInvocation() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	621 return invocationQueue.peek();
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 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	625 MethodInvocation methodInvocation = new MethodInvocation(info, new Assumptions(assumptions.useOptimisticAssumptions()), probability, relevance);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	626 invocationQueue.push(methodInvocation);
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	627 maxGraphs += info.numberOfMethods();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	628 assert graphQueue.size() <= maxGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	629 return methodInvocation;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	630 }
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 public void popInvocation() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	633 maxGraphs -= invocationQueue.peek().callee.numberOfMethods();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	634 assert graphQueue.size() <= maxGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	635 invocationQueue.pop();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	636 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	637
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	638 public int countRecursiveInlining(ResolvedJavaMethod method) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	639 int count = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	640 for (GraphInfo graphInfo : graphQueue) {
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	641 if (method.equals(graphInfo.method())) {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	642 count++;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	643 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	644 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	645 return count;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	646 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	647
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	648 public int inliningDepth() {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	649 assert invocationQueue.size() > 0;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	650 return invocationQueue.size() - 1;
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	651 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	652
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	653 @Override
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	654 public String toString() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	655 StringBuilder result = new StringBuilder("Invocations: ");
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	656
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	657 for (MethodInvocation invocation : invocationQueue) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	658 result.append(invocation.callee().numberOfMethods());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	659 result.append("x ");
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	660 result.append(invocation.callee().invoke());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	661 result.append("; ");
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 result.append("\nGraphs: ");
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	665 for (GraphInfo graph : graphQueue) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	666 result.append(graph.graph());
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	667 result.append("; ");
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 return result.toString();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	671 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	672
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	673 private boolean contains(StructuredGraph graph) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	674 for (GraphInfo info : graphQueue) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	675 if (info.graph() == graph) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	676 return true;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	677 }
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 return false;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	680 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	681
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	682 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	683 int count = 0;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	684 Iterator<Invoke> iterator = invokes.iterator();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	685 while (iterator.hasNext()) {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	686 iterator.next();
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	687 count++;
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 return count;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	690 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	691 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	692
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	693 private static class MethodInvocation {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	694
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	695 private final InlineInfo callee;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	696 private final Assumptions assumptions;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	697 private final double probability;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	698 private final double relevance;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	699
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	700 private int processedGraphs;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	701
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	702 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	703 this.callee = info;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	704 this.assumptions = assumptions;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	705 this.probability = probability;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	706 this.relevance = relevance;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	707 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	708
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	709 public void incrementProcessedGraphs() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	710 processedGraphs++;
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	711 assert processedGraphs <= callee.numberOfMethods();
9701 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
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	714 public int processedGraphs() {
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	715 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	716 return processedGraphs;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	717 }
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	718
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	719 public int totalGraphs() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	720 return callee.numberOfMethods();
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	721 }
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 public InlineInfo callee() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	724 return callee;
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 public Assumptions assumptions() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	728 return assumptions;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	729 }
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	730
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	731 public double probability() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	732 return probability;
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
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	735 public double relevance() {
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	736 return relevance;
e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	737 }
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	738
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	739 public boolean isRoot() {
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	740 return callee == null;
b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	741 }
9701 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
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	744 private static class GraphInfo {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	745
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	746 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	747 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	748 private final double probability;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	749 private final double relevance;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	750
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	751 private NodesToDoubles nodeProbabilities;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	752 private NodesToDoubles nodeRelevance;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	753
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	754 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	755 this.graph = graph;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	756 this.remainingInvokes = invokes;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	757 this.probability = probability;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	758 this.relevance = relevance;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	759
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	760 if (graph != null) {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	761 computeProbabilities();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	762 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	763 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	764
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	765 public ResolvedJavaMethod method() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	766 return graph.method();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	767 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	768
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	769 public boolean hasRemainingInvokes() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	770 return !remainingInvokes.isEmpty();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	771 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	772
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	773 public StructuredGraph graph() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	774 return graph;
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	775 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	776
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	777 public Invoke popInvoke() {
9722 b5dd7e3c8c80 Bugfixes for the inlining phase and for -XX:+PrintInlining. Christian Haeubl <haeubl@ssw.jku.at> parents: 9708 diff changeset	778 return remainingInvokes.removeFirst();
9702 907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	779 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	780
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	781 public void pushInvoke(Invoke invoke) {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	782 remainingInvokes.push(invoke);
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	783 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	784
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	785 public void computeProbabilities() {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	786 nodeProbabilities = new ComputeProbabilityClosure(graph).apply();
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	787 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	788 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	789
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	790 public double invokeProbability(Invoke invoke) {
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	791 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	792 }
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	793
907f1124b427 Removed memory leak and bugfixes for the InliningPhase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9701 diff changeset	794 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	795 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	796 }
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
9701 e538498d6eae some refactorings and cleanups for the InliningPhase Christian Haeubl <haeubl@ssw.jku.at> parents: 9699 diff changeset	799 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	800
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	801 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	802
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	803 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	804 }
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	805
9703 57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	806 public int lowLevelNodeCount() {
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	807 return lowLevelNodes;
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	808 }
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	809
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	810 public void setLowLevelNodeCount(int lowLevelNodes) {
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	811 this.lowLevelNodes = lowLevelNodes;
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	812 }
57113d21ce36 Added some tunable parameters to the inlining phase. Christian Haeubl <haeubl@ssw.jku.at> parents: 9702 diff changeset	813
7063 0d7dfa5b79e8 merged inlining and intrinsification phases Christian Haeubl <haeubl@ssw.jku.at> parents: 6539 diff changeset	814 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	815 }

Mercurial > hg > truffle

annotate graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java @ 9914:84890660eefb