[GR-22555] [GR-21228] Improve microbenchmarking.

PullRequest: graal/6239
wincc0823 · Jun 4, 2020 · b55ca28 · b55ca28
2 parents 746344a + 5d87ede
commit b55ca28
Show file tree

Hide file tree

Showing 29 changed files with 272 additions and 346 deletions.
diff --git a/common.json b/common.json
@@ -26,6 +26,6 @@
   },
 
   "ci": {
-    "overlay": "6c2bede4e1e7e2c16912d7c7e97ba8b2c155d6ee"
+    "overlay": "1e2ff02424b02162c43d587beabc6dfb01bc5baf"
   }
 }
diff --git a/compiler/ci_common/bench.hocon b/compiler/ci_common/bench.hocon
@@ -17,7 +17,7 @@ bench-jvmci : {
   mx-renaissance-legacy: ${bench-jvmci.mx-benchmark} ["renaissance-legacy:*"]
   mx-spark-sql-perf: ${bench-jvmci.mx-benchmark} ["spark-sql-perf"]
   mx-micros-graal-whitebox: ${bench-jvmci.mx-benchmark} ["jmh-whitebox:*"]
-  mx-micros-graal-dist: ${bench-jvmci.mx-benchmark} ["jmh-dist:*"]
+  mx-micros-graal-dist: ${bench-jvmci.mx-benchmark} ["jmh-dist:GRAAL_COMPILER_MICRO_BENCHMARKS"]
   mx-teardown : ["bench-uploader.py", "${BENCH_RESULTS_FILE_PATH}"]
 }
 
