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

10 files changed, 155 insertions, 66 deletions

diff --git a/jdk8-build-image.yaml b/jdk8-build-image.yaml
index 7a54f00fa6..64bf331ac1 100644
--- a/jdk8-build-image.yaml
+++ b/jdk8-build-image.yaml
@@ -4,7 +4,7 @@
     defaults: global
     description: |
         * Configures and builds jdk8u (ie, bin/java, bin/javac, et al) for various configurations.<br>
-        * The source tarball is copied from the jdk8-update-src-tree job.<br>
+        * The source tarball is copied from the jdk8-update-src-tree job!<br>
         * <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
     properties:
         - authorization:
@@ -38,8 +38,7 @@
             name: JVM_VARIANT
             values:
                 - server
-# SRDM: Disabled while LEG-347 is being fixed.
-#                - client
+                - zero
         - axis:
             type: user-defined
             name: BUILD_TYPE
@@ -86,19 +85,22 @@
 
             shopt -s nullglob
 
+            # SRDM Commented out as not needed for buildng client builds, but
+            # maybe necessary in future.
+            #
             # Apply patches
             # Only apply to client builds.
-            if [ "$JVM_VARIANT" = "client" ]; then
-                OLDDIR=$PWD
-                cd $WORKSPACE/patches
-                for patch in $(find  -name '*.patch'); do
-                    patch_dir=$(dirname $patch)
-                    patch_path=$(pwd)/$patch
-                    (echo Applying $patch to $patch_dir ; cd $OLDDIR/jdk8u/$patch_dir; \
-                    patch -p1  < $patch_path)
-                done
-                cd $OLDDIR
-            fi
+            # if [ "$JVM_VARIANT" = "client" ]; then
+            #    OLDDIR=$PWD
+            #    cd $WORKSPACE/patches
+            #    for patch in $(find  -name '*.patch'); do
+            #        patch_dir=$(dirname $patch)
+            #        patch_path=$(pwd)/$patch
+            #        (echo Applying $patch to $patch_dir ; cd $OLDDIR/jdk8u/$patch_dir; \
+            #        patch -p1  < $patch_path)
+            #    done
+            #    cd $OLDDIR
+            # fi
 
             # Extract boot jdk
             rm -rf primordial-jdk7
diff --git a/jdk8-jcstress-test.yaml b/jdk8-jcstress-test.yaml
index 6a74b0d5b1..fce795c055 100644
--- a/jdk8-jcstress-test.yaml
+++ b/jdk8-jcstress-test.yaml
@@ -26,7 +26,7 @@
             name: JVM_VARIANT
             values:
                 - server
-#                - client
+                - client
         - axis:
             type: user-defined
             name: BUILD_TYPE
@@ -68,17 +68,26 @@
             TEST_TYPE=all
             TEST_MODE=sanity
 
+            # client variant uses server with -XX:TieredStopAtLevel=1
+            # zero is a third possible value.
+            REAL_VARIANT=${JVM_VARIANT/client/server}
+
             JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar
             rm -rf jdk8u*
-            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
 
             # XXX Don't fail the job if jcstress itself fails.
             set +e
-            java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE}
+            if [ JVM_VARIANT = "server" ]; then
+                java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE}
+            else
+                java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE}
+            fi
+
             test_result=$?
             set -e
 
diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml
index 9a1d4aba6a..34b35e8111 100644
--- a/jdk8-jtreg-test.yaml
+++ b/jdk8-jtreg-test.yaml
@@ -31,8 +31,7 @@
             name: JVM_VARIANT
             values:
                 - server
-# SRDM: Disable client runs while waiting for LEG-347 to be fixed.
-#                - client
+                - client
         - axis:
             type: user-defined
             name: BUILD_TYPE
@@ -90,31 +89,34 @@
             source incoming/build-date.sh
 
             export JDK_VERSION=8u
-            IMAGE_DIR=${WORKSPACE}/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}
+            # 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}
             PERSIST=$HOME/srv/openjdk8u
 
 
             # Only set =1 for debugging.
             use_subcategories=0
 
-            if [ ${use_subcategories} -eq 1 ]; then 
+            if [ ${use_subcategories} -eq 1 ]; then
               case ${JTREG_CATEGORY} in
                 langtools)
                     JTREG_SUBCATEGORIES=tools/javap/typeAnnotations
                     ;;
                 jdk)
                     JTREG_SUBCATEGORIES=jdk/net/Sockets
-                    ;; 
+                    ;;
                 hotspot)
                     JTREG_SUBCATEGORIES=runtime/CommandLine
-                    ;; 
+                    ;;
               esac
             fi
 
             : ${JTREG_SUBCATEGORIES:=.}
 
             tar xf incoming/jdk8u.tar.gz
-            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
             tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
 
             # All the output directories and general frobbing
@@ -156,7 +158,7 @@
             cat ${blacklist}
             echo "---------"
 
-            export JAVA_HOME=${WORKSPACE}/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:${PATH}
 
             PATH=${WORKSPACE}/jtreg/bin:${PATH}
@@ -166,14 +168,27 @@
             # Ignore error in jtreg final result.
             set +e
 
