[ci] perform renaissance benchmarks on a single node

mttcr · Nov 16, 2016 · f0eb69e · f0eb69e
1 parent 56e4658
commit f0eb69e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/ci_common/bench-hwloc.hocon b/ci_common/bench-hwloc.hocon
@@ -42,3 +42,11 @@ bench-scala-dacapo-move-profiling-hwloc: ${bench-scala-dacapo-move-profiling} ${
     ${hwloc.node0} ${bench-jvmci.mx-scala-dacapo-move-profiling} ${bench-arguments}
   ]
 }
+
+# Renaissance-related targets
+
+bench-renaissance-hwloc: ${bench-renaissance} ${hwloc.bench-common-8} {
+  run: [
+    ${hwloc.node0} ${bench-jvmci.mx-renaissance} ${bench-arguments}
+  ]
+}
diff --git a/ci_common/x32-tracera.hocon b/ci_common/x32-tracera.hocon
@@ -5,5 +5,5 @@ x32.tracera: ${x32.default} {
 }
 
 builds += [
-  ${x32.tracera} ${bench-renaissance}                                          { name: "bench-renaissance-linux-x32-tracera" }
+  ${x32.tracera} ${bench-renaissance-hwloc}                                          { name: "bench-renaissance-linux-x32-tracera" }
 ]
diff --git a/ci_common/x32.hocon b/ci_common/x32.hocon
@@ -10,5 +10,5 @@ x32.default : ${commonLinux} {
 }
 
 builds += [
-  ${x32.default} ${bench-renaissance}         { name: "bench-renaissance-linux-x32" }
+  ${x32.default} ${bench-renaissance-hwloc}         { name: "bench-renaissance-linux-x32" }
 ]
diff --git a/ci_includes/x32-c2.hocon b/ci_includes/x32-c2.hocon
@@ -1,5 +1,4 @@
 x32.c2 : {
-  targets: [weekly]
   capabilities: [linux, x32, no_frequency_scaling, tmpfs10g]
   environment : {
     XMX         : "8g"
@@ -11,5 +10,5 @@ x32.c2 : {
 }
 
 builds += [
-  ${bench-renaissance}        ${x32.c2} { name: "bench-renaissance-linux-x32-c2" }
+  ${x32.c2} ${bench-renaissance-hwloc}        { targets: [weekly], name: "bench-renaissance-linux-x32-c2" }
 ]