Mercurial > hg > truffle
changeset 15672:6da6cba882f6
[inlining] access levels in AbstractInliningPolicy back to what they were
author | Miguel Garcia <miguel.m.garcia@oracle.com> |
---|---|
date | Thu, 15 May 2014 12:16:10 +0200 |
parents | c80794ec690b |
children | 9205a047fc86 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java |
diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Thu May 15 11:22:08 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Thu May 15 12:16:10 2014 +0200 @@ -28,7 +28,6 @@ import static com.oracle.graal.compiler.common.type.StampFactory.*; import java.util.*; -import java.util.function.*; import com.oracle.graal.api.code.*; import com.oracle.graal.api.code.Assumptions.Assumption;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java Thu May 15 11:22:08 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java Thu May 15 12:16:10 2014 +0200 @@ -45,19 +45,19 @@ this.hints = hints; } - public double computeMaximumSize(double relevance, int configuredMaximum) { + protected double computeMaximumSize(double relevance, int configuredMaximum) { double inlineRatio = Math.min(RelevanceCapForInlining.getValue(), relevance); return configuredMaximum * inlineRatio; } - public double getInliningBonus(InlineInfo info) { + protected double getInliningBonus(InlineInfo info) { if (hints != null && hints.containsKey(info.invoke())) { return hints.get(info.invoke()); } return 1; } - public boolean isIntrinsic(Replacements replacements, InlineInfo info) { + protected boolean isIntrinsic(Replacements replacements, InlineInfo info) { if (AlwaysInlineIntrinsics.getValue()) { return onlyIntrinsics(replacements, info); } else { @@ -86,7 +86,7 @@ return true; } - public static int previousLowLevelGraphSize(InlineInfo info) { + protected static int previousLowLevelGraphSize(InlineInfo info) { int size = 0; for (int i = 0; i < info.numberOfMethods(); i++) { ResolvedJavaMethod m = info.methodAt(i); @@ -99,7 +99,7 @@ return size; } - public static int determineNodeCount(InlineInfo info) { + protected static int determineNodeCount(InlineInfo info) { int nodes = 0; for (int i = 0; i < info.numberOfMethods(); i++) { InliningUtil.Inlineable elem = info.inlineableElementAt(i); @@ -110,7 +110,7 @@ return nodes; } - public static double determineInvokeProbability(ToDoubleFunction<FixedNode> probabilities, InlineInfo info) { + protected static double determineInvokeProbability(ToDoubleFunction<FixedNode> probabilities, InlineInfo info) { double invokeProbability = 0; for (int i = 0; i < info.numberOfMethods(); i++) { InliningUtil.Inlineable callee = info.inlineableElementAt(i);