Mercurial > hg > graal-compiler
changeset 22326:fb528be6e4e6
Fix graal gate.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Mon, 27 Jul 2015 18:09:26 +0200 |
parents | ebd91969569d |
children | b48d7b7bd938 |
files | mx.graal/mx_graal.py mx.graal/suite.py |
diffstat | 2 files changed, 22 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/mx_graal.py Mon Jul 27 16:11:41 2015 +0200 +++ b/mx.graal/mx_graal.py Mon Jul 27 18:09:26 2015 +0200 @@ -33,7 +33,7 @@ import mx import mx_jvmci -from mx_jvmci import JvmciJDKDeployedDist, vm, VM, Task, parseVmArgs, get_vm, isVMSupported, isJVMCIEnabled, get_jvmci_jdk +from mx_jvmci import JvmciJDKDeployedDist, vm, VM, Task, parseVmArgs, get_vm, isVMSupported, isJVMCIEnabled, get_jvmci_jdk, buildvms import mx_unittest from mx_unittest import unittest import mx_gate @@ -211,15 +211,30 @@ def _graal_gate_runner(args, tasks): - # Run unit tests on server-hosted-jvmci with -G:-SSA_LIR + # Build server-hosted-jvmci now so we can run the unit tests + with Task('BuildHotSpotGraalHosted: product', tasks) as t: + if t: buildvms(['--vms', 'server', '--builds', 'product']) + + # Run graal unit tests on server-hosted-jvmci with VM('server', 'product'): - with Task('UnitTestsNonSSA:hosted-product', tasks) as t: - if t: unittest(['--enable-timing', '--verbose', '--fail-fast', '-G:-SSA_LIR']) + with Task('Graal UnitTests: hosted-product', tasks) as t: + if t: unittest(['--suite', 'graal', '--enable-timing', '--verbose', '--fail-fast']) + + # Run graal unit tests on server-hosted-jvmci with -G:-SSA_LIR + with VM('server', 'product'): + with Task('Graal UnitTestsNonSSA: hosted-product', tasks) as t: + if t: unittest(['--suite', 'graal', '--enable-timing', '--verbose', '--fail-fast', '-G:-SSA_LIR']) + # Run ctw against rt.jar on server-hosted-jvmci with VM('server', 'product'): with Task('CTW:hosted-product', tasks) as t: if t: ctw(['--ctwopts', '-Inline +ExitVMOnException', '-esa', '-G:+CompileTheWorldMultiThreaded', '-G:-InlineDuringParsing', '-G:-CompileTheWorldVerbose']) + # Build the jvmci VMs so we can run the other tests + with Task('BuildHotSpotGraalOthers: fastdebug,product', tasks) as t: + if t: buildvms(['--vms', 'jvmci', '--builds', 'fastdebug,product']) + + # bootstrap tests with VM('jvmci', 'fastdebug'): with Task('BootstrapWithSystemAssertions:fastdebug', tasks) as t: if t: vm(['-esa', '-XX:-TieredCompilation', '-version']) @@ -263,6 +278,7 @@ with Task('BootstrapWithImmutableCode:product', tasks) as t: if t: vm(['-XX:-TieredCompilation', '-G:+ImmutableCode', '-G:+VerifyPhases', '-esa', '-version']) + # run dacapo sanitychecks for vmbuild in ['fastdebug', 'product']: for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild) + sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild): with Task(str(test) + ':' + vmbuild, tasks) as t: @@ -274,20 +290,6 @@ with Task('DaCapo_pmd:BatchMode:product', tasks) as t: if t: dacapo(['-Xbatch', 'pmd']) - # Prevent JVMCI modifications from breaking the standard builds - if args.buildNonJVMCI: - for vmbuild in ['product', 'fastdebug']: - for theVm in ['client', 'server']: - if not isVMSupported(theVm): - mx.log('The ' + theVm + ' VM is not supported on this platform') - continue - with VM(theVm, vmbuild): - with Task('DaCapo_pmd:' + theVm + ':' + vmbuild, tasks) as t: - if t: dacapo(['pmd']) - - with Task('UnitTests:' + theVm + ':' + vmbuild, tasks) as t: - if t: unittest(['-XX:CompileCommand=exclude,*::run*', 'graal.api', 'java.test']) - mx_gate.add_gate_runner(_suite, _graal_gate_runner) def deoptalot(args):
--- a/mx.graal/suite.py Mon Jul 27 16:11:41 2015 +0200 +++ b/mx.graal/suite.py Mon Jul 27 18:09:26 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "4dfa1275ffa382ce09831fba697f4d7167803448", + "version" : "aef178739a239a519e4238c74404db8c19e4c940", "urls" : [ {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"}, @@ -14,7 +14,7 @@ }, { "name" : "truffle", - "version" : "79206d503322220b34879b0605c6b9406b44a2d7", + "version" : "a4c9f8c89c6817e98b7342ef1e03f2ffb786a4b5", "urls" : [ {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/truffle-mx2", "kind" : "hg"}, {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},