comparison mx/commands.py @ 4312:8dd27e218e19

Merge
author Lukas Stadler <lukas.stadler@jku.at>
date Thu, 19 Jan 2012 19:06:25 +0100
parents 600cbdce9805
children b0aa4a52b89c 4aacce9c9cb9
comparison
equal deleted inserted replaced
4311:8e2c4affcd51 4312:8dd27e218e19
359 else: 359 else:
360 env = os.environ 360 env = os.environ
361 env.setdefault('ARCH_DATA_MODEL', '64') 361 env.setdefault('ARCH_DATA_MODEL', '64')
362 env.setdefault('LANG', 'C') 362 env.setdefault('LANG', 'C')
363 env.setdefault('HOTSPOT_BUILD_JOBS', '3') 363 env.setdefault('HOTSPOT_BUILD_JOBS', '3')
364 env.setdefault('ALT_BOOTDIR', jdk) 364 env['ALT_BOOTDIR'] = jdk
365 env.setdefault('INSTALL', 'y') 365 env.setdefault('INSTALL', 'y')
366 mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage) 366 mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage)
367 367
368 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None): 368 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):
369 """run the GraalVM""" 369 """run the GraalVM"""
514 resultFile = None 514 resultFile = None
515 if '-resultfile' in args: 515 if '-resultfile' in args:
516 index = args.index('-resultfile') 516 index = args.index('-resultfile')
517 if index + 1 < len(args): 517 if index + 1 < len(args):
518 resultFile = args[index + 1] 518 resultFile = args[index + 1]
519 del args[index] 519 del args[index]
520 del args[index] 520 del args[index]
521 else: 521 else:
522 mx.abort('-resultfile must be followed by a file name') 522 mx.abort('-resultfile must be followed by a file name')
523 vm = 'graal' 523 vm = 'graal'
524 if '-vm' in args: 524 if '-vm' in args:
525 index = args.index('-vm') 525 index = args.index('-vm')
526 if index + 1 < len(args): 526 if index + 1 < len(args):
527 vm = args[index + 1] 527 vm = args[index + 1]
528 del args[index] 528 del args[index]
529 del args[index] 529 del args[index]
530 else: 530 else:
531 mx.abort('-vm must be followed by a vm name (graal, server, client..)') 531 mx.abort('-vm must be followed by a vm name (graal, server, client..)')
532 if len(args) is 0: 532 if len(args) is 0:
533 args += ['all'] 533 args += ['all']
534 534
540 #Bootstrap 540 #Bootstrap
541 if ('bootstrap' in args or 'all' in args): 541 if ('bootstrap' in args or 'all' in args):
542 benchmarks += sanitycheck.getBootstraps() 542 benchmarks += sanitycheck.getBootstraps()
543 #SPECjvm2008 543 #SPECjvm2008
544 if ('specjvm2008' in args or 'all' in args): 544 if ('specjvm2008' in args or 'all' in args):
545 benchmarks += [sanitycheck.getSPECjvm2008(True, 60, 120)] 545 benchmarks += [sanitycheck.getSPECjvm2008(True, 120, 120)]
546 546
547 for test in benchmarks: 547 for test in benchmarks:
548 if not results.has_key(test.group): 548 if not results.has_key(test.group):
549 results[test.group] = {} 549 results[test.group] = {}
550 results[test.group].update(test.bench('-' + vm)) 550 results[test.group].update(test.bench('-' + vm))