-            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} \
-              -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
+            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} \
+                  -a -agentvm -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 \
+                  -testjdk:${IMAGE_DIR} \
+                  -exclude:${blacklist} \
+                  -conc:auto \
+                  -r:${report_dir} \
+                  -w:${work_dir} \
+                  -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
+            fi
 
             set -e
 
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
 
diff --git a/jdk8-terasort-benchmark.yaml b/jdk8-terasort-benchmark.yaml
index 497d3bd891..eda47e9cdf 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)
diff --git a/jdk9-build-image.yaml b/jdk9-build-image.yaml
index d900cd4f4e..9cf38756b5 100644
--- a/jdk9-build-image.yaml
+++ b/jdk9-build-image.yaml
@@ -31,8 +31,7 @@
             name: JVM_VARIANT
             values:
                 - server
-# SRDM: Disabled while LEG-347 is being fixed.
-#                - client
+                - zero
         - axis:
             type: user-defined
             name: BUILD_TYPE
diff --git a/jdk9-jcstress-test.yaml b/jdk9-jcstress-test.yaml
index e18e31dd2e..b0e8f86cbf 100644
--- a/jdk9-jcstress-test.yaml
+++ b/jdk9-jcstress-test.yaml
@@ -68,17 +68,26 @@
             TEST_TYPE=all
             TEST_MODE=sanity
 
+            # client variant uses server with -XX:TieredStopAtLevel=1
+            # zero is a third possible value.
+            REAL_VARIANT=${JVM_VARIANT/client/server}
+
             JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar
             rm -rf jdk9*
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:${PATH}
             which java
             java -version
 
             # XXX Don't fail the job if jcstress itself fails.
             set +e
-            java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE}
+            if [ JVM_VARIANT = "server" ]; then
+                java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE}
+            else
+                java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE}
+            fi
+
             test_result=$?
             set -e
 
diff --git a/jdk9-jtreg-test.yaml b/jdk9-jtreg-test.yaml
index f9e6f7eaf7..a9ea9462d7 100644
--- a/jdk9-jtreg-test.yaml
+++ b/jdk9-jtreg-test.yaml
@@ -31,8 +31,7 @@
             name: JVM_VARIANT
             values:
                 - server
-# SRDM: Disable client runs while waiting for LEG-347 to be fixed.
-#                - client
+                - client
         - axis:
             type: user-defined
             name: BUILD_TYPE
@@ -90,7 +89,10 @@
             source incoming/build-date.sh
 
             export JDK_VERSION=9
-            IMAGE_DIR=${WORKSPACE}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+            # client variant uses server with -XX:TieredStopAtLevel=1
+            # zero is a third possible value.
+            REAL_VARIANT=${JVM_VARIANT/client/server}
+            IMAGE_DIR=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
             PERSIST=$HOME/srv/openjdk9
 
 
@@ -114,7 +116,7 @@
             : ${JTREG_SUBCATEGORIES:=.}
 
             tar xf incoming/jdk9.tar.gz
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
             tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
 
             # All the output directories and general frobbing
@@ -156,7 +158,7 @@
             cat ${blacklist}
             echo "---------"
 
-            export JAVA_HOME=${WORKSPACE}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:${PATH}
 
             PATH=${WORKSPACE}/jtreg/bin:${PATH}
@@ -166,14 +168,28 @@
             # Ignore error in jtreg final result.
             set +e
 
-            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} \
-              -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
+            if [ $JVM_VARIANT = "server" ]; then
+                java -jar jtreg/lib/jtreg.jar \
+                  -dir:${src_dir}/${JTREG_CATEGORY}/test \
+                  -vmoption:-XX:-TieredCompilation \
+                  -testjdk:${IMAGE_DIR} \
+                  -exclude:${blacklist} \
+                  -conc:auto \
+                  -r:${report_dir} \
+                  -w:${work_dir} \
+                  -a -agentvm -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 \
+                  -testjdk:${IMAGE_DIR} \
+                  -exclude:${blacklist} \
+                  -conc:auto \
+                  -r:${report_dir} \
+                  -w:${work_dir} \
+                  -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
+            fi
 
             set -e
 
diff --git a/jdk9-specjbb2015-benchmark.yaml b/jdk9-specjbb2015-benchmark.yaml
index 2850222af0..3ba4d0e8f7 100644
--- a/jdk9-specjbb2015-benchmark.yaml
+++ b/jdk9-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/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk9-${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 --add-modules java.se.ee -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
+            if [ $JVM_VARIANT = "server" ]; then
+                (cd $SPECJBB_PRODUCT_HOME; java --add-modules java.se.ee -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
+            else
+                (cd $SPECJBB_PRODUCT_HOME; java --add-modules java.se.ee  -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
+            fi
 
             mkdir -p out
 
diff --git a/jdk9-terasort-benchmark.yaml b/jdk9-terasort-benchmark.yaml
index dbedb73b21..6600320048 100644
--- a/jdk9-terasort-benchmark.yaml
+++ b/jdk9-terasort-benchmark.yaml
@@ -64,11 +64,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 jdk9*
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
 
-            export JAVA_HOME=${WORKSPACE}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:$PATH
 
             ## Extract Hadoop pre-builts
@@ -115,8 +119,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)