aboutsummaryrefslogtreecommitdiff
path: root/jdk8-terasort-benchmark.yaml
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2016-11-25 11:50:07 +0000
committerStuart Monteith <stuart.monteith@linaro.org>2016-11-28 15:10:14 +0000
commitc319125db4f81ad99f9c5deccef362a97f8c4243 (patch)
tree176c52dcec2745622c8fd4a053ce2c5c43cda52d /jdk8-terasort-benchmark.yaml
parent32e0c4814588135ec3fe5ccc68aa5063092d591e (diff)
downloadconfigs-c319125db4f81ad99f9c5deccef362a97f8c4243.tar.gz
jdk: Enable Hotspot client VM runs
Rather than using patches to re-enable the client VM (i.e. C1 compiler), use the -XX:TieredStopAtLevel=1 option to prevent higher-levels of compilation. This requires the scripting to be aware of the JVM_VARIANT envvar and alter the behaviour accordingly, rather than just changing the execution path. Change-Id: I9955db0a959788685e050c060d80f0303a917e62
Diffstat (limited to 'jdk8-terasort-benchmark.yaml')
-rw-r--r--jdk8-terasort-benchmark.yaml21
1 files changed, 16 insertions, 5 deletions
diff --git a/jdk8-terasort-benchmark.yaml b/jdk8-terasort-benchmark.yaml
index 497d3bd89..eda47e9cd 100644
--- a/jdk8-terasort-benchmark.yaml
+++ b/jdk8-terasort-benchmark.yaml
@@ -24,8 +24,7 @@
name: JVM_VARIANT
values:
- server
-# SRDM: Disable client builds while waiting for LEG-347 to be fixed.
-# - client
+ - client
- axis:
type: user-defined
name: BUILD_TYPE
@@ -64,11 +63,15 @@
NGIGABYTES=1
+ # client variant uses server with -XX:TieredStopAtLevel=1
+ # zero is a third possible value.
+ REAL_VARIANT=${JVM_VARIANT/client/server}
+
## Extract jdk
rm -rf jdk8*
- tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+ tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
- export JAVA_HOME=${WORKSPACE}/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}
+ export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}
export PATH=${JAVA_HOME}/bin:$PATH
## Extract Hadoop pre-builts
@@ -115,8 +118,16 @@
trap "stop-dfs.sh; stop-yarn.sh" EXIT
+ # Use only C1 compiler for client runs.
+ if [ $JVM_VARIANT = "client" ]; then
+ VARIANT_OPT=-XX:TieredStopAtLevel=1
+ else
+ VARIANT_OPT=-Dharmless.property
+ fi
+
elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
- HADOOP_OPTS=-${JVM_VARIANT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+ HADOOP_OPTS=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+
hadoop fs -rm -R ${NGIGABYTES}GB-sorted
sed -i 's/\..*//' $elapsed_time_file
elapsed_time=$(cat $elapsed_time_file)