Skip to content

Commit

Permalink
Add benchmark builds for C1 and C2 on T7-2 and X5-2 machines
Browse files Browse the repository at this point in the history
Following benchmarks are running weekly with C1 and C2:
  * DaCapo
  * Scala DaCapo
  * SPECJVM2008
  * SPECJBB2005
  * SPECJBB2015
  * Graal Micros
Stefan Anzinger committed Jul 7, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 3c9f5d6 commit 8792d23
Showing 9 changed files with 210 additions and 271 deletions.
56 changes: 6 additions & 50 deletions ci.hocon
Original file line number Diff line number Diff line change
@@ -115,55 +115,6 @@ gateTraceRA : {
}
}

bench-jvmci : {
mx-benchmark : ["mx", "--jdk=jvmci", "benchmark", "--results-file", "bench-results.json"]
mx-dacapo : ${bench-jvmci.mx-benchmark} ["dacapo:*"]
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-specjbb2005: ${bench-jvmci.mx-benchmark} ["specjbb2005"]
mx-specjbb2015: ${bench-jvmci.mx-benchmark} ["specjbb2015"]
mx-micros-graal: ${bench-jvmci.mx-benchmark} ["jmh-graal-core-whitebox:*"]
mx-teardown : ["bench-uploader.py", "--url", "$BENCH_SERVER_URL", "bench-results.json"]
}

bench-common-8 : ${java8Downloads} {
setup: [
["mx", "build"]
]
teardown : [
${bench-jvmci.mx-teardown}
]
}

# SPECJvm2008-related targets

bench-specjvm2008: ${bench-common-8} {
downloads: {
SPECJVM2008: { name: specjvm2008, version: "1.01" }
}
timelimit: "2:50:00"
}

# SPECjbb2005-related targets

bench-specjbb2005: ${bench-common-8} {
downloads: {
SPECJBB2005: { name: specjbb2005, version: "1.07" }
}
timelimit: "2:00:00"
}

# SPECjbb2015-related targets

bench-specjbb2015: ${bench-common-8} {
downloads: {
SPECJBB2015: { name: specjbb2015, version: "1.00" }
}
timelimit: "3:00:00"
}

# Build targets

