truffle: mx/mx_graal.py comparison

comparison mx/mx_graal.py @ 15250:4c68a0eb69ca

mx: refactored JMH benchmark building and dependency creation out of 'jmh' into 'buildjmh' and 'makejmhdeps' respectively

author	Doug Simon <doug.simon@oracle.com>
date	Sat, 19 Apr 2014 00:41:04 +0200
parents	5c9185d42a3a
children	9ff9f6643986 12f2b3baa163

comparison

equal deleted inserted replaced

-:54dd156e5f09
+:4c68a0eb69ca
 mx.log(json.dumps(results))
 if resultFile:
 with open(resultFile, 'w') as f:
 f.write(json.dumps(results))
-def jmh(args):
+def _get_jmh_path():
-"""run the JMH_BENCHMARKS
+path = mx.get_env('JMH_BENCHMARKS', None)
+if not path:
-The benchmarks are running with the default VM.
-You can override this with an explicit option.
-For example:
-mx jmh -server ...
-Will force the benchmarks to be run with the server VM.
-"""
-# TODO: add option for `mvn clean package'
-vmArgs, benchmarksAndJsons = _extract_VM_args(args)
-benchmarks = [b for b in benchmarksAndJsons if not b.startswith('{')]
-jmhArgJsons = [b for b in benchmarksAndJsons if b.startswith('{')]
-jmhArgs = {'-rff' : join(_graal_home, 'mx', 'jmh', 'jmh.out'), '-v' : 'EXTRA' if mx._opts.verbose else 'NORMAL'}
-# e.g. '{"-wi" : 20}'
-for j in jmhArgJsons:
-try:
-for n, v in json.loads(j).iteritems():
-if v is None:
-del jmhArgs[n]
-else:
-jmhArgs[n] = v
-except ValueError as e:
-mx.abort('error parsing JSON input: {}"\n{}'.format(j, e))
-jmhPath = mx.get_env('JMH_BENCHMARKS', None)
-if not jmhPath:
 probe = join(dirname(_graal_home), 'java-benchmarks')
 if exists(probe):
-jmhPath = probe
+path = probe
-if not jmhPath:
+if not path:
 mx.abort("Please set the JMH_BENCHMARKS environment variable to point to the java-benchmarks workspace")
