From 01233ea6531a57bc6fd1b4679906502426ca0b60 Mon Sep 17 00:00:00 2001 From: David Leopoldseder Date: Fri, 12 Aug 2016 15:00:03 +0200 Subject: [PATCH] split specjvm2008 tasks into single vm and onevm run --- ci_common/bench.hocon | 25 +++++++++++++++++++------ ci_common/t72half.hocon | 3 ++- ci_common/x52-tracera.hocon | 3 ++- ci_common/x52.hocon | 3 ++- ci_includes/t72half-c1.hocon | 3 ++- ci_includes/t72half-c2.hocon | 3 ++- ci_includes/x52-c1.hocon | 3 ++- ci_includes/x52-c2.hocon | 3 ++- mx.graal-core/mx_graal_benchmark.py | 4 ++++ 9 files changed, 37 insertions(+), 13 deletions(-) diff --git a/ci_common/bench.hocon b/ci_common/bench.hocon index c70622810502..47fd0f56eb66 100644 --- a/ci_common/bench.hocon +++ b/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} { diff --git a/ci_common/t72half.hocon b/ci_common/t72half.hocon index 97364a445252..dd3580189624 100644 --- a/ci_common/t72half.hocon +++ b/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" } ] diff --git a/ci_common/x52-tracera.hocon b/ci_common/x52-tracera.hocon index 5cf0aee3fef4..59d609038f7d 100644 --- a/ci_common/x52-tracera.hocon +++ b/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" } ] diff --git a/ci_common/x52.hocon b/ci_common/x52.hocon index e027df8b9d43..6d56ee143d93 100644 --- a/ci_common/x52.hocon +++ b/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" } ] diff --git a/ci_includes/t72half-c1.hocon b/ci_includes/t72half-c1.hocon index a7278a3076f5..6c2d5b25cb36 100644 --- a/ci_includes/t72half-c1.hocon +++ b/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" } ] diff --git a/ci_includes/t72half-c2.hocon b/ci_includes/t72half-c2.hocon index 99c58ea53698..e24d062b03e6 100644 --- a/ci_includes/t72half-c2.hocon +++ b/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" } ] diff --git a/ci_includes/x52-c1.hocon b/ci_includes/x52-c1.hocon index 4b6256d5196d..1c57c01d91ee 100644 --- a/ci_includes/x52-c1.hocon +++ b/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" } ] diff --git a/ci_includes/x52-c2.hocon b/ci_includes/x52-c2.hocon index 505f3ec21cd9..0c8252d0669e 100644 --- a/ci_includes/x52-c2.hocon +++ b/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" } ] diff --git a/mx.graal-core/mx_graal_benchmark.py b/mx.graal-core/mx_graal_benchmark.py index dda5e121a4be..a85eb3da50dd 100644 --- a/mx.graal-core/mx_graal_benchmark.py +++ b/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[a-zA-Z0-9\._]+): (?P[0-9]+((,|\.)[0-9]+)?) ops/m$", # pylint: disable=line-too-long { "benchmark": ("", str), + "bench-suite": suite_name, "vm": "jvmci", "config.name": "default", "metric.name": "throughput",