ci: use environment variables for jvm-config

nathantran-zl · Jun 21, 2016 · a74d931 · a74d931
1 parent f59a638
commit a74d931
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 94 deletions.
diff --git a/ci.hocon b/ci.hocon
@@ -168,5 +168,4 @@ builds = [
 
 include "ci_includes/x52.hocon"
 include "ci_includes/x4150.hocon"
-# TODO: ensure the right config.name is set an reenable
-#include "ci_includes/x52-tracera.hocon"
+include "ci_includes/x52-tracera.hocon"
diff --git a/ci_includes/x52-tracera.hocon b/ci_includes/x52-tracera.hocon
@@ -1,77 +1,46 @@
-enable-tracera = ["-Dgraal.TraceRA=true"]
+x52.tracera: {
+  environment : {
+    JVM_CONFIG :  "graal-core-tracera"
+  }
+}
+
 
 # DaCapo-related targets
 
-bench-dacapo-x52-tracera: ${commonLinux} ${bench-common-8} {
+bench-dacapo-x52-tracera: ${bench-dacapo-x52} ${x52.tracera} {
   capabilities: [linux, x52, bench, daily]
   name: "bench-dacapo-linux-x52-tracera"
-  run: [
-    ${bench-jvmci.mx-dacapo} [
-      ] ${bench-dacapo-x52.args.mx} ["--"
-      ] ${bench-dacapo-x52.args.jvm} ${enable-tracera} ["--"
-      ] ${bench-dacapo-x52.args.bench}
-  ]
 }
 
-bench-dacapo-timing-x52-tracera: ${commonLinux} ${bench-common-8} {
+bench-dacapo-timing-x52-tracera: ${bench-dacapo-timing-x52} ${x52.tracera} {
   capabilities: [linux, x52, daily]
   name: "bench-dacapo-timing-linux-x52-tracera"
-  run: [
-    ${bench-jvmci.mx-dacapo-timing} [
-      ] ${bench-dacapo-timing-x52.args.mx} ["--"
-      ] ${bench-dacapo-timing-x52.args.jvm} ${enable-tracera} ["--"
-      ] ${bench-dacapo-timing-x52.args.bench}
-  ]
 }
 
 # Scala DaCapo-related targets
 
-bench-scala-dacapo-x52-tracera: ${commonLinux} ${bench-common-8} {
+bench-scala-dacapo-x52-tracera: ${bench-scala-dacapo-x52} ${x52.tracera} {
   capabilities: [linux, x52, bench, daily]
   name: "bench-scala-dacapo-linux-x52-tracera"
-  run: [
-    ${bench-jvmci.mx-scala-dacapo} [
-      ] ${bench-scala-dacapo-x52.args.mx} ["--"
-      ] ${bench-scala-dacapo-x52.args.jvm} ${enable-tracera} ["--"
-      ] ${bench-scala-dacapo-x52.args.bench}
-  ]
 }
 
-bench-scala-dacapo-timing-x52-tracera: ${commonLinux} ${bench-common-8} {
+bench-scala-dacapo-timing-x52-tracera: ${bench-scala-dacapo-timing-x52} ${x52.tracera} {
   capabilities: [linux, x52, daily]
   name: "bench-scala-dacapo-timing-linux-x52-tracera"
-  run: [
-    ${bench-jvmci.mx-scala-dacapo-timing} [
-      ] ${bench-scala-dacapo-timing-x52.args.mx} ["--"
-      ] ${bench-scala-dacapo-timing-x52.args.jvm} ${enable-tracera} ["--"
-      ] ${bench-scala-dacapo-timing-x52.args.bench}
-  ]
 }
 
 # SPECJvm2008-related targets
 
-bench-specjvm2008-x52-tracera: ${commonLinux} ${bench-specjvm2008} {
+bench-specjvm2008-x52-tracera: ${bench-specjvm2008-x52} ${x52.tracera} {
   capabilities: [linux, x52, bench, daily]
   name: "bench-specjvm2008-linux-x52-tracera"
-  run: [
-    ${bench-jvmci.mx-specjvm2008} [
-      ] ${bench-specjvm2008-x52.args.mx} ["--"
-      ] ${bench-specjvm2008-x52.args.jvm} ${enable-tracera} ["--"
-      ] ${bench-specjvm2008-x52.args.bench}
-  ]
 }
 
 # SPECjbb2015-related targets
 
-bench-specjbb2015-x52-tracera: ${commonLinux} ${bench-specjbb2015} {
+bench-specjbb2015-x52-tracera: ${bench-specjbb2015-x52} ${x52.tracera} {
   capabilities: [linux, x52, bench, daily]
   name: "bench-specjbb2015-linux-x52-tracera"
-  run: [
-    ${bench-jvmci.mx-specjbb2015} [
-      ] ${bench-specjbb2015-x52.args.mx} ["--"
-      ] ${bench-specjbb2015-x52.args.jvm} ${enable-tracera} ["--"
-      ] ${bench-specjbb2015-x52.args.bench}
-  ]
 }
 
 # Build targets

diff --git a/ci_includes/x52.hocon b/ci_includes/x52.hocon
@@ -1,108 +1,94 @@
+x52.default : {
+  environment : {
+    JVM_CONFIG :  "graal-core"
+  }
+}
+
 # DaCapo-related targets
 
-bench-dacapo-x52: ${commonLinux} ${bench-common-8} {
+bench-dacapo-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   capabilities: [linux, x52, bench, post-merge]
   name: "bench-dacapo-linux-x52"
-  args.mx : ["--machine-name", "x52"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : []
   run: [
     ${bench-jvmci.mx-dacapo} [
-      ] ${bench-dacapo-x52.args.mx} ["--"
-      ] ${bench-dacapo-x52.args.jvm} ["--"
-      ] ${bench-dacapo-x52.args.bench}
+      "--machine-name", "x52", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+    ]
   ]
 }
 
-bench-dacapo-timing-x52: ${commonLinux} ${bench-common-8} {
+bench-dacapo-timing-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   capabilities: [linux, x52, daily]
   name: "bench-dacapo-timing-linux-x52"
-  args.mx : ["--machine-name", "x52"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : []
   run: [
     ${bench-jvmci.mx-dacapo-timing} [
-      ] ${bench-dacapo-timing-x52.args.mx} ["--"
-      ] ${bench-dacapo-timing-x52.args.jvm} ["--"
-      ] ${bench-dacapo-timing-x52.args.bench}
+      "--machine-name", "x52", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+    ]
   ]
 }
 
 # Scala DaCapo-related targets
 
-bench-scala-dacapo-x52: ${commonLinux} ${bench-common-8} {
+bench-scala-dacapo-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   capabilities: [linux, x52, bench, post-merge]
   name: "bench-scala-dacapo-linux-x52"
-  args.mx : ["--machine-name", "x52"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : []
   run: [
     ${bench-jvmci.mx-scala-dacapo} [
-      ] ${bench-scala-dacapo-x52.args.mx} ["--"
-      ] ${bench-scala-dacapo-x52.args.jvm} ["--"
-      ] ${bench-scala-dacapo-x52.args.bench}
+      "--machine-name", "x52", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+    ]
   ]
 }
 
-bench-scala-dacapo-timing-x52: ${commonLinux} ${bench-common-8} {
+bench-scala-dacapo-timing-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
   capabilities: [linux, x52, daily]
   name: "bench-scala-dacapo-timing-linux-x52"
-  args.mx : ["--machine-name", "x52"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : []
   run: [
     ${bench-jvmci.mx-scala-dacapo-timing} [
-      ] ${bench-scala-dacapo-timing-x52.args.mx} ["--"
-      ] ${bench-scala-dacapo-timing-x52.args.jvm} ["--"
-      ] ${bench-scala-dacapo-timing-x52.args.bench}
+      "--machine-name", "x52", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+    ]
   ]
 }
 
 # SPECJvm2008-related targets
 
-bench-specjvm2008-x52: ${commonLinux} ${bench-specjvm2008} {
+bench-specjvm2008-x52: ${commonLinux} ${bench-specjvm2008} ${x52.default} {
   capabilities: [linux, x52, bench, post-merge]
   name: "bench-specjvm2008-linux-x52"
-  args.mx : ["--machine-name", "x52"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : ["-it", "240s", "-wt", "120s"]
   run: [
     ${bench-jvmci.mx-specjvm2008} [
-      ] ${bench-specjvm2008-x52.args.mx} ["--"
-      ] ${bench-specjvm2008-x52.args.jvm} ["--"
-      ] ${bench-specjvm2008-x52.args.bench}
+      "--machine-name", "x52", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--",
+      "-it", "240s", "-wt", "120s"
+    ]
   ]
 }
 
 # SPECjbb2013-related targets
 
-bench-specjbb2013-x52: ${commonLinux} ${bench-specjbb2013} {
+bench-specjbb2013-x52: ${commonLinux} ${bench-specjbb2013} ${x52.default} {
   capabilities: [linux, x52, bench, post-merge]
   name: "bench-specjbb2013-linux-x52"
-  args.mx : ["--machine-name", "x52"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : []
   run: [
     ${bench-jvmci.mx-specjbb2013} [
-      ] ${bench-specjbb2013-x52.args.mx} ["--"
-      ] ${bench-specjbb2013-x52.args.jvm} ["--"
-      ] ${bench-specjbb2013-x52.args.bench}
+      "--machine-name", "x52", "--",
+      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+    ]
   ]
 }
 
 # SPECjbb2015-related targets
 
-bench-specjbb2015-x52: ${commonLinux} ${bench-specjbb2015} {
+bench-specjbb2015-x52: ${commonLinux} ${bench-specjbb2015} ${x52.default} {
   capabilities: [linux, x52, bench, post-merge]
   name: "bench-specjbb2015-linux-x52"
-  args.mx : ["--machine-name", "x52"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : []
   run: [
     ${bench-jvmci.mx-specjbb2015} [
-      ] ${bench-specjbb2015-x52.args.mx} ["--"
-      ] ${bench-specjbb2015-x52.args.jvm} ["--"
-      ] ${bench-specjbb2015-x52.args.bench}
+      "--machine-name", "x52", "--",
+      "-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+    ]
   ]
 }