Remove UseJVMCICompiler option from hocon

This option is already defined in mx_graal_benchmark.py graal-core JVM configuration
kwahome · Jul 7, 2016 · 3c9f5d6 · 3c9f5d6
1 parent df73a94
commit 3c9f5d6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/ci_includes/t72half.hocon b/ci_includes/t72half.hocon
@@ -15,7 +15,7 @@ bench-dacapo-t72half: ${commonSolaris} ${bench-common-8} ${t72half.default} {
   run: [
     ${bench-jvmci.mx-dacapo} [
       "--machine-name", "t72half", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -28,7 +28,7 @@ bench-scala-dacapo-t72half: ${commonSolaris} ${bench-common-8} ${t72half.default
   run: [
     ${bench-jvmci.mx-scala-dacapo} [
       "--machine-name", "t72half", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -41,7 +41,7 @@ bench-specjvm2008-t72half: ${commonSolaris} ${bench-specjvm2008} ${t72half.defau
   run: [
     ${bench-jvmci.mx-specjvm2008} [
       "--machine-name", "t72half", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--",
       "-it", "240s", "-wt", "120s"
     ]
   ]
@@ -55,7 +55,7 @@ bench-specjbb2015-t72half: ${commonSolaris} ${bench-specjbb2015} ${t72half.defau
   run: [
     ${bench-jvmci.mx-specjbb2015} [
       "--machine-name", "t72half", "--",
-      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -69,7 +69,7 @@ bench-micros-graal-t72half: ${bench-common-8} ${t72half.default} {
   run: [
     ${bench-jvmci.mx-micros-graal} [
       "--machine-name", "t72half", "--",
-      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }

diff --git a/ci_includes/x4150.hocon b/ci_includes/x4150.hocon
@@ -11,7 +11,7 @@ bench-specjbb2005-x4150: ${commonLinux} ${bench-specjbb2005} ${x4150.default} {
   run: [
     ${bench-jvmci.mx-specjbb2005} [
       "--machine-name", "x4150", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }

diff --git a/ci_includes/x52.hocon b/ci_includes/x52.hocon
@@ -12,7 +12,7 @@ bench-dacapo-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   run: [
     ${bench-jvmci.mx-dacapo} [
       "--machine-name", "x52", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -23,7 +23,7 @@ bench-dacapo-timing-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   run: [
     ${bench-jvmci.mx-dacapo-timing} [
       "--machine-name", "x52", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -36,7 +36,7 @@ bench-scala-dacapo-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   run: [
     ${bench-jvmci.mx-scala-dacapo} [
       "--machine-name", "x52", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -47,7 +47,7 @@ bench-scala-dacapo-timing-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   run: [
     ${bench-jvmci.mx-scala-dacapo-timing} [
       "--machine-name", "x52", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -60,7 +60,7 @@ bench-specjvm2008-x52: ${commonLinux} ${bench-specjvm2008} ${x52.default} {
   run: [
     ${bench-jvmci.mx-specjvm2008} [
       "--machine-name", "x52", "--",
-      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--",
       "-it", "240s", "-wt", "120s"
     ]
   ]
@@ -74,7 +74,7 @@ bench-specjbb2015-x52: ${commonLinux} ${bench-specjbb2015} ${x52.default} {
   run: [
     ${bench-jvmci.mx-specjbb2015} [
       "--machine-name", "x52", "--",
-      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }
@@ -87,7 +87,7 @@ bench-micros-graal-x52: ${bench-common-8} ${x52.default} {
   run: [
     ${bench-jvmci.mx-micros-graal} [
       "--machine-name", "x52", "--",
-      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
     ]
   ]
 }