Mercurial > hg > truffle
changeset 18336:fbd92038a434
made replay compilation test failures less verbose
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 11 Nov 2014 11:45:23 +0100 |
parents | 636d3aa761e4 |
children | 3432571b7189 |
files | graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java |
diffstat | 1 files changed, 22 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Nov 11 11:43:27 2014 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Nov 11 11:45:23 2014 +0100 @@ -690,37 +690,32 @@ CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graphToCompile.method(), false); try (Context c = new Context(); Debug.Scope s = Debug.scope("ReplayCompiling", new DebugDumpScope("REPLAY", true))) { - try { - // Capturing compilation - Request<CompilationResult> capturingRequest = c.get(new GraalCompiler.Request<>(graphToCompile, null, cc, installedCodeOwner, getProviders(), getBackend(), getCodeCache().getTarget(), - null, getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL, getProfilingInfo(graphToCompile), getSpeculationLog(), getSuites(), new CompilationResult(), - CompilationResultBuilderFactory.Default)); - CompilationResult capturingResult = GraalCompiler.compile(capturingRequest); - String path = DeepFieldsEquals.equals(originalResult, capturingResult); - if (path != null) { - DeepFieldsEquals.equals(originalResult, capturingResult); - Assert.fail("Capturing replay compilation result differs from original compilation result at " + path); - } + // Capturing compilation + Request<CompilationResult> capturingRequest = c.get(new GraalCompiler.Request<>(graphToCompile, null, cc, installedCodeOwner, getProviders(), getBackend(), getCodeCache().getTarget(), + null, getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL, getProfilingInfo(graphToCompile), getSpeculationLog(), getSuites(), new CompilationResult(), + CompilationResultBuilderFactory.Default)); + CompilationResult capturingResult = GraalCompiler.compile(capturingRequest); + String path = DeepFieldsEquals.equals(originalResult, capturingResult); + if (path != null) { + DeepFieldsEquals.equals(originalResult, capturingResult); + Assert.fail("Capturing replay compilation result differs from original compilation result at " + path); + } - c.setMode(Mode.Replaying); + c.setMode(Mode.Replaying); - // Replay compilation - Request<CompilationResult> replyRequest = new GraalCompiler.Request<>(graphToCompile, null, cc, capturingRequest.installedCodeOwner, capturingRequest.providers, - capturingRequest.backend, capturingRequest.target, null, capturingRequest.graphBuilderSuite, capturingRequest.optimisticOpts, capturingRequest.profilingInfo, - capturingRequest.speculationLog, capturingRequest.suites, new CompilationResult(), capturingRequest.factory); + // Replay compilation + Request<CompilationResult> replyRequest = new GraalCompiler.Request<>(graphToCompile, null, cc, capturingRequest.installedCodeOwner, capturingRequest.providers, capturingRequest.backend, + capturingRequest.target, null, capturingRequest.graphBuilderSuite, capturingRequest.optimisticOpts, capturingRequest.profilingInfo, capturingRequest.speculationLog, + capturingRequest.suites, new CompilationResult(), capturingRequest.factory); - CompilationResult replayResult = GraalCompiler.compile(replyRequest); - path = DeepFieldsEquals.equals(originalResult, replayResult); - if (path != null) { - DeepFieldsEquals.equals(originalResult, replayResult); - Assert.fail("Capturing replay compilation result differs from original compilation result at " + path); - } + CompilationResult replayResult = GraalCompiler.compile(replyRequest); + path = DeepFieldsEquals.equals(originalResult, replayResult); + if (path != null) { + DeepFieldsEquals.equals(originalResult, replayResult); + Assert.fail("Capturing replay compilation result differs from original compilation result at " + path); + } - return capturingResult; - } catch (Throwable e) { - e.printStackTrace(); - throw e; - } + return capturingResult; } catch (Throwable e) { throw Debug.handle(e); }