truffle: mx/commands.py comparison

comparison mx/commands.py @ 4485:c82b74db2ccd

Merge

author	Andreas Woess <andreas.woess@jku.at>
date	Tue, 07 Feb 2012 21:17:08 +0100
parents	58ecb156a3e8
children	8caa4f2df081 43b4e9201c29

comparison

equal deleted inserted replaced

-:14a00ee82980
+:c82b74db2ccd
 if not sanitycheck.getDacapo(test, n, dacapoArgs).test('graal', opts=vmOpts):
 failed.append(test)
 if len(failed) != 0:
 mx.abort('DaCapo failures: ' + str(failed))
+def scaladacapo(args):
+"""run one or all Scala DaCapo benchmarks
+Scala DaCapo options are distinguished from VM options by a '@' prefix.
+For example, '@--iterations @5' will pass '--iterations 5' to the
+DaCapo harness."""
+numTests = {}
+if len(args) > 0:
+level = getattr(sanitycheck.SanityCheckLevel, args[0], None)
+if level is not None:
+del args[0]
+for (bench, ns) in sanitycheck.dacapoScalaSanityWarmup.items():
+if ns[level] > 0:
+numTests[bench] = ns[level]
+else:
+while len(args) != 0 and args[0][0] not in ['-', '@']:
+n = 1
+if args[0].isdigit():
+n = int(args[0])
+assert len(args) > 1 and args[1][0] not in ['-', '@'] and not args[1].isdigit()
+bm = args[1]
+del args[0]
+else:
+bm = args[0]
+del args[0]
+if bm not in sanitycheck.dacapoScalaSanityWarmup.keys():
+mx.abort('unknown benchmark: ' + bm + '\nselect one of: ' + str(sanitycheck.dacapoScalaSanityWarmup.keys()))
+numTests[bm] = n
+if len(numTests) is 0:
+for bench in sanitycheck.dacapoScalaSanityWarmup.keys():
+numTests[bench] = 1
+# Extract DaCapo options
+dacapoArgs = [(arg[1:]) for arg in args if arg.startswith('@')]
+# The remainder are VM options
+vmOpts = [arg for arg in args if not arg.startswith('@')]
+failed = []
+for (test, n) in numTests.items():
+if not sanitycheck.getScalaDacapo(test, n, dacapoArgs).test('graal', opts=vmOpts):
+failed.append(test)
+if len(failed) != 0:
+mx.abort('Scala DaCapo failures: ' + str(failed))
 def _jdk(build='product', create=False):
 """
 Get the JDK into which Graal is installed, creating it first if necessary.
 """
 t = Task('BuildJava')
 build(['--no-native'])
 tasks.append(t.stop())
-for vmbuild in ['product', 'fastdebug']:
+for vmbuild in ['fastdebug', 'product']:
 global _vmbuild
 _vmbuild = vmbuild
 t = Task('BuildHotSpot:' + vmbuild)
 build(['--no-java', vmbuild])
 dacapos = [a[7:] for a in args if a.startswith('dacapo:')]
 for dacapo in dacapos:
 if dacapo not in sanitycheck.dacapoSanityWarmup.keys():
 mx.abort('Unknown dacapo : ' + dacapo)
 benchmarks += [sanitycheck.getDacapo(dacapo, sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark])]
+if ('scaladacapo' in args or 'all' in args):
+benchmarks += sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
+else:
+dacapos = [a[7:] for a in args if a.startswith('scaladacapo:')]
+for dacapo in dacapos:
+if dacapo not in sanitycheck.dacapoScalaSanityWarmup.keys():
+mx.abort('Unknown dacapo : ' + dacapo)
+benchmarks += [sanitycheck.getScalaDacapo(dacapo, sanitycheck.dacapoScalaSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark])]
 #Bootstrap
 if ('bootstrap' in args or 'all' in args):
 benchmarks += sanitycheck.getBootstraps()
 #SPECjvm2008
 def specjvm2008(args):
 benchArgs = [a[1:] for a in args if a[0] == '@']
 vmArgs = [a for a in args if a[0] != '@']
 sanitycheck.getSPECjvm2008(benchArgs).bench('graal', opts=vmArgs)
+def hsdis(args):
+"""Installs the hsdis library
+This is needed to support HotSpot's assembly dumping features.
+By default it installs the Intel syntax version, use the 'att' argument to install AT&T syntax."""
+flavor = 'intel'
+if 'att' in args:
+flavor = 'att'
+build = _vmbuild if _vmSourcesAvailable else 'product'
+lib = mx.lib_suffix('hsdis-amd64')
+path = join(_jdk(build), 'jre', 'lib', 'amd64', lib)
+mx.download(path, ['http://lafo.ssw.uni-linz.ac.at/hsdis/' + flavor + "/" + lib])
 def mx_init():
 _vmbuild = 'product'
 commands = {
 'build': [build, '[-options]'],
 'clean': [clean, ''],
 'copyrightcheck': [copyrightcheck, ''],
+'hsdis': [hsdis, '[att]'],
 'dacapo': [dacapo, '[[n] benchmark] [VM options|@DaCapo options]'],
-'specjvm2008': [specjvm2008, ''],
+'scaladacapo': [scaladacapo, '[[n] benchmark] [VM options|@Scala DaCapo options]'],
+'specjvm2008': [specjvm2008, '[VM options|@specjvm2008 options]'],
 'example': [example, '[-v] example names...'],
 'gate' : [gate, ''],
 'bench' : [bench, '[-vm vm] [-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'],
 'unittest' : [unittest, '[filters...]'],
 'vm': [vm, '[-options] class [args...]']

Mercurial > hg > truffle

comparison mx/commands.py @ 4485:c82b74db2ccd