# HG changeset patch # User Christian Haeubl # Date 1371113698 -7200 # Node ID 7f2e23d309b37f6018f44b8eaac923c2ca921f70 # Parent 53f090c5975aa8c418a198ecb1bba472a8702b26 Minor refactorings for ComputeInliningRelevanceClosure. diff -r 53f090c5975a -r 7f2e23d309b3 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ComputeInliningRelevanceClosure.java --- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ComputeInliningRelevanceClosure.java Thu Jun 13 09:41:06 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ComputeInliningRelevanceClosure.java Thu Jun 13 10:54:58 2013 +0200 @@ -55,14 +55,14 @@ public ComputeInliningRelevanceIterator(StructuredGraph graph) { super(graph); - this.scopes = computeLowestPathProbabilities(); + this.scopes = computeScopesAndProbabilities(); } @Override protected void initializeScope() { Scope scope = scopes.get(currentScopeStart); parentRelevance = getParentScopeRelevance(scope); - currentProbability = scope.minPathProbability; + currentProbability = scope.probability; } private double getParentScopeRelevance(Scope scope) { @@ -72,7 +72,7 @@ for (AbstractEndNode end : ((LoopBeginNode) scope.start).forwardEnds()) { parentProbability += nodeProbabilities.get(end); } - return parentProbability / scope.parent.minPathProbability; + return parentProbability / scope.parent.probability; } else { assert scope.parent == null; return 1.0; @@ -89,11 +89,11 @@ assert !Double.isNaN(relevance); } - private HashMap computeLowestPathProbabilities() { + private HashMap computeScopesAndProbabilities() { HashMap result = new HashMap<>(); for (Scope scope : computeScopes()) { - scope.minPathProbability = Math.max(EPSILON, nodeProbabilities.get(scope.start)); + scope.probability = Math.max(EPSILON, nodeProbabilities.get(scope.start)); result.put(scope.start, scope); } @@ -132,7 +132,7 @@ public final FixedNode start; public final Scope parent; - public double minPathProbability; + public double probability; public Scope(FixedNode start, Scope parent) { this.start = start;