@@ -147,7 +147,7 @@ bench-micros-graal-whitebox: ${bench-common} ${default-heap} ${micros-bench-noti
   run: [
     ${bench-jvmci.mx-micros-graal-whitebox} ${bench-arguments}
   ]
-  timelimit: "5:00:00"
+  timelimit: "3:00:00"
 }
 
 bench-micros-graal-dist: ${bench-common} ${default-heap} ${micros-bench-notifications} {

diff --git a/compiler/ci_common/gate.hocon b/compiler/ci_common/gate.hocon
@@ -97,7 +97,7 @@ gateTestBenchmark : {
   run : [
     ${gateCmd} ["build,benchmarktest"]
     # blackbox jmh test
-    ["mx", "benchmark", "jmh-dist:*", "--", "-Djmh.ignoreLock=true", "--jvm-config=${JVM_CONFIG}", "--jvm=${JVM}", "--", ".*TestJMH.*" ]
+    ["mx", "benchmark", "jmh-dist:GRAAL_COMPILER_MICRO_BENCHMARKS", "--", "-Djmh.ignoreLock=true", "--jvm-config=${JVM_CONFIG}", "--jvm=${JVM}", "--", ".*TestJMH.*" ]
     # whitebox jmh test
     ["mx", "benchmark", "jmh-whitebox:*", "--", "-Djmh.ignoreLock=true", "--jvm-config=${JVM_CONFIG}", "--jvm=${JVM}", "--", ".*TestJMH.*" ]
   ]

diff --git a/compiler/ci_common/x52.hocon b/compiler/ci_common/x52.hocon
@@ -1,3 +1,31 @@
+// HotSpot client compiler (C1)
+x52.c1 : ${linux-amd64} {
+  capabilities: ${linux-amd64.capabilities} [x52, no_frequency_scaling]
+  environment : {
+    JVM_CONFIG :  "default"
+    JVM        :  "client"
+    MACHINE_NAME: "x52"
+  }
+}
+
+x52.c1-tmpfs10g : ${x52.c1} {
+  capabilities: [linux, x52, no_frequency_scaling, tmpfs10g]
+}
+
+// HotSpot server compiler (C2)
+x52.c2 : {
+  capabilities: [linux, x52, no_frequency_scaling]
+  environment : {
+    JVM_CONFIG   : "default"
+    JVM          : "server"
+    MACHINE_NAME : "x52"
+  }
+}
+
+x52.tmpfs10g-c2 : ${x52.c2} {
+  capabilities: ${x52.c2.capabilities} [tmpfs10g]
+}
+
 x52.default : ${linux-amd64} {
   capabilities: ${linux-amd64.capabilities} [x52, no_frequency_scaling]
   environment : {
@@ -76,8 +104,8 @@ builds += [
   ${x52.default-libgraal} ${bench-micros-graal-dist}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-dist-libgraal-linux-x52" }
 
   ${x52.default-libgraal} ${bench-specjvm2008-OneVM}              ${labsjdk11} { targets: [weekly, bench], name: "bench-compiler-specjvm2008-OneVM-libgraal-11-linux-x52" }
-  ${x52.default-libgraal} ${bench-micros-graal-whitebox}          ${labsjdk11} { targets: [weekly, bench], name: "bench-compiler-jmh-micros-graal-whitebox-libgraal-11-linux-x52" }
-  ${x52.default-libgraal} ${bench-micros-graal-dist}              ${labsjdk11} { targets: [weekly, bench], name: "bench-compiler-jmh-micros-graal-dist-libgraal-11-linux-x52" }
+  ${x52.default-libgraal} ${bench-micros-graal-whitebox}          ${labsjdk11} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-whitebox-libgraal-11-linux-x52" }
+  ${x52.default-libgraal} ${bench-micros-graal-dist}              ${labsjdk11} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-dist-libgraal-11-linux-x52" }
 
   #  special configurations
   ${x52.tmpfs10g-libgraal-g1gc} ${bench-dacapo-hwloc}             ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-dacapo-libgraal-g1gc-linux-x52" }
@@ -112,12 +140,8 @@ builds += [
   ${x52.default} ${bench-renaissance-legacy-hwloc}       ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-renaissance-legacy-linux-x52" }
   ${x52.default} ${bench-specjvm2008-OneVM}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-specjvm2008-OneVM-linux-x52" }
   ${x52.default} ${bench-spark-sql-perf}                 ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-spark-sql-perf-linux-x52" }
-  ${x52.default} ${bench-micros-graal-whitebox}          ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-whitebox-linux-x52" }
-  ${x52.default} ${bench-micros-graal-dist}              ${oraclejdk8} { targets: [daily, bench], name: "bench-compiler-jmh-micros-graal-dist-linux-x52" }
 
   ${x52.default} ${bench-specjvm2008-OneVM}              ${labsjdk11} { targets: [weekly, bench], name: "bench-compiler-specjvm2008-OneVM-11-linux-x52" }
-  ${x52.default} ${bench-micros-graal-whitebox}          ${labsjdk11} { targets: [weekly, bench], name: "bench-compiler-jmh-micros-graal-whitebox-11-linux-x52" }
-  ${x52.default} ${bench-micros-graal-dist}              ${labsjdk11} { targets: [weekly, bench], name: "bench-compiler-jmh-micros-graal-dist-11-linux-x52" }
 
   #  special configurations
   ${x52.tmpfs10g-g1gc} ${bench-dacapo-hwloc}             ${oraclejdk8} { targets: [weekly, bench], name: "bench-compiler-dacapo-g1gc-linux-x52" }

diff --git a/compiler/ci_includes/x52-c1.hocon b/compiler/ci_includes/x52-c1.hocon
@@ -1,22 +1,9 @@
-
-x52.c1 : ${oraclejdk8} {
-  capabilities: [linux, x52, no_frequency_scaling]
-  environment : {
-    JVM_CONFIG :  "default"
-    JVM        :  "client"
-    MACHINE_NAME: "x52"
-  }
-}
-
-x52.c1-tmpfs10g : ${x52.c1} {
-  capabilities: [linux, x52, no_frequency_scaling, tmpfs10g]
-}
-
 builds += [
-  ${x52.c1-tmpfs10g} ${bench-dacapo-hwloc}        { targets: [bench, weekly], name: "bench-compiler-dacapo-linux-x52-c1" }
-  ${x52.c1-tmpfs10g} ${bench-scala-dacapo-hwloc}  { targets: [bench, weekly], name: "bench-compiler-scala-dacapo-linux-x52-c1", timelimit: "1:00:00" }
-  ${x52.c1} ${bench-specjvm2008-Single}           { targets: [bench, weekly], name: "bench-compiler-specjvm2008-Single-linux-x52-c1" }
-  ${x52.c1} ${bench-specjvm2008-OneVM}            { targets: [bench, weekly], name: "bench-compiler-specjvm2008-OneVM-linux-x52-c1" }
-  ${x52.c1} ${bench-specjbb2015}                  { targets: [bench, weekly], name: "bench-compiler-specjbb2015-linux-x52-c1" }
-#  ${x52.c1} ${bench-micros-graal-dist}            { targets: [bench, weekly], name: "bench-jmh-micros-graal-dist-linux-x52-c1" }
+  // JDK 8
+  ${x52.c1-tmpfs10g} ${bench-dacapo-hwloc}        ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-dacapo-linux-x52-c1" }
+  ${x52.c1-tmpfs10g} ${bench-scala-dacapo-hwloc}  ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-scala-dacapo-linux-x52-c1", timelimit: "1:00:00" }
+  ${x52.c1} ${bench-specjvm2008-Single}           ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-specjvm2008-Single-linux-x52-c1" }
+  ${x52.c1} ${bench-specjvm2008-OneVM}            ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-specjvm2008-OneVM-linux-x52-c1" }
+  ${x52.c1} ${bench-specjbb2015}                  ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-specjbb2015-linux-x52-c1" }
+#  ${x52.c1} ${bench-micros-graal-dist}           ${oraclejdk8} { targets: [bench, weekly], name: "bench-jmh-micros-graal-dist-linux-x52-c1" }
 ]
diff --git a/compiler/ci_includes/x52-c2-jfr.hocon b/compiler/ci_includes/x52-c2-jfr.hocon
@@ -9,13 +9,13 @@ x52.c2-jfr : {
   targets: [bench, weekly]
 }
 
-x52.c2-tmpfs10g-jfr : ${x52.c2-jfr} {
+x52.tmpfs10g-c2-jfr : ${x52.c2-jfr} {
   capabilities: [linux, x52, no_frequency_scaling, tmpfs10g]
 }
 
 builds += [
-  ${x52.c2-tmpfs10g-jfr} ${bench-dacapo-jfr}         ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-dacapo-linux-x52-c2-jfr" }
-  ${x52.c2-tmpfs10g-jfr} ${bench-scala-dacapo-jfr}   ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-scala-dacapo-linux-x52-c2-jfr" }
+  ${x52.tmpfs10g-c2-jfr} ${bench-dacapo-jfr}         ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-dacapo-linux-x52-c2-jfr" }
+  ${x52.tmpfs10g-c2-jfr} ${bench-scala-dacapo-jfr}   ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-scala-dacapo-linux-x52-c2-jfr" }
   ${x52.c2-jfr} ${bench-specjvm2008-Single-jfr}      ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-specjvm2008-Single-linux-x52-c2-jfr" }
   ${x52.c2-jfr} ${bench-specjbb2015-jfr}             ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-specjbb2015-linux-x52-c2-jfr" }
   ${x52.c2-jfr} ${bench-renaissance-jfr}      ${oraclejdk8} { targets: [bench, weekly], name: "bench-compiler-renaissance-linux-x52-c2-jfr" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,6 @@ @@
       },
       "ci": {
-        "overlay": "6c2bede4e1e7e2c16912d7c7e97ba8b2c155d6ee"
+        "overlay": "1e2ff02424b02162c43d587beabc6dfb01bc5baf"
       }
     }