Mercurial > hg > graal-compiler
changeset 22620:0b85ebe05f88
Update jvmci import: Move CTW command into Graal
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Fri, 11 Sep 2015 08:59:29 -0700 |
| parents | 50da094850fb |
| children | 148cffb7bc99 |
| files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java mx.graal/mx_graal.py mx.graal/suite.py |
| diffstat | 4 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Thu Sep 10 10:13:16 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Fri Sep 11 08:59:29 2015 -0700 @@ -516,4 +516,8 @@ return true; } + public static void main(String[] args) throws Throwable { + HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) HotSpotJVMCIRuntime.runtime().getCompiler(); + compiler.compileTheWorld(); + } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java Thu Sep 10 10:13:16 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java Fri Sep 11 08:59:29 2015 -0700 @@ -72,7 +72,6 @@ } } - @Override public void compileTheWorld() throws Throwable { CompilerToVM compilerToVM = jvmciRuntime.getCompilerToVM(); int iterations = CompileTheWorld.Options.CompileTheWorldIterations.getValue();
--- a/mx.graal/mx_graal.py Thu Sep 10 10:13:16 2015 -0700 +++ b/mx.graal/mx_graal.py Fri Sep 11 08:59:29 2015 -0700 @@ -219,7 +219,7 @@ if isJVMCIEnabled(vm_): if vm_ == 'jvmci': vmargs += ['-XX:+BootstrapJVMCI'] - vmargs += ['-G:CompileTheWorldClasspath=' + jar, '-XX:-UseJVMCIClassLoader', 'jdk.internal.jvmci.hotspot.CompileTheWorldMain'] + vmargs += ['-G:CompileTheWorldClasspath=' + jar, '-XX:-UseJVMCIClassLoader', 'com.oracle.graal.hotspot.CompileTheWorld'] else: vmargs += ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + jar]
--- a/mx.graal/suite.py Thu Sep 10 10:13:16 2015 -0700 +++ b/mx.graal/suite.py Fri Sep 11 08:59:29 2015 -0700 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "10a9e989850ea4600b5bd677dfbf5bfc0a0d3753", + "version" : "94ba89d569367489f17fc298e25c43eeaec96a22", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},