1.1 --- a/make/build-benchmark.xml Fri Jan 11 10:40:51 2013 +0100
1.2 +++ b/make/build-benchmark.xml Fri Jan 11 18:26:18 2013 +0530
1.3 @@ -30,205 +30,276 @@
1.4 <include name="*.js"/>
1.5 </fileset>
1.6 <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/>
1.7 - <property name="extra-arg" value=""/>
1.8 </target>
1.9
1.10 <!-- box2d -->
1.11 - <target name="box2d-init">
1.12 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
1.13 + <target name="octane-box2d" depends="jar">
1.14 + <antcall target="run-octane">
1.15 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
1.16 + </antcall>
1.17 </target>
1.18
1.19 - <target name="octane-box2d" depends="jar, box2d-init, octane-verbose">
1.20 + <target name="octane-box2d-v8" depends="jar">
1.21 + <antcall target="run-octane-v8">
1.22 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
1.23 + </antcall>
1.24 + </target>
1.25 +
1.26 + <target name="octane-box2d-rhino" depends="jar">
1.27 + <antcall target="run-octane-rhino">
1.28 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
1.29 + </antcall>
1.30 + </target>
1.31 +
1.32 + <!-- code-load -->
1.33 + <target name="octane-code-load" depends="jar">
1.34 + <antcall target="run-octane">
1.35 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
1.36 + </antcall>
1.37 + </target>
1.38 +
1.39 + <target name="octane-code-load-v8" depends="jar">
1.40 + <antcall target="run-octane-v8">
1.41 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
1.42 + </antcall>
1.43 + </target>
1.44 +
1.45 + <target name="octane-code-load-rhino" depends="jar">
1.46 + <antcall target="run-octane-rhino">
1.47 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
1.48 + </antcall>
1.49 + </target>
1.50 +
1.51 + <!-- crypto -->
1.52 + <target name="octane-crypto" depends="jar">
1.53 + <antcall target="run-octane">
1.54 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
1.55 + </antcall>
1.56 + </target>
1.57 +
1.58 + <target name="octane-crypto-v8" depends="jar">
1.59 + <antcall target="run-octane-v8">
1.60 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
1.61 + </antcall>
1.62 + </target>
1.63 +
1.64 + <target name="octane-crypto-rhino" depends="jar">
1.65 + <antcall target="run-octane-rhino">
1.66 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
1.67 + </antcall>
1.68 + </target>
1.69 +
1.70 + <!-- deltablue -->
1.71 + <target name="octane-deltablue" depends="jar">
1.72 + <antcall target="run-octane">
1.73 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
1.74 + </antcall>
1.75 + </target>
1.76 +
1.77 + <target name="octane-deltablue-v8" depends="jar">
1.78 + <antcall target="run-octane-v8">
1.79 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
1.80 + </antcall>
1.81 + </target>
1.82 +
1.83 + <target name="octane-deltablue-rhino" depends="jar">
1.84 + <antcall target="run-octane-rhino">
1.85 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
1.86 + </antcall>
1.87 + </target>
1.88 +
1.89 + <!-- earley-boyer -->
1.90 + <target name="octane-earley-boyer" depends="jar">
1.91 + <antcall target="run-octane">
1.92 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
1.93 + </antcall>
1.94 + </target>
1.95 +
1.96 + <target name="octane-earley-boyer-v8" depends="jar">
1.97 + <antcall target="run-octane-v8">
1.98 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
1.99 + </antcall>
1.100 + </target>
1.101 +
1.102 + <target name="octane-earley-boyer-rhino" depends="jar">
1.103 + <antcall target="run-octane-rhino">
1.104 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
1.105 + </antcall>
1.106 + </target>
1.107 +
1.108 + <!-- gbemu -->
1.109 + <target name="octane-gbemu" depends="jar">
1.110 + <antcall target="run-octane">
1.111 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
1.112 + </antcall>
1.113 + </target>
1.114 +
1.115 + <target name="octane-gbemu-v8" depends="jar">
1.116 + <antcall target="run-octane-v8">
1.117 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
1.118 + </antcall>
1.119 + </target>
1.120 +
1.121 + <target name="octane-gbemu-rhino" depends="jar">
1.122 + <antcall target="run-octane-rhino">
1.123 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
1.124 + </antcall>
1.125 + </target>
1.126 +
1.127 + <!-- mandreel -->
1.128 + <target name="octane-mandreel" depends="jar">
1.129 + <antcall target="run-octane">
1.130 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/>
1.131 + </antcall>
1.132 + </target>
1.133 +
1.134 + <target name="octane-mandreel-v8" depends="jar">
1.135 + <antcall target="run-octane-v8">
1.136 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/>
1.137 + </antcall>
1.138 + </target>
1.139 +
1.140 + <target name="octane-mandreel-rhino" depends="jar">
1.141 + <antcall target="run-octane-rhino">
1.142 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/>
1.143 + </antcall>
1.144 + </target>
1.145 +
1.146 + <!-- navier-stokes -->
1.147 + <target name="octane-navier-stokes" depends="jar">
1.148 + <antcall target="run-octane">
1.149 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
1.150 + </antcall>
1.151 + </target>
1.152 +
1.153 + <target name="octane-navier-stokes-v8" depends="jar">
1.154 + <antcall target="run-octane-v8">
1.155 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
1.156 + </antcall>
1.157 + </target>
1.158 +
1.159 + <target name="octane-navier-stokes-rhino" depends="jar">
1.160 + <antcall target="run-octane-rhino">
1.161 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
1.162 + </antcall>
1.163 + </target>
1.164 +
1.165 + <!-- pdfjs -->
1.166 + <target name="octane-pdfjs" depends="jar">
1.167 + <antcall target="run-octane">
1.168 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
1.169 + </antcall>
1.170 + </target>
1.171 +
1.172 + <target name="octane-pdfjs-v8" depends="jar">
1.173 + <antcall target="run-octane-v8">
1.174 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
1.175 + </antcall>
1.176 + </target>
1.177 +
1.178 + <target name="octane-pdfjs-rhino" depends="jar">
1.179 + <antcall target="run-octane-rhino">
1.180 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
1.181 + </antcall>
1.182 + </target>
1.183 +
1.184 + <!-- raytrace -->
1.185 + <target name="octane-raytrace" depends="jar">
1.186 + <antcall target="run-octane">
1.187 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
1.188 + </antcall>
1.189 + </target>
1.190 +
1.191 + <target name="octane-raytrace-v8" depends="jar">
1.192 + <antcall target="run-octane-v8">
1.193 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
1.194 + </antcall>
1.195 + </target>
1.196 +
1.197 + <target name="octane-raytrace-rhino" depends="jar">
1.198 + <antcall target="run-octane-rhino">
1.199 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
1.200 + </antcall>
1.201 + </target>
1.202 +
1.203 + <!-- regexp -->
1.204 + <target name="octane-regexp" depends="jar">
1.205 + <antcall target="run-octane">
1.206 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
1.207 + </antcall>
1.208 + </target>
1.209 +
1.210 + <target name="octane-regexp-octane-v8" depends="jar">
1.211 + <antcall target="run-octane-v8">
1.212 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
1.213 + </antcall>
1.214 + </target>
1.215 +
1.216 + <target name="octane-regexp-rhino" depends="jar">
1.217 + <antcall target="run-octane-rhino">
1.218 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
1.219 + </antcall>
1.220 + </target>
1.221 +
1.222 + <!-- richards -->
1.223 + <target name="octane-richards" depends="jar">
1.224 + <antcall target="run-octane">
1.225 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/>
1.226 + </antcall>
1.227 + </target>
1.228 +
1.229 + <target name="octane-richards-v8" depends="jar">
1.230 + <antcall target="run-octane-v8">
1.231 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/>
1.232 + </antcall>
1.233 + </target>
1.234 +
1.235 + <target name="octane-richards-rhino" depends="jar">
1.236 + <antcall target="run-octane-rhino">
1.237 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/>
1.238 + </antcall>
1.239 + </target>
1.240 +
1.241 + <!-- splay -->
1.242 + <target name="octane-splay" depends="jar">
1.243 + <antcall target="run-octane">
1.244 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
1.245 + </antcall>
1.246 + </target>
1.247 +
1.248 + <target name="octane-splay-v8" depends="jar">
1.249 + <antcall target="run-octane-v8">
1.250 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
1.251 + </antcall>
1.252 + </target>
1.253 +
1.254 + <target name="octane-splay-rhino" depends="jar">
1.255 + <antcall target="run-octane-rhino">
1.256 + <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
1.257 + </antcall>
1.258 + </target>
1.259 +
1.260 + <!-- run octane benchmarks in a single process -->
1.261 + <target name="octane-single-process" depends="octane-init">
1.262 <antcall target="run-octane"/>
1.263 </target>
1.264
1.265 - <target name="octane-box2d-v8" depends="jar, box2d-init, octane-verbose">
1.266 - <antcall target="run-octane-v8"/>
1.267 + <!-- mandreel excluded due to OOM -->
1.268 + <target name="octane-separate-process" depends=
1.269 + "octane-box2d, octane-code-load, octane-crypto,
1.270 + octane-deltablue, octane-earley-boyer, octane-gbemu,
1.271 + octane-navier-stokes, octane-pdfjs, octane-raytrace,
1.272 + octane-regexp, octane-richards, octane-splay"/>
1.273 +
1.274 + <target name="--single-process" unless="${octane-test-sys-prop.separate.process}">
1.275 + <antcall target="octane-single-process"/>
1.276 + </target>
1.277 + <target name="--separate-process" if="${octane-test-sys-prop.separate.process}">
1.278 + <antcall target="octane-separate-process"/>
1.279 </target>
1.280
1.281 - <target name="octane-box2d-rhino" depends="jar, box2d-init, octane-verbose">
1.282 - <antcall target="run-octane-rhino"/>
1.283 - </target>
1.284 -
1.285 - <!-- code-load -->
1.286 - <target name="code-load-init">
1.287 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
1.288 - </target>
1.289 -
1.290 - <target name="octane-code-load" depends="jar, code-load-init, octane-verbose">
1.291 - <antcall target="run-octane"/>
1.292 - </target>
1.293 -
1.294 - <target name="octane-code-load-v8" depends="jar, code-load-init, octane-verbose">
1.295 - <antcall target="run-octane-v8"/>
1.296 - </target>
1.297 -
1.298 - <target name="octane-code-load-rhino" depends="jar, code-load-init, octane-verbose">
1.299 - <antcall target="run-octane-rhino"/>
1.300 - </target>
1.301 -
1.302 - <!-- crypto -->
1.303 - <target name="crypto-init">
1.304 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
1.305 - </target>
1.306 -
1.307 - <target name="octane-crypto" depends="jar, crypto-init, octane-verbose">
1.308 - <antcall target="run-octane"/>
1.309 - </target>
1.310 -
1.311 - <target name="octane-crypto-v8" depends="jar, crypto-init, octane-verbose">
1.312 - <antcall target="run-octane-v8"/>
1.313 - </target>
1.314 -
1.315 - <target name="octane-crypto-rhino" depends="jar, crypto-init, octane-verbose">
1.316 - <antcall target="run-octane-rhino"/>
1.317 - </target>
1.318 -
1.319 - <!-- deltablue -->
1.320 - <target name="deltablue-init">
1.321 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
1.322 - </target>
1.323 -
1.324 - <target name="octane-deltablue" depends="jar, deltablue-init, octane-verbose">
1.325 - <antcall target="run-octane"/>
1.326 - </target>
1.327 -
1.328 - <target name="octane-deltablue-v8" depends="jar, deltablue-init, octane-verbose">
1.329 - <antcall target="run-octane-v8"/>
1.330 - </target>
1.331 -
1.332 - <target name="octane-deltablue-rhino" depends="jar, deltablue-init, octane-verbose">
1.333 - <antcall target="run-octane-rhino"/>
1.334 - </target>
1.335 -
1.336 - <!-- earley-boyer -->
1.337 - <target name="earley-boyer-init">
1.338 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
1.339 - </target>
1.340 -
1.341 - <target name="octane-earley-boyer" depends="jar, earley-boyer-init, octane-verbose">
1.342 - <antcall target="run-octane"/>
1.343 - </target>
1.344 -
1.345 - <target name="octane-earley-boyer-v8" depends="jar, earley-boyer-init, octane-verbose">
1.346 - <antcall target="run-octane-v8"/>
1.347 - </target>
1.348 -
1.349 - <target name="octane-earley-boyer-rhino" depends="jar, earley-boyer-init, octane-verbose">
1.350 - <antcall target="run-octane-rhino"/>
1.351 - </target>
1.352 -
1.353 - <!-- gbemu -->
1.354 - <target name="gbemu-init">
1.355 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
1.356 - </target>
1.357 -
1.358 - <target name="octane-gbemu" depends="jar, gbemu-init, octane-verbose">
1.359 - <antcall target="run-octane"/>
1.360 - </target>
1.361 -
1.362 - <target name="octane-gbemu-v8" depends="jar, gbemu-init, octane-verbose">
1.363 - <antcall target="run-octane-v8"/>
1.364 - </target>
1.365 -
1.366 - <target name="octane-gbemu-rhino" depends="jar, gbemu-init, octane-verbose">
1.367 - <antcall target="run-octane-rhino"/>
1.368 - </target>
1.369 -
1.370 - <!-- navier-stokes -->
1.371 - <target name="navier-stokes-init">
1.372 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
1.373 - </target>
1.374 -
1.375 - <target name="octane-navier-stokes" depends="jar, navier-stokes-init, octane-verbose">
1.376 - <antcall target="run-octane"/>
1.377 - </target>
1.378 -
1.379 - <target name="octane-navier-stokes-v8" depends="jar, navier-stokes-init, octane-verbose">
1.380 - <antcall target="run-octane-v8"/>
1.381 - </target>
1.382 -
1.383 - <target name="octane-navier-stokes-rhino" depends="jar, navier-stokes-init, octane-verbose">
1.384 - <antcall target="run-octane-rhino"/>
1.385 - </target>
1.386 -
1.387 - <!-- pdfjs -->
1.388 - <target name="pdfjs-init">
1.389 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
1.390 - </target>
1.391 -
1.392 - <target name="octane-pdfjs" depends="jar, pdfjs-init, octane-verbose">
1.393 - <antcall target="run-octane"/>
1.394 - </target>
1.395 -
1.396 - <target name="octane-pdfjs-v8" depends="jar, pdfjs-init, octane-verbose">
1.397 - <antcall target="run-octane-v8"/>
1.398 - </target>
1.399 -
1.400 - <target name="octane-pdfjs-rhino" depends="jar, pdfjs-init, octane-verbose">
1.401 - <antcall target="run-octane-rhino"/>
1.402 - </target>
1.403 -
1.404 - <!-- raytrace -->
1.405 - <target name="raytrace-init">
1.406 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
1.407 - </target>
1.408 -
1.409 - <target name="octane-raytrace" depends="jar, raytrace-init, octane-verbose">
1.410 - <antcall target="run-octane"/>
1.411 - </target>
1.412 -
1.413 - <target name="octane-raytrace-v8" depends="jar, raytrace-init, octane-verbose">
1.414 - <antcall target="run-octane-v8"/>
1.415 - </target>
1.416 -
1.417 - <target name="octane-raytrace-rhino" depends="jar, raytrace-init, octane-verbose">
1.418 - <antcall target="run-octane-rhino"/>
1.419 - </target>
1.420 -
1.421 - <!-- regexp -->
1.422 - <target name="regexp-init">
1.423 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
1.424 - </target>
1.425 -
1.426 - <target name="octane-regexp" depends="jar, regexp-init, octane-verbose">
1.427 - <antcall target="run-octane"/>
1.428 - </target>
1.429 -
1.430 - <target name="octane-regexp-octane-v8" depends="jar, regexp-init, octane-verbose">
1.431 - <antcall target="run-octane-v8"/>
1.432 - </target>
1.433 -
1.434 - <target name="octane-regexp-rhino" depends="jar, regexp-init, octane-verbose">
1.435 - <antcall target="run-octane-rhino"/>
1.436 - </target>
1.437 -
1.438 -
1.439 - <!-- splay -->
1.440 - <target name="splay-init">
1.441 - <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
1.442 - </target>
1.443 -
1.444 - <target name="octane-splay" depends="jar, splay-init, octane-verbose">
1.445 - <antcall target="run-octane"/>
1.446 - </target>
1.447 -
1.448 - <target name="octane-splay-v8" depends="jar, splay-init, octane-verbose">
1.449 - <antcall target="run-octane-v8"/>
1.450 - </target>
1.451 -
1.452 - <target name="octane-splay-rhino" depends="jar, splay-init, octane-verbose">
1.453 - <antcall target="run-octane-rhino"/>
1.454 - </target>
1.455 -
1.456 - <target name="octane-verbose">
1.457 - <property name="extra-arg" value="--verbose"/>
1.458 - </target>
1.459 -
1.460 - <!-- run octane benchmarks using Nashorn as runtime -->
1.461 - <target name="octane" depends="octane-init">
1.462 - <antcall target="run-octane"/>
1.463 - </target>
1.464 + <!-- run 'octane' in single or separate processes based on config -->
1.465 + <target name="octane" depends="init, --single-process, --separate-process"/>
1.466
1.467 <!-- run octane benchmarks using octane as runtime -->
1.468 <target name="octane-v8" depends="octane-init">
1.469 @@ -254,7 +325,6 @@
1.470 <arg value="Nashorn"/>
1.471 <arg value="--verbose"/>
1.472 <arg value="--iterations 8"/>
1.473 - <arg value="${extra-arg}"/>
1.474 </java>
1.475 </target>
1.476
1.477 @@ -267,7 +337,6 @@
1.478 <arg value="v8"/>
1.479 <arg value="--verbose"/>
1.480 <arg value="--iterations 8"/>
1.481 - <arg value="${extra-arg}"/>
1.482 </exec>
1.483 </target>
1.484
1.485 @@ -283,7 +352,6 @@
1.486 <arg value="Rhino"/>
1.487 <arg value="--verbose"/>
1.488 <arg value="--iterations 8"/>
1.489 - <arg value="${extra-arg}"/>
1.490 </java>
1.491 </target>
1.492
