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 | |
| 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
36 files changed, 160 insertions, 569 deletions
diff --git a/jdk11-build-and-test.yaml b/jdk11-build-and-test.yaml index 44d3c2d494..6e6316b7d1 100644 --- a/jdk11-build-and-test.yaml +++ b/jdk11-build-and-test.yaml @@ -67,7 +67,6 @@ projects: - name: jdk11-specjbb2015-benchmark current-parameters: true - restrict-matrix-project: 'JVM_VARIANT == "server"' kill-phase-on: FAILURE - multijob: name: '1GB Terasort benchmark' @@ -90,7 +89,6 @@ projects: - name: jdk11-jcstress-test current-parameters: true - restrict-matrix-project: 'JVM_VARIANT == "server"' kill-phase-on: FAILURE - multijob: name: 'Publish results to openjdk.linaro.org' diff --git a/jdk11-build-image.yaml b/jdk11-build-image.yaml index 079915a60a..287942de65 100644 --- a/jdk11-build-image.yaml +++ b/jdk11-build-image.yaml @@ -25,12 +25,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - zero - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -53,20 +47,11 @@ filter: 'out/jdk11.tar.gz' target: incoming flatten: true -# - copyartifact: -# project: archive-primordial-jdk11 -# filter: 'out/primordial-jdk11.tar.gz' -# target: incoming -# flatten: true - shell: | #!/bin/bash set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - ccache_build_opts=--disable-ccache rm -rf jdk* primordial-jdk* build* @@ -95,17 +80,17 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../jdk11/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk11 ${ccache_build_opts} + sh ../jdk11/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk11 ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd pushd build-stage2 - sh ../jdk11/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} + sh ../jdk11/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd else pushd build-stage2 - sh ../jdk11/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} + sh ../jdk11/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd fi @@ -113,7 +98,7 @@ # Archive the result rm -rf out mkdir out - artifact_name=jdk11-${JVM_VARIANT}-${BUILD_TYPE} + artifact_name=jdk11-${BUILD_TYPE} tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . # Archive test support files. diff --git a/jdk11-build-release.yaml b/jdk11-build-release.yaml index 7f178950d6..26f62f8095 100644 --- a/jdk11-build-release.yaml +++ b/jdk11-build-release.yaml @@ -24,11 +24,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -51,24 +46,14 @@ filter: 'out/jdk11.tar.gz' target: incoming flatten: true -# - copyartifact: -# project: archive-primordial-jdk11 -# filter: 'out/primordial-jdk11.tar.gz' -# target: incoming -# flatten: true - shell: | #!/bin/bash set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - export JVM_VARIANT=server - # Generate files names dependent on year/month. RELEASE=$(date +%y%m) - JDKDIR=jdk11-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + JDKDIR=jdk11-${BUILD_TYPE}-${RELEASE} JDK_SRCDIR=jdk11-src-${RELEASE} ccache_build_opts=--disable-ccache @@ -105,13 +90,12 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk11 ${ccache_build_opts} + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk11 ${ccache_build_opts} make images popd pushd build-stage2 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \ - --with-debug-level=${BUILD_TYPE} \ + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \ ${ccache_build_opts} \ --with-version-opt="Linaro-$RELEASE" \ @@ -120,8 +104,7 @@ popd else pushd build-stage2 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \ - --with-debug-level=${BUILD_TYPE} \ + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ ${ccache_build_opts} \ --with-version-opt="Linaro-$RELEASE" \ --with-version-pre="release" @@ -130,7 +113,7 @@ fi # Archive the result - artifact_name=jdk11-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + artifact_name=jdk11-${BUILD_TYPE}-${RELEASE} # This is different from ordinary builds. tar -C build-stage2/images --exclude=\*.debuginfo --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk diff --git a/jdk11-jcstress-test-persist-results.yaml b/jdk11-jcstress-test-persist-results.yaml index 583bfefaf4..14cf35396f 100644 --- a/jdk11-jcstress-test-persist-results.yaml +++ b/jdk11-jcstress-test-persist-results.yaml @@ -31,12 +31,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -46,8 +40,6 @@ values: - j12-qrep-01 execution-strategy: -# combination-filter: | -# JVM_VARIANT=="server" sequential: true wrappers: - workspace-cleanup: @@ -63,7 +55,7 @@ flatten: true - copyartifact: project: jdk11-jcstress-test - filter: 'out/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz' target: incoming flatten: true - shell: | @@ -88,7 +80,7 @@ fi mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} - tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d')) echo "Previous Results" cat ${RESULTS_CSV} diff --git a/jdk11-jcstress-test.yaml b/jdk11-jcstress-test.yaml index 870848d341..f2656fc4c8 100644 --- a/jdk11-jcstress-test.yaml +++ b/jdk11-jcstress-test.yaml @@ -28,12 +28,7 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined + name: BUILD_TYPE values: - release @@ -61,14 +56,10 @@ TEST_TYPE=all DEPS=$HOME/workspace/jdkX-get-deps - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - JCSTRESS_JAR=$DEPS/jcstress.jar rm -rf jdk11* - tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk11-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk11-${REAL_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdk11-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:${PATH} which java java -version @@ -83,7 +74,7 @@ rm -rf out mkdir out - out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE} + out_dirname=jcstress-results-${BUILD_TYPE} rm -rf ${out_dirname} mkdir -p ${out_dirname} diff --git a/jdk11-jtreg-test-persist-results.yaml b/jdk11-jtreg-test-persist-results.yaml index 7719d37452..a2f0d2ac32 100644 --- a/jdk11-jtreg-test-persist-results.yaml +++ b/jdk11-jtreg-test-persist-results.yaml @@ -30,12 +30,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -62,7 +56,7 @@ builders: - copyartifact: project: jdk11-jtreg-test - filter: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz' target: incoming flatten: true - copyartifact: @@ -80,18 +74,18 @@ PERSIST=$HOME/srv/openjdk11 export JDK_VERSION=11 - result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz - image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk11-server-${BUILD_TYPE}.tar.gz + image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdk11-${BUILD_TYPE}.tar.gz : ${YEAR:=$(date +%Y)} : ${DAY_OF_YEAR:=$(date +%j)} basedir=$PERSIST/openjdk-jtreg-nightly-tests src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR} - work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} - report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport - image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk + work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} + report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport + image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk rm -rf ${image_dir} mkdir -p ${image_dir} diff --git a/jdk11-jtreg-test.yaml b/jdk11-jtreg-test.yaml index ab38892cc3..94adff4c5b 100644 --- a/jdk11-jtreg-test.yaml +++ b/jdk11-jtreg-test.yaml @@ -31,12 +31,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -77,18 +71,15 @@ source $DEPS/build-date.sh export JDK_VERSION=11 - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - IMAGE_DIR=${WORKSPACE}/jdk11-${REAL_VARIANT}-${BUILD_TYPE} + IMAGE_DIR=${WORKSPACE}/jdk11-${BUILD_TYPE} PERSIST=$HOME/srv/openjdk11 JCSTRESS=$DEPS/jcstress.jar tar xf $DEPS/jdk11.tar.gz - tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk11-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11-${BUILD_TYPE}.tar.gz tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz - tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk11-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz + tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11-${BUILD_TYPE}-support.tar.gz # All the output directories and general frobbing # output is to match the existing layout as expected @@ -102,8 +93,8 @@ mkdir -p ${basedir}/{src,builds,reports} src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR} - work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} - report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport + work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} + report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport mkdir -p out ${src_dir} ${work_dir} ${report_dir} @@ -129,12 +120,12 @@ cat ${blacklist} echo "---------" - export JAVA_HOME=${WORKSPACE}/jdk11-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdk11-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:${PATH} # For hotspot and jdk we pass a -nativepath: option to jtreg. # This enables the tests needing native libraries to run. - NATIVEPATH=${WORKSPACE}/jdk11-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib + NATIVEPATH=${WORKSPACE}/jdk11-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib if [ $JTREG_CATEGORY = "langtools" ]; then # The nativepath option we pass must be a valid directory, or @@ -160,36 +151,18 @@ TEST_SUBDIR=test/${JTREG_CATEGORY} fi - if [ $JVM_VARIANT = "server" ]; then - java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir} \ - -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ - -vmoption:-XX:-TieredCompilation \ - -vmoption:-Xmx2G \ - -testjdk:${IMAGE_DIR} \ - -exclude:${blacklist} \ - -conc:20 \ - -r:${report_dir} \ - -w:${work_dir} \ - $NATIVE_OPT \ - -timeout:8 \ - -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n - else - java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir} \ - -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ - -vmoption:-XX:+TieredCompilation \ - -vmoption:-XX:TieredStopAtLevel=1 \ - -vmoption:-Xmx2G \ - -testjdk:${IMAGE_DIR} \ - -exclude:${blacklist} \ - -conc:20 \ - -r:${report_dir} \ - -w:${work_dir} \ - $NATIVE_OPT \ - -timeout:8 \ - -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR} | cat -n - fi + java -jar jtreg/lib/jtreg.jar \ + -dir:${src_dir} \ + -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ + -vmoption:-Xmx2G \ + -testjdk:${IMAGE_DIR} \ + -exclude:${blacklist} \ + -conc:20 \ + -r:${report_dir} \ + -w:${work_dir} \ + $NATIVE_OPT \ + -timeout:8 \ + -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n # Kill leftover jstatd processes. @@ -206,7 +179,7 @@ find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \; mkdir -p out - tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports + tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports publishers: - archive: - artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz' diff --git a/jdk11-specjbb2015-benchmark-persist-results.yaml b/jdk11-specjbb2015-benchmark-persist-results.yaml index 28d5a58ca6..6c96f87458 100644 --- a/jdk11-specjbb2015-benchmark-persist-results.yaml +++ b/jdk11-specjbb2015-benchmark-persist-results.yaml @@ -23,12 +23,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -38,8 +32,6 @@ values: - j12-qrep-01 execution-strategy: -# combination-filter: | -# JVM_VARIANT=="server" sequential: true wrappers: - workspace-cleanup: @@ -78,10 +70,10 @@ echo "Previous Results" cat ${RESULTS_CSV} set -eux - result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz [ -e $result_tarball ] || exit 1 tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball - cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR} + cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR} pushd ${SPECJBB_EXPANDED_RESULTS_DIR} echo "Updating ${RESULTS_CSV}" $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV} diff --git a/jdk11-specjbb2015-benchmark.yaml b/jdk11-specjbb2015-benchmark.yaml index e6474843f7..1aae65e3d6 100644 --- a/jdk11-specjbb2015-benchmark.yaml +++ b/jdk11-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: jdk11-build-image -# filter: 'out/jdk11-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' -# target: incoming -# flatten: true - copyartifact: project: jdk-build-specjbb2015-jdk11 filter: 'out/SPECjbb2015-jdk11.tar.gz' @@ -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/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk11-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk11-${REAL_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdk11-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:$PATH which java java -version @@ -92,15 +75,11 @@ # -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 -ikv -m composite) - else - (cd $SPECJBB_PRODUCT_HOME; java -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite) - fi + (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -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 +90,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 diff --git a/jdk11-terasort-benchmark-persist-results.yaml b/jdk11-terasort-benchmark-persist-results.yaml index c24427d08e..15e56ec6af 100644 --- a/jdk11-terasort-benchmark-persist-results.yaml +++ b/jdk11-terasort-benchmark-persist-results.yaml @@ -22,12 +22,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -47,7 +41,7 @@ builders: - copyartifact: project: jdk11-terasort-benchmark - filter: 'out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv' + filter: 'out/terasort-results-${BUILD_TYPE}.csv' target: incoming flatten: true - shell: | @@ -57,7 +51,7 @@ PERSIST=$HOME/srv/openjdk11 export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results - new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv + new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv prev_results=$BENCHMARK_RESULTS_DIR/results.csv # Ensure persistent directory exists. diff --git a/jdk11-terasort-benchmark.yaml b/jdk11-terasort-benchmark.yaml index 73f4d4b57d..ffe48f1c1c 100644 --- a/jdk11-terasort-benchmark.yaml +++ b/jdk11-terasort-benchmark.yaml @@ -22,12 +22,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -52,21 +46,18 @@ NGIGABYTES=1 - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} CACHE_FILES=$HOME/workspace/jdk-cache-files2 ## Extract jdk rm -rf jdk11* - tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk11-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk11-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdk11-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:$PATH ## Extract Hadoop pre-builts rm -rf openjdk8-hadooop-LCA14 - tar xf incoming/openjdk8-hadoop-LCA14.tar.gz + tar xf $CACHE_FILES/openjdk8-hadoop-LCA14.tar.gz ## Benchmark # FIXME @@ -108,21 +99,14 @@ 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=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted + /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) date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s) - echo "$date_as_epoch,$JVM_VARIANT,$NGIGABYTES,$elapsed_time" > out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv + echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv rm -rf incoming/${NGIGABYTES}* publishers: - archive: diff --git a/jdk8-build-and-test.yaml b/jdk8-build-and-test.yaml index 5a507d1456..36ac803540 100644 --- a/jdk8-build-and-test.yaml +++ b/jdk8-build-and-test.yaml @@ -67,7 +67,6 @@ projects: - name: jdk8-specjbb2015-benchmark current-parameters: true - restrict-matrix-project: 'JVM_VARIANT == "server"' kill-phase-on: FAILURE - multijob: name: '1GB Terasort benchmark' @@ -90,7 +89,6 @@ projects: - name: jdk8-jcstress-test current-parameters: true - restrict-matrix-project: 'JVM_VARIANT == "server"' kill-phase-on: FAILURE - multijob: name: 'Publish results to openjdk.linaro.org' diff --git a/jdk8-build-image.yaml b/jdk8-build-image.yaml index dd54007da6..e5f543906e 100644 --- a/jdk8-build-image.yaml +++ b/jdk8-build-image.yaml @@ -36,12 +36,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - zero - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -64,20 +58,11 @@ filter: 'out/jdk8u.tar.gz' target: incoming flatten: true - - copyartifact: - project: archive-primordial-jdk7 - filter: 'out/primordial-jdk7.tar.gz' - target: incoming - flatten: true - shell: | #!/bin/bash set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - ccache_build_opts=--disable-ccache rm -rf jdk* primordial-jdk* build* @@ -105,17 +90,17 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../jdk8u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} + sh ../jdk8u/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} make images popd pushd build-stage2 - sh ../jdk8u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image ${ccache_build_opts} + sh ../jdk8u/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image ${ccache_build_opts} make images popd else pushd build-stage2 - sh ../jdk8u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} + sh ../jdk8u/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} make images popd fi @@ -123,7 +108,7 @@ # Archive the result rm -rf out mkdir out - artifact_name=jdk8u-${JVM_VARIANT}-${BUILD_TYPE} + artifact_name=jdk8u-${BUILD_TYPE} tar -C build-stage2/images/j2sdk-image --exclude=\*.diz --transform="s!^!$artifact_name/!" -acf out/${artifact_name}.tar.gz jre bin lib publishers: - archive: diff --git a/jdk8-build-release.yaml b/jdk8-build-release.yaml index 562eec719f..2df6c6f9ec 100644 --- a/jdk8-build-release.yaml +++ b/jdk8-build-release.yaml @@ -36,11 +36,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -63,9 +58,6 @@ filter: 'out/jdk8u.tar.gz' target: incoming flatten: true - - copyartifact: - project: archive-primordial-jdk7 - filter: 'out/primordial-jdk7.tar.gz' target: incoming flatten: true - shell: | @@ -73,14 +65,9 @@ set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - export JVM_VARIANT=server - # Generate files names dependent on year/month. RELEASE=$(date +%y%m) - JDKDIR=jdk8u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + JDKDIR=jdk8u-${BUILD_TYPE}-${RELEASE} JDK_SRCDIR=jdk8u-src-${RELEASE} ccache_build_opts=--disable-ccache @@ -94,6 +81,10 @@ export PATH=${JAVA_HOME}/bin:${PATH} cd ${WORKSPACE} + + # Setup archive directory + mkdir out + # Extract sources from upstream job rm -rf jdk8u tar xf incoming/jdk8u.tar.gz @@ -116,13 +107,12 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} make images popd pushd build-stage2 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \ - --with-debug-level=${BUILD_TYPE} \ + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image \ ${ccache_build_opts} \ --with-user-release-suffix="Linaro-$RELEASE" \ @@ -131,8 +121,7 @@ popd else pushd build-stage2 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \ - --with-debug-level=${BUILD_TYPE} \ + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ ${ccache_build_opts} \ --with-user-release-suffix="Linaro-$RELEASE" \ --with-milestone="release" @@ -141,7 +130,7 @@ fi # Archive the result - artifact_name=jdk8u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + artifact_name=jdk8u-${BUILD_TYPE}-${RELEASE} # This is different from ordinary builds. tar -C build-stage2/images --exclude=\*.diz --transform="s!^j2sdk-image!$artifact_name!" -acf out/${artifact_name}.tar.xz j2sdk-image diff --git a/jdk8-jcstress-test-persist-results.yaml b/jdk8-jcstress-test-persist-results.yaml index 3f023edc96..b2fafa4601 100644 --- a/jdk8-jcstress-test-persist-results.yaml +++ b/jdk8-jcstress-test-persist-results.yaml @@ -31,12 +31,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -46,8 +40,6 @@ values: - j12-qrep-01 execution-strategy: -# combination-filter: | -# JVM_VARIANT=="server" sequential: true wrappers: - workspace-cleanup: @@ -63,7 +55,7 @@ flatten: true - copyartifact: project: jdk8-jcstress-test - filter: 'out/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz' target: incoming flatten: true - shell: | @@ -88,7 +80,7 @@ fi mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} - tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d')) echo "Previous Results" cat ${RESULTS_CSV} diff --git a/jdk8-jcstress-test.yaml b/jdk8-jcstress-test.yaml index fa78b8fd87..01b24f8435 100644 --- a/jdk8-jcstress-test.yaml +++ b/jdk8-jcstress-test.yaml @@ -28,12 +28,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -61,14 +55,10 @@ TEST_TYPE=all DEPS=$HOME/workspace/jdkX-get-deps - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - JCSTRESS_JAR=$DEPS/jcstress.jar rm -rf jdk8u* - 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 @@ -83,7 +73,7 @@ rm -rf out mkdir out - out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE} + out_dirname=jcstress-results-${BUILD_TYPE} rm -rf ${out_dirname} mkdir -p ${out_dirname} diff --git a/jdk8-jtreg-test-persist-results.yaml b/jdk8-jtreg-test-persist-results.yaml index 271e0d51a4..c0f3ba4afc 100644 --- a/jdk8-jtreg-test-persist-results.yaml +++ b/jdk8-jtreg-test-persist-results.yaml @@ -30,12 +30,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -62,7 +56,7 @@ builders: - copyartifact: project: jdk8-jtreg-test - filter: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz' target: incoming flatten: true - copyartifact: @@ -80,18 +74,18 @@ PERSIST=$HOME/srv/openjdk8u export JDK_VERSION=8u - result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz - image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk8u-server-${BUILD_TYPE}.tar.gz + image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdk8u-server-${BUILD_TYPE}.tar.gz : ${YEAR:=$(date +%Y)} : ${DAY_OF_YEAR:=$(date +%j)} basedir=$PERSIST/openjdk-jtreg-nightly-tests src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR} - work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} - report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport - image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/j2sdk-image + work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} + report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport + image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/j2sdk-image rm -rf ${image_dir} mkdir -p ${image_dir} diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml index 5ec1a2d665..d4546cbeaf 100644 --- a/jdk8-jtreg-test.yaml +++ b/jdk8-jtreg-test.yaml @@ -31,12 +31,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -77,10 +71,7 @@ source $DEPS/build-date.sh export JDK_VERSION=8u - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - IMAGE_DIR=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE} + IMAGE_DIR=${WORKSPACE}/jdk8u-${BUILD_TYPE} PERSIST=$HOME/srv/openjdk8u JCSTRESS=$DEPS/jcstress.jar @@ -105,7 +96,7 @@ : ${JTREG_SUBCATEGORIES:=.} tar xf $DEPS/jdk8u.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 + tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk8u-${BUILD_TYPE}.tar.gz tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz # All the output directories and general frobbing @@ -120,8 +111,8 @@ mkdir -p ${basedir}/{src,builds,reports} src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR} - work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} - report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport + work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} + report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport mkdir -p out ${src_dir} ${work_dir} ${report_dir} @@ -147,7 +138,7 @@ cat ${blacklist} echo "---------" - export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdk8u${BUILD_TYPE} export PATH=$JAVA_HOME/bin:${PATH} PATH=${WORKSPACE}/jtreg/bin:${PATH} @@ -157,21 +148,8 @@ # Ignore error in jtreg final result. set +e - if [ $JVM_VARIANT = "server" ]; then - java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir}/${JTREG_CATEGORY}/test \ - -testjdk:${IMAGE_DIR} \ - -exclude:${blacklist} \ - -conc:auto \ - -r:${report_dir} \ - -w:${work_dir} \ - -timeout:2 \ - -a -othervm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n - else - java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir}/${JTREG_CATEGORY}/test \ - -vmoption:-XX:+TieredCompilation \ - -vmoption:-XX:TieredStopAtLevel=1 \ + java -jar jtreg/lib/jtreg.jar \ + -dir:${src_dir}/${JTREG_CATEGORY}/test \ -testjdk:${IMAGE_DIR} \ -exclude:${blacklist} \ -conc:auto \ @@ -179,7 +157,7 @@ -w:${work_dir} \ -timeout:2 \ -a -othervm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n - fi + # Kill leftover jstatd processes. killall -9 jstatd @@ -195,7 +173,7 @@ find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \; mkdir -p out - tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports + tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports publishers: - archive: - artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz' diff --git a/jdk8-specjbb2013-benchmark-persist-results.yaml b/jdk8-specjbb2013-benchmark-persist-results.yaml index 790d2b8a3b..0a24e34181 100644 --- a/jdk8-specjbb2013-benchmark-persist-results.yaml +++ b/jdk8-specjbb2013-benchmark-persist-results.yaml @@ -14,7 +14,7 @@ days-to-keep: 30 num-to-keep: 10 artifact-num-to-keep: 5 - disabled: false + disabled: true node: j12-qrep-01 display-name: 'OpenJDK 8 - Write SPECjbb2013 results' axes: diff --git a/jdk8-specjbb2013-benchmark.yaml b/jdk8-specjbb2013-benchmark.yaml index b9f7045109..a0b2dc6c42 100644 --- a/jdk8-specjbb2013-benchmark.yaml +++ b/jdk8-specjbb2013-benchmark.yaml @@ -12,7 +12,7 @@ days-to-keep: 30 num-to-keep: 10 artifact-num-to-keep: 5 - disabled: false + disabled: true node: j12-qrep-01 display-name: 'OpenJDK 8 - Run SPECjbb2013 benchmark' axes: diff --git a/jdk8-specjbb2015-benchmark-persist-results.yaml b/jdk8-specjbb2015-benchmark-persist-results.yaml index efbb020cfe..052dc949f2 100644 --- a/jdk8-specjbb2015-benchmark-persist-results.yaml +++ b/jdk8-specjbb2015-benchmark-persist-results.yaml @@ -23,12 +23,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -38,8 +32,6 @@ values: - j12-qrep-01 execution-strategy: -# combination-filter: | -# JVM_VARIANT=="server" sequential: true wrappers: - workspace-cleanup: @@ -78,10 +70,10 @@ echo "Previous Results" cat ${RESULTS_CSV} set -eux - result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz [ -e $result_tarball ] || exit 1 tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball - cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR} + cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR} pushd ${SPECJBB_EXPANDED_RESULTS_DIR} echo "Updating ${RESULTS_CSV}" $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV} 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 diff --git a/jdk8-terasort-benchmark-persist-results.yaml b/jdk8-terasort-benchmark-persist-results.yaml index 067727040a..6c636153ba 100644 --- a/jdk8-terasort-benchmark-persist-results.yaml +++ b/jdk8-terasort-benchmark-persist-results.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 @@ -46,7 +40,7 @@ builders: - copyartifact: project: jdk8-terasort-benchmark - filter: 'out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv' + filter: 'out/terasort-results-${BUILD_TYPE}.csv' target: incoming flatten: true - shell: | @@ -56,7 +50,7 @@ PERSIST=$HOME/srv/openjdk8u export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results - new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv + new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv prev_results=$BENCHMARK_RESULTS_DIR/results.csv # Ensure persistent directory exists. diff --git a/jdk8-terasort-benchmark.yaml b/jdk8-terasort-benchmark.yaml index aacadc4c7a..66315aa98d 100644 --- a/jdk8-terasort-benchmark.yaml +++ b/jdk8-terasort-benchmark.yaml @@ -22,12 +22,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -52,16 +46,12 @@ NGIGABYTES=1 - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - CACHE_FILES=$HOME/workspace/jdk-cache-files2 ## Extract jdk rm -rf jdk8* - 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 + tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk8u-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdk8u-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:$PATH ## Extract Hadoop pre-builts @@ -108,21 +98,14 @@ 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=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted + /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) date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s) - echo "$date_as_epoch,$JVM_VARIANT,$NGIGABYTES,$elapsed_time" > out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv + echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv rm -rf incoming/${NGIGABYTES}* publishers: - archive: diff --git a/jdkX-build-and-test.yaml b/jdkX-build-and-test.yaml index dcf7612157..62d71dba6b 100644 --- a/jdkX-build-and-test.yaml +++ b/jdkX-build-and-test.yaml @@ -67,7 +67,6 @@ projects: - name: jdkX-specjbb2015-benchmark current-parameters: true - restrict-matrix-project: 'JVM_VARIANT == "server"' kill-phase-on: FAILURE - multijob: name: '1GB Terasort benchmark' @@ -90,7 +89,6 @@ projects: - name: jdkX-jcstress-test current-parameters: true - restrict-matrix-project: 'JVM_VARIANT == "server"' kill-phase-on: FAILURE - multijob: name: 'Publish results to openjdk.linaro.org' diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml index 68907afc60..e1300c2c2a 100644 --- a/jdkX-build-image.yaml +++ b/jdkX-build-image.yaml @@ -25,12 +25,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - zero - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -53,20 +47,11 @@ filter: 'out/jdkX.tar.gz' target: incoming flatten: true -# - copyartifact: -# project: archive-primordial-jdkX -# filter: 'out/primordial-jdkX.tar.gz' -# target: incoming -# flatten: true - shell: | #!/bin/bash set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - ccache_build_opts=--disable-ccache rm -rf jdk* primordial-jdk* build* @@ -83,8 +68,6 @@ shopt -s nullglob - - # Configure and build mkdir -p build-stage1 build-stage2 @@ -95,17 +78,17 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts} + sh ../jdkX/configure } --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd pushd build-stage2 - sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} + sh ../jdkX/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd else pushd build-stage2 - sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} + sh ../jdkX/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd fi @@ -113,7 +96,7 @@ # Archive the result rm -rf out mkdir out - artifact_name=jdkX-${JVM_VARIANT}-${BUILD_TYPE} + artifact_name=jdkX-${BUILD_TYPE} tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . # Archive test support files. diff --git a/jdkX-build-release.yaml b/jdkX-build-release.yaml index f99fb53ee8..a46083ab09 100644 --- a/jdkX-build-release.yaml +++ b/jdkX-build-release.yaml @@ -25,11 +25,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -52,24 +47,14 @@ filter: 'out/jdkX.tar.gz' target: incoming flatten: true -# - copyartifact: -# project: archive-primordial-jdkX -# filter: 'out/primordial-jdkX.tar.gz' -# target: incoming -# flatten: true - shell: | #!/bin/bash set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - export JVM_VARIANT=server - # Generate files names dependent on year/month. RELEASE=$(date +%y%m) - JDKDIR=jdkX-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + JDKDIR=jdkX-${BUILD_TYPE}-${RELEASE} JDK_SRCDIR=jdkX-src-${RELEASE} ccache_build_opts=--disable-ccache @@ -106,13 +91,12 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts} + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts} make images popd pushd build-stage2 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \ - --with-debug-level=${BUILD_TYPE} \ + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \ ${ccache_build_opts} \ --with-version-opt="Linaro-$RELEASE" \ @@ -121,8 +105,7 @@ popd else pushd build-stage2 - sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \ - --with-debug-level=${BUILD_TYPE} \ + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ ${ccache_build_opts} \ --with-version-opt="Linaro-$RELEASE" \ --with-version-pre="release" @@ -131,7 +114,7 @@ fi # Archive the result - artifact_name=jdkX-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + artifact_name=jdkX-${BUILD_TYPE}-${RELEASE} # This is different from ordinary builds. tar -C build-stage2/images --exclude=\*.debuginfo --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk diff --git a/jdkX-ci-build.yaml b/jdkX-ci-build.yaml index 85c3b82fb7..d977cf2904 100644 --- a/jdkX-ci-build.yaml +++ b/jdkX-ci-build.yaml @@ -35,20 +35,11 @@ - pollscm: cron: 'H * * * *' builders: -# Include this when we decide to do jtreg tests. -# - copyartifact: -# project: jtreg-build -# filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz' -# flatten: true - shell: | #!/bin/bash set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - ccache_build_opts=--disable-ccache # Include when Jtreg tests make sense to be run. #rm -rf jtreg diff --git a/jdkX-jcstress-test-persist-results.yaml b/jdkX-jcstress-test-persist-results.yaml index 3d8a51d723..721a1117ce 100644 --- a/jdkX-jcstress-test-persist-results.yaml +++ b/jdkX-jcstress-test-persist-results.yaml @@ -31,12 +31,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -46,8 +40,6 @@ values: - j12-qrep-01 execution-strategy: -# combination-filter: | -# JVM_VARIANT=="server" sequential: true wrappers: - workspace-cleanup: @@ -63,7 +55,7 @@ flatten: true - copyartifact: project: jdkX-jcstress-test - filter: 'out/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz' target: incoming flatten: true - shell: | @@ -88,7 +80,7 @@ fi mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} - tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d')) echo "Previous Results" cat ${RESULTS_CSV} diff --git a/jdkX-jcstress-test.yaml b/jdkX-jcstress-test.yaml index 5d9a8a58b0..61b4ec2b74 100644 --- a/jdkX-jcstress-test.yaml +++ b/jdkX-jcstress-test.yaml @@ -28,12 +28,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -61,14 +55,10 @@ TEST_TYPE=all DEPS=$HOME/workspace/jdkX-get-deps - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - JCSTRESS_JAR=$DEPS/jcstress.jar rm -rf jdkX* - tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:${PATH} which java java -version @@ -83,7 +73,7 @@ rm -rf out mkdir out - out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE} + out_dirname=jcstress-results-${BUILD_TYPE} rm -rf ${out_dirname} mkdir -p ${out_dirname} diff --git a/jdkX-jtreg-test-persist-results.yaml b/jdkX-jtreg-test-persist-results.yaml index 55a8fc964b..bfa4e465a7 100644 --- a/jdkX-jtreg-test-persist-results.yaml +++ b/jdkX-jtreg-test-persist-results.yaml @@ -30,12 +30,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -62,7 +56,7 @@ builders: - copyartifact: project: jdkX-jtreg-test - filter: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz' target: incoming flatten: true - copyartifact: @@ -80,18 +74,18 @@ PERSIST=$HOME/srv/openjdkX export JDK_VERSION=X - result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz - image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdkX-server-${BUILD_TYPE}.tar.gz + image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdkX-${BUILD_TYPE}.tar.gz : ${YEAR:=$(date +%Y)} : ${DAY_OF_YEAR:=$(date +%j)} basedir=$PERSIST/openjdk-jtreg-nightly-tests src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR} - work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} - report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport - image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk + work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} + report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport + image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk rm -rf ${image_dir} mkdir -p ${image_dir} diff --git a/jdkX-jtreg-test.yaml b/jdkX-jtreg-test.yaml index 97bc5c63c8..0a79ec66a8 100644 --- a/jdkX-jtreg-test.yaml +++ b/jdkX-jtreg-test.yaml @@ -31,12 +31,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -77,18 +71,15 @@ source $DEPS/build-date.sh export JDK_VERSION=X - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - IMAGE_DIR=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE} + IMAGE_DIR=${WORKSPACE}/jdkX-${BUILD_TYPE} PERSIST=$HOME/srv/openjdkX JCSTRESS=$DEPS/jcstress.jar tar xf $DEPS/jdkX.tar.gz - tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz - tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz + tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}-support.tar.gz # All the output directories and general frobbing # output is to match the existing layout as expected @@ -102,8 +93,8 @@ mkdir -p ${basedir}/{src,builds,reports} src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR} - work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} - report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport + work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY} + report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport mkdir -p out ${src_dir} ${work_dir} ${report_dir} @@ -129,12 +120,12 @@ cat ${blacklist} echo "---------" - export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:${PATH} # For hotspot and jdk we pass a -nativepath: option to jtreg. # This enables the tests needing native libraries to run. - NATIVEPATH=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib + NATIVEPATH=${WORKSPACE}/jdkX-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib if [ $JTREG_CATEGORY = "langtools" ]; then # The nativepath option we pass must be a valid directory, or @@ -160,37 +151,18 @@ TEST_SUBDIR=test/${JTREG_CATEGORY} fi - if [ $JVM_VARIANT = "server" ]; then - java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir} \ - -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ - -vmoption:-XX:-TieredCompilation \ - -vmoption:-Xmx2G \ - -testjdk:${IMAGE_DIR} \ - -exclude:${blacklist} \ - -conc:20 \ - -r:${report_dir} \ - -w:${work_dir} \ - $NATIVE_OPT \ - -timeout:8 \ - -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n - else - java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir} \ - -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ - -vmoption:-XX:+TieredCompilation \ - -vmoption:-XX:TieredStopAtLevel=1 \ - -vmoption:-Xmx2G \ - -testjdk:${IMAGE_DIR} \ - -exclude:${blacklist} \ - -conc:20 \ - -r:${report_dir} \ - -w:${work_dir} \ - $NATIVE_OPT \ - -timeout:8 \ - -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR} | cat -n - fi - + java -jar jtreg/lib/jtreg.jar \ + -dir:${src_dir} \ + -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ + -vmoption:-Xmx2G \ + -testjdk:${IMAGE_DIR} \ + -exclude:${blacklist} \ + -conc:20 \ + -r:${report_dir} \ + -w:${work_dir} \ + $NATIVE_OPT \ + -timeout:8 \ + -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n # Kill leftover jstatd processes. killall -9 jstatd @@ -206,7 +178,7 @@ find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \; mkdir -p out - tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports + tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports publishers: - archive: - artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' + artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz' diff --git a/jdkX-specjbb2015-benchmark-persist-results.yaml b/jdkX-specjbb2015-benchmark-persist-results.yaml index ba588d9762..0b2ec9ec6c 100644 --- a/jdkX-specjbb2015-benchmark-persist-results.yaml +++ b/jdkX-specjbb2015-benchmark-persist-results.yaml @@ -23,12 +23,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -38,8 +32,6 @@ values: - j12-qrep-01 execution-strategy: -# combination-filter: | -# JVM_VARIANT=="server" sequential: true wrappers: - workspace-cleanup: @@ -78,10 +70,10 @@ echo "Previous Results" cat ${RESULTS_CSV} set -eux - result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz [ -e $result_tarball ] || exit 1 tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball - cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR} + cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR} pushd ${SPECJBB_EXPANDED_RESULTS_DIR} echo "Updating ${RESULTS_CSV}" $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV} diff --git a/jdkX-specjbb2015-benchmark.yaml b/jdkX-specjbb2015-benchmark.yaml index 62a4b753d8..8d41bab605 100644 --- a/jdkX-specjbb2015-benchmark.yaml +++ b/jdkX-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: jdkX-build-image -# filter: 'out/jdkX-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' -# target: incoming -# flatten: true - copyartifact: project: jdk-build-specjbb2015-jdk11 filter: 'out/SPECjbb2015-jdk11.tar.gz' @@ -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/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:$PATH which java java -version @@ -92,15 +75,11 @@ # -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 -ikv -m composite) - else - (cd $SPECJBB_PRODUCT_HOME; java -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite) - fi + (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -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 +90,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 diff --git a/jdkX-terasort-benchmark-persist-results.yaml b/jdkX-terasort-benchmark-persist-results.yaml index 81999fb396..0bce6f4e0e 100644 --- a/jdkX-terasort-benchmark-persist-results.yaml +++ b/jdkX-terasort-benchmark-persist-results.yaml @@ -22,12 +22,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -47,7 +41,7 @@ builders: - copyartifact: project: jdkX-terasort-benchmark - filter: 'out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv' + filter: 'out/terasort-results-${BUILD_TYPE}.csv' target: incoming flatten: true - shell: | @@ -57,7 +51,7 @@ PERSIST=$HOME/srv/openjdkX export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results - new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv + new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv prev_results=$BENCHMARK_RESULTS_DIR/results.csv # Ensure persistent directory exists. diff --git a/jdkX-terasort-benchmark.yaml b/jdkX-terasort-benchmark.yaml index 97000f3f0f..95cd5c3581 100644 --- a/jdkX-terasort-benchmark.yaml +++ b/jdkX-terasort-benchmark.yaml @@ -22,12 +22,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -52,16 +46,12 @@ NGIGABYTES=1 - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - CACHE_FILES=$HOME/workspace/jdk-cache-files2 ## Extract jdk rm -rf jdkX* - tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:$PATH ## Extract Hadoop pre-builts @@ -108,21 +98,14 @@ 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=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted + /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) date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s) - echo "$date_as_epoch,$JVM_VARIANT,$NGIGABYTES,$elapsed_time" > out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv + echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv rm -rf incoming/${NGIGABYTES}* publishers: - archive: |