Mercurial > hg > graal-jvmci-8

comparison test/compiler/ciReplay/common.sh @ 12072:6c72125a2f40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8016456: ciReplay test assumes TIERED compilation is available Reviewed-by: vlivanov, kvn, dholmes
author iignatyev
date Fri, 16 Aug 2013 17:34:37 +0400
parents cd6f6fccd287
children 4dece0730c50
comparison
equal deleted inserted replaced
12070:afbe18ae0905 12072:6c72125a2f40
87 } 87 }
88 88
89 # $1 - initial error_code 89 # $1 - initial error_code
90 common_tests() { 90 common_tests() {
91 positive_test $1 "COMMON :: THE SAME FLAGS" 91 positive_test $1 "COMMON :: THE SAME FLAGS"
92 positive_test `expr $1 + 1` "COMMON :: TIERED" -XX:+TieredCompilation 92 if [ $tiered_available -eq 1 ]
93 then
94 positive_test `expr $1 + 1` "COMMON :: TIERED" -XX:+TieredCompilation
95 fi
93 } 96 }
94 97
95 # $1 - initial error_code 98 # $1 - initial error_code
96 # $2 - non-tiered comp_level 99 # $2 - non-tiered comp_level
97 nontiered_tests() { 100 nontiered_tests() {
113 # testing in opposite VM 116 # testing in opposite VM
114 if [ $server_available -eq 1 ] 117 if [ $server_available -eq 1 ]
115 then 118 then
116 negative_test $1 "SERVER :: NON-TIERED" -XX:-TieredCompilation \ 119 negative_test $1 "SERVER :: NON-TIERED" -XX:-TieredCompilation \
117 -server 120 -server
118 positive_test `expr $1 + 1` "SERVER :: TIERED" -XX:+TieredCompilation \ 121 if [ $tiered_available -eq 1 ]
119 -server 122 then
123 positive_test `expr $1 + 1` "SERVER :: TIERED" -XX:+TieredCompilation \
124 -server
125 fi
120 fi 126 fi
121 nontiered_tests `expr $1 + 2` $client_level 127 nontiered_tests `expr $1 + 2` $client_level
122 } 128 }
123 129
124 # $1 - initial error_code 130 # $1 - initial error_code
165 171
166 client_available=`${JAVA} ${TESTVMOPTS} -client -Xinternalversion 2>&1 | \ 172 client_available=`${JAVA} ${TESTVMOPTS} -client -Xinternalversion 2>&1 | \
167 grep -c Client` 173 grep -c Client`
168 server_available=`${JAVA} ${TESTVMOPTS} -server -Xinternalversion 2>&1 | \ 174 server_available=`${JAVA} ${TESTVMOPTS} -server -Xinternalversion 2>&1 | \
169 grep -c Server` 175 grep -c Server`
176 tiered_available=`${JAVA} ${TESTVMOPTS} -XX:+TieredCompilation -XX:+PrintFlagsFinal -version | \
177 grep TieredCompilation | \
178 grep -c true`
170 is_tiered=`${JAVA} ${TESTVMOPTS} -XX:+PrintFlagsFinal -version | \ 179 is_tiered=`${JAVA} ${TESTVMOPTS} -XX:+PrintFlagsFinal -version | \
171 grep TieredCompilation | \ 180 grep TieredCompilation | \
172 grep -c true` 181 grep -c true`
173 # CompLevel_simple -- C1 182 # CompLevel_simple -- C1
174 client_level=1 183 client_level=1
175 # CompLevel_full_optimization -- C2 or Shark 184 # CompLevel_full_optimization -- C2 or Shark
176 server_level=4 185 server_level=4
177 186
178 echo "client_available=$client_available" 187 echo "client_available=$client_available"
179 echo "server_available=$server_available" 188 echo "server_available=$server_available"
189 echo "tiered_available=$tiered_available"
180 echo "is_tiered=$is_tiered" 190 echo "is_tiered=$is_tiered"
181 191
182 # crash vm in compiler thread with generation replay data and 'small' dump-file 192 # crash vm in compiler thread with generation replay data and 'small' dump-file
183 # $@ - additional vm opts 193 # $@ - additional vm opts
184 generate_replay() { 194 generate_replay() {