Mercurial > hg > truffle
diff graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java @ 19232:66c60942c06c
GraalCompiler.emitLowLevel: use LowLevelSuites instead of LowLevelCompilerConfiguration.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Tue, 10 Feb 2015 11:09:28 +0100 |
parents | 41af11212ed3 |
children | 9f411d79ffc0 |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Feb 10 10:29:39 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Feb 10 11:09:28 2015 +0100 @@ -50,6 +50,7 @@ import com.oracle.graal.graph.*; import com.oracle.graal.java.*; import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.phases.*; import com.oracle.graal.nodeinfo.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.cfg.*; @@ -88,6 +89,7 @@ private final Providers providers; private final Backend backend; private final Suites suites; + private final LowLevelSuites lowLevelSuites; /** * Can be overridden by unit tests to verify properties of the graph. @@ -163,10 +165,16 @@ return ret; } + protected LowLevelSuites createLowLevelSuites() { + LowLevelSuites ret = backend.getSuites().createLowLevelSuites(); + return ret; + } + public GraalCompilerTest() { this.backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend(); this.providers = getBackend().getProviders(); this.suites = createSuites(); + this.lowLevelSuites = createLowLevelSuites(); installSubstitutions(); } @@ -187,6 +195,7 @@ } this.providers = backend.getProviders(); this.suites = createSuites(); + this.lowLevelSuites = createLowLevelSuites(); installSubstitutions(); } @@ -354,6 +363,10 @@ return suites; } + protected LowLevelSuites getLowLevelSuites() { + return lowLevelSuites; + } + protected Providers getProviders() { return providers; } @@ -740,7 +753,8 @@ lastCompiledGraph = graphToCompile; CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graphToCompile.method(), false); Request<CompilationResult> request = new Request<>(graphToCompile, cc, installedCodeOwner, getProviders(), getBackend(), getCodeCache().getTarget(), null, getDefaultGraphBuilderSuite(), - OptimisticOptimizations.ALL, getProfilingInfo(graphToCompile), getSpeculationLog(), getSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default); + OptimisticOptimizations.ALL, getProfilingInfo(graphToCompile), getSpeculationLog(), getSuites(), getLowLevelSuites(), new CompilationResult(), + CompilationResultBuilderFactory.Default); return GraalCompiler.compile(request); }