split specjvm2008 tasks into single vm and onevm run

ci_common/bench.hocon

@@ -8,7 +8,8 @@ bench-jvmci : {
   mx-scala-dacapo : ${bench-jvmci.mx-benchmark} ["scala-dacapo:*"]
   mx-dacapo-timing : ${bench-jvmci.mx-benchmark} ["dacapo-timing:*"]
   mx-scala-dacapo-timing : ${bench-jvmci.mx-benchmark} ["scala-dacapo-timing:*"]
-  mx-specjvm2008: ${bench-jvmci.mx-benchmark} ["specjvm2008:*"]
+  mx-specjvm2008-Single: ${bench-jvmci.mx-benchmark} ["specjvm2008:*"]
+  mx-specjvm2008-OneVM: ${bench-jvmci.mx-benchmark} ["specjvm2008"]
   mx-specjbb2005: ${bench-jvmci.mx-benchmark} ["specjbb2005"]
   mx-specjbb2015: ${bench-jvmci.mx-benchmark} ["specjbb2015"]
   mx-micros-graal: ${bench-jvmci.mx-benchmark} ["jmh-graal-core-whitebox:*"]
@@ -68,20 +69,32 @@ bench-specjbb2005: ${bench-common-8} {
 }
 
 # SPECJvm2008-related targets
-
 bench-specjvm2008: ${bench-common-8} {
-  targets: [bench, post-merge]
   downloads: {
     SPECJVM2008: { name: specjvm2008, version: "1.01" }
   }
+  timelimit: "2:50:00"
+}
+
+bench-specjvm2008-Single: ${bench-specjvm2008} {
+  targets += [bench, post-merge]
   run: [
-    ${bench-jvmci.mx-specjvm2008} ${bench-arguments} [
+    ${bench-jvmci.mx-specjvm2008-Single} ${bench-arguments} [
       "--", "-it", "240s", "-wt", "120s"
     ]
-  ]
-  timelimit: "2:50:00"
+  ]  
 }
 
+bench-specjvm2008-OneVM: ${bench-specjvm2008} {
+  targets: [bench, weekly]
+  run: [
+    ${bench-jvmci.mx-specjvm2008-OneVM} ${bench-arguments} [
+      "--", "-it", "240s", "-wt", "120s"
+    ]
+  ]  
+}
+
+
 # SPECjbb2015-related targets
 
 bench-specjbb2015: ${bench-common-8} {

ci_common/t72half.hocon

@@ -16,7 +16,8 @@ builds += [
   ${t72half.default} ${bench-dacapo-timing}       { name: "bench-dacapo-timing-solaris-t72half" }
   ${t72half.default} ${bench-scala-dacapo}        { name: "bench-scala-dacapo-solaris-t72half" }
   ${t72half.default} ${bench-scala-dacapo-timing} { name: "bench-scala-dacapo-timing-solaris-t72half" }
-  ${t72half.default} ${bench-specjvm2008}         { name: "bench-specjvm2008-solaris-t72half" }
+  ${t72half.default} ${bench-specjvm2008-Single}  { name: "bench-specjvm2008-Single-solaris-t72half" }
+  ${t72half.default} ${bench-specjvm2008-OneVM}   { name: "bench-specjvm2008-OneVM-solaris-t72half" }  
   ${t72half.default} ${bench-specjbb2015}         { name: "bench-specjbb2015-solaris-t72half" }
   ${t72half.default} ${bench-micros-graal}        { name: "bench-jmh-micros-graal-solaris-t72half" }
 ]

ci_common/x52-tracera.hocon

@@ -9,7 +9,8 @@ builds += [
   ${x52.tracera} ${bench-dacapo-timing}       { name: "bench-dacapo-timing-linux-x52-tracera" }
   ${x52.tracera} ${bench-scala-dacapo}        { name: "bench-scala-dacapo-linux-x52-tracera" }
   ${x52.tracera} ${bench-scala-dacapo-timing} { name: "bench-scala-dacapo-timing-linux-x52-tracera" }
-  ${x52.tracera} ${bench-specjvm2008}         { name: "bench-specjvm2008-linux-x52-tracera" }
+  ${x52.tracera} ${bench-specjvm2008-Single}  { name: "bench-specjvm2008-Single-linux-x52-tracera" }
+  ${x52.tracera} ${bench-specjvm2008-OneVM}   { name: "bench-specjvm2008-OneVM-linux-x52-tracera" }
   ${x52.tracera} ${bench-specjbb2015}         { name: "bench-specjbb2015-linux-x52-tracera" }
   ${x52.tracera} ${bench-micros-graal}        { name: "bench-jmh-micros-graal-linux-x52-tracera" }
 ]

ci_common/x52.hocon

@@ -14,7 +14,8 @@ builds += [
   ${x52.default} ${bench-dacapo-timing}       { name: "bench-dacapo-timing-linux-x52" }
   ${x52.default} ${bench-scala-dacapo}        { name: "bench-scala-dacapo-linux-x52" }
   ${x52.default} ${bench-scala-dacapo-timing} { name: "bench-scala-dacapo-timing-linux-x52" }
-  ${x52.default} ${bench-specjvm2008}         { name: "bench-specjvm2008-linux-x52" }
+  ${x52.default} ${bench-specjvm2008-Single}  { name: "bench-specjvm2008-Single-linux-x52" }
+  ${x52.default} ${bench-specjvm2008-OneVM}   { name: "bench-specjvm2008-OneVM-linux-x52" }
   ${x52.default} ${bench-specjbb2015}         { name: "bench-specjbb2015-linux-x52" }
   ${x52.default} ${bench-micros-graal}        { name: "bench-jmh-micros-graal-linux-x52" }
 ]

ci_includes/t72half-c1.hocon

@@ -15,7 +15,8 @@ t72half.c1 : {
 builds += [
   ${bench-dacapo}              ${t72half.c1} { name: "bench-dacapo-solaris-t72half-c1" }
   ${bench-scala-dacapo}        ${t72half.c1} { name: "bench-scala-dacapo-solaris-t72half-c1" }
-  ${bench-specjvm2008}         ${t72half.c1} { name: "bench-specjvm2008-solaris-t72half-c1" }
+  ${bench-specjvm2008-Single}  ${t72half.c1} { name: "bench-specjvm2008-Single-solaris-t72half-c1" }
+  ${bench-specjvm2008-OneVM}   ${t72half.c1} { name: "bench-specjvm2008-OneVm-solaris-t72half-c1" }  
   ${bench-specjbb2015}         ${t72half.c1} { name: "bench-specjbb2015-solaris-t72half-c1" }
 #  ${bench-micros-graal}        ${t72half.c1} { name: "bench-jmh-micros-graal-solaris-t72half-c1" }
 ]

ci_includes/t72half-c2.hocon

@@ -15,7 +15,8 @@ t72half.c2 : {
 builds += [
   ${bench-dacapo}              ${t72half.c2} { name: "bench-dacapo-solaris-t72half-c2" }
   ${bench-scala-dacapo}        ${t72half.c2} { name: "bench-scala-dacapo-solaris-t72half-c2" }
-  ${bench-specjvm2008}         ${t72half.c2} { name: "bench-specjvm2008-solaris-t72half-c2" }
+  ${bench-specjvm2008-Single}  ${t72half.c2} { name: "bench-specjvm2008-Single-solaris-t72half-c2" }
+  ${bench-specjvm2008-OneVM}   ${t72half.c2} { name: "bench-specjvm2008-OneVM-solaris-t72half-c2" }  
   ${bench-specjbb2015}         ${t72half.c2} { name: "bench-specjbb2015-solaris-t72half-c2" }
 #  ${bench-micros-graal}        ${t72half.c2} { name: "bench-jmh-micros-graal-solaris-t72half-c2" }
 ]

ci_includes/x52-c1.hocon

@@ -14,7 +14,8 @@ x52.c1 : {
 builds += [
   ${bench-dacapo}              ${x52.c1} { name: "bench-dacapo-linux-x52-c1" }
   ${bench-scala-dacapo}        ${x52.c1} { name: "bench-scala-dacapo-linux-x52-c1" }
-  ${bench-specjvm2008}         ${x52.c1} { name: "bench-specjvm2008-linux-x52-c1" }
+  ${bench-specjvm2008-Single}  ${x52.c1} { name: "bench-specjvm2008-Single-linux-x52-c1" }
+  ${bench-specjvm2008-OneVM}   ${x52.c1} { name: "bench-specjvm2008-OneVM-linux-x52-c1" }  
   ${bench-specjbb2015}         ${x52.c1} { name: "bench-specjbb2015-linux-x52-c1" }
 #  ${bench-micros-graal}        ${x52.c1} { name: "bench-jmh-micros-graal-linux-x52-c1" }
 ]

ci_includes/x52-c2.hocon

@@ -14,7 +14,8 @@ x52.c2 : {
 builds += [
   ${bench-dacapo}              ${x52.c2} { name: "bench-dacapo-linux-x52-c2" }
   ${bench-scala-dacapo}        ${x52.c2} { name: "bench-scala-dacapo-linux-x52-c2" }
-  ${bench-specjvm2008}         ${x52.c2} { name: "bench-specjvm2008-linux-x52-c2" }
+  ${bench-specjvm2008-Single}  ${x52.c2} { name: "bench-specjvm2008-Single-linux-x52-c2" }
+  ${bench-specjvm2008-OneVM}   ${x52.c2} { name: "bench-specjvm2008-OneVM-linux-x52-c2" }  
   ${bench-specjbb2015}         ${x52.c2} { name: "bench-specjbb2015-linux-x52-c2" }
 #  ${bench-micros-graal}        ${x52.c2} { name: "bench-jmh-micros-graal-linux-x52-c2" }
 ]

mx.graal-core/mx_graal_benchmark.py

@@ -537,11 +537,15 @@ def flakySuccessPatterns(self):
         return []
 
     def rules(self, out, benchmarks, bmSuiteArgs):
+        suite_name = self.name()
+        if benchmarks and len(benchmarks) == 1:
+            suite_name = suite_name +  "-single"
         return [
           mx_benchmark.StdOutRule(
             r"^Score on (?P<benchmark>[a-zA-Z0-9\._]+): (?P<score>[0-9]+((,|\.)[0-9]+)?) ops/m$", # pylint: disable=line-too-long
             {
               "benchmark": ("<benchmark>", str),
+              "bench-suite": suite_name,
               "vm": "jvmci",
               "config.name": "default",
               "metric.name": "throughput",