comparison mx/commands.py @ 4219:47f7d91d34cf

Fix javac build issues with classpath WIP for benchmarks
author Gilles Duboscq <gilles.m.duboscq@gmail.com>
date Wed, 04 Jan 2012 22:54:27 +0100
parents a13d61d3910e
children 339cf8d4904d
comparison
equal deleted inserted replaced
4218:03eaec130ed1 4219:47f7d91d34cf
311 return 311 return
312 else: 312 else:
313 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='3', ALT_BOOTDIR=jdk, INSTALL='y') 313 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='3', ALT_BOOTDIR=jdk, INSTALL='y')
314 mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage) 314 mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage)
315 315
316 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None): 316 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):
317 """run the GraalVM""" 317 """run the GraalVM"""
318 318
319 build = _vmbuild if _vmSourcesAvailable else 'product' 319 build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product'
320 if mx.java().debug: 320 if mx.java().debug:
321 args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args 321 args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args
322 exe = join(_jdk(build), 'bin', mx.exe_suffix('java')) 322 exe = join(_jdk(build), 'bin', mx.exe_suffix('java'))
323 return mx.run([exe, vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout) 323 return mx.run([exe, vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
324 324
568 568
569 duration = datetime.timedelta(seconds=time.time() - start) 569 duration = datetime.timedelta(seconds=time.time() - start)
570 mx.log(time.strftime('%d %b %Y %H:%M:%S - Gate done (duration - ' + str(duration) + ')')) 570 mx.log(time.strftime('%d %b %Y %H:%M:%S - Gate done (duration - ' + str(duration) + ')'))
571 571
572 def bench(args): 572 def bench(args):
573 573 results = {}
574 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Fast): 574 #DaCapo
575 print test.bench('-graal') 575 benchmarks = sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
576 #Bootstrap
577 benchmarks += sanitycheck.getBootstraps()
578
579 for test in benchmarks:
580 if not results.has_key(test.group):
581 results[test.group] = {}
582 results[test.group].update(test.bench('-graal'))
583 print results
576 584
577 def mx_init(): 585 def mx_init():
578 _vmbuild = 'product' 586 _vmbuild = 'product'
579 commands = { 587 commands = {
580 'build': [build, ''], 588 'build': [build, ''],