truffle: mx/commands.py annotate

annotate mx/commands.py @ 8211:74896b25297a

Test canonicalization and checkstyle early in gate process Run the unittests in hosted mode (server)

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Mon, 11 Mar 2013 19:21:31 +0100
parents	4b11a0983557
children	b9eb0d939e60

rev	line source
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1 #
4225 339cf8d4904d Made mx.run work properly when stderr is redirected to stdout. Doug Simon <doug.simon@oracle.com> parents: 4219 diff changeset	2 # commands.py - the GraalVM specific commands
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	3 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4 # ----------------------------------------------------------------------------------------------------
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	5 #
4187 ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	6 # Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	8 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	9 # This code is free software; you can redistribute it and/or modify it
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	10 # under the terms of the GNU General Public License version 2 only, as
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	11 # published by the Free Software Foundation.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	12 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	13 # This code is distributed in the hope that it will be useful, but WITHOUT
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	14 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	15 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	16 # version 2 for more details (a copy is included in the LICENSE file that
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	17 # accompanied this code).
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	18 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	19 # You should have received a copy of the GNU General Public License version
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	20 # 2 along with this work; if not, write to the Free Software Foundation,
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	21 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	22 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	23 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	24 # or visit www.oracle.com if you need additional information or have any
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	25 # questions.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	26 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	27 # ----------------------------------------------------------------------------------------------------
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	28
7509 442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7345 diff changeset	29 import os, sys, shutil, zipfile, tempfile, re, time, datetime, platform, subprocess, multiprocessing
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4257 diff changeset	30 from os.path import join, exists, dirname, basename
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	31 from argparse import ArgumentParser, REMAINDER
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	32 import mx
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	33 import sanitycheck
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	34 import json
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	35
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	36 _graal_home = dirname(dirname(__file__))
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	37
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	38 """ Used to distinguish an exported GraalVM (see 'mx export'). """
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	39 _vmSourcesAvailable = exists(join(_graal_home, 'make')) and exists(join(_graal_home, 'src'))
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	40
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	41 """ The VM that will be run by the 'vm' command: graal(default), client or server.
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	42 This can be set via the global '--vm' option. """
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	43 _vm = 'graal'
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	44
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	45 """ The VM build that will be run by the 'vm' command: product(default), fastdebug or debug.
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	46 This can be set via the global '--fastdebug' and '--debug' options. """
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	47 _vmbuild = 'product'
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	48
5024 7ccdae96e98a Allow JaCoCon to append to the execution file Gilles Duboscq <duboscq@ssw.jku.at> parents: 5016 diff changeset	49 _jacoco = 'off'
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	50
5875 000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	51 _native_dbg = None
000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	52
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	53 _make_eclipse_launch = False
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	54
4276 f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	55 _copyrightTemplate = """/*
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	56 * Copyright (c) {0}, Oracle and/or its affiliates. All rights reserved.
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	57 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	58 *
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	59 * This code is free software; you can redistribute it and/or modify it
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	60 * under the terms of the GNU General Public License version 2 only, as
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	61 * published by the Free Software Foundation.
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	62 *
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	63 * This code is distributed in the hope that it will be useful, but WITHOUT
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	64 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	65 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	66 * version 2 for more details (a copy is included in the LICENSE file that
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	67 * accompanied this code).
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	68 *
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	69 * You should have received a copy of the GNU General Public License version
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	70 * 2 along with this work; if not, write to the Free Software Foundation,
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	71 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	72 *
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	73 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	74 * or visit www.oracle.com if you need additional information or have any
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	75 * questions.
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	76 */
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	77
4276 f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	78 """
f8f262212aa4 Modified 'mx build' to update graal_paths.hpp (if necessary). Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	79
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	80 _minVersion = mx.JavaVersion('1.7.0_04')
9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	81
6705 0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	82 def _chmodDir(chmodFlags, dirname, fnames):
0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	83 os.chmod(dirname, chmodFlags)
7509 442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7345 diff changeset	84 for name in fnames:
442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7345 diff changeset	85 os.chmod(os.path.join(dirname, name), chmodFlags)
6705 0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	86
0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	87 def chmodRecursive(dirname, chmodFlags):
0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	88 os.path.walk(dirname, _chmodDir, chmodFlags)
0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	89
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	90 def clean(args):
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	91 """clean the GraalVM source tree"""
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4244 diff changeset	92 opts = mx.clean(args, parser=ArgumentParser(prog='mx clean'))
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	93 if opts.native:
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	94 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='16')
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	95 mx.run([mx.gmake_cmd(), 'clean'], cwd=join(_graal_home, 'make'))
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	96 jdks = join(_graal_home, 'jdk' + str(mx.java().version))
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	97 if exists(jdks):
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	98 shutil.rmtree(jdks)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	99
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	100 def export(args):
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	101 """create a GraalVM zip file for distribution"""
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	102
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	103 parser = ArgumentParser(prog='mx export');
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	104 parser.add_argument('--omit-vm-build', action='store_false', dest='vmbuild', help='omit VM build step')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	105 parser.add_argument('--omit-dist-init', action='store_false', dest='distInit', help='omit class files and IDE configurations from distribution')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	106 parser.add_argument('zipfile', nargs=REMAINDER, metavar='zipfile')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	107
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	108 args = parser.parse_args(args)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	109
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	110 tmp = tempfile.mkdtemp(prefix='tmp', dir=_graal_home)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	111 if args.vmbuild:
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	112 # Make sure the product VM binary is up to date
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	113 build(['product'])
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	114
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	115 mx.log('Copying Java sources and mx files...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	116 mx.run(('hg archive -I graal -I mx -I mxtool -I mx.sh ' + tmp).split())
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	117
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	118 # Copy the GraalVM JDK
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	119 mx.log('Copying GraalVM JDK...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	120 src = _jdk()
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	121 dst = join(tmp, basename(src))
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	122 shutil.copytree(src, dst)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	123 zfName = join(_graal_home, 'graalvm-' + mx.get_os() + '.zip')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	124 zf = zipfile.ZipFile(zfName, 'w')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	125 for root, _, files in os.walk(tmp):
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	126 for f in files:
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	127 name = join(root, f)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	128 arcname = name[len(tmp) + 1:]
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	129 zf.write(join(tmp, name), arcname)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	130
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	131 # create class files and IDE configurations
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	132 if args.distInit:
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	133 mx.log('Creating class files...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	134 mx.run('mx build'.split(), cwd=tmp)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	135 mx.log('Creating IDE configurations...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	136 mx.run('mx ideinit'.split(), cwd=tmp)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	137
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	138 # clean up temp directory
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	139 mx.log('Cleaning up...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	140 shutil.rmtree(tmp)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	141
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	142 mx.log('Created distribution in ' + zfName)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	143
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	144 def example(args):
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	145 """run some or all Graal examples"""
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	146 examples = {
5064 8a88c903e381 Updated mx commands. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5047 diff changeset	147 'safeadd': ['com.oracle.graal.examples.safeadd', 'com.oracle.graal.examples.safeadd.Main'],
8a88c903e381 Updated mx commands. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5047 diff changeset	148 'vectorlib': ['com.oracle.graal.examples.vectorlib', 'com.oracle.graal.examples.vectorlib.Main'],
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	149 }
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	150
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	151 def run_example(verbose, project, mainClass):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	152 cp = mx.classpath(project)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	153 sharedArgs = ['-Xcomp', '-XX:CompileOnly=Main', mainClass]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	154
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	155 res = []
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	156 mx.log("=== Server VM ===")
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	157 printArg = '-XX:+PrintCompilation' if verbose else '-XX:-PrintCompilation'
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	158 res.append(vm(['-cp', cp, printArg] + sharedArgs, vm='server'))
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	159 mx.log("=== Graal VM ===")
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	160 printArg = '-G:+PrintCompilation' if verbose else '-G:-PrintCompilation'
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	161 res.append(vm(['-cp', cp, printArg, '-G:-Extend', '-G:-Inline'] + sharedArgs))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	162 mx.log("=== Graal VM with extensions ===")
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	163 res.append(vm(['-cp', cp, printArg, '-G:+Extend', '-G:-Inline'] + sharedArgs))
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	164
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	165 if len([x for x in res if x != 0]) != 0:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	166 return 1
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	167 return 0
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	168
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	169 verbose = False
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	170 if '-v' in args:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	171 verbose = True
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	172 args = [a for a in args if a != '-v']
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	173
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	174 if len(args) == 0:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	175 args = examples.keys()
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	176 for a in args:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	177 config = examples.get(a)
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	178 if config is None:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	179 mx.log('unknown example: ' + a + ' {available examples = ' + str(examples.keys()) + '}')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	180 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	181 mx.log('--------- ' + a + ' ------------')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	182 project, mainClass = config
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	183 run_example(verbose, project, mainClass)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	184
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	185 def dacapo(args):
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	186 """run one or all DaCapo benchmarks
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	187
4244 a69889e5a8a5 Made the DaCapo library be downloaded only on demand. Doug Simon <doug.simon@oracle.com> parents: 4240 diff changeset	188 DaCapo options are distinguished from VM options by a '@' prefix.
5649 14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	189 For example, '@-n @5' will pass '-n 5' to the
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	190 DaCapo harness."""
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	191
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	192 numTests = {}
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	193 if len(args) > 0:
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	194 level = getattr(sanitycheck.SanityCheckLevel, args[0], None)
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	195 if level is not None:
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	196 del args[0]
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	197 for (bench, ns) in sanitycheck.dacapoSanityWarmup.items():
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	198 if ns[level] > 0:
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	199 numTests[bench] = ns[level]
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	200 else:
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	201 while len(args) != 0 and args[0][0] not in ['-', '@']:
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	202 n = 1
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	203 if args[0].isdigit():
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	204 n = int(args[0])
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	205 assert len(args) > 1 and args[1][0] not in ['-', '@'] and not args[1].isdigit()
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	206 bm = args[1]
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	207 del args[0]
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	208 else:
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	209 bm = args[0]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	210
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	211 del args[0]
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	212 if bm not in sanitycheck.dacapoSanityWarmup.keys():
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	213 mx.abort('unknown benchmark: ' + bm + '\nselect one of: ' + str(sanitycheck.dacapoSanityWarmup.keys()))
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	214 numTests[bm] = n
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	215
dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	216 if len(numTests) is 0:
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	217 for bench in sanitycheck.dacapoSanityWarmup.keys():
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	218 numTests[bench] = 1
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	219
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	220 # Extract DaCapo options
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	221 dacapoArgs = [(arg[1:]) for arg in args if arg.startswith('@')]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	222
dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	223 # The remainder are VM options
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	224 vmOpts = [arg for arg in args if not arg.startswith('@')]
5229 ce6cb3a1eb44 mx dacapo, mx scaladacapo and mx specjvm2008 should use the specified vm Gilles Duboscq <duboscq@ssw.jku.at> parents: 5197 diff changeset	225 vm = _vm
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	226
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	227 failed = []
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	228 for (test, n) in numTests.items():
5229 ce6cb3a1eb44 mx dacapo, mx scaladacapo and mx specjvm2008 should use the specified vm Gilles Duboscq <duboscq@ssw.jku.at> parents: 5197 diff changeset	229 if not sanitycheck.getDacapo(test, n, dacapoArgs).test(vm, opts=vmOpts):
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	230 failed.append(test)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	231
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	232 if len(failed) != 0:
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	233 mx.abort('DaCapo failures: ' + str(failed))
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	234
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	235 def scaladacapo(args):
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	236 """run one or all Scala DaCapo benchmarks
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	237
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	238 Scala DaCapo options are distinguished from VM options by a '@' prefix.
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	239 For example, '@--iterations @5' will pass '--iterations 5' to the
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	240 DaCapo harness."""
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	241
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	242 numTests = {}
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	243
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	244 if len(args) > 0:
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	245 level = getattr(sanitycheck.SanityCheckLevel, args[0], None)
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	246 if level is not None:
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	247 del args[0]
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	248 for (bench, ns) in sanitycheck.dacapoScalaSanityWarmup.items():
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	249 if ns[level] > 0:
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	250 numTests[bench] = ns[level]
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	251 else:
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	252 while len(args) != 0 and args[0][0] not in ['-', '@']:
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	253 n = 1
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	254 if args[0].isdigit():
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	255 n = int(args[0])
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	256 assert len(args) > 1 and args[1][0] not in ['-', '@'] and not args[1].isdigit()
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	257 bm = args[1]
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	258 del args[0]
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	259 else:
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	260 bm = args[0]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	261
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	262 del args[0]
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	263 if bm not in sanitycheck.dacapoScalaSanityWarmup.keys():
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	264 mx.abort('unknown benchmark: ' + bm + '\nselect one of: ' + str(sanitycheck.dacapoScalaSanityWarmup.keys()))
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	265 numTests[bm] = n
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	266
dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	267 if len(numTests) is 0:
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	268 for bench in sanitycheck.dacapoScalaSanityWarmup.keys():
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	269 numTests[bench] = 1
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	270
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	271 # Extract DaCapo options
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	272 dacapoArgs = [(arg[1:]) for arg in args if arg.startswith('@')]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	273
dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	274 # The remainder are VM options
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	275 vmOpts = [arg for arg in args if not arg.startswith('@')]
5229 ce6cb3a1eb44 mx dacapo, mx scaladacapo and mx specjvm2008 should use the specified vm Gilles Duboscq <duboscq@ssw.jku.at> parents: 5197 diff changeset	276 vm = _vm;
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	277
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	278 failed = []
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	279 for (test, n) in numTests.items():
5229 ce6cb3a1eb44 mx dacapo, mx scaladacapo and mx specjvm2008 should use the specified vm Gilles Duboscq <duboscq@ssw.jku.at> parents: 5197 diff changeset	280 if not sanitycheck.getScalaDacapo(test, n, dacapoArgs).test(vm, opts=vmOpts):
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	281 failed.append(test)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	282
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	283 if len(failed) != 0:
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	284 mx.abort('Scala DaCapo failures: ' + str(failed))
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	285
6495 75f130f2b30f moved AMD64 specific HotSpot code in com.oracle.graal.hotspot.amd64 project Doug Simon <doug.simon@oracle.com> parents: 6340 diff changeset	286 def _arch():
6512 edea9ba7ac7b Windows-specific fix for mx. Christian Haeubl <haeubl@ssw.jku.at> parents: 6506 diff changeset	287 machine = platform.uname()[4]
6558 0a6d8857306d arch is i86pc on solaris x64 boxes. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6512 diff changeset	288 if machine in ['amd64', 'AMD64', 'x86_64', 'i86pc']:
6495 75f130f2b30f moved AMD64 specific HotSpot code in com.oracle.graal.hotspot.amd64 project Doug Simon <doug.simon@oracle.com> parents: 6340 diff changeset	289 return 'amd64'
6566 ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	290 if machine == 'i386' and mx.get_os() == 'darwin':
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	291 try:
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	292 # Support for Snow Leopard and earlier version of MacOSX
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	293 if subprocess.check_output(['sysctl', '-n', 'hw.cpu64bit_capable']).strip() == '1':
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	294 return 'amd64'
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	295 except OSError:
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	296 # sysctl is not available
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	297 pass
ef48be91f5fd fixed detection of architecture on Snow Leopard and earlier versions of MacOSX Doug Simon <doug.simon@oracle.com> parents: 6558 diff changeset	298 mx.abort('unknown or unsupported architecture: os=' + mx.get_os() + ', machine=' + machine)
6495 75f130f2b30f moved AMD64 specific HotSpot code in com.oracle.graal.hotspot.amd64 project Doug Simon <doug.simon@oracle.com> parents: 6340 diff changeset	299
4607 ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	300 def _vmLibDirInJdk(jdk):
ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	301 """
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	302 Get the directory within a JDK where the server and client
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	303 subdirectories are located.
4607 ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	304 """
ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	305 if platform.system() == 'Darwin':
ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	306 return join(jdk, 'jre', 'lib')
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	307 if platform.system() == 'Windows':
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	308 return join(jdk, 'jre', 'bin')
6495 75f130f2b30f moved AMD64 specific HotSpot code in com.oracle.graal.hotspot.amd64 project Doug Simon <doug.simon@oracle.com> parents: 6340 diff changeset	309 return join(jdk, 'jre', 'lib', _arch())
4607 ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	310
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	311 def _vmCfgInJdk(jdk):
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	312 """
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	313 Get the jvm.cfg file.
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	314 """
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	315 if platform.system() == 'Windows':
6495 75f130f2b30f moved AMD64 specific HotSpot code in com.oracle.graal.hotspot.amd64 project Doug Simon <doug.simon@oracle.com> parents: 6340 diff changeset	316 return join(jdk, 'jre', 'lib', _arch(), 'jvm.cfg')
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	317 return join(_vmLibDirInJdk(jdk), 'jvm.cfg')
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	318
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	319 def _jdk(build='product', create=False):
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	320 """
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	321 Get the JDK into which Graal is installed, creating it first if necessary.
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	322 """
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	323 jdk = join(_graal_home, 'jdk' + str(mx.java().version), build)
5870 d84a26dc32f5 Make 'db' directory from JDK optional since it does not exists in all OpenJDK-based JDKs (cf. Icedtea) Gilles Duboscq <duboscq@ssw.jku.at> parents: 5868 diff changeset	324 jdkContents = ['bin', 'include', 'jre', 'lib']
d84a26dc32f5 Make 'db' directory from JDK optional since it does not exists in all OpenJDK-based JDKs (cf. Icedtea) Gilles Duboscq <duboscq@ssw.jku.at> parents: 5868 diff changeset	325 if (exists(join(jdk, 'db'))):
d84a26dc32f5 Make 'db' directory from JDK optional since it does not exists in all OpenJDK-based JDKs (cf. Icedtea) Gilles Duboscq <duboscq@ssw.jku.at> parents: 5868 diff changeset	326 jdkContents.append('db')
4252 67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	327 if mx.get_os() != 'windows':
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	328 jdkContents.append('man')
4582 b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	329 if create:
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	330 if not exists(jdk):
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	331 srcJdk = mx.java().jdk
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	332 mx.log('Creating ' + jdk + ' from ' + srcJdk)
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	333 os.makedirs(jdk)
4252 67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	334 for d in jdkContents:
4582 b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	335 src = join(srcJdk, d)
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	336 dst = join(jdk, d)
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	337 if not exists(src):
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	338 mx.abort('Host JDK directory is missing: ' + src)
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	339 shutil.copytree(src, dst)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	340
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	341 # Make a copy of the default VM so that this JDK can be
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	342 # reliably used as the bootstrap for a HotSpot build.
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	343 jvmCfg = _vmCfgInJdk(jdk)
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	344 if not exists(jvmCfg):
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	345 mx.abort(jvmCfg + ' does not exist')
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	346
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	347 lines = []
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	348 defaultVM = None
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	349 with open(jvmCfg) as f:
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	350 for line in f:
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	351 if line.startswith('-') and defaultVM is None:
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	352 parts = line.split()
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	353 assert len(parts) == 2, parts
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	354 assert parts[1] == 'KNOWN', parts[1]
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	355 defaultVM = parts[0][1:]
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	356 lines.append('-' + defaultVM + '0 KNOWN\n')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	357 lines.append(line)
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	358
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	359 assert defaultVM is not None, 'Could not find default VM in ' + jvmCfg
6687 a9a50f21e000 Added change to copied directory's protection when source JDK directories are read-only. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6566 diff changeset	360 if mx.get_os() != 'windows':
6705 0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	361 chmodRecursive(jdk, 0755)
4607 ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	362 shutil.copytree(join(_vmLibDirInJdk(jdk), defaultVM), join(_vmLibDirInJdk(jdk), defaultVM + '0'))
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	363
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	364 with open(jvmCfg, 'w') as f:
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	365 for line in lines:
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	366 f.write(line)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	367
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	368 # Install a copy of the disassembler library
e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	369 try:
e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	370 hsdis([], copyToDir=_vmLibDirInJdk(jdk))
e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	371 except SystemExit:
e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	372 pass
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	373 else:
4582 b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	374 if not exists(jdk):
4587 5b04b33dac74 add jtt tests, converted from the maxine repository using ConvertJTT Lukas Stadler <lukas.stadler@jku.at> parents: 4584 diff changeset	375 mx.abort('The ' + build + ' VM has not been created - run \'mx clean; mx build ' + build + '\'')
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	376
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	377 _installGraalJarInJdks(mx.distribution('GRAAL'))
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	378
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	379 return jdk
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	380
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	381 def _installGraalJarInJdks(graalDist):
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	382 graalJar = graalDist.path
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	383 jdks = join(_graal_home, 'jdk' + str(mx.java().version))
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	384 if exists(jdks):
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	385 for e in os.listdir(jdks):
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	386 jreLibDir = join(jdks, e, 'jre', 'lib')
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	387 if exists(jreLibDir):
8180 0934903d28f3 use shutil.move to make concurrent updating/replacement of graal.jar atomic Doug Simon <doug.simon@oracle.com> parents: 8135 diff changeset	388 # do a copy and then a move to get atomic updating (on Unix) of graal.jar in the JRE
8183 4b11a0983557 fixed issue with deleting temp files on Windows Doug Simon <doug.simon@oracle.com> parents: 8182 diff changeset	389 fd, tmp = tempfile.mkstemp(suffix='', prefix='graal.jar', dir=jreLibDir)
8180 0934903d28f3 use shutil.move to make concurrent updating/replacement of graal.jar atomic Doug Simon <doug.simon@oracle.com> parents: 8135 diff changeset	390 shutil.copyfile(graalJar, tmp)
8183 4b11a0983557 fixed issue with deleting temp files on Windows Doug Simon <doug.simon@oracle.com> parents: 8182 diff changeset	391 os.close(fd)
8180 0934903d28f3 use shutil.move to make concurrent updating/replacement of graal.jar atomic Doug Simon <doug.simon@oracle.com> parents: 8135 diff changeset	392 shutil.move(tmp, join(jreLibDir, 'graal.jar'))
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	393
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	394 # run a command in the windows SDK Debug Shell
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	395 def _runInDebugShell(cmd, workingDir, logFile=None, findInOutput=None, respondTo={}):
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	396 newLine = os.linesep
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	397 STARTTOKEN = 'RUNINDEBUGSHELL_STARTSEQUENCE'
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	398 ENDTOKEN = 'RUNINDEBUGSHELL_ENDSEQUENCE'
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	399
4252 67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	400 winSDK = mx.get_env('WIN_SDK', 'C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\')
6306 2a819543cc45 Warnings for windows build if there is no SDK Gilles Duboscq <duboscq@ssw.jku.at> parents: 6294 diff changeset	401
2a819543cc45 Warnings for windows build if there is no SDK Gilles Duboscq <duboscq@ssw.jku.at> parents: 6294 diff changeset	402 if not exists(winSDK):
2a819543cc45 Warnings for windows build if there is no SDK Gilles Duboscq <duboscq@ssw.jku.at> parents: 6294 diff changeset	403 mx.abort("Could not find Windows SDK : '" + winSDK + "' does not exist")
2a819543cc45 Warnings for windows build if there is no SDK Gilles Duboscq <duboscq@ssw.jku.at> parents: 6294 diff changeset	404
2a819543cc45 Warnings for windows build if there is no SDK Gilles Duboscq <duboscq@ssw.jku.at> parents: 6294 diff changeset	405 if not exists(join(winSDK, 'Bin', 'SetEnv.cmd')):
2a819543cc45 Warnings for windows build if there is no SDK Gilles Duboscq <duboscq@ssw.jku.at> parents: 6294 diff changeset	406 mx.abort("Invalid Windows SDK path (" + winSDK + ") : could not find Bin/SetEnv.cmd (you can use the WIN_SDK environment variable to specify an other path)")
4252 67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	407
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	408 p = subprocess.Popen('cmd.exe /E:ON /V:ON /K ""' + winSDK + '/Bin/SetEnv.cmd" & echo ' + STARTTOKEN + '"', \
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	409 shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4257 diff changeset	410 stdout = p.stdout
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4257 diff changeset	411 stdin = p.stdin
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	412 if logFile:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	413 log = open(logFile, 'w')
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	414 ret = False
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	415 while True:
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	416
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	417 # encoding may be None on windows plattforms
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	418 if sys.stdout.encoding is None:
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	419 encoding = 'utf-8'
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	420 else:
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	421 encoding = sys.stdout.encoding
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	422
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 7290 diff changeset	423 line = stdout.readline().decode(encoding)
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	424 if logFile:
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	425 log.write(line.encode('utf-8'))
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	426 line = line.strip()
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	427 mx.log(line)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	428 if line == STARTTOKEN:
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4257 diff changeset	429 stdin.write('cd /D ' + workingDir + ' & ' + cmd + ' & echo ' + ENDTOKEN + newLine)
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	430 for regex in respondTo.keys():
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	431 match = regex.search(line)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	432 if match:
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4257 diff changeset	433 stdin.write(respondTo[regex] + newLine)
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	434 if findInOutput:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	435 match = findInOutput.search(line)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	436 if match:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	437 ret = True
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	438 if line == ENDTOKEN:
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	439 if not findInOutput:
5868 a10e72af4dc5 Make windows build work even if Visual Studio is not installed (only the Windows SDK is required) Gilles Duboscq <duboscq@ssw.jku.at> parents: 5782 diff changeset	440 stdin.write('echo ERRXXX%errorlevel%' + newLine)
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	441 else:
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	442 break
5868 a10e72af4dc5 Make windows build work even if Visual Studio is not installed (only the Windows SDK is required) Gilles Duboscq <duboscq@ssw.jku.at> parents: 5782 diff changeset	443 if line.startswith('ERRXXX'):
a10e72af4dc5 Make windows build work even if Visual Studio is not installed (only the Windows SDK is required) Gilles Duboscq <duboscq@ssw.jku.at> parents: 5782 diff changeset	444 if line == 'ERRXXX0':
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	445 ret = True
87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	446 break;
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4257 diff changeset	447 stdin.write('exit' + newLine)
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	448 if logFile:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	449 log.close()
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	450 return ret
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	451
5103 276e14614531 Added jdkhome command to mx. Doug Simon <doug.simon@oracle.com> parents: 5094 diff changeset	452 def jdkhome(args, vm=None):
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	453 """print the JDK directory selected for the 'vm' command"""
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	454
5103 276e14614531 Added jdkhome command to mx. Doug Simon <doug.simon@oracle.com> parents: 5094 diff changeset	455 build = _vmbuild if _vmSourcesAvailable else 'product'
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	456 print join(_graal_home, 'jdk' + str(mx.java().version), build)
5103 276e14614531 Added jdkhome command to mx. Doug Simon <doug.simon@oracle.com> parents: 5094 diff changeset	457
4577 bc8b58c11768 Added debug build of HotSpot Client to the gate. Doug Simon <doug.simon@oracle.com> parents: 4575 diff changeset	458 def build(args, vm=None):
4575 ccb5369481a2 Clarified mx help text on how to build/run [Graal\|Client\|Server]. Doug Simon <doug.simon@oracle.com> parents: 4572 diff changeset	459 """build the VM binary
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	460
4575 ccb5369481a2 Clarified mx help text on how to build/run [Graal\|Client\|Server]. Doug Simon <doug.simon@oracle.com> parents: 4572 diff changeset	461 The global '--vm' option selects which VM to build. This command also
ccb5369481a2 Clarified mx help text on how to build/run [Graal\|Client\|Server]. Doug Simon <doug.simon@oracle.com> parents: 4572 diff changeset	462 compiles the Graal classes irrespective of what VM is being built.
ccb5369481a2 Clarified mx help text on how to build/run [Graal\|Client\|Server]. Doug Simon <doug.simon@oracle.com> parents: 4572 diff changeset	463 The optional last argument specifies what build level is to be used
ccb5369481a2 Clarified mx help text on how to build/run [Graal\|Client\|Server]. Doug Simon <doug.simon@oracle.com> parents: 4572 diff changeset	464 for the VM binary."""
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	465
dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	466 # Call mx.build to compile the Java sources
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	467 opts2 = mx.build(['--source', '1.7'] + args, parser=ArgumentParser(prog='mx build'))
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	468
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	469 if not _vmSourcesAvailable or not opts2.native:
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	470 return
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	471
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	472 builds = opts2.remainder
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	473 if len(builds) == 0:
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	474 builds = ['product']
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	475
4577 bc8b58c11768 Added debug build of HotSpot Client to the gate. Doug Simon <doug.simon@oracle.com> parents: 4575 diff changeset	476 if vm is None:
bc8b58c11768 Added debug build of HotSpot Client to the gate. Doug Simon <doug.simon@oracle.com> parents: 4575 diff changeset	477 vm = _vm
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	478
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	479 if vm == 'server':
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	480 buildSuffix = ''
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	481 elif vm == 'client':
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	482 buildSuffix = '1'
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	483 else:
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	484 assert vm == 'graal', vm
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	485 buildSuffix = 'graal'
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	486
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	487 for build in builds:
5094 d3f547b08304 added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env) Doug Simon <doug.simon@oracle.com> parents: 5090 diff changeset	488 if build == 'ide-build-target':
d3f547b08304 added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env) Doug Simon <doug.simon@oracle.com> parents: 5090 diff changeset	489 build = os.environ.get('IDE_BUILD_TARGET', 'product')
d3f547b08304 added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env) Doug Simon <doug.simon@oracle.com> parents: 5090 diff changeset	490 if len(build) == 0:
d3f547b08304 added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env) Doug Simon <doug.simon@oracle.com> parents: 5090 diff changeset	491 mx.log('[skipping build from IDE as IDE_BUILD_TARGET environment variable is ""]')
d3f547b08304 added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env) Doug Simon <doug.simon@oracle.com> parents: 5090 diff changeset	492 continue
d3f547b08304 added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env) Doug Simon <doug.simon@oracle.com> parents: 5090 diff changeset	493
4582 b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	494 jdk = _jdk(build, create=True)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	495
4607 ee87cfe2f8f9 Made GraalVM build work on Mac OS X. Doug Simon <doug.simon@oracle.com> parents: 4602 diff changeset	496 vmDir = join(_vmLibDirInJdk(jdk), vm)
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	497 if not exists(vmDir):
6687 a9a50f21e000 Added change to copied directory's protection when source JDK directories are read-only. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6566 diff changeset	498 if mx.get_os() != 'windows':
6705 0cb1ac637dd0 Added recursive chmod for cases where JAVA_HOME is not owned by graal workspace owner. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6702 diff changeset	499 chmodRecursive(jdk, 0755)
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	500 mx.log('Creating VM directory in JDK7: ' + vmDir)
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	501 os.makedirs(vmDir)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	502
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	503 def filterXusage(line):
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	504 if not 'Xusage.txt' in line:
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	505 sys.stderr.write(line + os.linesep)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	506
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	507 # Check if a build really needs to be done
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	508 timestampFile = join(vmDir, '.build-timestamp')
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	509 if opts2.force or not exists(timestampFile):
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	510 mustBuild = True
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	511 else:
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	512 mustBuild = False
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	513 timestamp = os.path.getmtime(timestampFile)
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	514 sources = []
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	515 for d in ['src', 'make']:
5244 55ff4ba8d7b1 ignore src/share/tools directory in native build out-of-date check Doug Simon <doug.simon@oracle.com> parents: 5239 diff changeset	516 for root, dirnames, files in os.walk(join(_graal_home, d)):
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	517 # ignore <graal>/src/share/tools
5244 55ff4ba8d7b1 ignore src/share/tools directory in native build out-of-date check Doug Simon <doug.simon@oracle.com> parents: 5239 diff changeset	518 if root == join(_graal_home, 'src', 'share'):
55ff4ba8d7b1 ignore src/share/tools directory in native build out-of-date check Doug Simon <doug.simon@oracle.com> parents: 5239 diff changeset	519 dirnames.remove('tools')
55ff4ba8d7b1 ignore src/share/tools directory in native build out-of-date check Doug Simon <doug.simon@oracle.com> parents: 5239 diff changeset	520 sources += [join(root, name) for name in files]
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	521 for f in sources:
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	522 if len(f) != 0 and os.path.getmtime(f) > timestamp:
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	523 mustBuild = True
5244 55ff4ba8d7b1 ignore src/share/tools directory in native build out-of-date check Doug Simon <doug.simon@oracle.com> parents: 5239 diff changeset	524 break
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	525
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	526 if not mustBuild:
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	527 mx.log('[all files in src and make directories are older than ' + timestampFile[len(_graal_home) + 1:] + ' - skipping native build]')
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	528 continue
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	529
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	530 if platform.system() == 'Windows':
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	531 compilelogfile = _graal_home + '/graalCompile.log'
4252 67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	532 mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin')
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4247 diff changeset	533
4572 76841bdd5f3e (Windows) Add Graal build configurations (with GRAAL defined) and fix build command. Andreas Woess <andreas.woess@jku.at> parents: 4559 diff changeset	534 variant = {'client': 'compiler1', 'server': 'compiler2'}.get(vm, vm)
76841bdd5f3e (Windows) Add Graal build configurations (with GRAAL defined) and fix build command. Andreas Woess <andreas.woess@jku.at> parents: 4559 diff changeset	535 project_config = variant + '_' + build
76841bdd5f3e (Windows) Add Graal build configurations (with GRAAL defined) and fix build command. Andreas Woess <andreas.woess@jku.at> parents: 4559 diff changeset	536 _runInDebugShell('msbuild ' + _graal_home + r'\build\vs-amd64\jvm.vcproj /p:Configuration=' + project_config + ' /target:clean', _graal_home)
76841bdd5f3e (Windows) Add Graal build configurations (with GRAAL defined) and fix build command. Andreas Woess <andreas.woess@jku.at> parents: 4559 diff changeset	537 winCompileCmd = r'set HotSpotMksHome=' + mksHome + r'& set OUT_DIR=' + jdk + r'& set JAVA_HOME=' + jdk + r'& set path=%JAVA_HOME%\bin;%path%;%HotSpotMksHome%& cd /D "' +_graal_home + r'\make\windows"& call create.bat ' + _graal_home
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	538 print(winCompileCmd)
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	539 winCompileSuccess = re.compile(r"^Writing \.vcxproj file:")
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	540 if not _runInDebugShell(winCompileCmd, _graal_home, compilelogfile, winCompileSuccess):
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	541 mx.log('Error executing create command')
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	542 return
4572 76841bdd5f3e (Windows) Add Graal build configurations (with GRAAL defined) and fix build command. Andreas Woess <andreas.woess@jku.at> parents: 4559 diff changeset	543 winBuildCmd = 'msbuild ' + _graal_home + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64'
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	544 if not _runInDebugShell(winBuildCmd, _graal_home, compilelogfile):
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	545 mx.log('Error building project')
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	546 return
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	547 else:
4582 b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	548 cpus = multiprocessing.cpu_count()
6718 cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	549 runCmd = [mx.gmake_cmd()]
4572 76841bdd5f3e (Windows) Add Graal build configurations (with GRAAL defined) and fix build command. Andreas Woess <andreas.woess@jku.at> parents: 4559 diff changeset	550 if build == 'debug':
76841bdd5f3e (Windows) Add Graal build configurations (with GRAAL defined) and fix build command. Andreas Woess <andreas.woess@jku.at> parents: 4559 diff changeset	551 build = 'jvmg'
6718 cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	552 runCmd.append(build + buildSuffix)
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	553 env = os.environ
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	554 env.setdefault('ARCH_DATA_MODEL', '64')
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	555 env.setdefault('LANG', 'C')
4582 b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	556 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus))
4294 600cbdce9805 force ALT_BOOTDIR to the proper jdk to avoid installing non-product builds into the product build Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4293 diff changeset	557 env['ALT_BOOTDIR'] = jdk
7154 5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API Doug Simon <doug.simon@oracle.com> parents: 6958 diff changeset	558 if not env.has_key('OMIT_GRAAL'):
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API Doug Simon <doug.simon@oracle.com> parents: 6958 diff changeset	559 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	560 env.setdefault('INSTALL', 'y')
6702 602ee4d1db61 added setup of ENFORCE_COMPILER_REV and ENFORCE_CC_COMPILER_REV when using sunstudio compilers on Solaris to avoid build complaint from HotSpot makefiles. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6701 diff changeset	561 if mx.get_os() == 'solaris' :
602ee4d1db61 added setup of ENFORCE_COMPILER_REV and ENFORCE_CC_COMPILER_REV when using sunstudio compilers on Solaris to avoid build complaint from HotSpot makefiles. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6701 diff changeset	562 # If using sparcWorks, setup flags to avoid make complaining about CC version
602ee4d1db61 added setup of ENFORCE_COMPILER_REV and ENFORCE_CC_COMPILER_REV when using sunstudio compilers on Solaris to avoid build complaint from HotSpot makefiles. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6701 diff changeset	563 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0]
602ee4d1db61 added setup of ENFORCE_COMPILER_REV and ENFORCE_CC_COMPILER_REV when using sunstudio compilers on Solaris to avoid build complaint from HotSpot makefiles. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6701 diff changeset	564 if cCompilerVersion.startswith('CC: Sun C++') :
602ee4d1db61 added setup of ENFORCE_COMPILER_REV and ENFORCE_CC_COMPILER_REV when using sunstudio compilers on Solaris to avoid build complaint from HotSpot makefiles. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6701 diff changeset	565 compilerRev = cCompilerVersion.split(' ')[3]
6718 cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	566 env.setdefault('ENFORCE_COMPILER_REV', compilerRev)
cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	567 env.setdefault('ENFORCE_CC_COMPILER_REV', compilerRev)
cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	568 if build == 'jvmg':
cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	569 # I want ALL the symbols when I'm debugging on Solaris
cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	570 # Some Makefile variable are overloaded by environment variable so we need to explicitely
cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	571 # pass them down in the command line. This one is an example of that.
cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	572 runCmd.append('STRIP_POLICY=no_strip')
6276 03c4c25ae726 disabled zipping of lib.debuginfo files to simplify debugging with gdb Doug Simon <doug.simon@oracle.com>* parents: 5881 diff changeset	573 # This removes the need to unzip the *.diz files before debugging in gdb
03c4c25ae726 disabled zipping of lib.debuginfo files to simplify debugging with gdb Doug Simon <doug.simon@oracle.com>* parents: 5881 diff changeset	574 env.setdefault('ZIP_DEBUGINFO_FILES', '0')
03c4c25ae726 disabled zipping of lib.debuginfo files to simplify debugging with gdb Doug Simon <doug.simon@oracle.com>* parents: 5881 diff changeset	575
7548 a8b0476270cf disabled running of Queens test (i.e., test_gamma) in normal HotSpot builds Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	576 # We don't need to run the Queens test (i.e. test_gamma)
a8b0476270cf disabled running of Queens test (i.e., test_gamma) in normal HotSpot builds Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	577 env.setdefault('TEST_IN_BUILD', 'false')
a8b0476270cf disabled running of Queens test (i.e., test_gamma) in normal HotSpot builds Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	578
4582 b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	579 # Clear these 2 variables as having them set can cause very confusing build problems
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	580 env.pop('LD_LIBRARY_PATH', None)
b24386206122 Made all vm builds go into subdirectories, even product builds to simplify building the various types of VMs (server, client and graal). Doug Simon <doug.simon@oracle.com> parents: 4577 diff changeset	581 env.pop('CLASSPATH', None)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	582
6718 cce59a7ee92c Avoids stripping libjvm.so when building debug on Solaris (.debuginfo files don't work well with Oracle Solaris Studio 12.3's solaris). Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6705 diff changeset	583 mx.run(runCmd, cwd=join(_graal_home, 'make'), err=filterXusage)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	584
5680 87fc13b59258 Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout Gilles Duboscq <duboscq@ssw.jku.at> parents: 5649 diff changeset	585 jvmCfg = _vmCfgInJdk(jdk)
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	586 found = False
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	587 if not exists(jvmCfg):
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	588 mx.abort(jvmCfg + ' does not exist')
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	589
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	590 prefix = '-' + vm
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	591 vmKnown = prefix + ' KNOWN\n'
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	592 lines = []
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	593 with open(jvmCfg) as f:
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	594 for line in f:
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	595 if vmKnown in line:
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	596 found = True
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	597 break
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	598 if not line.startswith(prefix):
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	599 lines.append(line)
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	600 if not found:
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	601 mx.log('Appending "' + prefix + ' KNOWN" to ' + jvmCfg)
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	602 lines.append(vmKnown)
6688 806821a1c0a8 Make sure files in copy of JDK has write-protection unset before modifying it. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6687 diff changeset	603 if mx.get_os() != 'windows':
806821a1c0a8 Make sure files in copy of JDK has write-protection unset before modifying it. Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6687 diff changeset	604 os.chmod(jvmCfg, 0755)
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	605 with open(jvmCfg, 'w') as f:
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	606 for line in lines:
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	607 f.write(line)
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	608
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	609 if exists(timestampFile):
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	610 os.utime(timestampFile, None)
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	611 else:
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	612 file(timestampFile, 'a')
b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5234 diff changeset	613
5257 a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	614 def vmg(args):
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	615 """run the debug build of VM selected by the '--vm' option"""
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	616 return vm(args, vmbuild='debug')
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	617
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	618 def vmfg(args):
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	619 """run the fastdebug build of VM selected by the '--vm' option"""
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	620 return vm(args, vmbuild='fastdebug')
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	621
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	622 def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):
4575 ccb5369481a2 Clarified mx help text on how to build/run [Graal\|Client\|Server]. Doug Simon <doug.simon@oracle.com> parents: 4572 diff changeset	623 """run the VM selected by the '--vm' option"""
4219 47f7d91d34cf Fix javac build issues with classpath Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4216 diff changeset	624
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	625 if vm is None:
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	626 vm = _vm
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	627
4219 47f7d91d34cf Fix javac build issues with classpath Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4216 diff changeset	628 build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product'
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	629 jdk = _jdk(build)
5189 6fbf12b8e572 automated download of hsdis lib if PrintAssembly option is used; added support for hsdis on the Mac Doug Simon <doug.simon@oracle.com> parents: 5153 diff changeset	630 mx.expand_project_in_args(args)
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	631 if _make_eclipse_launch:
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	632 mx.make_eclipse_launch(args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True))
5189 6fbf12b8e572 automated download of hsdis lib if PrintAssembly option is used; added support for hsdis on the Mac Doug Simon <doug.simon@oracle.com> parents: 5153 diff changeset	633 if len([a for a in args if 'PrintAssembly' in a]) != 0:
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	634 hsdis([], copyToDir=_vmLibDirInJdk(jdk))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 5024 diff changeset	635 if mx.java().debug_port is not None:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 5024 diff changeset	636 args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(mx.java().debug_port)] + args
5024 7ccdae96e98a Allow JaCoCon to append to the execution file Gilles Duboscq <duboscq@ssw.jku.at> parents: 5016 diff changeset	637 if _jacoco == 'on' or _jacoco == 'append':
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	638 jacocoagent = mx.library("JACOCOAGENT", True)
5366 67e63e8dcbd2 build JaCoCo exclude list by scanning for snippets Doug Simon <doug.simon@oracle.com> parents: 5295 diff changeset	639 # Exclude all compiler tests and snippets
5881 472a648769e4 better JaCoCo : only include com.oracle.graal.* and com.oracle.max., exclude com.oracle.graal.jtt. Gilles Duboscq <duboscq@ssw.jku.at> parents: 5878 diff changeset	640 excludes = ['com.oracle.graal.compiler.tests.', 'com.oracle.graal.jtt.']
5366 67e63e8dcbd2 build JaCoCo exclude list by scanning for snippets Doug Simon <doug.simon@oracle.com> parents: 5295 diff changeset	641 for p in mx.projects():
6294 b0fc02623974 exclude TestPrograms from JaCoCo processing Doug Simon <doug.simon@oracle.com> parents: 6291 diff changeset	642 excludes += _find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution', '@Test'], includeInnerClasses=True)
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	643 excludes += p.find_classes_with_matching_source_line(None, lambda line: 'JaCoCo Exclude' in line, includeInnerClasses=True)
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	644
5881 472a648769e4 better JaCoCo : only include com.oracle.graal.* and com.oracle.max., exclude com.oracle.graal.jtt. Gilles Duboscq <duboscq@ssw.jku.at> parents: 5878 diff changeset	645 includes = ['com.oracle.graal.', 'com.oracle.max.']
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	646 agentOptions = {
5024 7ccdae96e98a Allow JaCoCon to append to the execution file Gilles Duboscq <duboscq@ssw.jku.at> parents: 5016 diff changeset	647 'append' : 'true' if _jacoco == 'append' else 'false',
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	648 'bootclasspath' : 'true',
5881 472a648769e4 better JaCoCo : only include com.oracle.graal.* and com.oracle.max., exclude com.oracle.graal.jtt. Gilles Duboscq <duboscq@ssw.jku.at> parents: 5878 diff changeset	649 'includes' : ':'.join(includes),
5878 191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	650 'excludes' : ':'.join(excludes),
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	651 'destfile' : 'jacoco.exec'
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	652 }
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	653 args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args
6691 9611d0ccb4ec Automatically add -d64 vm options when running graal Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6688 diff changeset	654 if '-d64' not in args:
9611d0ccb4ec Automatically add -d64 vm options when running graal Laurent Daynes <Laurent.Daynes@oracle.com> parents: 6688 diff changeset	655 args = ['-d64'] + args
8132 394f685c1502 prepend -XX:GraalClassPath option if graal.jar exists (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	656
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	657 exe = join(jdk, 'bin', mx.exe_suffix('java'))
5875 000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	658 dbg = _native_dbg.split() if _native_dbg is not None else []
000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	659 return mx.run(dbg + [exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	660
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	661 def _find_classes_with_annotations(p, pkgRoot, annotations, includeInnerClasses=False):
5366 67e63e8dcbd2 build JaCoCo exclude list by scanning for snippets Doug Simon <doug.simon@oracle.com> parents: 5295 diff changeset	662 """
5482 9f4783c0269e folded -G:+CheckcastCounters functionality into checkcast snippets Doug Simon <doug.simon@oracle.com> parents: 5438 diff changeset	663 Scan the sources of project 'p' for Java source files containing a line starting with 'annotation'
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	664 (ignoring preceding whitespace) and return the fully qualified class name for each Java
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	665 source file matched in a list.
5366 67e63e8dcbd2 build JaCoCo exclude list by scanning for snippets Doug Simon <doug.simon@oracle.com> parents: 5295 diff changeset	666 """
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	667
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	668 matches = lambda line : len([a for a in annotations if line == a or line.startswith(a + '(')]) != 0
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5729 diff changeset	669 return p.find_classes_with_matching_source_line(pkgRoot, matches, includeInnerClasses)
5366 67e63e8dcbd2 build JaCoCo exclude list by scanning for snippets Doug Simon <doug.simon@oracle.com> parents: 5295 diff changeset	670
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	671 def _run_tests(args, harness):
4630 ef0ff914c10f Make it possible to pass jvm args in jtt and unittest Gilles Duboscq <duboscq@ssw.jku.at> parents: 4602 diff changeset	672 pos = [a for a in args if a[0] != '-' and a[0] != '@' ]
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	673 neg = [a[1:] for a in args if a[0] == '-']
4630 ef0ff914c10f Make it possible to pass jvm args in jtt and unittest Gilles Duboscq <duboscq@ssw.jku.at> parents: 4602 diff changeset	674 vmArgs = [a[1:] for a in args if a[0] == '@']
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	675
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	676 def containsAny(c, substrings):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	677 for s in substrings:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	678 if s in c:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	679 return True
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	680 return False
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	681
5649 14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	682 for p in mx.projects():
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	683 classes = _find_classes_with_annotations(p, None, ['@Test'])
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	684
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	685 if len(pos) != 0:
633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	686 classes = [c for c in classes if containsAny(c, pos)]
633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	687 if len(neg) != 0:
633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	688 classes = [c for c in classes if not containsAny(c, neg)]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	689
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	690 if len(classes) != 0:
633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	691 mx.log('running tests in ' + p.name)
633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	692 harness(p, vmArgs, classes)
5649 14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	693
14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	694 def unittest(args):
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	695 """run the JUnit tests
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	696
5649 14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	697 If filters are supplied, only tests whose fully qualified name
14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	698 include a filter as a substring are run. Negative filters are
14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	699 those with a '-' prefix. VM args should have a @ prefix."""
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	700
5649 14505f3e6b4c modified harness for running JUnit and JTT tests such that only projects declaring a 'testHarness' attribute in mx/projects are scanned for tests Doug Simon <doug.simon@oracle.com> parents: 5596 diff changeset	701 def harness(p, vmArgs, classes):
7290 a81db08fe930 added -ea to execution of unit tests Doug Simon <doug.simon@oracle.com> parents: 7289 diff changeset	702 prefixArgs = ['-XX:-BootstrapGraal', '-esa', '-ea']
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	703 vm(prefixArgs + vmArgs + ['-cp', mx.classpath(p.name), 'org.junit.runner.JUnitCore'] + classes)
633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	704 _run_tests(args, harness)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	705
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	706 def buildvms(args):
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	707 """build one or more VMs in various configurations"""
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	708
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	709 parser = ArgumentParser(prog='mx buildvms');
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	710 parser.add_argument('--vms', help='a comma separated list of VMs to build (default: server,client,graal)', default='server,client,graal')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	711 parser.add_argument('--builds', help='a comma separated list of build types (default: product,fastdebug,debug)', default='product,fastdebug,debug')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	712
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	713 args = parser.parse_args(args)
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	714 vms = args.vms.split(',')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	715 builds = args.builds.split(',')
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	716
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	717 allStart = time.time()
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	718 for v in vms:
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	719 for vmbuild in builds:
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	720 logFile = join(v + '-' + vmbuild + '.log')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	721 log = open(join(_graal_home, logFile), 'wb')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	722 start = time.time()
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	723 mx.log('BEGIN: ' + v + '-' + vmbuild + '\t(see: ' + logFile + ')')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	724 # Run as subprocess so that output can be directed to a file
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	725 subprocess.check_call([sys.executable, '-u', join('mxtool', 'mx.py'), '--vm', v, 'build', vmbuild], cwd=_graal_home, stdout=log, stderr=subprocess.STDOUT)
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	726 duration = datetime.timedelta(seconds=time.time() - start)
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	727 mx.log('END: ' + v + '-' + vmbuild + '\t[' + str(duration) + ']')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	728 allDuration = datetime.timedelta(seconds=time.time() - allStart)
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	729 mx.log('TOTAL TIME: ' + '[' + str(allDuration) + ']')
7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	730
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	731 def gate(args):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	732 """run the tests used to validate a push
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	733
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	734 If this command exits with a 0 exit code, then the source code is in
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	735 a state that would be accepted for integration into the main repository."""
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	736
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	737 class Task:
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	738 def __init__(self, title):
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	739 self.start = time.time()
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	740 self.title = title
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	741 self.end = None
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	742 self.duration = None
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	743 mx.log(time.strftime('gate: %d %b %Y %H:%M:%S: BEGIN: ') + title)
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	744 def stop(self):
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	745 self.end = time.time()
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	746 self.duration = datetime.timedelta(seconds=self.end - self.start)
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	747 mx.log(time.strftime('gate: %d %b %Y %H:%M:%S: END: ') + self.title + ' [' + str(self.duration) + ']')
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	748 return self
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	749 def abort(self, codeOrMessage):
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	750 self.end = time.time()
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	751 self.duration = datetime.timedelta(seconds=self.end - self.start)
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	752 mx.log(time.strftime('gate: %d %b %Y %H:%M:%S: ABORT: ') + self.title + ' [' + str(self.duration) + ']')
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	753 mx.abort(codeOrMessage)
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	754 return self
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	755
4601 ade18666f2be Added --omit-native-build to gate command so that native cleaning and building can be omitted for changesets that made no changes to the C/C++ code. Doug Simon <doug.simon@oracle.com> parents: 4584 diff changeset	756 parser = ArgumentParser(prog='mx gate');
5232 c005ca943790 added -j option to gate command to disable cleaning of Java class files Doug Simon <doug.simon@oracle.com> parents: 5197 diff changeset	757 parser.add_argument('-j', '--omit-java-clean', action='store_false', dest='cleanJava', help='omit cleaning Java native code')
5750 30876d0bb92d In gate command, allways build natives, use '-n' to avoid cleaning them only Gilles Duboscq <duboscq@ssw.jku.at> parents: 5729 diff changeset	758 parser.add_argument('-n', '--omit-native-clean', action='store_false', dest='cleanNative', help='omit cleaning and building native code')
4608 05a33fabcfe6 Added -g option to 'mx gate' to omit the server and client builds (i.e. -g == graal only). Doug Simon <doug.simon@oracle.com> parents: 4607 diff changeset	759 parser.add_argument('-g', '--only-build-graalvm', action='store_false', dest='buildNonGraal', help='only build the Graal VM')
5033 d7ecce178ad2 Add jacoco report and a -XX:+DeoptimizeALot -XX:+VerifyOops bootstrap run to the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 5032 diff changeset	760 parser.add_argument('--jacocout', help='specify the output directory for jacoco report')
4601 ade18666f2be Added --omit-native-build to gate command so that native cleaning and building can be omitted for changesets that made no changes to the C/C++ code. Doug Simon <doug.simon@oracle.com> parents: 4584 diff changeset	761
ade18666f2be Added --omit-native-build to gate command so that native cleaning and building can be omitted for changesets that made no changes to the C/C++ code. Doug Simon <doug.simon@oracle.com> parents: 4584 diff changeset	762 args = parser.parse_args(args)
ade18666f2be Added --omit-native-build to gate command so that native cleaning and building can be omitted for changesets that made no changes to the C/C++ code. Doug Simon <doug.simon@oracle.com> parents: 4584 diff changeset	763
5431 0bd1ba69db2a removed double declaration of _vmbuild global variable in gate command Doug Simon <doug.simon@oracle.com> parents: 5430 diff changeset	764 global _vmbuild
0bd1ba69db2a removed double declaration of _vmbuild global variable in gate command Doug Simon <doug.simon@oracle.com> parents: 5430 diff changeset	765 global _vm
0bd1ba69db2a removed double declaration of _vmbuild global variable in gate command Doug Simon <doug.simon@oracle.com> parents: 5430 diff changeset	766 global _jacoco
5878 191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	767
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	768 tasks = []
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	769 total = Task('Gate')
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	770 try:
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	771
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	772 t = Task('Clean')
5232 c005ca943790 added -j option to gate command to disable cleaning of Java class files Doug Simon <doug.simon@oracle.com> parents: 5197 diff changeset	773 cleanArgs = []
5750 30876d0bb92d In gate command, allways build natives, use '-n' to avoid cleaning them only Gilles Duboscq <duboscq@ssw.jku.at> parents: 5729 diff changeset	774 if not args.cleanNative:
5232 c005ca943790 added -j option to gate command to disable cleaning of Java class files Doug Simon <doug.simon@oracle.com> parents: 5197 diff changeset	775 cleanArgs.append('--no-native')
c005ca943790 added -j option to gate command to disable cleaning of Java class files Doug Simon <doug.simon@oracle.com> parents: 5197 diff changeset	776 if not args.cleanJava:
c005ca943790 added -j option to gate command to disable cleaning of Java class files Doug Simon <doug.simon@oracle.com> parents: 5197 diff changeset	777 cleanArgs.append('--no-java')
c005ca943790 added -j option to gate command to disable cleaning of Java class files Doug Simon <doug.simon@oracle.com> parents: 5197 diff changeset	778 clean(cleanArgs)
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	779 tasks.append(t.stop())
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	780
7533 29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	781 eclipse_exe = os.environ.get('ECLIPSE_EXE')
29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	782 if eclipse_exe is not None:
29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	783 t = Task('CodeFormatCheck')
29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	784 if mx.eclipseformat(['-e', eclipse_exe]) != 0:
29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	785 t.abort('Formatter modified files - run "mx eclipseformat", check in changes and repush')
29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	786 tasks.append(t.stop())
8211 74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	787
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	788 t = Task('Canonicalization Check')
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	789 mx.log(time.strftime('%d %b %Y %H:%M:%S - Ensuring mx/projects files are canonicalized...'))
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	790 if mx.canonicalizeprojects([]) != 0:
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	791 t.abort('Rerun "mx canonicalizeprojects" and check-in the modified mx/projects files.')
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	792 tasks.append(t.stop())
7533 29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	793
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	794 t = Task('BuildJava')
7748 2d57a3bd82ab Make gate fail on warnings Gilles Duboscq <duboscq@ssw.jku.at> parents: 7730 diff changeset	795 build(['--no-native', '--jdt-warning-as-error'])
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	796 tasks.append(t.stop())
5878 191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	797
8211 74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	798 t = Task('Checkstyle')
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	799 if mx.checkstyle([]) != 0:
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	800 t.abort('Checkstyle warnings were found')
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	801 tasks.append(t.stop())
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	802
5878 191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	803 if exists('jacoco.exec'):
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	804 os.unlink('jacoco.exec')
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	805
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	806 if args.jacocout is not None:
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	807 _jacoco = 'append'
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	808 else:
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	809 _jacoco = 'off'
6319 0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	810
0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	811 t = Task('BuildHotSpotGraal: fastdebug,product')
8211 74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	812 buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product'])
6319 0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	813 tasks.append(t.stop())
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	814
6319 0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	815 _vmbuild = 'fastdebug'
0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	816 t = Task('BootstrapWithSystemAssertions:fastdebug')
0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	817 vm(['-esa', '-version'])
0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	818 tasks.append(t.stop())
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	819
6319 0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	820 _vmbuild = 'product'
8211 74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	821 originalVm = _vm
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	822 _vm = 'server' # hosted mode
74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	823 t = Task('UnitTests:hosted-product')
7289 d1aa5ffac560 Remove CompileCommand that excluses run* for unittests Gilles Duboscq <duboscq@ssw.jku.at> parents: 7287 diff changeset	824 unittest([])
6319 0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	825 tasks.append(t.stop())
8211 74896b25297a Test canonicalization and checkstyle early in gate process Gilles Duboscq <duboscq@ssw.jku.at> parents: 8183 diff changeset	826 _vm = originalVm
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	827
6319 0a0d0dfd83bc Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 6306 diff changeset	828 for vmbuild in ['fastdebug', 'product']:
4240 394424b7df1a Disabled certain DaCapo tests for fastdebug testing in the gate. Doug Simon <doug.simon@oracle.com> parents: 4238 diff changeset	829 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
4238 e0d09e05aa9b Made the gate time each DaCapo test individually. Doug Simon <doug.simon@oracle.com> parents: 4235 diff changeset	830 t = Task(str(test) + ':' + vmbuild)
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	831 if not test.test('graal'):
5244 55ff4ba8d7b1 ignore src/share/tools directory in native build out-of-date check Doug Simon <doug.simon@oracle.com> parents: 5239 diff changeset	832 t.abort(test.name + ' Failed')
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	833 tasks.append(t.stop())
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	834
5033 d7ecce178ad2 Add jacoco report and a -XX:+DeoptimizeALot -XX:+VerifyOops bootstrap run to the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 5032 diff changeset	835 if args.jacocout is not None:
d7ecce178ad2 Add jacoco report and a -XX:+DeoptimizeALot -XX:+VerifyOops bootstrap run to the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 5032 diff changeset	836 jacocoreport([args.jacocout])
5878 191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	837
191e08da4de4 Apply jacoco coverage to all gate tests Gilles Duboscq <duboscq@ssw.jku.at> parents: 5877 diff changeset	838 _jacoco = 'off'
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	839
5016 c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	840 t = Task('CleanAndBuildGraalVisualizer')
c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	841 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build'])
c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	842 tasks.append(t.stop())
c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	843
c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	844 # Prevent Graal modifications from breaking the standard builds
5750 30876d0bb92d In gate command, allways build natives, use '-n' to avoid cleaning them only Gilles Duboscq <duboscq@ssw.jku.at> parents: 5729 diff changeset	845 if args.buildNonGraal:
5016 c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	846 t = Task('BuildHotSpotVarieties')
c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	847 buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product'])
c142a64141a8 Reorder gate checks to do the important stuff first Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4684 diff changeset	848 tasks.append(t.stop())
5430 27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	849
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	850 for vmbuild in ['product', 'fastdebug']:
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	851 _vmbuild = vmbuild
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	852 for theVm in ['client', 'server']:
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	853 _vm = theVm
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	854
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	855 t = Task('DaCapo_pmd:' + theVm + ':' + vmbuild)
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	856 dacapo(['pmd'])
27536e9982fa added execution of DaCapo_pmd by [server\|client]+[product\|fastdebug] to the gate Doug Simon <doug.simon@oracle.com> parents: 5410 diff changeset	857 tasks.append(t.stop())
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	858
7155 c356cab093bc added execution of the Graal API unittest with non-GraalVM HotSpot builds to the gate Doug Simon <doug.simon@oracle.com> parents: 7154 diff changeset	859 t = Task('UnitTests:' + theVm + ':' + vmbuild)
c356cab093bc added execution of the Graal API unittest with non-GraalVM HotSpot builds to the gate Doug Simon <doug.simon@oracle.com> parents: 7154 diff changeset	860 unittest(['@-XX:CompileCommand=exclude,::run', 'graal.api'])
c356cab093bc added execution of the Graal API unittest with non-GraalVM HotSpot builds to the gate Doug Simon <doug.simon@oracle.com> parents: 7154 diff changeset	861 tasks.append(t.stop())
c356cab093bc added execution of the Graal API unittest with non-GraalVM HotSpot builds to the gate Doug Simon <doug.simon@oracle.com> parents: 7154 diff changeset	862
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4244 diff changeset	863 except KeyboardInterrupt:
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4244 diff changeset	864 total.abort(1)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	865
4584 7e5d8d1c74a1 Modified JDK replication process such that a copy of the default VM is made. This prevents issues with the replicated JDK being used to bootstrap a HotSpot build. Doug Simon <doug.simon@oracle.com> parents: 4582 diff changeset	866 except BaseException as e:
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4244 diff changeset	867 import traceback
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4244 diff changeset	868 traceback.print_exc()
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	869 total.abort(str(e))
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	870
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4230 diff changeset	871 total.stop()
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	872
4438 0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	873 mx.log('Gate task times:')
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	874 for t in tasks:
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	875 mx.log(' ' + str(t.duration) + '\t' + t.title)
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	876 mx.log(' =======')
0312460af9fc Made gate do a full clean and added timing report for all gate tasks to end of gate log. Doug Simon <doug.simon@oracle.com> parents: 4417 diff changeset	877 mx.log(' ' + str(total.duration))
6340 74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	878
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	879 def deoptalot(args):
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	880 """Bootstrap a fastdebug Graal VM with DeoptimizeALot and VerifyOops on
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	881
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	882 If the first argument is a number, the process will be repeated
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	883 this number of times. All other arguments are passed to the VM."""
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	884 count = 1
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	885 if len(args) > 0 and args[0].isdigit():
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	886 count = int(args[0])
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	887 del args[0]
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	888
7509 442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7345 diff changeset	889 for _ in range(count):
6340 74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	890 if not vm(['-XX:+DeoptimizeALot', '-XX:+VerifyOops'] + args + ['-version'], vmbuild='fastdebug') == 0:
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	891 mx.abort("Failed")
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	892
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	893 def longtests(args):
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	894
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	895 deoptalot(['15', '-Xmx48m'])
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	896
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	897 dacapo(['100', 'eclipse', '-esa'])
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	898
4536 8caa4f2df081 Added 'gv' command to mx for launching the GraalVisualizer. Doug Simon <doug.simon@oracle.com> parents: 4483 diff changeset	899 def gv(args):
8caa4f2df081 Added 'gv' command to mx for launching the GraalVisualizer. Doug Simon <doug.simon@oracle.com> parents: 4483 diff changeset	900 """run the Graal Visualizer"""
5047 6bc165b0fdcd Added 'intro' command to mx that runs a simple 'hello world' program and visualizes its compilation in the Graal Visualizer. Doug Simon <doug.simon@oracle.com> parents: 5034 diff changeset	901 with open(join(_graal_home, '.graal_visualizer.log'), 'w') as fp:
5089 206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	902 mx.log('[Graal Visualizer log is in ' + fp.name + ']')
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	903 if not exists(join(_graal_home, 'visualizer', 'build.xml')):
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	904 mx.log('[This initial execution may take a while as the NetBeans platform needs to be downloaded]')
5047 6bc165b0fdcd Added 'intro' command to mx that runs a simple 'hello world' program and visualizes its compilation in the Graal Visualizer. Doug Simon <doug.simon@oracle.com> parents: 5034 diff changeset	905 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-l', fp.name, 'run'])
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	906
5089 206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	907 def igv(args):
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	908 """run the Ideal Graph Visualizer"""
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	909 with open(join(_graal_home, '.ideal_graph_visualizer.log'), 'w') as fp:
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	910 mx.log('[Ideal Graph Visualizer log is in ' + fp.name + ']')
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	911 if not exists(join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'nbplatform')):
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	912 mx.log('[This initial execution may take a while as the NetBeans platform needs to be downloaded]')
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	913 mx.run(['ant', '-f', join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml'), '-l', fp.name, 'run'])
206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	914
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4187 diff changeset	915 def bench(args):
4324 b0aa4a52b89c Added support for project specs in classpath. Doug Simon <doug.simon@oracle.com> parents: 4294 diff changeset	916 """run benchmarks and parse their output for results
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	917
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	918 Results are JSON formated : {group : {benchmark : score}}."""
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	919 resultFile = None
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	920 if '-resultfile' in args:
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	921 index = args.index('-resultfile')
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	922 if index + 1 < len(args):
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	923 resultFile = args[index + 1]
4293 d4906ea4255b Handle SIGTERM : killing mx will properly kill subprocesses Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4288 diff changeset	924 del args[index]
d4906ea4255b Handle SIGTERM : killing mx will properly kill subprocesses Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4288 diff changeset	925 del args[index]
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	926 else:
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	927 mx.abort('-resultfile must be followed by a file name')
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	928 vm = _vm
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	929 if len(args) is 0:
7563 3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	930 args = ['all']
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	931
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	932 def benchmarks_in_group(group):
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	933 prefix = group + ':'
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	934 return [a[len(prefix):] for a in args if a.startswith(prefix)]
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	935
4219 47f7d91d34cf Fix javac build issues with classpath Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4216 diff changeset	936 results = {}
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	937 benchmarks = []
4219 47f7d91d34cf Fix javac build issues with classpath Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4216 diff changeset	938 #DaCapo
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	939 if ('dacapo' in args or 'all' in args):
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	940 benchmarks += sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
4335 0d661161fa24 Add possibility to run individual DaCapo & SPECjvm2008 benchmarks, small fix in success and score regular expressions for SPECjvm2008 Gilles Duboscq <duboscq@ssw.jku.at> parents: 4330 diff changeset	941 else:
7563 3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	942 dacapos = benchmarks_in_group('dacapo')
4335 0d661161fa24 Add possibility to run individual DaCapo & SPECjvm2008 benchmarks, small fix in success and score regular expressions for SPECjvm2008 Gilles Duboscq <duboscq@ssw.jku.at> parents: 4330 diff changeset	943 for dacapo in dacapos:
0d661161fa24 Add possibility to run individual DaCapo & SPECjvm2008 benchmarks, small fix in success and score regular expressions for SPECjvm2008 Gilles Duboscq <duboscq@ssw.jku.at> parents: 4330 diff changeset	944 if dacapo not in sanitycheck.dacapoSanityWarmup.keys():
7563 3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	945 mx.abort('Unknown DaCapo : ' + dacapo)
4335 0d661161fa24 Add possibility to run individual DaCapo & SPECjvm2008 benchmarks, small fix in success and score regular expressions for SPECjvm2008 Gilles Duboscq <duboscq@ssw.jku.at> parents: 4330 diff changeset	946 benchmarks += [sanitycheck.getDacapo(dacapo, sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark])]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	947
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	948 if ('scaladacapo' in args or 'all' in args):
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	949 benchmarks += sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	950 else:
7563 3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	951 scaladacapos = benchmarks_in_group('scaladacapo')
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	952 for scaladacapo in scaladacapos:
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	953 if scaladacapo not in sanitycheck.dacapoScalaSanityWarmup.keys():
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	954 mx.abort('Unknown Scala DaCapo : ' + scaladacapo)
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	955 benchmarks += [sanitycheck.getScalaDacapo(scaladacapo, sanitycheck.dacapoScalaSanityWarmup[scaladacapo][sanitycheck.SanityCheckLevel.Benchmark])]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	956
4219 47f7d91d34cf Fix javac build issues with classpath Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4216 diff changeset	957 #Bootstrap
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	958 if ('bootstrap' in args or 'all' in args):
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	959 benchmarks += sanitycheck.getBootstraps()
4230 b780ecb920c9 Add SPECjvm2008 to benchmarks, use dacapos defined in sanitycheck for the gate Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4228 diff changeset	960 #SPECjvm2008
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	961 if ('specjvm2008' in args or 'all' in args):
7345 dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	962 benchmarks += [sanitycheck.getSPECjvm2008([], False, True, 120, 120)]
4335 0d661161fa24 Add possibility to run individual DaCapo & SPECjvm2008 benchmarks, small fix in success and score regular expressions for SPECjvm2008 Gilles Duboscq <duboscq@ssw.jku.at> parents: 4330 diff changeset	963 else:
7563 3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	964 specjvms = benchmarks_in_group('specjvm2008')
4335 0d661161fa24 Add possibility to run individual DaCapo & SPECjvm2008 benchmarks, small fix in success and score regular expressions for SPECjvm2008 Gilles Duboscq <duboscq@ssw.jku.at> parents: 4330 diff changeset	965 for specjvm in specjvms:
7345 dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	966 benchmarks += [sanitycheck.getSPECjvm2008([specjvm], False, True, 120, 120)]
5877 0e54d9bb922d Add SPECjbb2005 to the benchmarks Gilles Duboscq <duboscq@ssw.jku.at> parents: 5875 diff changeset	967
0e54d9bb922d Add SPECjbb2005 to the benchmarks Gilles Duboscq <duboscq@ssw.jku.at> parents: 5875 diff changeset	968 if ('specjbb2005' in args or 'all' in args):
0e54d9bb922d Add SPECjbb2005 to the benchmarks Gilles Duboscq <duboscq@ssw.jku.at> parents: 5875 diff changeset	969 benchmarks += [sanitycheck.getSPECjbb2005()]
7565 9a521597686b Add SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 7563 diff changeset	970
7730 cf27135ccf5b Remove SPECjbb2013 from default benchmarks Gilles Duboscq <duboscq@ssw.jku.at> parents: 7565 diff changeset	971 if ('specjbb2013' in args): # or 'all' in args //currently not in default set
7565 9a521597686b Add SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 7563 diff changeset	972 benchmarks += [sanitycheck.getSPECjbb2013()]
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	973
4219 47f7d91d34cf Fix javac build issues with classpath Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4216 diff changeset	974 for test in benchmarks:
7563 3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	975 for (groupName, res) in test.bench(vm).items():
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	976 group = results.setdefault(groupName, {})
3aab15f42934 moved execution of a benchmark out of OutputParser Doug Simon <doug.simon@oracle.com> parents: 7552 diff changeset	977 group.update(res)
4282 063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	978 mx.log(json.dumps(results))
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	979 if resultFile:
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	980 with open(resultFile, 'w') as f:
063ea022532c mx commands : improve bench command, fix in the outparser so that no empty 'line' is retruned if there was no match, fix bootstrap's regex Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4276 diff changeset	981 f.write(json.dumps(results))
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	982
4228 e872562f95f8 add a simple specjvm2008 command, fail a benchmark if one of the failureRE matches Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4227 diff changeset	983 def specjvm2008(args):
4537 43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	984 """run one or all SPECjvm2008 benchmarks
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	985
7345 dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	986 All options begining with - will be passed to the vm except for -ikv -ict -wt and -it.
4537 43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	987 Other options are supposed to be benchmark names and will be passed to SPECjvm2008."""
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	988 benchArgs = [a for a in args if a[0] != '-']
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	989 vmArgs = [a for a in args if a[0] == '-']
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	990 wt = None
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	991 it = None
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	992 skipValid = False
7345 dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	993 skipCheck = False
5295 31fc6b6c0425 Pass -v argument to SPECjvm2008 harness Gilles Duboscq <duboscq@ssw.jku.at> parents: 5269 diff changeset	994 if '-v' in vmArgs:
31fc6b6c0425 Pass -v argument to SPECjvm2008 harness Gilles Duboscq <duboscq@ssw.jku.at> parents: 5269 diff changeset	995 vmArgs.remove('-v')
31fc6b6c0425 Pass -v argument to SPECjvm2008 harness Gilles Duboscq <duboscq@ssw.jku.at> parents: 5269 diff changeset	996 benchArgs.append('-v')
7345 dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	997 if '-ict' in vmArgs:
dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	998 skipCheck = True
dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	999 vmArgs.remove('-ict')
4537 43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1000 if '-ikv' in vmArgs:
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1001 skipValid = True
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1002 vmArgs.remove('-ikv')
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1003 if '-wt' in vmArgs:
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1004 wtIdx = args.index('-wt')
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1005 try:
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1006 wt = int(args[wtIdx+1])
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1007 except:
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1008 mx.abort('-wt (Warmup time) needs a numeric value (seconds)')
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1009 vmArgs.remove('-wt')
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1010 benchArgs.remove(args[wtIdx+1])
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1011 if '-it' in vmArgs:
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1012 itIdx = args.index('-it')
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1013 try:
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1014 it = int(args[itIdx+1])
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1015 except:
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1016 mx.abort('-it (Iteration time) needs a numeric value (seconds)')
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1017 vmArgs.remove('-it')
43b4e9201c29 Improve specjvm2008 command Gilles Duboscq <duboscq@ssw.jku.at> parents: 4483 diff changeset	1018 benchArgs.remove(args[itIdx+1])
5229 ce6cb3a1eb44 mx dacapo, mx scaladacapo and mx specjvm2008 should use the specified vm Gilles Duboscq <duboscq@ssw.jku.at> parents: 5197 diff changeset	1019 vm = _vm;
7345 dd903cdfe708 Add possibility for -ict option to SPECjvm2008 benchmark execution. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 7299 diff changeset	1020 sanitycheck.getSPECjvm2008(benchArgs, skipCheck, skipValid, wt, it).bench(vm, opts=vmArgs)
8147 9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1021
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1022 def specjbb2013(args):
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1023 """runs the composite SPECjbb2013 benchmark
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1024
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1025 All options begining with - will be passed to the vm"""
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1026 benchArgs = [a for a in args if a[0] != '-']
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1027 vmArgs = [a for a in args if a[0] == '-']
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1028 vm = _vm;
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1029 sanitycheck.getSPECjbb2013(benchArgs).bench(vm, opts=vmArgs)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1030
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	1031 def hsdis(args, copyToDir=None):
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	1032 """download the hsdis library
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4480 diff changeset	1033
7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4480 diff changeset	1034 This is needed to support HotSpot's assembly dumping features.
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	1035 By default it downloads the Intel syntax version, use the 'att' argument to install AT&T syntax."""
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4480 diff changeset	1036 flavor = 'intel'
7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4480 diff changeset	1037 if 'att' in args:
7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4480 diff changeset	1038 flavor = 'att'
6495 75f130f2b30f moved AMD64 specific HotSpot code in com.oracle.graal.hotspot.amd64 project Doug Simon <doug.simon@oracle.com> parents: 6340 diff changeset	1039 lib = mx.lib_suffix('hsdis-' + _arch())
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	1040 path = join(_graal_home, 'lib', lib)
5189 6fbf12b8e572 automated download of hsdis lib if PrintAssembly option is used; added support for hsdis on the Mac Doug Simon <doug.simon@oracle.com> parents: 5153 diff changeset	1041 if not exists(path):
6fbf12b8e572 automated download of hsdis lib if PrintAssembly option is used; added support for hsdis on the Mac Doug Simon <doug.simon@oracle.com> parents: 5153 diff changeset	1042 mx.download(path, ['http://lafo.ssw.uni-linz.ac.at/hsdis/' + flavor + "/" + lib])
5596 e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	1043 if copyToDir is not None and exists(copyToDir):
e4b1bc5e29e0 hsdis library is downloaded into newly created Graal JDK Doug Simon <doug.simon@oracle.com> parents: 5517 diff changeset	1044 shutil.copy(path, copyToDir)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1045
5245 71ac4221b1b0 added hcfdis command Doug Simon <doug.simon@oracle.com> parents: 5244 diff changeset	1046 def hcfdis(args):
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	1047 """disassemble HexCodeFiles embedded in text files
5245 71ac4221b1b0 added hcfdis command Doug Simon <doug.simon@oracle.com> parents: 5244 diff changeset	1048
71ac4221b1b0 added hcfdis command Doug Simon <doug.simon@oracle.com> parents: 5244 diff changeset	1049 Run a tool over the input files to convert all embedded HexCodeFiles
71ac4221b1b0 added hcfdis command Doug Simon <doug.simon@oracle.com> parents: 5244 diff changeset	1050 to a disassembled format."""
6958 abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1051
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1052 parser = ArgumentParser(prog='mx hcfdis');
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1053 parser.add_argument('-m', '--map', help='address to symbol map applied to disassembler output')
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1054 parser.add_argument('files', nargs=REMAINDER, metavar='files...')
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1055
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1056 args = parser.parse_args(args)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1057
6278 4f9574b2893e removed dependence on private java.lang.String internals in HexCodeFile Doug Simon <doug.simon@oracle.com> parents: 6276 diff changeset	1058 path = join(_graal_home, 'lib', 'hcfdis-1.jar')
5245 71ac4221b1b0 added hcfdis command Doug Simon <doug.simon@oracle.com> parents: 5244 diff changeset	1059 if not exists(path):
6278 4f9574b2893e removed dependence on private java.lang.String internals in HexCodeFile Doug Simon <doug.simon@oracle.com> parents: 6276 diff changeset	1060 mx.download(path, ['http://lafo.ssw.uni-linz.ac.at/hcfdis-1.jar'])
6958 abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1061 mx.run_java(['-jar', path] + args.files)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1062
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1063 if args.map is not None:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1064 addressRE = re.compile(r'0[xX]([A-Fa-f0-9]+)')
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1065 with open(args.map) as fp:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1066 lines = fp.read().splitlines()
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1067 symbols = dict()
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1068 for l in lines:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1069 addressAndSymbol = l.split(' ', 1)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1070 if len(addressAndSymbol) == 2:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1071 address, symbol = addressAndSymbol;
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1072 if address.startswith('0x'):
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1073 address = long(address, 16)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1074 symbols[address] = symbol
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1075 for f in args.files:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1076 with open(f) as fp:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1077 lines = fp.read().splitlines()
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1078 updated = False
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1079 for i in range(0, len(lines)):
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1080 l = lines[i]
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1081 for m in addressRE.finditer(l):
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1082 sval = m.group(0)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1083 val = long(sval, 16)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1084 sym = symbols.get(val)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1085 if sym:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1086 l = l.replace(sval, sym)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1087 updated = True
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1088 lines[i] = l
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1089 if updated:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1090 mx.log('updating ' + f)
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1091 with open('new_' + f, "w") as fp:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1092 for l in lines:
abbe4faaf0c1 added support for dumping an address to symbol map (with -G:+PrintAddressMap) to translate addresses in disassembled output (via new '-m' option to the hcfdis command) Doug Simon <doug.simon@oracle.com> parents: 6718 diff changeset	1093 print >> fp, l
5245 71ac4221b1b0 added hcfdis command Doug Simon <doug.simon@oracle.com> parents: 5244 diff changeset	1094
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1095 def jacocoreport(args):
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	1096 """create a JaCoCo coverage report
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1097
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1098 Creates the report from the 'jacoco.exec' file in the current directory.
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1099 Default output directory is 'coverage', but an alternative can be provided as an argument."""
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1100 jacocoreport = mx.library("JACOCOREPORT", True)
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1101 out = 'coverage'
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1102 if len(args) == 1:
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1103 out = args[0]
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1104 elif len(args) > 1:
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1105 mx.abort('jacocoreport takes only one argument : an output directory')
e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1106 mx.run_java(['-jar', jacocoreport.get_path(True), '-in', 'jacoco.exec', '-g', join(_graal_home, 'graal'), out])
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1107
5700 12a34d1bcaa2 added site command to generate a javadoc-based website Doug Simon <doug.simon@oracle.com> parents: 5688 diff changeset	1108 def site(args):
6291 633136426f26 consolidated jtt command into unittest command and removed need for explicit 'testHarness' property in 'projects' file Doug Simon <doug.simon@oracle.com> parents: 6278 diff changeset	1109 """create a website containing javadoc and the project dependency graph"""
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1110
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5764 diff changeset	1111 return mx.site(['--name', 'Graal',
5782 488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5771 diff changeset	1112 '--jd', '@-tag', '--jd', '@test:X',
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5771 diff changeset	1113 '--jd', '@-tag', '--jd', '@run:X',
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5771 diff changeset	1114 '--jd', '@-tag', '--jd', '@bug:X',
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5771 diff changeset	1115 '--jd', '@-tag', '--jd', '@summary:X',
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5771 diff changeset	1116 '--jd', '@-tag', '--jd', '@vmoption:X',
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5764 diff changeset	1117 '--overview', join(_graal_home, 'graal', 'overview.html'),
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5764 diff changeset	1118 '--title', 'Graal OpenJDK Project Documentation',
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6495 diff changeset	1119 '--dot-output-base', 'projects'] + args)
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1120
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	1121 def mx_init():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	1122 _vmbuild = 'product'
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1123 commands = {
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	1124 'build': [build, '[-options]'],
4601 ade18666f2be Added --omit-native-build to gate command so that native cleaning and building can be omitted for changesets that made no changes to the C/C++ code. Doug Simon <doug.simon@oracle.com> parents: 4584 diff changeset	1125 'buildvms': [buildvms, '[-options]'],
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1126 'clean': [clean, ''],
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4480 diff changeset	1127 'hsdis': [hsdis, '[att]'],
5245 71ac4221b1b0 added hcfdis command Doug Simon <doug.simon@oracle.com> parents: 5244 diff changeset	1128 'hcfdis': [hcfdis, ''],
5089 206e68bb66c6 Made the IdealGraphVisualizer runnable from mx with new 'igv' command. Doug Simon <doug.simon@oracle.com> parents: 5064 diff changeset	1129 'igv' : [igv, ''],
5103 276e14614531 Added jdkhome command to mx. Doug Simon <doug.simon@oracle.com> parents: 5094 diff changeset	1130 'jdkhome': [jdkhome, ''],
4228 e872562f95f8 add a simple specjvm2008 command, fail a benchmark if one of the failureRE matches Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4227 diff changeset	1131 'dacapo': [dacapo, '[[n] benchmark] [VM options\|@DaCapo options]'],
4480 7d6490436b57 Add Scala DaCapo benchs Gilles Duboscq <duboscq@ssw.jku.at> parents: 4438 diff changeset	1132 'scaladacapo': [scaladacapo, '[[n] benchmark] [VM options\|@Scala DaCapo options]'],
8147 9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1133 'specjvm2008': [specjvm2008, '[VM options\|specjvm2008 options (-v, -ikv, -ict, -wt, -it)]'],
9786ac8fff61 Use different vm args for SPECjbb2013 Gilles Duboscq <duboscq@ssw.jku.at> parents: 8135 diff changeset	1134 'specjbb2013': [specjbb2013, '[VM options]'],
5090 0a1e5b876667 Disabled 'examples' command until the examples are revived. Doug Simon <doug.simon@oracle.com> parents: 5089 diff changeset	1135 #'example': [example, '[-v] example names...'],
4601 ade18666f2be Added --omit-native-build to gate command so that native cleaning and building can be omitted for changesets that made no changes to the C/C++ code. Doug Simon <doug.simon@oracle.com> parents: 4584 diff changeset	1136 'gate' : [gate, '[-options]'],
4536 8caa4f2df081 Added 'gv' command to mx for launching the GraalVisualizer. Doug Simon <doug.simon@oracle.com> parents: 4483 diff changeset	1137 'gv' : [gv, ''],
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	1138 'bench' : [bench, '[-resultfile file] [all(default)\|dacapo\|specjvm2008\|bootstrap]'],
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	1139 'unittest' : [unittest, '[filters...]'],
4684 e136f2d0d002 Activate jtt for the gate Gilles Duboscq <duboscq@ssw.jku.at> parents: 4660 diff changeset	1140 'jacocoreport' : [jacocoreport, '[output directory]'],
5700 12a34d1bcaa2 added site command to generate a javadoc-based website Doug Simon <doug.simon@oracle.com> parents: 5688 diff changeset	1141 'site' : [site, '[-options]'],
5257 a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	1142 'vm': [vm, '[-options] class [args...]'],
a549662f6c6f added 'vmg' and 'vmfg' commands to mx as convenient aliases for running the debug and fastdebug builds of the selected VM Doug Simon <doug.simon@oracle.com> parents: 5245 diff changeset	1143 'vmg': [vmg, '[-options] class [args...]'],
6340 74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	1144 'vmfg': [vmfg, '[-options] class [args...]'],
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	1145 'deoptalot' : [deoptalot, '[n]'],
74560fdffd51 Add a draft longtests command to mc's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 6319 diff changeset	1146 'longtests' : [longtests, '']
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1147 }
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1148
5064 8a88c903e381 Updated mx commands. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5047 diff changeset	1149 mx.add_argument('--jacoco', help='instruments com.oracle.* classes using JaCoCo', default='off', choices=['off', 'on', 'append'])
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1150
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1151 if (_vmSourcesAvailable):
7788 dbbe8ce3bfa5 commands: accept 'server0' as a vm, accept version number which have '-...' suffix (-internal, -ea...) Gilles Duboscq <duboscq@ssw.jku.at> parents: 7779 diff changeset	1152 mx.add_argument('--vm', action='store', dest='vm', default='graal', choices=['graal', 'server', 'client', 'server0'], help='the VM to build/run (default: graal)')
4417 648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	1153 mx.add_argument('--product', action='store_const', dest='vmbuild', const='product', help='select the product build of the VM')
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	1154 mx.add_argument('--debug', action='store_const', dest='vmbuild', const='debug', help='select the debug build of the VM')
648a7873cea2 Made it possible to build and run the client and server VM with a new '--vm' option to 'mx build' and a global option of the same name. Doug Simon <doug.simon@oracle.com> parents: 4407 diff changeset	1155 mx.add_argument('--fastdebug', action='store_const', dest='vmbuild', const='fastdebug', help='select the fast debug build of the VM')
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1156 mx.add_argument('--ecl', action='store_true', dest='make_eclipse_launch', help='create launch configuration for running VM execution(s) in Eclipse')
5875 000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	1157 mx.add_argument('--native-dbg', action='store', dest='native_dbg', help='Start the vm inside a debugger', metavar='<debugger>')
000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	1158 mx.add_argument('--gdb', action='store_const', const='/usr/bin/gdb --args', dest='native_dbg', help='alias for --native-dbg /usr/bin/gdb -- args')
000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	1159
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1160
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1161 commands.update({
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1162 'export': [export, '[-options] [zipfile]'],
4240 394424b7df1a Disabled certain DaCapo tests for fastdebug testing in the gate. Doug Simon <doug.simon@oracle.com> parents: 4238 diff changeset	1163 'build': [build, '[-options] [product\|debug\|fastdebug]...']
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1164 })
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1165
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	1166 mx.commands.update(commands)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	1167
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	1168 def mx_post_parse_cmd_line(opts):#
9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	1169 # TODO _minVersion check could probably be part of a Suite in mx?
9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	1170 if (mx.java().version < _minVersion) :
9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7788 diff changeset	1171 mx.abort('Requires Java version ' + str(_minVersion) + ' or greater, got version ' + str(mx.java().version))
5729 dab877fe7c31 prevented error during mx site from corrupting an existing site Doug Simon <doug.simon@oracle.com> parents: 5708 diff changeset	1172
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1173 if (_vmSourcesAvailable):
4559 723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	1174 if hasattr(opts, 'vm') and opts.vm is not None:
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	1175 global _vm
723df37192d6 Make it possible again to build a real client libjvm, drop the UseGraal flag. Gilles Duboscq <duboscq@ssw.jku.at> parents: 4540 diff changeset	1176 _vm = opts.vm
4216 a13d61d3910e fix for when no vm build is explicitely selected Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4215 diff changeset	1177 if hasattr(opts, 'vmbuild') and opts.vmbuild is not None:
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	1178 global _vmbuild
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	1179 _vmbuild = opts.vmbuild
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1180 global _make_eclipse_launch
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1181 _make_eclipse_launch = getattr(opts, 'make_eclipse_launch', False)
5024 7ccdae96e98a Allow JaCoCon to append to the execution file Gilles Duboscq <duboscq@ssw.jku.at> parents: 5016 diff changeset	1182 global _jacoco
7ccdae96e98a Allow JaCoCon to append to the execution file Gilles Duboscq <duboscq@ssw.jku.at> parents: 5016 diff changeset	1183 _jacoco = opts.jacoco
5875 000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	1184 global _native_dbg
000fb0550afe Add an option to launch the vm from a debugger in mx's commands Gilles Duboscq <duboscq@ssw.jku.at> parents: 5871 diff changeset	1185 _native_dbg = opts.native_dbg
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	1186
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8132 diff changeset	1187 mx.distribution('GRAAL').add_update_listener(_installGraalJarInJdks)

Mercurial > hg > truffle

annotate mx/commands.py @ 8211:74896b25297a