truffle: mx/mx_graal.py comparison

comparison mx/mx_graal.py @ 18949:886cf229e5ee

Merge

author	Stefan Anzinger <stefan.anzinger@oracle.com>
date	Mon, 26 Jan 2015 21:19:36 +0100
parents	926488f5d345
children	43baadc1913a

comparison

equal deleted inserted replaced

-:759d9ffc97fd
+:886cf229e5ee
 #
 # commands.py - the GraalVM specific commands
 #
 # ----------------------------------------------------------------------------------------------------
 #
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 mx.make_eclipse_launch(args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True))
 if _jacoco == 'on' or _jacoco == 'append':
 jacocoagent = mx.library("JACOCOAGENT", True)
 # Exclude all compiler tests and snippets
-baseExcludes = ['com.oracle.graal.compiler.test', 'com.oracle.graal.jtt', 'com.oracle.graal.api.meta.test', 'com.oracle.truffle.api.test', \
+includes = ['com.oracle.graal.*']
-'com.oracle.truffle.api.dsl.test', 'com.oracle.graal.truffle', 'com.oracle.graal.truffle.test', 'com.oracle.graal.compiler.hsail.test']
+baseExcludes = []
+for p in mx.projects():
+projsetting = getattr(p, 'jacoco', '')
+if projsetting == 'exclude':
+baseExcludes.append(p.name)
+if projsetting == 'include':
+includes.append(p.name + '.*')
 def _filter(l):
 # filter out specific classes which are already covered by a baseExclude package
 return [clazz for clazz in l if not any([clazz.startswith(package) for package in baseExcludes])]
 excludes = []
 for p in mx.projects():
 excludes += _filter(_find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution', '@Test'], includeInnerClasses=True).keys())
 excludes += _filter(p.find_classes_with_matching_source_line(None, lambda line: 'JaCoCo Exclude' in line, includeInnerClasses=True).keys())
 excludes += [package + '.*' for package in baseExcludes]
-includes = ['com.oracle.graal.*']
 agentOptions = {
 'append' : 'true' if _jacoco == 'append' else 'false',
 'bootclasspath' : 'true',
 'includes' : ':'.join(includes),
 'excludes' : ':'.join(excludes),
 def shortunittest(args):
 """alias for 'unittest --whitelist test/whitelist_shortunittest.txt'{0}"""
 args = ['--whitelist', 'test/whitelist_shortunittest.txt'] + args
 unittest(args)
+def microbench(args):
+"""run JMH microbenchmark projects"""
+vmArgs, jmhArgs = _extract_VM_args(args, useDoubleDash=True)
+# look for -f in JMH arguments
+containsF = False
+forking = True
+for i in range(len(jmhArgs)):
+arg = jmhArgs[i]
+if arg.startswith('-f'):
+containsF = True
+if arg == '-f' and (i+1) < len(jmhArgs):
+arg += jmhArgs[i+1]
+try:
+if int(arg[2:]) == 0:
+forking = False
+except ValueError:
+pass
+# default to -f1 if not specified otherwise
+if not containsF:
+jmhArgs += ['-f1']
+# find all projects with the JMH dependency
+jmhProjects = []
+for p in mx.projects():
+if 'JMH' in p.deps:
+jmhProjects.append(p.name)
+cp = mx.classpath(jmhProjects)
+# execute JMH runner
+args = ['-cp', cp]
+if not forking:
+args += vmArgs
+args += ['org.openjdk.jmh.Main']
+if forking:
+(_, _, jvm, _, _) = _parseVmArgs(vmArgs)
+args += ['--jvmArgsPrepend', ' '.join(['-' + jvm] + vmArgs)]
+vm(args + jmhArgs)
 def buildvms(args):
 """build one or more VMs in various configurations"""
 vmsDefault = ','.join(_vmChoices.keys())
 deoptalot(['15', '-Xmx48m'])
 dacapo(['100', 'eclipse', '-esa'])
 def _igvFallbackJDK(env):
-igvHomes = [h for h in mx._java_homes if h.version < mx.VersionSpec("1.8.0_20") or h.version >= mx.VersionSpec("1.8.0_40")]
+v8u20 = mx.VersionSpec("1.8.0_20")
-if igvHomes[0] != mx._java_homes[0]:
+v8u40 = mx.VersionSpec("1.8.0_40")
+v8 = mx.VersionSpec("1.8")
+igvHomes = [h for h in mx._java_homes if h.version >= v8 and (h.version < v8u20 or h.version >= v8u40)]
+defaultJava = mx.java()
+if defaultJava not in igvHomes:
+if not igvHomes:
+mx.abort("No JDK available for building IGV. Must have JDK >= 1.8 and < 1.8.0u20 or >= 1.8.0u40 in JAVA_HOME or EXTRA_JAVA_HOMES")
 env = dict(env)
 fallbackJDK = igvHomes[0]
 mx.logv("1.8.0_20 has a known javac bug (JDK-8043926), thus falling back to " + str(fallbackJDK.version))
 env['JAVA_HOME'] = str(fallbackJDK.jdk)
 return env
 def igv(args):
 """run the Ideal Graph Visualizer"""
-with open(join(_graal_home, '.ideal_graph_visualizer.log'), 'w') as fp:
+logFile = '.ideal_graph_visualizer.log'
+with open(join(_graal_home, logFile), 'w') as fp:
 # When the http_proxy environment variable is set, convert it to the proxy settings that ant needs
 env = dict(os.environ)
 proxy = os.environ.get('http_proxy')
 if not (proxy is None) and len(proxy) > 0:
 if '://' in proxy:
 elif supportedVersion < currentVersion:
 mx.log('Supported NetBeans version in igv command should be updated to ' + str(currentVersion))
 if not exists(nbplatform):
 mx.logv('[This execution may take a while as the NetBeans platform needs to be downloaded]')
-mx.run(['ant', '-f', mx._cygpathU2W(join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml')), '-l', mx._cygpathU2W(fp.name), 'run'], env=env)
+if mx.run(['ant', '-f', mx._cygpathU2W(join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml')), '-l', mx._cygpathU2W(fp.name), 'run'], env=env, nonZeroIsFatal=False):
+mx.abort("IGV ant build & launch failed. Check '" + logFile + "'. You can also try to delete 'src/share/tools/IdealGraphVisualizer/nbplatform'.")
 def maven_install_truffle(args):
 """install Truffle into your local Maven repository"""
 for name in ['TRUFFLE', 'TRUFFLE-DSL-PROCESSOR']:
 mx.archive(["@" + name])
 out = 'coverage'
 if len(args) == 1:
 out = args[0]
 elif len(args) > 1:
 mx.abort('jacocoreport takes only one argument : an output directory')
-mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + [p.dir for p in mx.projects()])
+includes = ['com.oracle.graal']
+for p in mx.projects():
+projsetting = getattr(p, 'jacoco', '')
+if projsetting == 'include':
+includes.append(p.name)
+includedirs = set()
+for p in mx.projects():
+for include in includes:
+if include in p.dir:
+includedirs.add(p.dir)
+for i in includedirs:
+bindir = i + '/bin'
+if not os.path.exists(bindir):
+os.makedirs(bindir)
+mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + sorted(includedirs))
 def sl(args):
 """run an SL program"""
 vmArgs, slArgs = _extract_VM_args(args)
 vm(vmArgs + ['-cp', mx.classpath(["TRUFFLE", "com.oracle.truffle.sl"]), "com.oracle.truffle.sl.SLMain"] + slArgs)
 'specjvm2008': [specjvm2008, '[VM options] benchmarks...|"all" [SPECjvm2008 options]'],
 'specjbb2013': [specjbb2013, '[VM options] [-- [SPECjbb2013 options]]'],
 'specjbb2005': [specjbb2005, '[VM options] [-- [SPECjbb2005 options]]'],
 'gate' : [gate, '[-options]'],
 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'],
+'microbench' : [microbench, '[VM options] [-- [JMH options]]'],
 'unittest' : [unittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
 'makejmhdeps' : [makejmhdeps, ''],
 'shortunittest' : [shortunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix],
 'jacocoreport' : [jacocoreport, '[output directory]'],
 'site' : [site, '[-options]'],

Mercurial > hg > truffle

comparison mx/mx_graal.py @ 18949:886cf229e5ee