diff options
author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-16 16:25:21 +0100 |
---|---|---|
committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-18 15:07:12 +0100 |
commit | 087485e32c5b98cf938634ef7f6b047594dab4fe (patch) | |
tree | 863d82d8b0263e279fbb54bafb032b7be5e149e2 /jdk8-specjbb2015-benchmark.yaml | |
parent | 80c34418134366450d402fda8d8d79227b972de8 (diff) |
jdk: Test only with default tier options.
Test with the default JVM. Don't force runs to use C1 or C2.
Change-Id: I2264dfa593d858ee37432615d3e6a3022ab223dd
Diffstat (limited to 'jdk8-specjbb2015-benchmark.yaml')
-rw-r--r-- | jdk8-specjbb2015-benchmark.yaml | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/jdk8-specjbb2015-benchmark.yaml b/jdk8-specjbb2015-benchmark.yaml index 1830a2758d..e65404abd6 100644 --- a/jdk8-specjbb2015-benchmark.yaml +++ b/jdk8-specjbb2015-benchmark.yaml @@ -21,12 +21,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -44,13 +38,6 @@ - matrix-tie-parent: node: j12-qrep-01 builders: -# copyartifact is slow and the file is local -# copy instead of going back and forth between master <-> slave -# - copyartifact: -# project: jdk8-build-image -# filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' -# target: incoming -# flatten: true - copyartifact: project: archive-specjbb2015-product-tarball filter: 'out/SPECjbb2015.tgz' @@ -60,14 +47,10 @@ #!/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/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk8u-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdk8u-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:$PATH which java java -version @@ -92,15 +75,12 @@ # -Dspecjbb.controller.preset.duration=100 \ # -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 + (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite) + mkdir -p out - datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${JVM_VARIANT}-${BUILD_TYPE}/") + datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${BUILD_TYPE}/") cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile @@ -111,7 +91,7 @@ -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \ -l 1 - tar -acf out/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz result + tar -acf out/specjbb-result-${BUILD_TYPE}.tar.gz result rm -rf html mkdir html |