# HG changeset patch # User Miguel Garcia # Date 1400248842 -7200 # Node ID 13fa2732a8bd7f161ae6a74ac59da49553e7a56b # Parent 9e697dbc28a70806a87829eba3355a5f79e69ce3 [inlining] readability by means of import static diff -r 9e697dbc28a7 -r 13fa2732a8bd graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java Fri May 16 15:54:13 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java Fri May 16 16:00:42 2014 +0200 @@ -34,6 +34,9 @@ import java.util.Map; import java.util.function.ToDoubleFunction; +import static com.oracle.graal.phases.common.inlining.InliningUtil.logInlinedMethod; +import static com.oracle.graal.phases.common.inlining.InliningUtil.logNotInlinedMethod; + import static com.oracle.graal.compiler.common.GraalOptions.*; public class GreedyInliningPolicy extends AbstractInliningPolicy { @@ -57,17 +60,17 @@ public boolean isWorthInlining(ToDoubleFunction probabilities, Replacements replacements, InlineInfo info, int inliningDepth, double probability, double relevance, boolean fullyProcessed) { if (InlineEverything.getValue()) { - InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "inline everything"); + logInlinedMethod(info, inliningDepth, fullyProcessed, "inline everything"); return true; } if (isIntrinsic(replacements, info)) { - InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "intrinsic"); + logInlinedMethod(info, inliningDepth, fullyProcessed, "intrinsic"); return true; } if (info.shouldInline()) { - InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "forced inlining"); + logInlinedMethod(info, inliningDepth, fullyProcessed, "forced inlining"); return true; } @@ -76,13 +79,13 @@ int lowLevelGraphSize = previousLowLevelGraphSize(info); if (SmallCompiledLowLevelGraphSize.getValue() > 0 && lowLevelGraphSize > SmallCompiledLowLevelGraphSize.getValue() * inliningBonus) { - InliningUtil.logNotInlinedMethod(info, inliningDepth, "too large previous low-level graph (low-level-nodes: %d, relevance=%f, probability=%f, bonus=%f, nodes=%d)", lowLevelGraphSize, - relevance, probability, inliningBonus, nodes); + logNotInlinedMethod(info, inliningDepth, "too large previous low-level graph (low-level-nodes: %d, relevance=%f, probability=%f, bonus=%f, nodes=%d)", lowLevelGraphSize, relevance, + probability, inliningBonus, nodes); return false; } if (nodes < TrivialInliningSize.getValue() * inliningBonus) { - InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "trivial (relevance=%f, probability=%f, bonus=%f, nodes=%d)", relevance, probability, inliningBonus, nodes); + logInlinedMethod(info, inliningDepth, fullyProcessed, "trivial (relevance=%f, probability=%f, bonus=%f, nodes=%d)", relevance, probability, inliningBonus, nodes); return true; } @@ -94,19 +97,19 @@ */ double invokes = determineInvokeProbability(probabilities, info); if (LimitInlinedInvokes.getValue() > 0 && fullyProcessed && invokes > LimitInlinedInvokes.getValue() * inliningBonus) { - InliningUtil.logNotInlinedMethod(info, inliningDepth, "callee invoke probability is too high (invokeP=%f, relevance=%f, probability=%f, bonus=%f, nodes=%d)", invokes, relevance, - probability, inliningBonus, nodes); + logNotInlinedMethod(info, inliningDepth, "callee invoke probability is too high (invokeP=%f, relevance=%f, probability=%f, bonus=%f, nodes=%d)", invokes, relevance, probability, + inliningBonus, nodes); return false; } double maximumNodes = computeMaximumSize(relevance, (int) (MaximumInliningSize.getValue() * inliningBonus)); if (nodes <= maximumNodes) { - InliningUtil.logInlinedMethod(info, inliningDepth, fullyProcessed, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d <= %f)", relevance, probability, inliningBonus, - nodes, maximumNodes); + logInlinedMethod(info, inliningDepth, fullyProcessed, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d <= %f)", relevance, probability, inliningBonus, nodes, + maximumNodes); return true; } - InliningUtil.logNotInlinedMethod(info, inliningDepth, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d > %f)", relevance, probability, inliningBonus, nodes, maximumNodes); + logNotInlinedMethod(info, inliningDepth, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d > %f)", relevance, probability, inliningBonus, nodes, maximumNodes); return false; } }