Mercurial > hg > graal-jvmci-8
changeset 8621:10163579bbae
Merge
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Wed, 03 Apr 2013 16:47:11 +0200 |
parents | 516e35a8eed8 (diff) 832b9a115a2d (current diff) |
children | d8f28e2e2b49 |
files | graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java |
diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/IterativeInliningTest.java Wed Apr 03 15:01:48 2013 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/IterativeInliningTest.java Wed Apr 03 16:47:11 2013 +0200 @@ -101,7 +101,7 @@ private void processMethod(final String snippet) { graph = parse(snippet); new ComputeProbabilityPhase().apply(graph); - GraalOptions.PEAReadCache = true; + GraalOptions.OptEarlyReadElimination = true; new IterativeInliningPhase(runtime(), new Assumptions(false), null, getDefaultPhasePlan(), OptimisticOptimizations.ALL).apply(graph); } }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java Wed Apr 03 15:01:48 2013 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java Wed Apr 03 16:47:11 2013 +0200 @@ -204,7 +204,7 @@ new ComputeProbabilityPhase().apply(graph); Assumptions assumptions = new Assumptions(false); new InliningPhase(runtime(), null, assumptions, null, getDefaultPhasePlan(), OptimisticOptimizations.ALL).apply(graph); - GraalOptions.PEAReadCache = true; + GraalOptions.OptEarlyReadElimination = true; new PartialEscapeAnalysisPhase(runtime(), assumptions, false).apply(graph); } }
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java Wed Apr 03 15:01:48 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java Wed Apr 03 16:47:11 2013 +0200 @@ -68,7 +68,6 @@ public static int EscapeAnalysisIterations = 2; public static String EscapeAnalyzeOnly = null; public static int MaximumEscapeAnalysisArrayLength = 32; - public static boolean PEAReadCache = ____; public static boolean PEAInliningHints = ____; public static double TailDuplicationProbability = 0.5; @@ -191,6 +190,7 @@ public static boolean OptAssumptions = true; public static boolean OptConvertDeoptsToGuards = true; public static boolean OptReadElimination = true; + public static boolean OptEarlyReadElimination = true; public static boolean OptCanonicalizer = true; public static boolean OptScheduleOutOfLoops = true; public static boolean OptEliminateGuards = true;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeAnalysisPhase.java Wed Apr 03 15:01:48 2013 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeAnalysisPhase.java Wed Apr 03 16:47:11 2013 +0200 @@ -76,7 +76,7 @@ return; } - if (!GraalOptions.PEAReadCache) { + if (!GraalOptions.OptEarlyReadElimination) { boolean analyzableNodes = false; for (Node node : graph.getNodes()) { if (node instanceof VirtualizableAllocation) {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Wed Apr 03 15:01:48 2013 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Wed Apr 03 16:47:11 2013 +0200 @@ -110,7 +110,7 @@ trace("%s ", node); deleted = false; } - if (GraalOptions.PEAReadCache) { + if (GraalOptions.OptEarlyReadElimination) { if (!deleted) { if (node instanceof StoreFieldNode) { METRIC_STOREFIELD_RECORDED.increment();