builds = [
@@ -187,7 +138,12 @@ builds = [
${gateBootstrap8} ${commonLinux} ${gateTraceRA} {capabilities : [linux, amd64, gate], name: "gate-bootstrap-8-linux-amd64-tracera"}
]

include "ci_includes/bench.hocon"
include "ci_includes/x52.hocon"
include "ci_includes/x4150.hocon"
include "ci_includes/x52-c1.hocon"
include "ci_includes/x52-c2.hocon"
include "ci_includes/x52-tracera.hocon"
include "ci_includes/x4150.hocon"
include "ci_includes/t72half.hocon"
include "ci_includes/t72half-c1.hocon"
include "ci_includes/t72half-c2.hocon"
101 changes: 101 additions & 0 deletions ci_includes/bench.hocon
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# DaCapo-related targets

bench-arguments : ["--machine-name", "${MACHINE_NAME}", "--", "-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--jvm=${JVM}"]

bench-jvmci : {
mx-benchmark : ["mx", "benchmark", "--results-file", "bench-results.json"]
mx-dacapo : ${bench-jvmci.mx-benchmark} ["dacapo:*"]
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-specjbb2005: ${bench-jvmci.mx-benchmark} ["specjbb2005"]
mx-specjbb2015: ${bench-jvmci.mx-benchmark} ["specjbb2015"]
mx-micros-graal: ${bench-jvmci.mx-benchmark} ["jmh-graal-core-whitebox:*"]
mx-teardown : ["bench-uploader.py", "--url", "$BENCH_SERVER_URL", "bench-results.json"]
}

bench-common-8 : ${java8Downloads} {
setup: [
["mx", "build"]
]
teardown : [
${bench-jvmci.mx-teardown}
]
}

bench-dacapo: ${bench-common-8} {
targets : [bench, post-merge]
run: [
${bench-jvmci.mx-dacapo} ${bench-arguments}
]
}

bench-dacapo-timing: ${commonLinux} ${bench-common-8} {
targets: [daily]
run: [
${bench-jvmci.mx-dacapo-timing} ${bench-arguments}
]
}

# Scala DaCapo-related targets

bench-scala-dacapo: ${bench-common-8} {
targets: [bench, post-merge]
run: [
${bench-jvmci.mx-scala-dacapo} ${bench-arguments}
]
}

bench-scala-dacapo-timing: ${bench-common-8} {
targets: [daily]
run: [
${bench-jvmci.mx-scala-dacapo-timing} ${bench-arguments}
]
}

# SPECjbb2005-related targets

bench-specjbb2005: ${bench-common-8} {
downloads: {
SPECJBB2005: { name: specjbb2005, version: "1.07" }
}
timelimit: "2:00:00"
}

# SPECJvm2008-related targets

bench-specjvm2008: ${bench-common-8} {
targets: [bench, post-merge]
downloads: {
SPECJVM2008: { name: specjvm2008, version: "1.01" }
}
run: [
${bench-jvmci.mx-specjvm2008} ${bench-arguments} [
"--", "-it", "240s", "-wt", "120s"
]
]
timelimit: "2:50:00"
}

# SPECjbb2015-related targets

bench-specjbb2015: ${bench-common-8} {
targets: [bench, post-merge]
run: [
${bench-jvmci.mx-specjbb2015} ${bench-arguments}
]
downloads: {
SPECJBB2015: { name: specjbb2015, version: "1.00" }
}
timelimit: "3:00:00"
}

# JMH micros graal

bench-micros-graal: ${bench-common-8} {
targets: [weekly]
run: [
${bench-jvmci.mx-micros-graal} ${bench-arguments}
]
}
19 changes: 19 additions & 0 deletions ci_includes/t72half-c1.hocon
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# T7-2 machine, with zone limited to one socket (half)

t72half.c1 : {
targets: [weekly]
capabilities: [solaris, t72half]
environment : {
JVM_CONFIG : "default"
JVM : "client"
MACHINE_NAME : "t72half"
}
}

builds += [
${bench-dacapo} ${t72half.c1} { name: "bench-dacapo-linux-t72half-c1" }
${bench-scala-dacapo} ${t72half.c1} { name: "bench-scala-dacapo-linux-t72half-c1" }
${bench-specjvm2008} ${t72half.c1} { name: "bench-specjvm2008-linux-t72half-c1" }
${bench-specjbb2015} ${t72half.c1} { name: "bench-specjbb2015-linux-t72half-c1" }
# ${bench-micros-graal} ${t72half.c1} { name: "bench-jmh-micros-graal-t72half-c1" }
]
19 changes: 19 additions & 0 deletions ci_includes/t72half-c2.hocon
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# T7-2 machine, with zone limited to one socket (half)

t72half.c2 : {
targets: [weekly]
capabilities: [solaris, t72half]
environment : {
JVM_CONFIG : "default"
JVM : "server"
MACHINE_NAME : "t72half"
}
}

builds += [
${bench-dacapo} ${t72half.c2} { name: "bench-dacapo-linux-t72half-c2" }
${bench-scala-dacapo} ${t72half.c2} { name: "bench-scala-dacapo-linux-t72half-c2" }
${bench-specjvm2008} ${t72half.c2} { name: "bench-specjvm2008-linux-t72half-c2" }
${bench-specjbb2015} ${t72half.c2} { name: "bench-specjbb2015-linux-t72half-c2" }
# ${bench-micros-graal} ${t72half.c2} { name: "bench-jmh-micros-graal-t72half-c2" }
]
84 changes: 9 additions & 75 deletions ci_includes/t72half.hocon
Original file line number Diff line number Diff line change
@@ -4,83 +4,17 @@ t72half.default : {
capabilities: [solaris, t72half]
environment : {
JVM_CONFIG : "graal-core"
JVM : "server"
MACHINE_NAME: "t72half"
}
}

# DaCapo-related targets

bench-dacapo-t72half: ${commonSolaris} ${bench-common-8} ${t72half.default} {
targets: [bench, post-merge]
name: "bench-dacapo-solaris-t72half"
run: [
${bench-jvmci.mx-dacapo} [
"--machine-name", "t72half", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

# Scala DaCapo-related targets

bench-scala-dacapo-t72half: ${commonSolaris} ${bench-common-8} ${t72half.default} {
targets: [bench, post-merge]
name: "bench-scala-dacapo-solaris-t72half"
run: [
${bench-jvmci.mx-scala-dacapo} [
"--machine-name", "t72half", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

# SPECJvm2008-related targets

bench-specjvm2008-t72half: ${commonSolaris} ${bench-specjvm2008} ${t72half.default} {
targets: [bench, post-merge]
name: "bench-specjvm2008-linux-t72half"
run: [
${bench-jvmci.mx-specjvm2008} [
"--machine-name", "t72half", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--",
"-it", "240s", "-wt", "120s"
]
]
}

# SPECjbb2015-related targets

bench-specjbb2015-t72half: ${commonSolaris} ${bench-specjbb2015} ${t72half.default} {
targets: [bench, post-merge]
name: "bench-specjbb2015-linux-t72half"
run: [
${bench-jvmci.mx-specjbb2015} [
"--machine-name", "t72half", "--",
"-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

# JMH micros graal

bench-micros-graal-t72half: ${bench-common-8} ${t72half.default} {
targets: [weekly]
capabilities: [solaris, t72half]
name: "bench-jmh-micros-graal-t72half"
run: [
${bench-jvmci.mx-micros-graal} [
"--machine-name", "t72half", "--",
"-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}


# Build targets

builds += [
${bench-dacapo-t72half}
${bench-scala-dacapo-t72half}
${bench-specjvm2008-t72half}
${bench-specjbb2015-t72half}
${bench-micros-graal-t72half}
${bench-dacapo} ${t72half.default} { name: "bench-dacapo-linux-t72half" }
${bench-dacapo-timing} ${t72half.default} { name: "bench-dacapo-timing-linux-t72half" }
${bench-scala-dacapo} ${t72half.default} { name: "bench-scala-dacapo-linux-t72half" }
${bench-scala-dacapo-timing} ${t72half.default} { name: "bench-scala-dacapo-timing-linux-t72half" }
${bench-specjvm2008} ${t72half.default} { name: "bench-specjvm2008-linux-t72half" }
${bench-specjbb2015} ${t72half.default} { name: "bench-specjbb2015-linux-t72half" }
${bench-micros-graal} ${t72half.default} { name: "bench-jmh-micros-graal-t72half" }
]
19 changes: 19 additions & 0 deletions ci_includes/x52-c1.hocon
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

x52.c1 : {
targets: [weekly]
capabilities: [linux, x52]
environment : {
JVM_CONFIG : "default"
JVM : "client"
MACHINE_NAME: "x52"
}
}

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-specjbb2015} ${x52.c1} { name: "bench-specjbb2015-linux-x52-c1" }
# ${bench-micros-graal} ${x52.c1} { name: "bench-jmh-micros-graal-x52-c1" }
]

19 changes: 19 additions & 0 deletions ci_includes/x52-c2.hocon
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

x52.c2 : {
targets: [weekly]
capabilities: [linux, x52]
environment : {
JVM_CONFIG : "default"
JVM : "server"
MACHINE_NAME: "x52"
}
}

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-specjbb2015} ${x52.c2} { name: "bench-specjbb2015-linux-x52-c2" }
# ${bench-micros-graal} ${x52.c2} { name: "bench-jmh-micros-graal-x52-c2" }
]

57 changes: 8 additions & 49 deletions ci_includes/x52-tracera.hocon
Original file line number Diff line number Diff line change
@@ -1,56 +1,15 @@
x52.tracera: {
x52.tracera: ${x52.default} {
environment : {
JVM_CONFIG : "graal-core-tracera"
}
}


# DaCapo-related targets

bench-dacapo-x52-tracera: ${bench-dacapo-x52} ${x52.tracera} {
capabilities: [linux, x52, bench, daily]
name: "bench-dacapo-linux-x52-tracera"
}

bench-dacapo-timing-x52-tracera: ${bench-dacapo-timing-x52} ${x52.tracera} {
capabilities: [linux, x52, daily]
name: "bench-dacapo-timing-linux-x52-tracera"
}

# Scala DaCapo-related targets

bench-scala-dacapo-x52-tracera: ${bench-scala-dacapo-x52} ${x52.tracera} {
capabilities: [linux, x52, bench, daily]
name: "bench-scala-dacapo-linux-x52-tracera"
}

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"
}

# SPECJvm2008-related targets

bench-specjvm2008-x52-tracera: ${bench-specjvm2008-x52} ${x52.tracera} {
capabilities: [linux, x52, bench, daily]
name: "bench-specjvm2008-linux-x52-tracera"
}

# SPECjbb2015-related targets

bench-specjbb2015-x52-tracera: ${bench-specjbb2015-x52} ${x52.tracera} {
capabilities: [linux, x52, bench, daily]
name: "bench-specjbb2015-linux-x52-tracera"
}


# Build targets

builds += [
${bench-dacapo-x52-tracera}
${bench-scala-dacapo-x52-tracera}
${bench-specjvm2008-x52-tracera}
${bench-specjbb2015-x52-tracera}
${bench-dacapo-timing-x52-tracera}
${bench-scala-dacapo-timing-x52-tracera}
${bench-dacapo} ${x52.default} { name: "bench-dacapo-linux-x52-tracera" }
${bench-dacapo-timing} ${x52.default} { name: "bench-dacapo-timing-linux-x52-tracera" }
${bench-scala-dacapo} ${x52.default} { name: "bench-scala-dacapo-linux-x52-tracera" }
${bench-scala-dacapo-timing} ${x52.default} { name: "bench-scala-dacapo-timing-linux-x52-tracera" }
${bench-specjvm2008} ${x52.default} { name: "bench-specjvm2008-linux-x52-tracera" }
${bench-specjbb2015} ${x52.default} { name: "bench-specjbb2015-linux-x52-tracera" }
${bench-micros-graal} ${x52.default} { name: "bench-jmh-micros-graal-x52-tracera" }
]
107 changes: 10 additions & 97 deletions ci_includes/x52.hocon
Original file line number Diff line number Diff line change
@@ -1,105 +1,18 @@
x52.default : {
capabilities: [linux, x52]
environment : {
JVM_CONFIG : "graal-core"
JVM : "server"
MACHINE_NAME: "x52"
}
}

# DaCapo-related targets

bench-dacapo-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
capabilities: [linux, x52, bench, post-merge]
name: "bench-dacapo-linux-x52"
run: [
${bench-jvmci.mx-dacapo} [
"--machine-name", "x52", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

bench-dacapo-timing-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
capabilities: [linux, x52, daily]
name: "bench-dacapo-timing-linux-x52"
run: [
${bench-jvmci.mx-dacapo-timing} [
"--machine-name", "x52", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

# Scala DaCapo-related targets

bench-scala-dacapo-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
capabilities: [linux, x52, bench, post-merge]
name: "bench-scala-dacapo-linux-x52"
run: [
${bench-jvmci.mx-scala-dacapo} [
"--machine-name", "x52", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

bench-scala-dacapo-timing-x52: ${commonLinux} ${bench-common-8} ${x52.default} {
capabilities: [linux, x52, daily]
name: "bench-scala-dacapo-timing-linux-x52"
run: [
${bench-jvmci.mx-scala-dacapo-timing} [
"--machine-name", "x52", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

# SPECJvm2008-related targets

bench-specjvm2008-x52: ${commonLinux} ${bench-specjvm2008} ${x52.default} {
capabilities: [linux, x52, bench, post-merge]
name: "bench-specjvm2008-linux-x52"
run: [
${bench-jvmci.mx-specjvm2008} [
"--machine-name", "x52", "--",
"-Xmx64g", "-Xms64g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}", "--",
"-it", "240s", "-wt", "120s"
]
]
}

# SPECjbb2015-related targets

bench-specjbb2015-x52: ${commonLinux} ${bench-specjbb2015} ${x52.default} {
capabilities: [linux, x52, bench, post-merge]
name: "bench-specjbb2015-linux-x52"
run: [
${bench-jvmci.mx-specjbb2015} [
"--machine-name", "x52", "--",
"-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

# JMH micros graal

bench-micros-graal-x52: ${bench-common-8} ${x52.default} {
capabilities: [linux, x52, weekly]
name: "bench-jmh-micros-graal-x52"
run: [
${bench-jvmci.mx-micros-graal} [
"--machine-name", "x52", "--",
"-Xmx64g", "-Xms64g", "-Xmn56g", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
]
]
}

# Build targets

builds += [
${bench-dacapo-x52}
${bench-scala-dacapo-x52}
${bench-specjvm2008-x52}
${bench-specjbb2015-x52}
${bench-dacapo-timing-x52}
${bench-scala-dacapo-timing-x52}
${bench-micros-graal-x52}
${bench-dacapo} ${x52.default} { name: "bench-dacapo-linux-x52" }
${bench-dacapo-timing} ${x52.default} { name: "bench-dacapo-timing-linux-x52" }
${bench-scala-dacapo} ${x52.default} { name: "bench-scala-dacapo-linux-x52" }
${bench-scala-dacapo-timing} ${x52.default} { name: "bench-scala-dacapo-timing-linux-x52" }
${bench-specjvm2008} ${x52.default} { name: "bench-specjvm2008-linux-x52" }
${bench-specjbb2015} ${x52.default} { name: "bench-specjbb2015-linux-x52" }
${bench-micros-graal} ${x52.default} { name: "bench-jmh-micros-graal-x52" }
]

0 comments on commit 8792d23

Please sign in to comment.