diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-25 11:50:07 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-28 15:10:14 +0000 |
| commit | c319125db4f81ad99f9c5deccef362a97f8c4243 (patch) | |
| tree | 176c52dcec2745622c8fd4a053ce2c5c43cda52d /jdk8-specjbb2015-benchmark.yaml | |
| parent | 32e0c4814588135ec3fe5ccc68aa5063092d591e (diff) | |
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-specjbb2015-benchmark.yaml')
| -rw-r--r-- | jdk8-specjbb2015-benchmark.yaml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/jdk8-specjbb2015-benchmark.yaml b/jdk8-specjbb2015-benchmark.yaml index 8926cd4664..478f9c51fd 100644 --- a/jdk8-specjbb2015-benchmark.yaml +++ b/jdk8-specjbb2015-benchmark.yaml @@ -61,10 +61,14 @@ #!/bin/bash set -exu + # + # client variant uses server with -XX:TieredStopAtLevel=1 + # zero is a third possible value. + REAL_VARIANT=${JVM_VARIANT/client/server} ## Extract jdk - 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 - export JAVA_HOME=${WORKSPACE}/jdk8u-${JVM_VARIANT}-${BUILD_TYPE} + 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-${REAL_VARIANT}-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:$PATH which java java -version @@ -89,7 +93,11 @@ # -Dspecjbb.controller.preset.duration=100 \ # -jar specjbb2015.jar -m composite) - (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite) + if [ $JVM_VARIANT = "server" ]; then + (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite) + else + (cd $SPECJBB_PRODUCT_HOME; java -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite) + fi mkdir -p out |