Mercurial > hg > graal-compiler
changeset 22908:774b5a2ed732
Add scopes for dumping in conditional elimination tests
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Thu, 29 Oct 2015 12:22:45 -0700 |
parents | 6943313d3779 |
children | 5ce3e8996c83 |
files | graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java |
diffstat | 1 files changed, 23 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java Thu Oct 29 12:22:17 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java Thu Oct 29 12:22:45 2015 -0700 @@ -57,6 +57,7 @@ testConditionalElimination(snippet, referenceSnippet, false); } + @SuppressWarnings("try") protected void testConditionalElimination(String snippet, String referenceSnippet, boolean applyConditionalEliminationOnReference) { StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES); Debug.dump(graph, "Graph"); @@ -68,21 +69,30 @@ */ canonicalizer1.disableSimplification(); } - canonicalizer1.apply(graph, context); - new ConvertDeoptimizeToGuardPhase().apply(graph, context); CanonicalizerPhase canonicalizer = new CanonicalizerPhase(); - new DominatorConditionalEliminationPhase(true).apply(graph, context); - canonicalizer.apply(graph, context); - canonicalizer.apply(graph, context); - new ConvertDeoptimizeToGuardPhase().apply(graph, context); + try (Debug.Scope scope = Debug.scope("ConditionalEliminationTest", graph)) { + canonicalizer1.apply(graph, context); + new ConvertDeoptimizeToGuardPhase().apply(graph, context); + new DominatorConditionalEliminationPhase(true).apply(graph, context); + canonicalizer.apply(graph, context); + canonicalizer.apply(graph, context); + new ConvertDeoptimizeToGuardPhase().apply(graph, context); + } catch (Throwable t) { + Debug.handle(t); + } StructuredGraph referenceGraph = parseEager(referenceSnippet, AllowAssumptions.YES); - new ConvertDeoptimizeToGuardPhase().apply(referenceGraph, context); - if (applyConditionalEliminationOnReference) { - new DominatorConditionalEliminationPhase(true).apply(referenceGraph, context); - canonicalizer.apply(referenceGraph, context); - canonicalizer.apply(referenceGraph, context); - } else { - canonicalizer.apply(referenceGraph, context); + try (Debug.Scope scope = Debug.scope("ConditionalEliminationTest.ReferenceGraph", graph)) { + + new ConvertDeoptimizeToGuardPhase().apply(referenceGraph, context); + if (applyConditionalEliminationOnReference) { + new DominatorConditionalEliminationPhase(true).apply(referenceGraph, context); + canonicalizer.apply(referenceGraph, context); + canonicalizer.apply(referenceGraph, context); + } else { + canonicalizer.apply(referenceGraph, context); + } + } catch (Throwable t) { + Debug.handle(t); } assertEquals(referenceGraph, graph); }