-if not exists(jmhPath):
+if not exists(path):
-mx.abort("The directory denoted by the JMH_BENCHMARKS environment variable does not exist: " + jmhPath)
+mx.abort("The directory denoted by the JMH_BENCHMARKS environment variable does not exist: " + path)
-mx.log('Using benchmarks in ' + jmhPath)
+return path
+def makejmhdeps(args):
+"""creates and installs Maven dependencies required by the JMH benchmarks
+The dependencies are specified by files named pom.mxdeps in the
+JMH directory tree. Each such file contains a list of dependencies
+defined in JSON format. For example:
+'[{"artifactId" : "compiler.test", "groupId" : "com.oracle.graal", "deps" : ["com.oracle.graal.compiler.test"]}]'
+will result in a dependency being installed in the local Maven repository
+that can be referenced in a pom.xml file as follows:
+<dependency>
+<groupId>com.oracle.graal</groupId>
+<artifactId>compiler.test</artifactId>
+<version>1.0-SNAPSHOT</version>
+</dependency>"""
+parser = ArgumentParser(prog='mx makejmhdeps')
+parser.add_argument('-s', '--settings', help='alternative path for Maven user settings file', metavar='<path>')
+parser.add_argument('-p', '--permissive', action='store_true', help='issue note instead of error if a Maven dependency cannot be built due to missing projects/libraries')
+args = parser.parse_args(args)
+def makejmhdep(artifactId, groupId, deps):
+graalSuite = mx.suite("graal")
+path = artifactId + '.jar'
+if args.permissive:
+for name in deps:
+if not mx.project(name, fatalIfMissing=False):
+if not mx.library(name, fatalIfMissing=False):
+mx.log('Skipping ' + groupId + '.' + artifactId + '.jar as ' + name + ' cannot be resolved')
+return
+d = mx.Distribution(graalSuite, name=artifactId, path=path, sourcesPath=path, deps=deps, excludedLibs=[])
+d.make_archive()
+cmd = ['mvn', '-q', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId,
+'-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path]
+if args.settings:
+cmd = cmd + ['-s', args.settings]
+mx.run(cmd)
+os.unlink(d.path)
+jmhPath = _get_jmh_path()
+for root, _, filenames in os.walk(jmhPath):
+for f in [join(root, n) for n in filenames if n == 'pom.mxdeps']:
+mx.logv('[processing ' + f + ']')
+try:
+with open(f) as fp:
+for d in json.load(fp):
+artifactId = d['artifactId']
+groupId = d['groupId']
+deps = d['deps']
+makejmhdep(artifactId, groupId, deps)
+except ValueError as e:
+mx.abort('Error parsing {}:\n{}'.format(f, e))
+def buildjmh(args):
+"""build the JMH benchmarks"""
+parser = ArgumentParser(prog='mx buildjmh')
+parser.add_argument('-s', '--settings', help='alternative path for Maven user settings file', metavar='<path>')
+parser.add_argument('-c', action='store_true', dest='clean', help='clean before building')
+args = parser.parse_args(args)
+jmhPath = _get_jmh_path()
+mx.log('JMH benchmarks: ' + jmhPath)
 timestamp = mx.TimeStampFile(join(_graal_home, 'mx', 'jmh', jmhPath.replace(os.sep, '_') + '.timestamp'))
-buildJmh = False
+mustBuild = args.clean
-jmhTree = []
+if not mustBuild:
-for root, dirnames, filenames in os.walk(jmhPath):
+try:
-if root == jmhPath:
+hgfiles = [join(jmhPath, f) for f in subprocess.check_output(['hg', '-R', jmhPath, 'locate']).split('\n')]
-for n in ['.hg', '.metadata']:
+mustBuild = timestamp.isOlderThan(hgfiles)
-if n in dirnames:
+except:
-dirnames.remove(n)
+# not a Mercurial repository or hg commands are not available.
-jmhTree.append(os.path.relpath(root, jmhPath) + ':')
+mustBuild = True
-jmhTree = jmhTree + filenames
-jmhTree.append('')
+if mustBuild:
-files = [join(root, f) for f in filenames]
-if timestamp.isOlderThan(files):
-buildJmh = True
-if not buildJmh:
-with open(timestamp.path) as fp:
-oldJmhTree = fp.read().split('\n')
-if oldJmhTree != jmhTree:
-import difflib
-diff = difflib.unified_diff(oldJmhTree, jmhTree)
-mx.log("Need to rebuild JMH due to change in JMH directory tree indicated by this diff:")
-mx.log('\n'.join(diff))
-buildJmh = True
-if buildJmh:
 buildOutput = []
 def _redirect(x):
 if mx._opts.verbose:
 mx.log(x[:-1])
 else:
 buildOutput.append(x)
 env = os.environ.copy()
 env['JAVA_HOME'] = _jdk(vmToCheck='server')
 env['MAVEN_OPTS'] = '-server'
 mx.log("Building benchmarks...")
-retcode = mx.run(['mvn', 'package'], cwd=jmhPath, out=_redirect, env=env, nonZeroIsFatal=False)
+makejmhdeps(['-p'] + (['-s', args.settings] if args.settings else []))
+cmd = ['mvn']
+if args.settings:
+cmd = cmd + ['-s', args.settings]
+if args.clean:
+cmd.append('clean')
+cmd.append('package')
+retcode = mx.run(cmd, cwd=jmhPath, out=_redirect, env=env, nonZeroIsFatal=False)
 if retcode != 0:
 mx.log(''.join(buildOutput))
 mx.abort(retcode)
 timestamp.touch()
-with open(timestamp.path, 'w') as fp:
+else:
-fp.write('\n'.join(jmhTree))
+mx.logv('[all Mercurial controlled files in ' + jmhPath + ' are older than ' + timestamp.path + ' - skipping build]')
+def jmh(args):
+"""run the JMH benchmarks
+This command respects the standard --vm and --vmbuild options
+for choosing which VM to run the benchmarks with."""
+if '-h' in args:
+mx.help_(['jmh'])
+mx.abort(1)
+vmArgs, benchmarksAndJsons = _extract_VM_args(args)
+benchmarks = [b for b in benchmarksAndJsons if not b.startswith('{')]
+jmhArgJsons = [b for b in benchmarksAndJsons if b.startswith('{')]
+jmhArgs = {'-rff' : join(_graal_home, 'mx', 'jmh', 'jmh.out'), '-v' : 'EXTRA' if mx._opts.verbose else 'NORMAL'}
+# e.g. '{"-wi" : 20}'
+for j in jmhArgJsons:
+try:
+for n, v in json.loads(j).iteritems():
+if v is None:
+del jmhArgs[n]
+else:
+jmhArgs[n] = v
+except ValueError as e:
+mx.abort('error parsing JSON input: {}\n{}'.format(j, e))
+jmhPath = _get_jmh_path()
+mx.log('Using benchmarks in ' + jmhPath)
 matchedSuites = set()
 numBench = [0]
 for micros in os.listdir(jmhPath):
 absoluteMicro = os.path.join(jmhPath, micros)
 mx.logv('JMH: ignored ' + absoluteMicro + " because it doesn't start with 'micros-'")
 continue
 microJar = os.path.join(absoluteMicro, "target", "microbenchmarks.jar")
 if not exists(microJar):
-mx.logv('JMH: ignored ' + absoluteMicro + " because it doesn't contain the expected jar file ('" + microJar + "')")
+mx.abort('Missing ' + microJar + ' - please run "mx buildjmh"')
-continue
 if benchmarks:
 def _addBenchmark(x):
 if x.startswith("Benchmark:"):
 return
 match = False
 for k, v in jmhArgs.iteritems():
 javaArgs.append(k)
 if len(str(v)):
 javaArgs.append(str(v))
 mx.run_java(javaArgs + regex, addDefaultArgs=False, cwd=jmhPath)
 def specjvm2008(args):
 """run one or more SPECjvm2008 benchmarks"""
 def launcher(bm, harnessArgs, extraVmOpts):
 return len(failures)
 def mx_init(suite):
 commands = {
 'build': [build, ''],
+'buildjmh': [buildjmh, '[-options]'],
 'buildvars': [buildvars, ''],
 'buildvms': [buildvms, '[-options]'],
 'c1visualizer' : [c1visualizer, ''],
 'checkheaders': [checkheaders, ''],
 'clean': [clean, ''],
 'specjbb2005': [specjbb2005, '[VM options] [-- [SPECjbb2005 options]]'],
 'gate' : [gate, '[-options]'],
 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'],
 'unittest' : [unittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
 'longunittest' : [longunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
+'makejmhdeps' : [makejmhdeps, ''],
 'shortunittest' : [shortunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
 'jacocoreport' : [jacocoreport, '[output directory]'],
 'site' : [site, '[-options]'],
 'vm': [vm, '[-options] class [args...]'],
 'vmg': [vmg, '[-options] class [args...]'],

Mercurial > hg > truffle

comparison mx/mx_graal.py @ 15250:4c68a0eb69ca