Mercurial > hg > graal-compiler

changeset 22653:9ca1a782b6c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update jvmci import: Replace JVMCICompileWithC1Only with package based controls
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 17 Sep 2015 22:15:07 -0700
parents 3a68d50004d8
children 4fca22325604
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java mx.graal/suite.py
diffstat 2 files changed, 21 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java	Thu Sep 17 16:48:47 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java	Thu Sep 17 22:15:07 2015 -0700
@@ -29,12 +29,24 @@
 import jdk.internal.jvmci.compiler.CompilerFactory;
 import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime;
 import jdk.internal.jvmci.inittimer.InitTimer;
+import jdk.internal.jvmci.options.Option;
+import jdk.internal.jvmci.options.OptionType;
+import jdk.internal.jvmci.options.OptionValue;
 import jdk.internal.jvmci.runtime.JVMCIRuntime;
 
 import com.oracle.graal.phases.tiers.CompilerConfiguration;
 
 public abstract class HotSpotGraalCompilerFactory implements CompilerFactory {
 
+    static class Options {
+
+        // @formatter:off
+        @Option(help = "In tiered mode compile the compiler itself using optimized first tier code.", type = OptionType.Expert)
+        public static final OptionValue<Boolean> CompileGraalWithC1Only = new OptionValue<>(true);
+        // @formatter:on
+
+    }
+
     protected abstract HotSpotBackendFactory getBackendFactory(Architecture arch);
 
     protected abstract CompilerConfiguration createCompilerConfiguration();
@@ -57,4 +69,12 @@
             return new HotSpotGraalCompiler(jvmciRuntime, graalRuntime);
         }
     }
+
+    @Override
+    public String[] getTrivialPrefixes() {
+        if (Options.CompileGraalWithC1Only.getValue()) {
+            return new String[]{"jdk/internal/jvmci", "com/oracle/graal"};
+        }
+        return null;
+    }
 }
--- a/mx.graal/suite.py	Thu Sep 17 16:48:47 2015 +0200
+++ b/mx.graal/suite.py	Thu Sep 17 22:15:07 2015 -0700
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "ec96f33a101dbd76da419ce1d2f0ed70b983966c",
+               "version" : "b4abfaab2ba9e1cbc29376465af4de519efb8a0e",
                "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"},