Mercurial > hg > graal-jvmci-8
changeset 22476:6050079bb7bd
removed microbench command (use jmh command instead)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 27 Aug 2015 18:28:49 +0200 |
parents | 5b1d16455b92 |
children | c3ad14a83248 |
files | mx.jvmci/mx_jvmci.py |
diffstat | 1 files changed, 4 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py Thu Aug 27 17:08:25 2015 +0200 +++ b/mx.jvmci/mx_jvmci.py Thu Aug 27 18:28:49 2015 +0200 @@ -1373,10 +1373,11 @@ mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved') return if dep.isDistribution(): - allDeps = allDeps + [d.name for d in dep.archived_deps() if d.isJavaProject()] + allDeps = allDeps + [d for d in dep.archived_deps() if d.isJavaProject()] else: - allDeps.append(name) - d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedLibs=[], distDependencies=[], javaCompliance=None) + allDeps.append(dep) + d = mx.JARDistribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, \ + mainClass=None, excludedLibs=[], distDependencies=[], javaCompliance=None, platformDependent=False, theLicense=None) d.make_archive() env = os.environ.copy() env['JAVA_HOME'] = get_jvmci_jdk(vmToCheck='server') @@ -1541,46 +1542,6 @@ javaArgs.append(str(v)) mx.run_java(javaArgs + regex, addDefaultArgs=False, cwd=jmhPath) -def microbench(args): - """run JMH microbenchmark projects""" - vmArgs, jmhArgs = mx.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 a direct 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 hsdis(args, copyToDir=None): """download the hsdis library