Mercurial > hg > graal-jvmci-8
annotate mx.jvmci/mx_jvmci.py @ 23404:3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Tue, 24 May 2016 13:51:28 +0200 |
parents | 24505bf61633 |
children | 53d9235e99ba |
rev | line source |
---|---|
3718 | 1 # |
2 # ---------------------------------------------------------------------------------------------------- | |
3 # | |
18897
9afee75cee46
mx: add microbench command to run JMH benchmarks
Roland Schatz <roland.schatz@oracle.com>
parents:
18894
diff
changeset
|
4 # Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. |
3718 | 5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
6 # | |
7 # This code is free software; you can redistribute it and/or modify it | |
8 # under the terms of the GNU General Public License version 2 only, as | |
9 # published by the Free Software Foundation. | |
10 # | |
11 # This code is distributed in the hope that it will be useful, but WITHOUT | |
12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 # version 2 for more details (a copy is included in the LICENSE file that | |
15 # accompanied this code). | |
16 # | |
17 # You should have received a copy of the GNU General Public License version | |
18 # 2 along with this work; if not, write to the Free Software Foundation, | |
19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
20 # | |
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | |
22 # or visit www.oracle.com if you need additional information or have any | |
23 # questions. | |
24 # | |
25 # ---------------------------------------------------------------------------------------------------- | |
26 | |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
27 import os, stat, errno, sys, shutil, zipfile, tarfile, tempfile, re, time, datetime, platform, subprocess, socket |
23332
d5690e838afa
mx: remove makejmhdeps buildjmh and jmh.
Josef Eisl <josef.eisl@jku.at>
parents:
23331
diff
changeset
|
28 from os.path import join, exists, basename |
22020
36a7ec14279d
moved unit test support from mx_graal.py to mx.py
Doug Simon <doug.simon@oracle.com>
parents:
22019
diff
changeset
|
29 from argparse import ArgumentParser, REMAINDER |
13472
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
30 import xml.dom.minidom |
9116
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
31 import json, textwrap |
22693
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
32 from collections import OrderedDict |
22031
434fbaaf53d7
moved findbugs support from mx_graal.py to mx_findbugs.py
Doug Simon <doug.simon@oracle.com>
parents:
22024
diff
changeset
|
33 |
434fbaaf53d7
moved findbugs support from mx_graal.py to mx_findbugs.py
Doug Simon <doug.simon@oracle.com>
parents:
22024
diff
changeset
|
34 import mx |
434fbaaf53d7
moved findbugs support from mx_graal.py to mx_findbugs.py
Doug Simon <doug.simon@oracle.com>
parents:
22024
diff
changeset
|
35 import mx_unittest |
22274
ed0b8310ac56
import unittest from mx_unittest.py
Doug Simon <doug.simon@oracle.com>
parents:
22273
diff
changeset
|
36 from mx_unittest import unittest |
22286
2ecfec90e51e
moved gate from mx_jvmci.py to mx_gate.py in core mx
Doug Simon <doug.simon@oracle.com>
parents:
22284
diff
changeset
|
37 from mx_gate import Task |
2ecfec90e51e
moved gate from mx_jvmci.py to mx_gate.py in core mx
Doug Simon <doug.simon@oracle.com>
parents:
22284
diff
changeset
|
38 import mx_gate |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
39 import mx_jvmci_makefile |
3718 | 40 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
41 _suite = mx.suite('jvmci') |
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
|
42 |
22777
781e01df3c4c
added JVMCI_VERSION constant
Doug Simon <doug.simon@oracle.com>
parents:
22771
diff
changeset
|
43 JVMCI_VERSION = 8 |
781e01df3c4c
added JVMCI_VERSION constant
Doug Simon <doug.simon@oracle.com>
parents:
22771
diff
changeset
|
44 |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
45 """ The VMs that can be built and run along with an optional description. Only VMs with a |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
46 description are listed in the dialogue for setting the default VM (see get_vm()). """ |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
47 _vmChoices = { |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
48 'server' : 'Normal compilation is performed with a tiered system (C1 + C2 or Graal) and Graal is available for hosted compilation.', |
22099
10b08d53b060
removed TRUFFLE distribution - only use TRUFFLE library
Doug Simon <doug.simon@oracle.com>
parents:
22096
diff
changeset
|
49 'client' : None, # VM compilation with client compiler, hosted compilation with Graal |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
50 'server-nojvmci' : None, # all compilation with tiered system (i.e., client + server), JVMCI omitted |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
51 'client-nojvmci' : None, # all compilation with client compiler, JVMCI omitted |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
52 'original' : None, # default VM copied from bootstrap JDK |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
53 } |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
54 |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
55 _jvmciModes = { |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
56 'hosted' : ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI'], |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
57 'jit' : ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI', '-XX:+UseJVMCICompiler'], |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
58 'disabled' : ['-XX:+UnlockExperimentalVMOptions', '-XX:-EnableJVMCI'] |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
59 } |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
60 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
61 # Aliases for legacy VM names |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
62 _vmAliases = { |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
63 'jvmci' : 'server', |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
64 'graal' : 'server', |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
65 'server-nograal' : 'server-nojvmci', |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
66 'client-nograal' : 'client-nograal', |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
67 } |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
68 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
69 _JVMCI_JDK_TAG = 'jvmci' |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
70 |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
71 """ The VM that will be run by the 'vm' command and built by default by the 'build' command. |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
72 This can be set via the global '--vm' option or the DEFAULT_VM environment variable. |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
73 It can also be temporarily set by using of a VM context manager object in a 'with' statement. """ |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
74 _vm = None |
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
|
75 |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
76 class JVMCIMode: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
77 def __init__(self, jvmciMode): |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
78 self.jvmciMode = jvmciMode |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
79 self.vmArgs = _jvmciModes[jvmciMode] |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
80 |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
81 def __enter__(self): |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
82 global _jvmciMode |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
83 self.previousMode = _jvmciMode |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
84 _jvmciMode = self |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
85 |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
86 def __exit__(self, exc_type, exc_value, traceback): |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
87 global _jvmciMode |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
88 _jvmciMode = self.previousMode |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
89 |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
90 """ The JVMCI mode that will be used by the 'vm' command. This can be set with the global '-M' option. |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
91 It can also be temporarily set using the JVMCIMode context manager object in a 'with' statement. |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
92 Defaults to 'hosted'. """ |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
93 _jvmciMode = JVMCIMode('hosted') |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
94 |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
95 """ The VM builds that will be run by the 'vm' command - default is first in list """ |
9157
a38d748d4130
Add support for the 'optimized' build in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
9130
diff
changeset
|
96 _vmbuildChoices = ['product', 'fastdebug', 'debug', 'optimized'] |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
97 |
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
98 """ The VM build that will be run by the 'vm' command. |
11371
74414b248381
mx: added --vmbuild global option, removed --product, --fastdebug, --debug options as well as suffix of build command
Doug Simon <doug.simon@oracle.com>
parents:
11368
diff
changeset
|
99 This can be set via the global '--vmbuild' option. |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
100 It can also be temporarily set by using of a VM context manager object in a 'with' statement. """ |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
101 _vmbuild = _vmbuildChoices[0] |
3718 | 102 |
11401
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
103 """ The current working directory to switch to before running the VM. """ |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
104 _vm_cwd = None |
10454
590b0c26877f
mx: add --workdir argument
Bernhard Urban <bernhard.urban@jku.at>
parents:
10417
diff
changeset
|
105 |
11401
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
106 """ The base directory in which the JDKs cloned from $JAVA_HOME exist. """ |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
107 _installed_jdks = None |
10570
2f80624df8a2
Add a --vmdir argument to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10568
diff
changeset
|
108 |
11401
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
109 """ Prefix for running the VM. """ |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
110 _vm_prefix = None |
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
|
111 |
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
|
112 _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
|
113 |
15594
62738ce98804
mx: set _minVersion to 1.8
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15593
diff
changeset
|
114 _minVersion = mx.VersionSpec('1.8') |
7916
9bff64f43299
Better java version numbers support in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
7788
diff
changeset
|
115 |
20102
6e5df2d60fbd
mx: fix compliance check for EXTRA_JAVA_HOMES, add maximum JAVA_HOME version in mx_graal
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
20032
diff
changeset
|
116 # max version (first _unsupported_ version) |
20805
379471b334cb
Lift 8u40 mx restriction
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
20102
diff
changeset
|
117 _untilVersion = None |
20102
6e5df2d60fbd
mx: fix compliance check for EXTRA_JAVA_HOMES, add maximum JAVA_HOME version in mx_graal
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
20032
diff
changeset
|
118 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
119 class JDKDeployedDist(object): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
120 def __init__(self, name): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
121 self._name = name |
22143
616739e61fb6
changed JDKDeployedDist.postJdkInstall to be an overridable method
Doug Simon <doug.simon@oracle.com>
parents:
22142
diff
changeset
|
122 |
616739e61fb6
changed JDKDeployedDist.postJdkInstall to be an overridable method
Doug Simon <doug.simon@oracle.com>
parents:
22142
diff
changeset
|
123 def dist(self): |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
124 return mx.distribution(self._name) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
125 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
126 def deploy(self, jdkDir): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
127 mx.nyi('deploy', self) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
128 |
22761
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
129 def post_parse_cmd_line(self): |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
130 def _install(d): |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
131 _installDistInJdks(self) |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
132 self.dist().add_update_listener(_install) |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
133 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
134 class JarJDKDeployedDist(JDKDeployedDist): |
22287
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
135 def __init__(self, name, partOfHotSpot=False): |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
136 JDKDeployedDist.__init__(self, name) |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
137 self.partOfHotSpot = partOfHotSpot |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
138 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
139 def targetDir(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
140 mx.nyi('targetDir', self) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
141 |
22616
8a837db73b92
Remove source deployment.
Christian Humer <christian.humer@oracle.com>
parents:
22614
diff
changeset
|
142 def _copyToJdk(self, jdkDir, target): |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
143 targetDir = join(jdkDir, target) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
144 dist = self.dist() |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
145 mx.logv('Deploying {} to {}'.format(dist.name, targetDir)) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
146 copyToJdk(dist.path, targetDir) |
22452
b6fd47c5dc0b
Add ability to define a source target folder for distribution deployments.
Christian Humer <christian.humer@oracle.com>
parents:
22438
diff
changeset
|
147 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
148 def deploy(self, jdkDir): |
22616
8a837db73b92
Remove source deployment.
Christian Humer <christian.humer@oracle.com>
parents:
22614
diff
changeset
|
149 self._copyToJdk(jdkDir, self.targetDir()) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
150 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
151 class ExtJDKDeployedDist(JarJDKDeployedDist): |
22287
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
152 def __init__(self, name, partOfHotSpot=False): |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
153 JarJDKDeployedDist.__init__(self, name, partOfHotSpot) |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
154 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
155 def targetDir(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
156 return join('jre', 'lib', 'ext') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
157 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
158 class LibJDKDeployedDist(JarJDKDeployedDist): |
22287
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
159 def __init__(self, name, partOfHotSpot=False): |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
160 JarJDKDeployedDist.__init__(self, name, partOfHotSpot) |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
161 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
162 def targetDir(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
163 return join('jre', 'lib') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
164 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
165 class JvmciJDKDeployedDist(JarJDKDeployedDist): |
22429
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
166 def __init__(self, name, partOfHotSpot=False, compilers=False): |
22287
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
167 JarJDKDeployedDist.__init__(self, name, partOfHotSpot) |
22429
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
168 self._compilers = compilers |
22287
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
169 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
170 def targetDir(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
171 return join('jre', 'lib', 'jvmci') |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
172 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
173 def deploy(self, jdkDir): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
174 JarJDKDeployedDist.deploy(self, jdkDir) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
175 _updateJVMCIFiles(jdkDir) |
22429
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
176 if self._compilers: |
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
177 _updateJVMCIProperties(jdkDir, self._compilers) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
178 |
22761
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
179 def post_parse_cmd_line(self): |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
180 super(JvmciJDKDeployedDist, self).post_parse_cmd_line() |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
181 self.set_archiveparticipant() |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
182 |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
183 def set_archiveparticipant(self): |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
184 dist = self.dist() |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
185 dist.set_archiveparticipant(JVMCIArchiveParticipant(dist)) |
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
186 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
187 def _exe(l): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
188 return mx.exe_suffix(l) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
189 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
190 def _lib(l): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
191 return mx.add_lib_suffix(mx.add_lib_prefix(l)) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
192 |
22330
856aeb17e892
Add debug info files in hotspot's results
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22328
diff
changeset
|
193 def _lib_dbg(l): |
856aeb17e892
Add debug info files in hotspot's results
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22328
diff
changeset
|
194 return mx.add_debug_lib_suffix(mx.add_lib_prefix(l)) |
856aeb17e892
Add debug info files in hotspot's results
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22328
diff
changeset
|
195 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
196 class HotSpotVMJDKDeployedDist(JDKDeployedDist): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
197 def dist(self): |
22282
9ab88ee1f79f
spelling fix: instanciate -> instantiate
Doug Simon <doug.simon@oracle.com>
parents:
22281
diff
changeset
|
198 name = mx.instantiatedDistributionName(self._name, dict(vm=get_vm(), vmbuild=_vmbuild), context=self._name) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
199 return mx.distribution(name) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
200 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
201 def deploy(self, jdkDir): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
202 vmbuild = _vmbuildFromJdkDir(jdkDir) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
203 if vmbuild != _vmbuild: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
204 return |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
205 _hs_deploy_map = { |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
206 'jvmti.h' : 'include', |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
207 'sa-jdi.jar' : 'lib', |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
208 _lib('jvm') : join(relativeVmLibDirInJdk(), get_vm()), |
22330
856aeb17e892
Add debug info files in hotspot's results
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22328
diff
changeset
|
209 _lib_dbg('jvm') : join(relativeVmLibDirInJdk(), get_vm()), |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
210 _lib('saproc') : relativeVmLibDirInJdk(), |
22330
856aeb17e892
Add debug info files in hotspot's results
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22328
diff
changeset
|
211 _lib_dbg('saproc') : relativeVmLibDirInJdk(), |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
212 _lib('jsig') : relativeVmLibDirInJdk(), |
22330
856aeb17e892
Add debug info files in hotspot's results
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22328
diff
changeset
|
213 _lib_dbg('jsig') : relativeVmLibDirInJdk(), |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
214 } |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
215 dist = self.dist() |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
216 with tarfile.open(dist.path, 'r') as tar: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
217 for m in tar.getmembers(): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
218 if m.name in _hs_deploy_map: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
219 targetDir = join(jdkDir, _hs_deploy_map[m.name]) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
220 mx.logv('Deploying {} from {} to {}'.format(m.name, dist.name, targetDir)) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
221 tar.extract(m, targetDir) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
222 updateJvmCfg(jdkDir, get_vm()) |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
223 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
224 """ |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
225 List of distributions that are deployed into a JDK by mx. |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
226 """ |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
227 jdkDeployedDists = [ |
22761
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
228 LibJDKDeployedDist('JVMCI_SERVICES', partOfHotSpot=True), |
22287
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
229 JvmciJDKDeployedDist('JVMCI_API', partOfHotSpot=True), |
5cce6c398d70
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
Doug Simon <doug.simon@oracle.com>
parents:
22286
diff
changeset
|
230 JvmciJDKDeployedDist('JVMCI_HOTSPOT', partOfHotSpot=True), |
22323
6128b5118a28
Resolve cyclic dependencies involving annotation processors.
Roland Schatz <roland.schatz@oracle.com>
parents:
22322
diff
changeset
|
231 JvmciJDKDeployedDist('JVMCI_HOTSPOTVMCONFIG', partOfHotSpot=True), |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
232 HotSpotVMJDKDeployedDist('JVM_<vmbuild>_<vm>'), |
16902
0583d157992a
formalized the set of distribution jars that are installed into the JDK to ensure both mx and the HotSpot make system do the necessary deployment
Doug Simon <doug.simon@oracle.com>
parents:
16877
diff
changeset
|
233 ] |
0583d157992a
formalized the set of distribution jars that are installed into the JDK to ensure both mx and the HotSpot make system do the necessary deployment
Doug Simon <doug.simon@oracle.com>
parents:
16877
diff
changeset
|
234 |
16627
68deb37eed70
mx: fix permissions of copied bootstrap JDK files (don't make everything executable)
Bernhard Urban <bernhard.urban@jku.at>
parents:
16623
diff
changeset
|
235 JDK_UNIX_PERMISSIONS_DIR = 0755 |
68deb37eed70
mx: fix permissions of copied bootstrap JDK files (don't make everything executable)
Bernhard Urban <bernhard.urban@jku.at>
parents:
16623
diff
changeset
|
236 JDK_UNIX_PERMISSIONS_FILE = 0644 |
16782
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
237 JDK_UNIX_PERMISSIONS_EXEC = 0755 |
13919
9d70445ea369
mx: set correct permissions for graal.jar
Bernhard Urban <bernhard.urban@jku.at>
parents:
13846
diff
changeset
|
238 |
14602
591f4a575ebf
issue warning/error where ever relevant if a non-supported VM (e.g., client VM on Mac) is used in mx
Doug Simon <doug.simon@oracle.com>
parents:
14595
diff
changeset
|
239 def isVMSupported(vm): |
18799
750db34c9fe1
client-nograal is supported on Mac
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
18733
diff
changeset
|
240 if 'client' == vm and len(platform.mac_ver()[0]) != 0: |
14602
591f4a575ebf
issue warning/error where ever relevant if a non-supported VM (e.g., client VM on Mac) is used in mx
Doug Simon <doug.simon@oracle.com>
parents:
14595
diff
changeset
|
241 # Client VM not supported: java launcher on Mac OS X translates '-client' to '-server' |
591f4a575ebf
issue warning/error where ever relevant if a non-supported VM (e.g., client VM on Mac) is used in mx
Doug Simon <doug.simon@oracle.com>
parents:
14595
diff
changeset
|
242 return False |
591f4a575ebf
issue warning/error where ever relevant if a non-supported VM (e.g., client VM on Mac) is used in mx
Doug Simon <doug.simon@oracle.com>
parents:
14595
diff
changeset
|
243 return True |
591f4a575ebf
issue warning/error where ever relevant if a non-supported VM (e.g., client VM on Mac) is used in mx
Doug Simon <doug.simon@oracle.com>
parents:
14595
diff
changeset
|
244 |
22141
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
245 def get_vm_cwd(): |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
246 """ |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
247 Get the current working directory to switch to before running the VM. |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
248 """ |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
249 return _vm_cwd |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
250 |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
251 def get_installed_jdks(): |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
252 """ |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
253 Get the base directory in which the JDKs cloned from $JAVA_HOME exist. |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
254 """ |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
255 return _installed_jdks |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
256 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
257 def get_vm_prefix(asList=True): |
22141
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
258 """ |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
259 Get the prefix for running the VM ("/usr/bin/gdb --args"). |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
260 """ |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
261 if asList: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
262 return _vm_prefix.split() if _vm_prefix is not None else [] |
22141
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
263 return _vm_prefix |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
264 |
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
265 def get_vm_choices(): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
266 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
267 Get the names of available VMs. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
268 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
269 return _vmChoices.viewkeys() |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
270 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
271 def dealiased_vm(vm): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
272 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
273 If 'vm' is an alias, returns the aliased name otherwise returns 'vm'. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
274 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
275 if vm and vm in _vmAliases: |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
276 if vm == 'jvmci' or vm == 'graal': |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
277 mx.log('"--vm ' + vm + '" is deprecated, using "--vm server -Mjit" instead') |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
278 global _jvmciMode |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
279 _jvmciMode = JVMCIMode('jit') |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
280 return _vmAliases[vm] |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
281 return vm |
22141
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
282 |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
283 def get_jvmci_mode_args(): |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
284 return _jvmciMode.vmArgs |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
285 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
286 def get_vm(): |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
287 """ |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
288 Gets the configured VM, presenting a dialogue if there is no currently configured VM. |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
289 """ |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
290 global _vm |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
291 if _vm: |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
292 return _vm |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
293 vm = mx.get_env('DEFAULT_VM') |
22018
11ed27b2abe8
remove hard-coded use of 'mx' to refer to the mxDir for the graal suite
Doug Simon <doug.simon@oracle.com>
parents:
22017
diff
changeset
|
294 envPath = join(_suite.mxDir, 'env') |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
295 if vm and vm in _vmAliases: |
21584
9bb04af58490
support DEFAULT_VM=graal in mx/env
Doug Simon <doug.simon@oracle.com>
parents:
21580
diff
changeset
|
296 if exists(envPath): |
9bb04af58490
support DEFAULT_VM=graal in mx/env
Doug Simon <doug.simon@oracle.com>
parents:
21580
diff
changeset
|
297 with open(envPath) as fp: |
21642 | 298 if 'DEFAULT_VM=' + vm in fp.read(): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
299 mx.log('Please update the DEFAULT_VM value in ' + envPath + ' to replace "' + vm + '" with "' + _vmAliases[vm] + '"') |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
300 vm = _vmAliases[vm] |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
301 if vm is None: |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
302 items = [k for k in _vmChoices.keys() if _vmChoices[k] is not None] |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
303 if len(items) > 1: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
304 if not mx.is_interactive(): |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
305 mx.abort('Need to specify VM with --vm option or DEFAULT_VM environment variable') |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
306 mx.log('Please select the VM to be executed from the following: ') |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
307 descriptions = [_vmChoices[k] for k in _vmChoices.keys() if _vmChoices[k] is not None] |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
308 vm = mx.select_items(items, descriptions, allowMultiple=False) |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
309 mx.ask_persist_env('DEFAULT_VM', vm) |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
310 else: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
311 vm = items[0] |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
312 _vm = vm |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
313 return vm |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
314 |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
315 """ |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
316 A context manager that can be used with the 'with' statement to set the VM |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
317 used by all VM executions within the scope of the 'with' statement. For example: |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
318 |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
319 with VM('server'): |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
320 dacapo(['pmd']) |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
321 """ |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
322 class VM: |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
323 def __init__(self, vm=None, build=None): |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
324 assert build is None or build in _vmbuildChoices |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
325 self.build = build if build else _vmbuild |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
326 if vm == 'jvmci': |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
327 mx.log('WARNING: jvmci VM is deprecated, using server VM with -Mjit instead') |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
328 self.vm = 'server' |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
329 self.jvmciMode = JVMCIMode('jit') |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
330 else: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
331 assert vm is None or vm in _vmChoices.keys() |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
332 self.vm = vm if vm else _vm |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
333 self.jvmciMode = None |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
334 |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
335 def __enter__(self): |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
336 global _vm, _vmbuild |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
337 self.previousVm = _vm |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
338 self.previousBuild = _vmbuild |
22286
2ecfec90e51e
moved gate from mx_jvmci.py to mx_gate.py in core mx
Doug Simon <doug.simon@oracle.com>
parents:
22284
diff
changeset
|
339 mx.reInstantiateDistribution('JVM_<vmbuild>_<vm>', dict(vm=self.previousVm, vmbuild=self.previousBuild), dict(vm=self.vm, vmbuild=self.build)) |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
340 _vm = self.vm |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
341 _vmbuild = self.build |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
342 if self.jvmciMode is not None: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
343 self.jvmciMode.__enter__() |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
344 |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
345 def __exit__(self, exc_type, exc_value, traceback): |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
346 global _vm, _vmbuild |
22286
2ecfec90e51e
moved gate from mx_jvmci.py to mx_gate.py in core mx
Doug Simon <doug.simon@oracle.com>
parents:
22284
diff
changeset
|
347 mx.reInstantiateDistribution('JVM_<vmbuild>_<vm>', dict(vm=self.vm, vmbuild=self.build), dict(vm=self.previousVm, vmbuild=self.previousBuild)) |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
348 _vm = self.previousVm |
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
349 _vmbuild = self.previousBuild |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
350 if self.jvmciMode is not None: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
351 self.jvmciMode.__exit__(exc_type, exc_value, traceback) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
352 |
16627
68deb37eed70
mx: fix permissions of copied bootstrap JDK files (don't make everything executable)
Bernhard Urban <bernhard.urban@jku.at>
parents:
16623
diff
changeset
|
353 def chmodRecursive(dirname, chmodFlagsDir): |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
354 if mx.get_os() == 'windows': |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
355 return |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
356 |
16627
68deb37eed70
mx: fix permissions of copied bootstrap JDK files (don't make everything executable)
Bernhard Urban <bernhard.urban@jku.at>
parents:
16623
diff
changeset
|
357 def _chmodDir(chmodFlags, dirname, fnames): |
68deb37eed70
mx: fix permissions of copied bootstrap JDK files (don't make everything executable)
Bernhard Urban <bernhard.urban@jku.at>
parents:
16623
diff
changeset
|
358 os.chmod(dirname, chmodFlagsDir) |
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
|
359 |
16627
68deb37eed70
mx: fix permissions of copied bootstrap JDK files (don't make everything executable)
Bernhard Urban <bernhard.urban@jku.at>
parents:
16623
diff
changeset
|
360 os.path.walk(dirname, _chmodDir, chmodFlagsDir) |
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 |
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
|
362 def export(args): |
15420
5947bb02474f
mx export: change the way of marking a repo as dirty
Bernhard Urban <bernhard.urban@jku.at>
parents:
15405
diff
changeset
|
363 """create archives of builds split by vmbuild and vm""" |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
364 |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
365 parser = ArgumentParser(prog='mx export') |
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
|
366 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
|
367 |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
368 # collect data about export |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
369 infos = dict() |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
370 infos['timestamp'] = time.time() |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
371 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
372 hgcfg = mx.HgConfig() |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
373 hgcfg.check() |
15420
5947bb02474f
mx export: change the way of marking a repo as dirty
Bernhard Urban <bernhard.urban@jku.at>
parents:
15405
diff
changeset
|
374 infos['revision'] = hgcfg.tip('.') + ('+' if hgcfg.isDirty('.') else '') |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
375 # TODO: infos['repository'] |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
376 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
377 infos['jdkversion'] = str(get_jvmci_bootstrap_jdk().version) |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
378 |
17012
ad10671d1bbd
mx: move get_arch() to mxtool
Bernhard Urban <bernhard.urban@jku.at>
parents:
16983
diff
changeset
|
379 infos['architecture'] = mx.get_arch() |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
380 infos['platform'] = mx.get_os() |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
381 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
382 if mx.get_os != 'windows': |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
383 pass |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
384 # infos['ccompiler'] |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
385 # infos['linker'] |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
386 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
387 infos['hostname'] = socket.gethostname() |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
388 |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
389 def _writeJson(suffix, properties): |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
390 d = infos.copy() |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
391 for k, v in properties.iteritems(): |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
392 assert not d.has_key(k) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
393 d[k] = v |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
394 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
395 jsonFileName = 'export-' + suffix + '.json' |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
396 with open(jsonFileName, 'w') as f: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
397 print >> f, json.dumps(d) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
398 return jsonFileName |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
399 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
400 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
401 def _genFileName(archivetype, middle): |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
402 idPrefix = infos['revision'] + '_' |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
403 idSuffix = '.tar.gz' |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
404 return join(_suite.dir, "graalvm_" + archivetype + "_" + idPrefix + middle + idSuffix) |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
405 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
406 def _genFileArchPlatformName(archivetype, middle): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
407 return _genFileName(archivetype, infos['platform'] + '_' + infos['architecture'] + '_' + middle) |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
408 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
409 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
410 # archive different build types of hotspot |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
411 for vmBuild in _vmbuildChoices: |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
412 jdkDir = join(_jdksDir(), vmBuild) |
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
413 if not exists(jdkDir): |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
414 mx.logv("skipping " + vmBuild) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
415 continue |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
416 |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
417 tarName = _genFileArchPlatformName('basejdk', vmBuild) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
418 mx.logv("creating basejdk " + tarName) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
419 vmSet = set() |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
420 with tarfile.open(tarName, 'w:gz') as tar: |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
421 for root, _, files in os.walk(jdkDir): |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
422 if basename(root) in _vmChoices.keys(): |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
423 # TODO: add some assert to check path assumption |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
424 vmSet.add(root) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
425 continue |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
426 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
427 for f in files: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
428 name = join(root, f) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
429 # print name |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
430 tar.add(name, name) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
431 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
432 n = _writeJson("basejdk-" + vmBuild, {'vmbuild' : vmBuild}) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
433 tar.add(n, n) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
434 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
435 # create a separate archive for each VM |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
436 for vm in vmSet: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
437 bVm = basename(vm) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
438 vmTarName = _genFileArchPlatformName('vm', vmBuild + '_' + bVm) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
439 mx.logv("creating vm " + vmTarName) |
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
|
440 |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
441 debugFiles = set() |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
442 with tarfile.open(vmTarName, 'w:gz') as tar: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
443 for root, _, files in os.walk(vm): |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
444 for f in files: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
445 # TODO: mac, windows, solaris? |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
446 if any(map(f.endswith, [".debuginfo"])): |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
447 debugFiles.add(f) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
448 else: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
449 name = join(root, f) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
450 # print name |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
451 tar.add(name, name) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
452 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
453 n = _writeJson("vm-" + vmBuild + "-" + bVm, {'vmbuild' : vmBuild, 'vm' : bVm}) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
454 tar.add(n, n) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
455 |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
456 if len(debugFiles) > 0: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
457 debugTarName = _genFileArchPlatformName('debugfilesvm', vmBuild + '_' + bVm) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
458 mx.logv("creating debugfilesvm " + debugTarName) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
459 with tarfile.open(debugTarName, 'w:gz') as tar: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
460 for f in debugFiles: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
461 name = join(root, f) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
462 # print name |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
463 tar.add(name, name) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
464 |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
465 n = _writeJson("debugfilesvm-" + vmBuild + "-" + bVm, {'vmbuild' : vmBuild, 'vm' : bVm}) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
466 tar.add(n, n) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
467 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
468 # jvmci directory |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
469 jvmciDirTarName = _genFileName('classfiles', 'javac') |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
470 mx.logv("creating jvmci " + jvmciDirTarName) |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
471 with tarfile.open(jvmciDirTarName, 'w:gz') as tar: |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
472 for root, _, files in os.walk("jvmci"): |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
473 for f in [f for f in files if not f.endswith('.java')]: |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
474 name = join(root, f) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
475 # print name |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
476 tar.add(name, name) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
477 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
478 n = _writeJson("jvmci", {'javacompiler' : 'javac'}) |
15405
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
479 tar.add(n, n) |
5dcf0ae606f3
mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents:
15404
diff
changeset
|
480 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
481 def relativeVmLibDirInJdk(): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
482 mxos = mx.get_os() |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
483 if mxos == 'darwin': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
484 return join('jre', 'lib') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
485 if mxos == 'windows' or mxos == 'cygwin': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
486 return join('jre', 'bin') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
487 return join('jre', 'lib', mx.get_arch()) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
488 |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
489 def vmLibDirInJdk(jdkDir): |
4607
ee87cfe2f8f9
Made GraalVM build work on Mac OS X.
Doug Simon <doug.simon@oracle.com>
parents:
4602
diff
changeset
|
490 """ |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
491 Gets the directory within a JDK where the server and client |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
492 sub-directories are located. |
4607
ee87cfe2f8f9
Made GraalVM build work on Mac OS X.
Doug Simon <doug.simon@oracle.com>
parents:
4602
diff
changeset
|
493 """ |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
494 return join(jdkDir, relativeVmLibDirInJdk()) |
4607
ee87cfe2f8f9
Made GraalVM build work on Mac OS X.
Doug Simon <doug.simon@oracle.com>
parents:
4602
diff
changeset
|
495 |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
496 def getVmJliLibDirs(jdkDir): |
17014
6a30738791f7
mx: add helper for determine jli location
Bernhard Urban <bernhard.urban@jku.at>
parents:
17012
diff
changeset
|
497 """ |
6a30738791f7
mx: add helper for determine jli location
Bernhard Urban <bernhard.urban@jku.at>
parents:
17012
diff
changeset
|
498 Get the directories within a JDK where the jli library designates to. |
6a30738791f7
mx: add helper for determine jli location
Bernhard Urban <bernhard.urban@jku.at>
parents:
17012
diff
changeset
|
499 """ |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
500 mxos = mx.get_os() |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
501 if mxos == 'darwin': |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
502 return [join(jdkDir, 'jre', 'lib', 'jli')] |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
503 if mxos == 'windows' or mxos == 'cygwin': |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
504 return [join(jdkDir, 'jre', 'bin'), join(jdkDir, 'bin')] |
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
505 return [join(jdkDir, 'jre', 'lib', mx.get_arch(), 'jli'), join(jdkDir, 'lib', mx.get_arch(), 'jli')] |
17014
6a30738791f7
mx: add helper for determine jli location
Bernhard Urban <bernhard.urban@jku.at>
parents:
17012
diff
changeset
|
506 |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
507 def getVmCfgInJdk(jdkDir, jvmCfgFile='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
|
508 """ |
87fc13b59258
Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
5649
diff
changeset
|
509 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
|
510 """ |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
511 mxos = mx.get_os() |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
512 if mxos == "windows" or mxos == "cygwin": |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
513 return join(jdkDir, 'jre', 'lib', mx.get_arch(), jvmCfgFile) |
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
514 return join(vmLibDirInJdk(jdkDir), jvmCfgFile) |
5680
87fc13b59258
Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
5649
diff
changeset
|
515 |
9119
0c9c4ae236b2
refactoring to ensure the path to the JDKs dir is consistent between the _jdk() and clean() command
Doug Simon <doug.simon@oracle.com>
parents:
9118
diff
changeset
|
516 def _jdksDir(): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
517 return os.path.abspath(join(_installed_jdks if _installed_jdks else _suite.dir, 'jdk' + str(get_jvmci_bootstrap_jdk().version))) |
9119
0c9c4ae236b2
refactoring to ensure the path to the JDKs dir is consistent between the _jdk() and clean() command
Doug Simon <doug.simon@oracle.com>
parents:
9118
diff
changeset
|
518 |
17055
3e4d3be0b6bf
mx: fix default handling of vm config and build type
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
17052
diff
changeset
|
519 def _handle_missing_VM(bld, vm=None): |
3e4d3be0b6bf
mx: fix default handling of vm config and build type
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
17052
diff
changeset
|
520 if not vm: |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
521 vm = get_vm() |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
522 mx.log('The ' + bld + ' ' + vm + ' VM has not been created') |
21169
41ec6d89cb84
mx: fix calls to is_interactive()
Andreas Woess <andreas.woess@oracle.com>
parents:
21166
diff
changeset
|
523 if mx.is_interactive(): |
11511
3110bea9a6b0
mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11493
diff
changeset
|
524 if mx.ask_yes_no('Build it now', 'y'): |
11371
74414b248381
mx: added --vmbuild global option, removed --product, --fastdebug, --debug options as well as suffix of build command
Doug Simon <doug.simon@oracle.com>
parents:
11368
diff
changeset
|
525 with VM(vm, bld): |
74414b248381
mx: added --vmbuild global option, removed --product, --fastdebug, --debug options as well as suffix of build command
Doug Simon <doug.simon@oracle.com>
parents:
11368
diff
changeset
|
526 build([]) |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
527 return |
23343
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
528 mx.abort('You need to run "mx --vm=' + vm + ' --vmbuild=' + bld + ' build" to build the selected VM') |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
529 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
530 def check_VM_exists(vm, jdkDir, build=None): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
531 if not build: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
532 build = _vmbuild |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
533 jvmCfg = getVmCfgInJdk(jdkDir) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
534 found = False |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
535 with open(jvmCfg) as f: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
536 for line in f: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
537 if line.strip() == '-' + vm + ' KNOWN': |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
538 found = True |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
539 break |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
540 if not found: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
541 _handle_missing_VM(build, vm) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
542 |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
543 def get_jvmci_jdk_dir(build=None, vmToCheck=None, create=False, deployDists=True): |
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
|
544 """ |
22491
917b3ad10c32
renamed 'installJars' parameter of get_jvmci_jdk to 'deployDists'
Doug Simon <doug.simon@oracle.com>
parents:
22479
diff
changeset
|
545 Gets the path of the JVMCI JDK corresponding to 'build' (or '_vmbuild'), creating it |
917b3ad10c32
renamed 'installJars' parameter of get_jvmci_jdk to 'deployDists'
Doug Simon <doug.simon@oracle.com>
parents:
22479
diff
changeset
|
546 first if it does not exist and 'create' is True. If the JDK was created or |
917b3ad10c32
renamed 'installJars' parameter of get_jvmci_jdk to 'deployDists'
Doug Simon <doug.simon@oracle.com>
parents:
22479
diff
changeset
|
547 'deployDists' is True, then the JDK deployable distributions are deployed into |
917b3ad10c32
renamed 'installJars' parameter of get_jvmci_jdk to 'deployDists'
Doug Simon <doug.simon@oracle.com>
parents:
22479
diff
changeset
|
548 the JDK. |
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
|
549 """ |
17055
3e4d3be0b6bf
mx: fix default handling of vm config and build type
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
17052
diff
changeset
|
550 if not build: |
22019
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
551 build = _vmbuild |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
552 jdkDir = join(_jdksDir(), build) |
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
|
553 if create: |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
554 srcJdk = get_jvmci_bootstrap_jdk().home |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
555 if not exists(jdkDir): |
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
556 mx.log('Creating ' + jdkDir + ' from ' + srcJdk) |
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
557 shutil.copytree(srcJdk, jdkDir) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
558 |
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
|
559 # 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
|
560 # reliably used as the bootstrap for a HotSpot build. |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
561 jvmCfg = getVmCfgInJdk(jdkDir) |
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
|
562 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
|
563 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
|
564 |
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
|
565 defaultVM = None |
8647
5f8299106dd9
A server0 "build" needs to create a jdk copy if it does not exist yet
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8646
diff
changeset
|
566 jvmCfgLines = [] |
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
|
567 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
|
568 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
|
569 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
|
570 parts = line.split() |
12540
0aa37fd2f33e
mx: fix detection for sparc. ignore unparsable lines in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12497
diff
changeset
|
571 if len(parts) == 2: |
0aa37fd2f33e
mx: fix detection for sparc. ignore unparsable lines in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12497
diff
changeset
|
572 assert parts[1] == 'KNOWN', parts[1] |
0aa37fd2f33e
mx: fix detection for sparc. ignore unparsable lines in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12497
diff
changeset
|
573 defaultVM = parts[0][1:] |
0aa37fd2f33e
mx: fix detection for sparc. ignore unparsable lines in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12497
diff
changeset
|
574 jvmCfgLines += ['# default VM is a copy of the unmodified ' + defaultVM + ' VM\n'] |
0aa37fd2f33e
mx: fix detection for sparc. ignore unparsable lines in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12497
diff
changeset
|
575 jvmCfgLines += ['-original KNOWN\n'] |
0aa37fd2f33e
mx: fix detection for sparc. ignore unparsable lines in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12497
diff
changeset
|
576 else: |
0aa37fd2f33e
mx: fix detection for sparc. ignore unparsable lines in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12497
diff
changeset
|
577 # skip lines which we cannot parse (e.g. '-hotspot ALIASED_TO -client') |
12583
110c3faa57e9
mx: print warning if encounter a non-parsable line in jvm.cfg
Bernhard Urban <bernhard.urban@jku.at>
parents:
12540
diff
changeset
|
578 mx.log("WARNING: skipping not parsable line \"" + line + "\"") |
8647
5f8299106dd9
A server0 "build" needs to create a jdk copy if it does not exist yet
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8646
diff
changeset
|
579 else: |
5f8299106dd9
A server0 "build" needs to create a jdk copy if it does not exist yet
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8646
diff
changeset
|
580 jvmCfgLines += [line] |
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
|
581 |
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
|
582 assert defaultVM is not None, 'Could not find default VM in ' + jvmCfg |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
583 chmodRecursive(jdkDir, JDK_UNIX_PERMISSIONS_DIR) |
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
584 shutil.move(join(vmLibDirInJdk(jdkDir), defaultVM), join(vmLibDirInJdk(jdkDir), 'original')) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
585 |
18733
d7ec30ebb0f2
Properly chmod files modified when creating JDK image
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
18714
diff
changeset
|
586 if mx.get_os() != 'windows': |
d7ec30ebb0f2
Properly chmod files modified when creating JDK image
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
18714
diff
changeset
|
587 os.chmod(jvmCfg, JDK_UNIX_PERMISSIONS_FILE) |
8261
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
588 with open(jvmCfg, 'w') as fp: |
8647
5f8299106dd9
A server0 "build" needs to create a jdk copy if it does not exist yet
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8646
diff
changeset
|
589 for line in jvmCfgLines: |
5f8299106dd9
A server0 "build" needs to create a jdk copy if it does not exist yet
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8646
diff
changeset
|
590 fp.write(line) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
591 |
5596
e4b1bc5e29e0
hsdis library is downloaded into newly created Graal JDK
Doug Simon <doug.simon@oracle.com>
parents:
5517
diff
changeset
|
592 # 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
|
593 try: |
23352
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
594 hsdis_args = [] |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
595 syntax = mx.get_env('HSDIS_SYNTAX') |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
596 if syntax: |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
597 hsdis_args = [syntax] |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
598 hsdis(hsdis_args, copyToDir=vmLibDirInJdk(jdkDir)) |
5596
e4b1bc5e29e0
hsdis library is downloaded into newly created Graal JDK
Doug Simon <doug.simon@oracle.com>
parents:
5517
diff
changeset
|
599 except SystemExit: |
e4b1bc5e29e0
hsdis library is downloaded into newly created Graal JDK
Doug Simon <doug.simon@oracle.com>
parents:
5517
diff
changeset
|
600 pass |
3718 | 601 else: |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
602 if not exists(jdkDir): |
11797
65dbed1fdf46
be verbose when the JDK specified by --installed-jdks is missing
Doug Simon <doug.simon@oracle.com>
parents:
11784
diff
changeset
|
603 if _installed_jdks: |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
604 mx.log("The selected JDK directory does not (yet) exist: " + jdkDir) |
17055
3e4d3be0b6bf
mx: fix default handling of vm config and build type
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
17052
diff
changeset
|
605 _handle_missing_VM(build, vmToCheck) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
606 |
22491
917b3ad10c32
renamed 'installJars' parameter of get_jvmci_jdk to 'deployDists'
Doug Simon <doug.simon@oracle.com>
parents:
22479
diff
changeset
|
607 if deployDists: |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
608 for jdkDist in jdkDeployedDists: |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
609 dist = jdkDist.dist() |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
610 if exists(dist.path): |
21031
e1c063565b3c
Graal Services: use services files in jre/lib/graal/services
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
20996
diff
changeset
|
611 _installDistInJdks(jdkDist) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
612 |
22693
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
613 # patch 'release' file (append jvmci revision) |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
614 releaseFile = join(jdkDir, 'release') |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
615 if exists(releaseFile): |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
616 releaseFileLines = [] |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
617 with open(releaseFile) as f: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
618 for line in f: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
619 releaseFileLines.append(line) |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
620 |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
621 if mx.get_os() != 'windows': |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
622 os.chmod(releaseFile, JDK_UNIX_PERMISSIONS_FILE) |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
623 with open(releaseFile, 'w') as fp: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
624 for line in releaseFileLines: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
625 timmedLine = line.strip() |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
626 if timmedLine.startswith('SOURCE="') and timmedLine.endswith('"'): |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
627 try: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
628 versions = OrderedDict() |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
629 for p in timmedLine[len('SOURCE="'):-len('"')].split(' '): |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
630 if p: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
631 idx = p.index(':') |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
632 versions[p[:idx]] = p[idx+1:] |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
633 if _suite.vc: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
634 versions['jvmci'] = _suite.vc.parent(_suite.dir)[:12] |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
635 else: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
636 versions['jvmci'] = "unknown" |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
637 if 'hotspot' in versions: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
638 del versions['hotspot'] |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
639 fp.write('SOURCE=" ' + ' '.join((k + ":" + v for k, v in versions.iteritems())) + '"' + os.linesep) |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
640 mx.logv("Updating " + releaseFile) |
23286
dd9cc155639c
Merge with jdk8u66-b17
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22777
diff
changeset
|
641 except BaseException as e: |
23379
24505bf61633
allow JVMCI compiler to change the compilation policy for a method (JDK-8152311)
Doug Simon <doug.simon@oracle.com>
parents:
23352
diff
changeset
|
642 mx.warn("Exception " + str(e) + " while updating release file") |
22693
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
643 fp.write(line) |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
644 else: |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
645 fp.write(line) |
af01df1b8f0d
Fix release file patching
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22680
diff
changeset
|
646 |
8261
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
647 if vmToCheck is not None: |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
648 jvmCfg = getVmCfgInJdk(jdkDir) |
8261
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
649 found = False |
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
650 with open(jvmCfg) as f: |
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
651 for line in f: |
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
652 if line.strip() == '-' + vmToCheck + ' KNOWN': |
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
653 found = True |
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
654 break |
2237260c6fdb
the contents of jvm.cfg are reset when copying the JDK so that the non-default VMs must be built before being run
Doug Simon <doug.simon@oracle.com>
parents:
8223
diff
changeset
|
655 if not found: |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
656 _handle_missing_VM(build, vmToCheck) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
657 |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
658 return jdkDir |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
659 |
22141
f85b80b29176
removed '_' prefix from exported methods and fields and provided accessors
Doug Simon <doug.simon@oracle.com>
parents:
22140
diff
changeset
|
660 def copyToJdk(src, dst, permissions=JDK_UNIX_PERMISSIONS_FILE): |
16782
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
661 name = os.path.basename(src) |
22716
f536aaa5a5d5
Use mx.ensure_dir_exists rather than os.makedirs to avoid races
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22707
diff
changeset
|
662 mx.ensure_dir_exists(dst) |
16782
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
663 dstLib = join(dst, name) |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
664 if mx.get_env('SYMLINK_GRAAL_JAR', None) == 'true': |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
665 # Using symlinks is much faster than copying but may |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
666 # cause issues if the lib is being updated while |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
667 # the VM is running. |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
668 if not os.path.islink(dstLib) or not os.path.realpath(dstLib) == src: |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
669 if exists(dstLib): |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
670 os.remove(dstLib) |
16858
a8af2abc2039
fixed regression in mx causing problems for the SYMLINK_GRAAL_JAR feature
Doug Simon <doug.simon@oracle.com>
parents:
16782
diff
changeset
|
671 os.symlink(src, dstLib) |
16782
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
672 else: |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
673 # do a copy and then a move to get atomic updating (on Unix) |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
674 fd, tmp = tempfile.mkstemp(suffix='', prefix=name, dir=dst) |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
675 shutil.copyfile(src, tmp) |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
676 os.close(fd) |
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
677 shutil.move(tmp, dstLib) |
16863
0d2e3399acfe
mx: add argument for permissions to copyToJdk()
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16862
diff
changeset
|
678 os.chmod(dstLib, permissions) |
16782
9f5e33cf8d52
Factored out the '_copyToJdk' function and allow copying files to jre/lib/ext.
Danilo Ansaloni <danilo.ansaloni@oracle.com>
parents:
16729
diff
changeset
|
679 |
22400
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
680 def _extractJVMCIFiles(jdkJars, jvmciJars, servicesDir, obsoleteCheck): |
22079
59b0fd9e6b27
instead of cleaning jvmci/services and jvmci/options directories in a JDK, look for stale entries and offer to delete them if mx is running interactively
Doug Simon <doug.simon@oracle.com>
parents:
22077
diff
changeset
|
681 |
22716
f536aaa5a5d5
Use mx.ensure_dir_exists rather than os.makedirs to avoid races
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22707
diff
changeset
|
682 oldServices = os.listdir(servicesDir) if exists(servicesDir) else mx.ensure_dir_exists(servicesDir) |
22079
59b0fd9e6b27
instead of cleaning jvmci/services and jvmci/options directories in a JDK, look for stale entries and offer to delete them if mx is running interactively
Doug Simon <doug.simon@oracle.com>
parents:
22077
diff
changeset
|
683 |
21937
3a292e8b9e51
replaced Service marker interface with non-standard META-INF directory names to differentiate JVMCI providers from standard service providers
Doug Simon <doug.simon@oracle.com>
parents:
21936
diff
changeset
|
684 jvmciServices = {} |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
685 for jar in jvmciJars: |
21070
2ee48d02afe3
mx: Merge graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21059
diff
changeset
|
686 if os.path.isfile(jar): |
2ee48d02afe3
mx: Merge graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21059
diff
changeset
|
687 with zipfile.ZipFile(jar) as zf: |
2ee48d02afe3
mx: Merge graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21059
diff
changeset
|
688 for member in zf.namelist(): |
22079
59b0fd9e6b27
instead of cleaning jvmci/services and jvmci/options directories in a JDK, look for stale entries and offer to delete them if mx is running interactively
Doug Simon <doug.simon@oracle.com>
parents:
22077
diff
changeset
|
689 if member.startswith('META-INF/jvmci.services/') and member != 'META-INF/jvmci.services/': |
21937
3a292e8b9e51
replaced Service marker interface with non-standard META-INF directory names to differentiate JVMCI providers from standard service providers
Doug Simon <doug.simon@oracle.com>
parents:
21936
diff
changeset
|
690 service = basename(member) |
22079
59b0fd9e6b27
instead of cleaning jvmci/services and jvmci/options directories in a JDK, look for stale entries and offer to delete them if mx is running interactively
Doug Simon <doug.simon@oracle.com>
parents:
22077
diff
changeset
|
691 assert service != "", member |
21518
c2e58b2a2a76
Extract options file to build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21514
diff
changeset
|
692 with zf.open(member) as serviceFile: |
21937
3a292e8b9e51
replaced Service marker interface with non-standard META-INF directory names to differentiate JVMCI providers from standard service providers
Doug Simon <doug.simon@oracle.com>
parents:
21936
diff
changeset
|
693 providers = jvmciServices.setdefault(service, []) |
21518
c2e58b2a2a76
Extract options file to build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21514
diff
changeset
|
694 for line in serviceFile.readlines(): |
c2e58b2a2a76
Extract options file to build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21514
diff
changeset
|
695 line = line.strip() |
22173
1a7f71d13b6e
avoid duplicate declarations of JVMCI service providers
Doug Simon <doug.simon@oracle.com>
parents:
22171
diff
changeset
|
696 if line and line not in providers: |
21937
3a292e8b9e51
replaced Service marker interface with non-standard META-INF directory names to differentiate JVMCI providers from standard service providers
Doug Simon <doug.simon@oracle.com>
parents:
21936
diff
changeset
|
697 providers.append(line) |
3a292e8b9e51
replaced Service marker interface with non-standard META-INF directory names to differentiate JVMCI providers from standard service providers
Doug Simon <doug.simon@oracle.com>
parents:
21936
diff
changeset
|
698 for service, providers in jvmciServices.iteritems(): |
22140
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
699 if not obsoleteCheck: |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
700 fd, tmp = tempfile.mkstemp(prefix=service) |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
701 f = os.fdopen(fd, 'w+') |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
702 for provider in providers: |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
703 f.write(provider + os.linesep) |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
704 target = join(servicesDir, service) |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
705 f.close() |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
706 shutil.move(tmp, target) |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
707 if mx.get_os() != 'windows': |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
708 os.chmod(target, JDK_UNIX_PERMISSIONS_FILE) |
22079
59b0fd9e6b27
instead of cleaning jvmci/services and jvmci/options directories in a JDK, look for stale entries and offer to delete them if mx is running interactively
Doug Simon <doug.simon@oracle.com>
parents:
22077
diff
changeset
|
709 if oldServices and service in oldServices: |
59b0fd9e6b27
instead of cleaning jvmci/services and jvmci/options directories in a JDK, look for stale entries and offer to delete them if mx is running interactively
Doug Simon <doug.simon@oracle.com>
parents:
22077
diff
changeset
|
710 oldServices.remove(service) |
21562 | 711 |
22400
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
712 if obsoleteCheck and mx.is_interactive() and oldServices: |
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
713 if mx.ask_yes_no('These files in ' + servicesDir + ' look obsolete:\n ' + '\n '.join(oldServices) + '\nDelete them', 'n'): |
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
714 for f in oldServices: |
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
715 path = join(servicesDir, f) |
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
716 os.remove(path) |
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
717 mx.log('Deleted ' + path) |
22079
59b0fd9e6b27
instead of cleaning jvmci/services and jvmci/options directories in a JDK, look for stale entries and offer to delete them if mx is running interactively
Doug Simon <doug.simon@oracle.com>
parents:
22077
diff
changeset
|
718 |
22140
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
719 def _updateJVMCIFiles(jdkDir, obsoleteCheck=False): |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
720 jreJVMCIDir = join(jdkDir, 'jre', 'lib', 'jvmci') |
21607
71b338926f2e
moved JVMCI classes into their own distributions (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21604
diff
changeset
|
721 jvmciJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.endswith('.jar')] |
21671
8d0c2aabfc2d
missed Graal -> JVMCI renamings
Doug Simon <doug.simon@oracle.com>
parents:
21642
diff
changeset
|
722 jreJVMCIServicesDir = join(jreJVMCIDir, 'services') |
22400
b876144b52f3
moved JVMCI option parsing back into Java (missing bits)
Doug Simon <doug.simon@oracle.com>
parents:
22398
diff
changeset
|
723 _extractJVMCIFiles(_getJdkDeployedJars(jdkDir), jvmciJars, jreJVMCIServicesDir, obsoleteCheck) |
21070
2ee48d02afe3
mx: Merge graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21059
diff
changeset
|
724 |
22429
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
725 def _updateJVMCIProperties(jdkDir, compilers): |
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
726 jvmciProperties = join(jdkDir, 'jre', 'lib', 'jvmci', 'jvmci.properties') |
22530
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
727 def createFile(lines): |
22429
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
728 with open(jvmciProperties, 'w') as fp: |
22530
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
729 header = "# the last definition of a property wins (i.e., it overwrites any earlier definitions)" |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
730 if header not in lines: |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
731 print >> fp, header |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
732 for line in lines: |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
733 print >> fp, line |
22438
dfd506f2ed61
Add comment to jvmci.properties file.
Roland Schatz <roland.schatz@oracle.com>
parents:
22436
diff
changeset
|
734 |
22530
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
735 lines = [] |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
736 if exists(jvmciProperties): |
22429
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
737 with open(jvmciProperties) as fp: |
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
738 for line in fp: |
23319
c1935b089c01
8151470: [JVMCI] remove up-call to HotSpotJVMCICompilerConfig.selectCompiler
Roland Schatz <roland.schatz@oracle.com>
parents:
23311
diff
changeset
|
739 if line.startswith('jvmci.Compiler='): |
22530
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
740 compiler = line.strip().split('=')[1] |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
741 if compiler not in compilers: |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
742 lines.append(line.strip()) |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
743 else: |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
744 lines.append(line.strip()) |
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
745 for compiler in compilers: |
23319
c1935b089c01
8151470: [JVMCI] remove up-call to HotSpotJVMCICompilerConfig.selectCompiler
Roland Schatz <roland.schatz@oracle.com>
parents:
23311
diff
changeset
|
746 lines.append("jvmci.Compiler=" + compiler) |
22530
cbab86a6c7f6
make processing of <jre>/lib/jvmci/*.properties file like other Java *.properties files in that the last definition of any propery "wins"
Doug Simon <doug.simon@oracle.com>
parents:
22520
diff
changeset
|
747 createFile(lines) |
22429
a1b0a76567c7
Select default compiler from jvmci.compiler system property.
Roland Schatz <roland.schatz@oracle.com>
parents:
22427
diff
changeset
|
748 |
21031
e1c063565b3c
Graal Services: use services files in jre/lib/graal/services
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
20996
diff
changeset
|
749 def _installDistInJdks(deployableDist): |
16623
addc0564e5b5
split com.oracle.graal.truffle.* projects into a separate graal-truffle.jar and added truffle.jar to the boot class path
Doug Simon <doug.simon@oracle.com>
parents:
16622
diff
changeset
|
750 """ |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
751 Installs the jar(s) for a given Distribution into all existing JVMCI JDKs |
16623
addc0564e5b5
split com.oracle.graal.truffle.* projects into a separate graal-truffle.jar and added truffle.jar to the boot class path
Doug Simon <doug.simon@oracle.com>
parents:
16622
diff
changeset
|
752 """ |
10574
0cad5096735e
commands.py: Make sure _jdk returns an absolute path. Use _jdk and _jdksDir where necessary
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10570
diff
changeset
|
753 jdks = _jdksDir() |
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
|
754 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
|
755 for e in os.listdir(jdks): |
21070
2ee48d02afe3
mx: Merge graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21059
diff
changeset
|
756 jdkDir = join(jdks, e) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
757 deployableDist.deploy(jdkDir) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
758 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
759 def _vmbuildFromJdkDir(jdkDir): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
760 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
761 Determines the VM build corresponding to 'jdkDir'. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
762 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
763 jdksDir = _jdksDir() |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
764 assert jdkDir.startswith(jdksDir) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
765 vmbuild = os.path.relpath(jdkDir, jdksDir) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
766 assert vmbuild in _vmbuildChoices, 'The vmbuild derived from ' + jdkDir + ' is unknown: ' + vmbuild |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
767 return vmbuild |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
768 |
22140
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
769 def _check_for_obsolete_jvmci_files(): |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
770 jdks = _jdksDir() |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
771 if exists(jdks): |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
772 for e in os.listdir(jdks): |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
773 jdkDir = join(jdks, e) |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
774 _updateJVMCIFiles(jdkDir, obsoleteCheck=True) |
60d9e50d5481
only perform check for obsolete JVMCI files during full build
Doug Simon <doug.simon@oracle.com>
parents:
22139
diff
changeset
|
775 |
21613
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
776 def _getJdkDeployedJars(jdkDir): |
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
777 """ |
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
778 Gets jar paths for all deployed distributions in the context of |
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
779 a given JDK directory. |
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
780 """ |
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
781 jars = [] |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
782 for dist in jdkDeployedDists: |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
783 if not isinstance(dist, JarJDKDeployedDist): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
784 continue |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
785 jar = basename(dist.dist().path) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
786 jars.append(join(dist.targetDir(), jar)) |
21613
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
787 return jars |
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
788 |
60154926b513
replaced use of javap with a small Java utility for refining service class list to only those implementing com.oracle.jvmci.service.Service
Doug Simon <doug.simon@oracle.com>
parents:
21607
diff
changeset
|
789 |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
790 # run a command in the windows SDK Debug Shell |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
791 def _runInDebugShell(cmd, workingDir, logFile=None, findInOutput=None, respondTo=None): |
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
792 if respondTo is None: |
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
793 respondTo = {} |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
794 newLine = os.linesep |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
795 startToken = 'RUNINDEBUGSHELL_STARTSEQUENCE' |
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
796 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
|
797 |
4252
67e88b7624d5
Removed need for GRAAL environment variable on Windows.
Doug Simon <doug.simon@oracle.com>
parents:
4247
diff
changeset
|
798 winSDK = mx.get_env('WIN_SDK', 'C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\') |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
799 |
17262
b641450c19ce
mx: rename helper functions for cygwin support and update comments
Bernhard Urban <bernhard.urban@jku.at>
parents:
17233
diff
changeset
|
800 if not exists(mx._cygpathW2U(winSDK)): |
6306
2a819543cc45
Warnings for windows build if there is no SDK
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6294
diff
changeset
|
801 mx.abort("Could not find Windows SDK : '" + winSDK + "' does not exist") |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
802 |
17262
b641450c19ce
mx: rename helper functions for cygwin support and update comments
Bernhard Urban <bernhard.urban@jku.at>
parents:
17233
diff
changeset
|
803 winSDKSetEnv = mx._cygpathW2U(join(winSDK, 'Bin', 'SetEnv.cmd')) |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
804 if not exists(winSDKSetEnv): |
6306
2a819543cc45
Warnings for windows build if there is no SDK
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6294
diff
changeset
|
805 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
|
806 |
17262
b641450c19ce
mx: rename helper functions for cygwin support and update comments
Bernhard Urban <bernhard.urban@jku.at>
parents:
17233
diff
changeset
|
807 wincmd = 'cmd.exe /E:ON /V:ON /K "' + mx._cygpathU2W(winSDKSetEnv) + '"' |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
808 p = subprocess.Popen(wincmd, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
4269
ffd5ce8fc736
Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents:
4257
diff
changeset
|
809 stdout = p.stdout |
ffd5ce8fc736
Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents:
4257
diff
changeset
|
810 stdin = p.stdin |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
811 if logFile: |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
812 log = open(logFile, 'w') |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
813 ret = False |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
814 |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
815 def _writeProcess(s): |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
816 stdin.write(s + newLine) |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
817 |
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
818 _writeProcess("echo " + startToken) |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
819 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
|
820 # 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
|
821 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
|
822 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
|
823 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
|
824 encoding = sys.stdout.encoding |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
825 |
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
|
826 line = stdout.readline().decode(encoding) |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
827 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
|
828 log.write(line.encode('utf-8')) |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
829 line = line.strip() |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
830 mx.log(line) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
831 if line == startToken: |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
832 _writeProcess('cd /D ' + workingDir + ' & ' + cmd + ' & echo ' + endToken) |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
833 for regex in respondTo.keys(): |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
834 match = regex.search(line) |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
835 if match: |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
836 _writeProcess(respondTo[regex]) |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
837 if findInOutput: |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
838 match = findInOutput.search(line) |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
839 if match: |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
840 ret = True |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
841 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
|
842 if not findInOutput: |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
843 _writeProcess('echo ERRXXX%errorlevel%') |
5680
87fc13b59258
Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
5649
diff
changeset
|
844 else: |
87fc13b59258
Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
5649
diff
changeset
|
845 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
|
846 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
|
847 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
|
848 ret = True |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
849 break |
17233
a02c295218aa
mx: add support for cygwin
Bernhard Urban <bernhard.urban@jku.at>
parents:
17055
diff
changeset
|
850 _writeProcess("exit") |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
851 if logFile: |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
852 log.close() |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4163
diff
changeset
|
853 return ret |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
854 |
11605
3676540f71cf
Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents:
11534
diff
changeset
|
855 def jdkhome(vm=None): |
3676540f71cf
Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents:
11534
diff
changeset
|
856 """return the JDK directory selected for the 'vm' command""" |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
857 return get_jvmci_jdk_dir(deployDists=False) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
858 |
11605
3676540f71cf
Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents:
11534
diff
changeset
|
859 def print_jdkhome(args, vm=None): |
3676540f71cf
Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents:
11534
diff
changeset
|
860 """print the JDK directory selected for the 'vm' command""" |
3676540f71cf
Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents:
11534
diff
changeset
|
861 print jdkhome(vm) |
5103
276e14614531
Added jdkhome command to mx.
Doug Simon <doug.simon@oracle.com>
parents:
5094
diff
changeset
|
862 |
9116
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
863 def buildvars(args): |
11377
0fbc1e418c88
fixed capitalization and tense in documentation of some mx commands
Doug Simon <doug.simon@oracle.com>
parents:
11373
diff
changeset
|
864 """describe the variables that can be set by the -D option to the 'mx build' commmand""" |
9116
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
865 |
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
866 buildVars = { |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
867 'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + get_jvmci_bootstrap_jdk().home + ')', |
9116
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
868 'ALT_OUTPUTDIR' : 'Build directory', |
18876
c446d00f2cdf
mx: added support for Jython 2.7b3 and made ordering in generated files more deterministic\nContributed-by: Igor Ignatyev <igor.ignatyev@oracle.com>
Doug Simon <doug.simon@oracle.com>
parents:
18869
diff
changeset
|
869 'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(mx.cpu_count()) + ')', |
9116
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
870 'INSTALL' : 'Install the built VM into the JDK? (default: y)', |
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
871 'ZIP_DEBUGINFO_FILES' : 'Install zipped debug symbols file? (default: 0)', |
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
872 } |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
873 |
9116
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
874 mx.log('HotSpot build variables that can be set by the -D option to "mx build":') |
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
875 mx.log('') |
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
876 for n in sorted(buildVars.iterkeys()): |
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
877 mx.log(n) |
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
878 mx.log(textwrap.fill(buildVars[n], initial_indent=' ', subsequent_indent=' ', width=200)) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
879 |
9120
9f361c0f912b
added note about mx/env to the output of 'mx buildvars'
Doug Simon <doug.simon@oracle.com>
parents:
9119
diff
changeset
|
880 mx.log('') |
22018
11ed27b2abe8
remove hard-coded use of 'mx' to refer to the mxDir for the graal suite
Doug Simon <doug.simon@oracle.com>
parents:
22017
diff
changeset
|
881 mx.log('Note that these variables can be given persistent values in the file ' + join(_suite.mxDir, 'env') + ' (see \'mx about\').') |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
882 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
883 def _hotspotReplaceResultsVar(m): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
884 var = m.group(1) |
22283
65eb572cbcb7
extended JVM_<vmbuild>_<vm> template distribution with MacOS support
Doug Simon <doug.simon@oracle.com>
parents:
22282
diff
changeset
|
885 if var == 'os': |
22332
4dfa1275ffa3
Fix alt outputdir for -nojvmci builds
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22331
diff
changeset
|
886 return _hotspotOs(mx.get_os()) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
887 if var == 'nojvmci': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
888 if get_vm().endswith('nojvmci'): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
889 return '-nojvmci' |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
890 return '' |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
891 if var == 'buildname': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
892 return _hotspotGetVariant() |
22284
09acb1bc3a56
make hotspot native project's results parameterized on <vmbuild>
Doug Simon <doug.simon@oracle.com>
parents:
22283
diff
changeset
|
893 if var == 'vmbuild': |
09acb1bc3a56
make hotspot native project's results parameterized on <vmbuild>
Doug Simon <doug.simon@oracle.com>
parents:
22283
diff
changeset
|
894 return _vmbuild |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
895 return mx._replaceResultsVar(m) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
896 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
897 class HotSpotProject(mx.NativeProject): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
898 def __init__(self, suite, name, deps, workingSets, results, output, **args): |
22436
5bf761306682
Don't create empty jvmci/src/{s,r,c} directories in mx.
Roland Schatz <roland.schatz@oracle.com>
parents:
22429
diff
changeset
|
899 mx.NativeProject.__init__(self, suite, name, "", [], deps, workingSets, results, output, join(suite.dir, "src")) # TODO... |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
900 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
901 def getOutput(self, replaceVar=_hotspotReplaceResultsVar): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
902 return mx.NativeProject.getOutput(self, replaceVar=replaceVar) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
903 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
904 def getResults(self, replaceVar=_hotspotReplaceResultsVar): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
905 return mx.NativeProject.getResults(self, replaceVar=replaceVar) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
906 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
907 def getBuildTask(self, args): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
908 return HotSpotBuildTask(self, args, _vmbuild, get_vm()) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
909 |
22332
4dfa1275ffa3
Fix alt outputdir for -nojvmci builds
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22331
diff
changeset
|
910 def _hotspotOs(mx_os): |
4dfa1275ffa3
Fix alt outputdir for -nojvmci builds
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22331
diff
changeset
|
911 if mx_os == 'darwin': |
4dfa1275ffa3
Fix alt outputdir for -nojvmci builds
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22331
diff
changeset
|
912 return 'bsd' |
4dfa1275ffa3
Fix alt outputdir for -nojvmci builds
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22331
diff
changeset
|
913 return mx_os |
4dfa1275ffa3
Fix alt outputdir for -nojvmci builds
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22331
diff
changeset
|
914 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
915 def _hotspotGetVariant(vm=None): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
916 if not vm: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
917 vm = get_vm() |
22328
3a95164b033c
Fix nojvmci builds.
Roland Schatz <roland.schatz@oracle.com>
parents:
22327
diff
changeset
|
918 variant = {'client': 'compiler1', 'server': 'compiler2', 'client-nojvmci': 'compiler1', 'server-nojvmci': 'compiler2'}.get(vm, vm) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
919 return variant |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
920 |
23311
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
921 """ |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
922 Represents a JDK HotSpot version derived from a build tag such as "jdk8u66-b16". |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
923 """ |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
924 class JDKHotSpotVersion: |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
925 def __init__(self, javaCompliance, update, build): |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
926 self.javaCompliance = javaCompliance |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
927 self.update = update |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
928 self.build = build |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
929 |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
930 @staticmethod |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
931 def parse_tag(tag): |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
932 m = re.match(r'jdk8u(\d+)-b(\d+)', tag) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
933 assert m, 'unrecognized jdk8 build tag: ' + tag |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
934 return JDKHotSpotVersion(mx.JavaCompliance('8'), m.group(1), m.group(2)) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
935 |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
936 def __str__(self): |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
937 return '{}_{}_{}'.format(self.javaCompliance.value, self.update, self.build) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
938 |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
939 def __cmp__(self, other): |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
940 assert isinstance(other, JDKHotSpotVersion), 'cannot compare a JDKHotSpotVersion object with ' + type(other) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
941 return cmp(str(self), str(other)) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
942 |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
943 def get_jvmci_hotspot_version(): |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
944 """ |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
945 Gets the upstream HotSpot version JVMCI is based on. |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
946 """ |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
947 vc = mx.VC.get_vc(_suite.dir, abortOnError=False) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
948 assert vc, 'expected jvmci-8 to be version controlled' |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
949 assert isinstance(vc, mx.HgConfig), 'expected jvmci-8 VC to be Mercurial, not ' + vc.proper_name |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
950 lines = vc.hg_command(_suite.dir, ['log', '-r', 'keyword("Added tag jdk8u")', '--template', '{desc}\\n'], quiet=True).strip().split('\n') |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
951 assert lines, 'no hg commits found that match "Added tag jdk8u..."' |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
952 versions = [line.split()[2] for line in lines] |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
953 return JDKHotSpotVersion.parse_tag(sorted(versions)[-1]) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
954 |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
955 def get_jdk_hotspot_version(tag=mx.DEFAULT_JDK_TAG): |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
956 """ |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
957 Gets the HotSpot version in the JDK selected by `tag`. |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
958 """ |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
959 jdk = mx.get_jdk(tag=tag) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
960 output = subprocess.check_output([jdk.java, '-version'], stderr=subprocess.STDOUT) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
961 m = re.search(r'Java\(TM\) SE Runtime Environment \(build 1.8.0_(\d+)-b(\d+)\)', output) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
962 return JDKHotSpotVersion(jdk.javaCompliance, m.group(1), m.group(2)) |
54b4e75c6088
added get_jvmci_hotspot_version and get_jdk_hotspot_version to respectively query the HotSpot version JVMCI is based on and the version in the bootstrap JDK
Doug Simon <doug.simon@oracle.com>
parents:
23308
diff
changeset
|
963 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
964 class HotSpotBuildTask(mx.NativeBuildTask): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
965 def __init__(self, project, args, vmbuild, vm): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
966 mx.NativeBuildTask.__init__(self, args, project) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
967 self.vm = vm |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
968 self.vmbuild = vmbuild |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
969 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
970 def __str__(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
971 return 'Building HotSpot[{}, {}]'.format(self.vmbuild, self.vm) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
972 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
973 def build(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
974 isWindows = platform.system() == 'Windows' or "CYGWIN" in platform.system() |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
975 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
976 if self.vm.startswith('server'): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
977 buildSuffix = '' |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
978 else: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
979 assert self.vm.startswith('client'), self.vm |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
980 buildSuffix = '1' |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
981 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
982 if isWindows: |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
983 t_compilelogfile = mx._cygpathU2W(os.path.join(_suite.dir, "jvmciCompile.log")) |
22335
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
984 mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin') |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
985 |
22335
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
986 variant = _hotspotGetVariant(self.vm) |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
987 project_config = variant + '_' + self.vmbuild |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
988 jvmciHome = mx._cygpathU2W(_suite.dir) |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
989 _runInDebugShell('msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcproj /p:Configuration=' + project_config + ' /target:clean', jvmciHome) |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
990 winCompileCmd = r'set HotSpotMksHome=' + mksHome + r'& set JAVA_HOME=' + mx._cygpathU2W(get_jvmci_bootstrap_jdk().home) + r'& set path=%JAVA_HOME%\bin;%path%;%HotSpotMksHome%& cd /D "' + jvmciHome + r'\make\windows"& call create.bat ' + jvmciHome |
22335
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
991 print winCompileCmd |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
992 winCompileSuccess = re.compile(r"^Writing \.vcxproj file:") |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
993 if not _runInDebugShell(winCompileCmd, jvmciHome, t_compilelogfile, winCompileSuccess): |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
994 mx.abort('Error executing create command') |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
995 winBuildCmd = 'msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64' |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
996 if not _runInDebugShell(winBuildCmd, jvmciHome, t_compilelogfile): |
8217ef77a80a
Work on Windows build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22334
diff
changeset
|
997 mx.abort('Error building project') |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
998 else: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
999 def filterXusage(line): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1000 if not 'Xusage.txt' in line: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1001 sys.stderr.write(line + os.linesep) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1002 cpus = self.parallelism |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1003 makeDir = join(_suite.dir, 'make') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1004 runCmd = [mx.gmake_cmd(), '-C', makeDir] |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1005 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1006 env = os.environ.copy() |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1007 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1008 # These must be passed as environment variables |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1009 env.setdefault('LANG', 'C') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1010 #env['JAVA_HOME'] = jdk |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1011 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1012 def setMakeVar(name, default, env=None): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1013 """Sets a make variable on the command line to the value |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1014 of the variable in 'env' with the same name if defined |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1015 and 'env' is not None otherwise to 'default' |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1016 """ |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1017 runCmd.append(name + '=' + (env.get(name, default) if env else default)) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1018 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1019 if self.args.D: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1020 for nv in self.args.D: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1021 name, value = nv.split('=', 1) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1022 setMakeVar(name.strip(), value) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1023 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1024 setMakeVar('ARCH_DATA_MODEL', '64', env=env) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1025 setMakeVar('HOTSPOT_BUILD_JOBS', str(cpus), env=env) |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1026 setMakeVar('ALT_BOOTDIR', get_jvmci_bootstrap_jdk().home, env=env) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1027 # setMakeVar("EXPORT_PATH", jdk) |
22627
e778e9aaed23
Add support for SPARC/Linux
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22616
diff
changeset
|
1028 if mx.get_os() == 'linux' and platform.processor() == 'sparc64': |
e778e9aaed23
Add support for SPARC/Linux
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22616
diff
changeset
|
1029 # SPARC/Linux |
e778e9aaed23
Add support for SPARC/Linux
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22616
diff
changeset
|
1030 setMakeVar("DEBUG_BINARIES", "true", env=env) |
23301
93caf66f5604
Disable GCCs ipa-cp-clone predictive-commoning on SPARC/Linux
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
23298
diff
changeset
|
1031 setMakeVar("EXTRA_CFLAGS", "-Wno-conversion-null -Wno-int-to-pointer-cast -Wno-unused-function -fno-tree-loop-distribute-patterns -fno-schedule-insns -fno-tree-ccp -fno-ipa-cp-clone -fno-predictive-commoning", env=env) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1032 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1033 setMakeVar('MAKE_VERBOSE', 'y' if mx._opts.verbose else '') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1034 if self.vm.endswith('nojvmci'): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1035 setMakeVar('INCLUDE_JVMCI', 'false') |
22332
4dfa1275ffa3
Fix alt outputdir for -nojvmci builds
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22331
diff
changeset
|
1036 setMakeVar('ALT_OUTPUTDIR', join(_suite.dir, 'build-nojvmci', _hotspotOs(mx.get_os())), env=env) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1037 else: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1038 version = _suite.release_version() |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1039 setMakeVar('USER_RELEASE_SUFFIX', 'jvmci-' + version) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1040 setMakeVar('INCLUDE_JVMCI', 'true') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1041 # setMakeVar('INSTALL', 'y', env=env) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1042 if mx.get_os() == 'darwin' and platform.mac_ver()[0] != '': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1043 # Force use of clang on MacOS |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1044 setMakeVar('USE_CLANG', 'true') |
22395
63e7eb179710
Set COMPILER_WARNINGS_FATAL=false during HotSpot build on MacOS
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22335
diff
changeset
|
1045 setMakeVar('COMPILER_WARNINGS_FATAL', 'false') |
63e7eb179710
Set COMPILER_WARNINGS_FATAL=false during HotSpot build on MacOS
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22335
diff
changeset
|
1046 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1047 if mx.get_os() == 'solaris': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1048 # If using sparcWorks, setup flags to avoid make complaining about CC version |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1049 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0] |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1050 if cCompilerVersion.startswith('CC: Sun C++'): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1051 compilerRev = cCompilerVersion.split(' ')[3] |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1052 setMakeVar('ENFORCE_COMPILER_REV', compilerRev, env=env) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1053 setMakeVar('ENFORCE_CC_COMPILER_REV', compilerRev, env=env) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1054 if self.vmbuild == 'jvmg': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1055 # We want ALL the symbols when debugging on Solaris |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1056 setMakeVar('STRIP_POLICY', 'no_strip') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1057 # This removes the need to unzip the *.diz files before debugging in gdb |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1058 setMakeVar('ZIP_DEBUGINFO_FILES', '0', env=env) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1059 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1060 if buildSuffix == "1": |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1061 setMakeVar("BUILD_CLIENT_ONLY", "true") |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1062 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1063 # Clear this variable as having it set can cause very confusing build problems |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1064 env.pop('CLASSPATH', None) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1065 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1066 # Issue an env prefix that can be used to run the make on the command line |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1067 if not mx._opts.verbose: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1068 mx.log('--------------- make command line ----------------------') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1069 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1070 envPrefix = ' '.join([key + '=' + env[key] for key in env.iterkeys() if not os.environ.has_key(key) or env[key] != os.environ[key]]) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1071 if len(envPrefix): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1072 mx.log('env ' + envPrefix + ' \\') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1073 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1074 runCmd.append(self.vmbuild + buildSuffix) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1075 runCmd.append("docs") |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1076 # runCmd.append("export_" + build) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1077 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1078 if not mx._opts.verbose: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1079 mx.log(' '.join(runCmd)) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1080 mx.log('--------------------------------------------------------') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1081 mx.run(runCmd, err=filterXusage, env=env) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1082 self._newestOutput = None |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1083 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1084 def needsBuild(self, newestInput): |
22727
9860aa60385f
Fix hotspot build task: needsBuild should check ProjectBuildTask.needsBuild
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22716
diff
changeset
|
1085 # Skip super (NativeBuildTask) because it always returns true |
9860aa60385f
Fix hotspot build task: needsBuild should check ProjectBuildTask.needsBuild
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22716
diff
changeset
|
1086 (superNeeds, superReason) = mx.ProjectBuildTask.needsBuild(self, newestInput) |
9860aa60385f
Fix hotspot build task: needsBuild should check ProjectBuildTask.needsBuild
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22716
diff
changeset
|
1087 if superNeeds: |
9860aa60385f
Fix hotspot build task: needsBuild should check ProjectBuildTask.needsBuild
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22716
diff
changeset
|
1088 return (superNeeds, superReason) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1089 newestOutput = self.newestOutput() |
22672
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22671
diff
changeset
|
1090 for d in ['src', 'make', join('jvmci', 'jdk.vm.ci.hotspot', 'src_gen', 'hotspot')]: # TODO should this be replaced by a dependency to the project? |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1091 for root, dirnames, files in os.walk(join(_suite.dir, d)): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1092 # ignore src/share/tools |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1093 if root == join(_suite.dir, 'src', 'share'): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1094 dirnames.remove('tools') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1095 for f in (join(root, name) for name in files): |
22413
454a38908a59
newestInput parameter to HotSpotBuildTask.needsBuild() is a TimeStampFile as of mx 5.3.3
Doug Simon <doug.simon@oracle.com>
parents:
22400
diff
changeset
|
1096 ts = mx.TimeStampFile(f) |
454a38908a59
newestInput parameter to HotSpotBuildTask.needsBuild() is a TimeStampFile as of mx 5.3.3
Doug Simon <doug.simon@oracle.com>
parents:
22400
diff
changeset
|
1097 if newestOutput: |
454a38908a59
newestInput parameter to HotSpotBuildTask.needsBuild() is a TimeStampFile as of mx 5.3.3
Doug Simon <doug.simon@oracle.com>
parents:
22400
diff
changeset
|
1098 if not newestOutput.exists(): |
454a38908a59
newestInput parameter to HotSpotBuildTask.needsBuild() is a TimeStampFile as of mx 5.3.3
Doug Simon <doug.simon@oracle.com>
parents:
22400
diff
changeset
|
1099 return (True, '{} does not exist'.format(newestOutput)) |
454a38908a59
newestInput parameter to HotSpotBuildTask.needsBuild() is a TimeStampFile as of mx 5.3.3
Doug Simon <doug.simon@oracle.com>
parents:
22400
diff
changeset
|
1100 if ts.isNewerThan(newestOutput): |
454a38908a59
newestInput parameter to HotSpotBuildTask.needsBuild() is a TimeStampFile as of mx 5.3.3
Doug Simon <doug.simon@oracle.com>
parents:
22400
diff
changeset
|
1101 return (True, '{} is newer than {}'.format(ts, newestOutput)) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1102 return (False, None) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1103 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1104 def buildForbidden(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1105 if mx.NativeBuildTask.buildForbidden(self): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1106 return True |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1107 if self.vm == 'original': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1108 if self.vmbuild != 'product': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1109 mx.log('only product build of original VM exists') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1110 return True |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1111 if not isVMSupported(self.vm): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1112 mx.log('The ' + self.vm + ' VM is not supported on this platform - skipping') |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1113 return True |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1114 return False |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1115 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1116 def clean(self, forBuild=False): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1117 if forBuild: # Let make handle incremental builds |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1118 return |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1119 def handleRemoveReadonly(func, path, exc): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1120 excvalue = exc[1] |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1121 if mx.get_os() == 'windows' and func in (os.rmdir, os.remove) and excvalue.errno == errno.EACCES: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1122 os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) # 0777 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1123 func(path) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1124 else: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1125 raise |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1126 |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1127 def rmIfExists(name): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1128 if os.path.isdir(name): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1129 shutil.rmtree(name, ignore_errors=False, onerror=handleRemoveReadonly) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1130 elif os.path.isfile(name): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1131 os.unlink(name) |
22646
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1132 nojvmci_outputdir = join(_suite.dir, 'build-nojvmci', _hotspotOs(mx.get_os())) |
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1133 makeFiles = join(_suite.dir, 'make') |
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1134 if mx._opts.verbose: |
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1135 outCapture = None |
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1136 else: |
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1137 def _consume(s): |
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1138 pass |
3af40fab60c2
Use make clean to clean hotspot build
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22627
diff
changeset
|
1139 outCapture = _consume |
22671
97f30e4d0e95
Pass ARCH_DATA_MODEL to make clean
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22670
diff
changeset
|
1140 mx.run([mx.gmake_cmd(), 'ARCH_DATA_MODEL=64', 'ALT_BOOTDIR=' + get_jvmci_bootstrap_jdk().home, 'clean'], out=outCapture, cwd=makeFiles) |
97f30e4d0e95
Pass ARCH_DATA_MODEL to make clean
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22670
diff
changeset
|
1141 mx.run([mx.gmake_cmd(), 'ARCH_DATA_MODEL=64', 'ALT_BOOTDIR=' + get_jvmci_bootstrap_jdk().home, 'ALT_OUTPUTDIR=' + nojvmci_outputdir, 'clean'], out=outCapture, cwd=makeFiles) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1142 rmIfExists(_jdksDir()) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1143 self._newestOutput = None |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1144 |
4577
bc8b58c11768
Added debug build of HotSpot Client to the gate.
Doug Simon <doug.simon@oracle.com>
parents:
4575
diff
changeset
|
1145 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
|
1146 """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
|
1147 |
11392
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1148 The global '--vm' and '--vmbuild' options select which VM type and build target to build.""" |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1149 |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1150 # Override to fail quickly if extra arguments are given |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1151 # at the end of the command line. This allows for a more |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1152 # helpful error message. |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1153 class AP(ArgumentParser): |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1154 def __init__(self): |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1155 ArgumentParser.__init__(self, prog='mx build') |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1156 def parse_args(self, args): |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1157 result = ArgumentParser.parse_args(self, args) |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1158 if len(result.remainder) != 0: |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1159 firstBuildTarget = result.remainder[0] |
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1160 mx.abort('To specify the ' + firstBuildTarget + ' VM build target, you need to use the global "--vmbuild" option. For example:\n' + |
23343
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1161 ' mx --vmbuild=' + firstBuildTarget + ' build') |
11392
66251d9f62ab
fail faster with better error message if deprecated and unsupported mx build command line is given
Doug Simon <doug.simon@oracle.com>
parents:
11377
diff
changeset
|
1162 return result |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
1163 |
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
1164 # Call mx.build to compile the Java sources |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1165 parser = AP() |
9116
e2dae636732a
added 'mx buildvars' command to list (some of) the variables that can be passed to 'mx build' with the -D option
Doug Simon <doug.simon@oracle.com>
parents:
9098
diff
changeset
|
1166 parser.add_argument('-D', action='append', help='set a HotSpot build variable (run \'mx buildvars\' to list variables)', metavar='name=value') |
21791
cd36556e1b78
Remove conditional makefile-based compilation of jvmci from mx_graal.py
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
21790
diff
changeset
|
1167 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1168 # initialize jdk |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
1169 get_jvmci_jdk_dir(create=True) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
1170 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1171 mx.build(['--source', '1.7'] + args, parser=parser) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1172 |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
1173 |
22492
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
1174 def updateJvmCfg(jdkDir, vm): |
f22fd96605ee
renamed get_jvmci_jdk to get_jvmci_jdk_dir and where relevant, variables named jdk to jdkDir
Doug Simon <doug.simon@oracle.com>
parents:
22491
diff
changeset
|
1175 jvmCfg = getVmCfgInJdk(jdkDir) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1176 if not exists(jvmCfg): |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1177 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
|
1178 |
23331
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1179 def getVMEntry(vm): |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1180 """Return the set of lines that should be in jvm.cfg for this vm configuration""" |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1181 known = '-' + vm + ' ' + 'KNOWN\n' |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1182 cfgLines = [] |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1183 cfgLines.append(known) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1184 for alias, aliased in _vmAliases.iteritems(): |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1185 if vm == aliased: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1186 cfgLines.append('-' + alias + ' ALIASED_TO -' + aliased + '\n') |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1187 return known, cfgLines |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1188 |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1189 # Compute the cfg entries for the currently selected VM and the default VM, |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1190 # if a default VM has been set. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1191 vmKnown, vmLines = getVMEntry(vm) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1192 defaultVMLines = [] |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1193 defaultVM = mx.get_env('DEFAULT_VM') |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1194 if defaultVM: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1195 if defaultVM == vm: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1196 defaultVM = None |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1197 else: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1198 defaultVMPath = join(vmLibDirInJdk(jdkDir), defaultVM, _lib('jvm')) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1199 if not exists(defaultVMPath): |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1200 mx.log('Warning: The default VM is "' + defaultVM + '" but it hasn\'t been built yet so "-' + vm + '" will be the default.') |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1201 defaultVM = None |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1202 else: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1203 defaultVMKnown, defaultVMLines = getVMEntry(defaultVM) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1204 |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1205 # The default VM should always be set as the default, so read the existing jvm.cfg |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1206 # and strip out any lines that mention the vm or the defaultVM, splitting the file |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1207 # into a possible comment prefix and all the rest of the lines from the jvm.cfg. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1208 # Note that this will enforce the defaultVM even if the default hasn't been built. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1209 prefix = [] |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1210 suffix = [] |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1211 lines = [] |
23331
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1212 outOfOrder = False |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1213 foundVm = False |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1214 foundDefaultVM = defaultVM == None |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1215 with open(jvmCfg) as f: |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1216 for line in f: |
23331
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1217 lines.append(line) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1218 if line.strip() == vmKnown.strip(): |
23331
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1219 foundVm = True |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1220 continue |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1221 if line.endswith(' ALIASED_TO -' + vm + '\n'): |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1222 continue |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1223 if defaultVM and line.strip() == defaultVMKnown.strip(): |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1224 foundDefaultVM = True |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1225 outOfOrder = foundVm |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1226 continue |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1227 if defaultVM and line.endswith(' ALIASED_TO -' + defaultVM + '\n'): |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1228 continue |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1229 if line.startswith('#') and len(suffix) == 0: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1230 prefix.append(line) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1231 else: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1232 suffix.append(line) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1233 |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1234 |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1235 # Build the new jvm.cfg out of the comment prefix, the entries for any default VM, |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1236 # the entries for the currently selected VM followed by the remaining lines. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1237 allLines = prefix + defaultVMLines + vmLines + suffix |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1238 |
23331
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1239 if allLines != lines: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1240 # The computed jvm.cfg is different from what's on disk so try to explain |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1241 # what effect the newly written one will have. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1242 if outOfOrder: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1243 # Both vm and defaultVM were already in the jvm.cfg but in a different order |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1244 # so vm was the default. The new jvm.cfg sets defaultVM as the default. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1245 mx.log('Resetting "' + defaultVM + '" as default in ' + jvmCfg) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1246 else: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1247 if defaultVM: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1248 if not foundDefaultVM: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1249 # The defaultVM was missing so it's being set to the default. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1250 mx.log('Setting default JVM to "-' + defaultVM + '" in ' + jvmCfg) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1251 if not foundVm: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1252 # vm wasn't found so it's added but is not the default. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1253 mx.log('Adding JVM "-' + vm + '" in ' + jvmCfg) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1254 else: |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1255 # No defaultVM was specified or it was the same as vm, so |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1256 # vm will be the default. |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1257 mx.log('Setting default JVM to "-' + vm + '" in ' + jvmCfg) |
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1258 |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1259 if mx.get_os() != 'windows': |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1260 os.chmod(jvmCfg, JDK_UNIX_PERMISSIONS_FILE) |
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1261 with open(jvmCfg, 'w') as f: |
23331
459ec97bec01
updates to jvm.cfg should respect DEFAULT_VM
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23321
diff
changeset
|
1262 for line in allLines: |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1263 f.write(line) |
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
|
1264 |
22672
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22671
diff
changeset
|
1265 mx_gate.add_jacoco_includes(['jdk.vm.ci.*']) |
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
|
1266 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1267 def run_vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None): |
22758
a130b51efb07
removed @Option mechanism from JVMCI (GRAAL-1371)
Doug Simon <doug.simon@oracle.com>
parents:
22732
diff
changeset
|
1268 """run a Java program by executing the java executable in a JVMCI JDK""" |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1269 jdkTag = mx.get_jdk_option().tag |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1270 if jdkTag and jdkTag != _JVMCI_JDK_TAG: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1271 mx.abort('The "--jdk" option must have the tag "' + _JVMCI_JDK_TAG + '" when running a command requiring a JVMCI VM') |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1272 jdk = get_jvmci_jdk(vmbuild=vmbuild) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1273 return jdk.run_java(args, vm=vm, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout) |
3718 | 1274 |
22182
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1275 def _unittest_config_participant(config): |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1276 vmArgs, mainClass, mainClassArgs = config |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1277 if isJVMCIEnabled(get_vm()): |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1278 # Remove entries from class path that are in JVMCI loaded jars |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1279 cpIndex, cp = mx.find_classpath_arg(vmArgs) |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1280 if cp: |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1281 excluded = set() |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1282 for jdkDist in jdkDeployedDists: |
22281
2333f2f5baed
Fixes for new jdkDeployedDists model in _unittest_config_participant
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22280
diff
changeset
|
1283 dist = jdkDist.dist() |
22182
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1284 excluded.update([d.output_dir() for d in dist.archived_deps() if d.isJavaProject()]) |
22707
829a9e1ccf23
mx: exclude JVMCI jars from unit test class path
Doug Simon <doug.simon@oracle.com>
parents:
22695
diff
changeset
|
1285 excluded.add(dist.path) |
22182
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1286 cp = os.pathsep.join([e for e in cp.split(os.pathsep) if e not in excluded]) |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1287 vmArgs[cpIndex] = cp |
18351 | 1288 |
22182
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1289 # Run the VM in a mode where application/test classes can |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1290 # access JVMCI loaded classes. |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1291 vmArgs = ['-XX:-UseJVMCIClassLoader'] + vmArgs |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1292 return (vmArgs, mainClass, mainClassArgs) |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1293 return config |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16394
diff
changeset
|
1294 |
22182
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1295 def _unittest_vm_launcher(vmArgs, mainClass, mainClassArgs): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1296 run_vm(vmArgs + [mainClass] + mainClassArgs) |
22182
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1297 |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1298 mx_unittest.add_config_participant(_unittest_config_participant) |
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1299 mx_unittest.set_vm_launcher('JVMCI VM launcher', _unittest_vm_launcher) |
8340
d9d883aeb96f
unittest: seperate target `longunittest' and `shortunittest'
Bernhard Urban <bernhard.urban@jku.at>
parents:
8317
diff
changeset
|
1300 |
d9d883aeb96f
unittest: seperate target `longunittest' and `shortunittest'
Bernhard Urban <bernhard.urban@jku.at>
parents:
8317
diff
changeset
|
1301 def shortunittest(args): |
22020
36a7ec14279d
moved unit test support from mx_graal.py to mx.py
Doug Simon <doug.simon@oracle.com>
parents:
22019
diff
changeset
|
1302 """alias for 'unittest --whitelist test/whitelist_shortunittest.txt'""" |
8340
d9d883aeb96f
unittest: seperate target `longunittest' and `shortunittest'
Bernhard Urban <bernhard.urban@jku.at>
parents:
8317
diff
changeset
|
1303 |
15324
5b5f47104c0d
mx: add whitelist for shortunittest
Bernhard Urban <bernhard.urban@jku.at>
parents:
15323
diff
changeset
|
1304 args = ['--whitelist', 'test/whitelist_shortunittest.txt'] + args |
22182
9bbd878b17af
use unittest extensibility
Doug Simon <doug.simon@oracle.com>
parents:
22181
diff
changeset
|
1305 mx_unittest.unittest(args) |
8340
d9d883aeb96f
unittest: seperate target `longunittest' and `shortunittest'
Bernhard Urban <bernhard.urban@jku.at>
parents:
8317
diff
changeset
|
1306 |
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
|
1307 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
|
1308 """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
|
1309 |
11296
4e943a311d9c
mx presents a command line dialogue to select the default VM if it is not configured (GRAAL-416)
Doug Simon <doug.simon@oracle.com>
parents:
11287
diff
changeset
|
1310 vmsDefault = ','.join(_vmChoices.keys()) |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
1311 vmbuildsDefault = ','.join(_vmbuildChoices) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1312 |
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1313 parser = ArgumentParser(prog='mx buildvms') |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
1314 parser.add_argument('--vms', help='a comma separated list of VMs to build (default: ' + vmsDefault + ')', metavar='<args>', default=vmsDefault) |
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
1315 parser.add_argument('--builds', help='a comma separated list of build types (default: ' + vmbuildsDefault + ')', metavar='<args>', default=vmbuildsDefault) |
9096
d4b868ed9cfb
buildvms command now runs "java -version" for each VM built unless -n option is specified
Doug Simon <doug.simon@oracle.com>
parents:
9095
diff
changeset
|
1316 parser.add_argument('-n', '--no-check', action='store_true', help='omit running "java -version" after each build') |
9097
a0ab945fb95f
build output during buildvms command is sent to console (instead of log files) if -c option is given
Doug Simon <doug.simon@oracle.com>
parents:
9096
diff
changeset
|
1317 parser.add_argument('-c', '--console', action='store_true', help='send build output to console instead of log file') |
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
|
1318 |
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
|
1319 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
|
1320 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
|
1321 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
|
1322 |
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
|
1323 allStart = time.time() |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1324 for vm in vms: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1325 if not isVMSupported(vm): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1326 mx.log('The ' + vm + ' VM is not supported on this platform - skipping') |
14602
591f4a575ebf
issue warning/error where ever relevant if a non-supported VM (e.g., client VM on Mac) is used in mx
Doug Simon <doug.simon@oracle.com>
parents:
14595
diff
changeset
|
1327 continue |
591f4a575ebf
issue warning/error where ever relevant if a non-supported VM (e.g., client VM on Mac) is used in mx
Doug Simon <doug.simon@oracle.com>
parents:
14595
diff
changeset
|
1328 |
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
|
1329 for vmbuild in builds: |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1330 if vm == 'original' and vmbuild != 'product': |
9095
d538dce8f403
support for non-GRAAL VMs co-existing with GRAAL VMs
Doug Simon <doug.simon@oracle.com>
parents:
9010
diff
changeset
|
1331 continue |
9097
a0ab945fb95f
build output during buildvms command is sent to console (instead of log files) if -c option is given
Doug Simon <doug.simon@oracle.com>
parents:
9096
diff
changeset
|
1332 if not args.console: |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1333 logFile = join(vm + '-' + vmbuild + '.log') |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1334 log = open(join(_suite.dir, logFile), 'wb') |
9097
a0ab945fb95f
build output during buildvms command is sent to console (instead of log files) if -c option is given
Doug Simon <doug.simon@oracle.com>
parents:
9096
diff
changeset
|
1335 start = time.time() |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1336 mx.log('BEGIN: ' + vm + '-' + vmbuild + '\t(see: ' + logFile + ')') |
17317
f434913f9cba
mx: buildvms should inherit verbosity
Bernhard Urban <bernhard.urban@jku.at>
parents:
17307
diff
changeset
|
1337 verbose = ['-v'] if mx._opts.verbose else [] |
9097
a0ab945fb95f
build output during buildvms command is sent to console (instead of log files) if -c option is given
Doug Simon <doug.simon@oracle.com>
parents:
9096
diff
changeset
|
1338 # Run as subprocess so that output can be directed to a file |
23343
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1339 cmd = [sys.executable, '-u', mx.__file__] + verbose + ['--vm=' + vm, '--vmbuild=' + vmbuild, 'build'] |
17317
f434913f9cba
mx: buildvms should inherit verbosity
Bernhard Urban <bernhard.urban@jku.at>
parents:
17307
diff
changeset
|
1340 mx.logv("executing command: " + str(cmd)) |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1341 subprocess.check_call(cmd, cwd=_suite.dir, stdout=log, stderr=subprocess.STDOUT) |
9097
a0ab945fb95f
build output during buildvms command is sent to console (instead of log files) if -c option is given
Doug Simon <doug.simon@oracle.com>
parents:
9096
diff
changeset
|
1342 duration = datetime.timedelta(seconds=time.time() - start) |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1343 mx.log('END: ' + vm + '-' + vmbuild + '\t[' + str(duration) + ']') |
9097
a0ab945fb95f
build output during buildvms command is sent to console (instead of log files) if -c option is given
Doug Simon <doug.simon@oracle.com>
parents:
9096
diff
changeset
|
1344 else: |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1345 with VM(vm, vmbuild): |
22292 | 1346 build([]) |
9096
d4b868ed9cfb
buildvms command now runs "java -version" for each VM built unless -n option is specified
Doug Simon <doug.simon@oracle.com>
parents:
9095
diff
changeset
|
1347 if not args.no_check: |
d4b868ed9cfb
buildvms command now runs "java -version" for each VM built unless -n option is specified
Doug Simon <doug.simon@oracle.com>
parents:
9095
diff
changeset
|
1348 vmargs = ['-version'] |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1349 run_vm(vmargs, vm=vm, vmbuild=vmbuild) |
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
|
1350 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
|
1351 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
|
1352 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1353 |
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1354 def _jvmci_gate_runner(args, tasks): |
22655
8ed4037e8286
Ignore verification jvmci.make on SPARC gate
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22653
diff
changeset
|
1355 if mx.get_arch() != 'sparcv9': |
8ed4037e8286
Ignore verification jvmci.make on SPARC gate
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22653
diff
changeset
|
1356 with Task('Check jvmci.make in sync with suite.py', tasks) as t: |
8ed4037e8286
Ignore verification jvmci.make on SPARC gate
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22653
diff
changeset
|
1357 if t: |
8ed4037e8286
Ignore verification jvmci.make on SPARC gate
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22653
diff
changeset
|
1358 jvmciMake = join(_suite.dir, 'make', 'jvmci.make') |
8ed4037e8286
Ignore verification jvmci.make on SPARC gate
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22653
diff
changeset
|
1359 if mx_jvmci_makefile.build_makefile(['-o', jvmciMake]) != 0: |
8ed4037e8286
Ignore verification jvmci.make on SPARC gate
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22653
diff
changeset
|
1360 t.abort('Rerun "mx makefile -o ' + jvmciMake + ' and check-in the modified ' + jvmciMake) |
22286
2ecfec90e51e
moved gate from mx_jvmci.py to mx_gate.py in core mx
Doug Simon <doug.simon@oracle.com>
parents:
22284
diff
changeset
|
1361 |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1362 # Build server-jvmci now so we can run the unit tests |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1363 with Task('BuildHotSpotJVMCI: product', tasks) as t: |
22326
f150f5e00ccd
Remove unused --check-distributions option.
Roland Schatz <roland.schatz@oracle.com>
parents:
22323
diff
changeset
|
1364 if t: buildvms(['--vms', 'server', '--builds', 'product']) |
11756
78e6109ee411
mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents:
11605
diff
changeset
|
1365 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1366 # Run unit tests on server-hosted-jvmci |
19162
32c7a5a88523
Run unit tests even earlier during gate
Doug Simon <doug.simon@oracle.com>
parents:
19160
diff
changeset
|
1367 with VM('server', 'product'): |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1368 with JVMCIMode('hosted'): |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1369 with Task('JVMCI UnitTests: hosted-product', tasks) as t: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1370 if t: unittest(['--suite', 'jvmci', '--enable-timing', '--verbose', '--fail-fast']) |
19160
d4f80cf249d0
Run unittest earlier during gate
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19044
diff
changeset
|
1371 |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1372 # Build the fastdebug VM |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1373 with Task('BuildHotSpotJVMCI: fastdebug', tasks) as t: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1374 if t: buildvms(['--vms', 'server', '--builds', 'fastdebug']) |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1375 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1376 with Task('CleanAndBuildIdealGraphVisualizer', tasks, disableJacoco=True) as t: |
20996
5e78d067ebbe
Do not build IGV in gate when running on SPARC
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
20994
diff
changeset
|
1377 if t and platform.processor() != 'sparc': |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1378 buildxml = mx._cygpathU2W(join(_suite.dir, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml')) |
21165
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1379 mx.run(['ant', '-f', buildxml, '-q', 'clean', 'build'], env=_igvBuildEnv()) |
11756
78e6109ee411
mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents:
11605
diff
changeset
|
1380 |
21566 | 1381 # Prevent JVMCI modifications from breaking the standard builds |
1382 if args.buildNonJVMCI: | |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1383 with Task('BuildHotSpotVarieties', tasks, disableJacoco=True) as t: |
20000
e8a0a61526b2
added support for refining the tasks run by 'mx gate' (e.g., 'mx gate -t Economy' will only run tasks whose title contains the substring 'Economy')
Doug Simon <doug.simon@oracle.com>
parents:
19796
diff
changeset
|
1384 if t: |
e8a0a61526b2
added support for refining the tasks run by 'mx gate' (e.g., 'mx gate -t Economy' will only run tasks whose title contains the substring 'Economy')
Doug Simon <doug.simon@oracle.com>
parents:
19796
diff
changeset
|
1385 buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) |
e8a0a61526b2
added support for refining the tasks run by 'mx gate' (e.g., 'mx gate -t Economy' will only run tasks whose title contains the substring 'Economy')
Doug Simon <doug.simon@oracle.com>
parents:
19796
diff
changeset
|
1386 if mx.get_os() not in ['windows', 'cygwin']: |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1387 buildvms(['--vms', 'server-nojvmci', '--builds', 'product,optimized']) |
11756
78e6109ee411
mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents:
11605
diff
changeset
|
1388 |
22291
ccee68149d93
added --all-suites option to gate
Doug Simon <doug.simon@oracle.com>
parents:
22290
diff
changeset
|
1389 mx_gate.add_gate_runner(_suite, _jvmci_gate_runner) |
22286
2ecfec90e51e
moved gate from mx_jvmci.py to mx_gate.py in core mx
Doug Simon <doug.simon@oracle.com>
parents:
22284
diff
changeset
|
1390 mx_gate.add_gate_argument('-g', '--only-build-jvmci', action='store_false', dest='buildNonJVMCI', help='only build the JVMCI VM') |
20000
e8a0a61526b2
added support for refining the tasks run by 'mx gate' (e.g., 'mx gate -t Economy' will only run tasks whose title contains the substring 'Economy')
Doug Simon <doug.simon@oracle.com>
parents:
19796
diff
changeset
|
1391 |
6340
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1392 def deoptalot(args): |
22108
51ceda0cf404
mx: make deoptalot command more flexible in terms of VM management
Doug Simon <doug.simon@oracle.com>
parents:
22099
diff
changeset
|
1393 """bootstrap a VM with DeoptimizeALot and VerifyOops on |
6340
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1394 |
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1395 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
|
1396 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
|
1397 count = 1 |
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1398 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
|
1399 count = int(args[0]) |
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1400 del args[0] |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1401 |
7509 | 1402 for _ in range(count): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1403 if not run_vm(['-XX:-TieredCompilation', '-XX:+DeoptimizeALot', '-XX:+VerifyOops'] + args + ['-version']) == 0: |
6340
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1404 mx.abort("Failed") |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1405 |
6340
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1406 def longtests(args): |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1407 |
6340
74560fdffd51
Add a draft longtests command to mc's commands
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
6319
diff
changeset
|
1408 deoptalot(['15', '-Xmx48m']) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1409 |
21165
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1410 def _igvJdk(): |
18893
19d99eec8876
Fix mx igv: do not use Java < 1.8, handle the case where no JDKs are supported. Give some hints when the igv ant build fails.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
18876
diff
changeset
|
1411 v8u20 = mx.VersionSpec("1.8.0_20") |
19d99eec8876
Fix mx igv: do not use Java < 1.8, handle the case where no JDKs are supported. Give some hints when the igv ant build fails.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
18876
diff
changeset
|
1412 v8u40 = mx.VersionSpec("1.8.0_40") |
19d99eec8876
Fix mx igv: do not use Java < 1.8, handle the case where no JDKs are supported. Give some hints when the igv ant build fails.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
18876
diff
changeset
|
1413 v8 = mx.VersionSpec("1.8") |
21165
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1414 def _igvJdkVersionCheck(version): |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1415 return version >= v8 and (version < v8u20 or version >= v8u40) |
22327
2c352e8d76ec
Fix 'mx igv' command.
Roland Schatz <roland.schatz@oracle.com>
parents:
22326
diff
changeset
|
1416 return mx.get_jdk(_igvJdkVersionCheck, versionDescription='>= 1.8 and < 1.8.0u20 or >= 1.8.0u40', purpose="building & running IGV").home |
21165
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1417 |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1418 def _igvBuildEnv(): |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1419 # When the http_proxy environment variable is set, convert it to the proxy settings that ant needs |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1420 env = dict(os.environ) |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1421 proxy = os.environ.get('http_proxy') |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1422 if not (proxy is None) and len(proxy) > 0: |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1423 if '://' in proxy: |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1424 # Remove the http:// prefix (or any other protocol prefix) |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1425 proxy = proxy.split('://', 1)[1] |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1426 # Separate proxy server name and port number |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1427 proxyName, proxyPort = proxy.split(':', 1) |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1428 proxyEnv = '-DproxyHost="' + proxyName + '" -DproxyPort=' + proxyPort |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1429 env['ANT_OPTS'] = proxyEnv |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1430 |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1431 env['JAVA_HOME'] = _igvJdk() |
17388
9e5abd0e7916
mx/igv: fallback mechanism to work around a javac bug in jdk8u20
Bernhard Urban <bernhard.urban@jku.at>
parents:
17372
diff
changeset
|
1432 return env |
9e5abd0e7916
mx/igv: fallback mechanism to work around a javac bug in jdk8u20
Bernhard Urban <bernhard.urban@jku.at>
parents:
17372
diff
changeset
|
1433 |
5089
206e68bb66c6
Made the IdealGraphVisualizer runnable from mx with new 'igv' command.
Doug Simon <doug.simon@oracle.com>
parents:
5064
diff
changeset
|
1434 def igv(args): |
206e68bb66c6
Made the IdealGraphVisualizer runnable from mx with new 'igv' command.
Doug Simon <doug.simon@oracle.com>
parents:
5064
diff
changeset
|
1435 """run the Ideal Graph Visualizer""" |
23321
fc1036575a76
make paths in IGV error message absolute
Doug Simon <doug.simon@oracle.com>
parents:
23319
diff
changeset
|
1436 logFile = join(_suite.dir, '.ideal_graph_visualizer.log') |
fc1036575a76
make paths in IGV error message absolute
Doug Simon <doug.simon@oracle.com>
parents:
23319
diff
changeset
|
1437 with open(logFile, 'w') as fp: |
10568
070b4a3c56f3
disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx
Doug Simon <doug.simon@oracle.com>
parents:
10527
diff
changeset
|
1438 mx.logv('[Ideal Graph Visualizer log is in ' + fp.name + ']') |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1439 nbplatform = join(_suite.dir, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'nbplatform') |
13472
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
1440 |
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
1441 # Remove NetBeans platform if it is earlier than the current supported version |
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
1442 if exists(nbplatform): |
19430
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1443 updateTrackingFile = join(nbplatform, 'platform', 'update_tracking', 'org-netbeans-core.xml') |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1444 if not exists(updateTrackingFile): |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1445 mx.log('Could not find \'' + updateTrackingFile + '\', removing NetBeans platform') |
13472
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
1446 shutil.rmtree(nbplatform) |
19430
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1447 else: |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1448 dom = xml.dom.minidom.parse(updateTrackingFile) |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1449 currentVersion = mx.VersionSpec(dom.getElementsByTagName('module_version')[0].getAttribute('specification_version')) |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1450 supportedVersion = mx.VersionSpec('3.43.1') |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1451 if currentVersion < supportedVersion: |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1452 mx.log('Replacing NetBeans platform version ' + str(currentVersion) + ' with version ' + str(supportedVersion)) |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1453 shutil.rmtree(nbplatform) |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1454 elif supportedVersion < currentVersion: |
9f037830060a
Make mx igv more robust against bad nbplatform states
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19335
diff
changeset
|
1455 mx.log('Supported NetBeans version in igv command should be updated to ' + str(currentVersion)) |
13472
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
1456 |
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
1457 if not exists(nbplatform): |
72e2ec923b7b
added support to replace NetBeans platform used by IGV if it is out of date (GRAAL-420)
Doug Simon <doug.simon@oracle.com>
parents:
13471
diff
changeset
|
1458 mx.logv('[This execution may take a while as the NetBeans platform needs to be downloaded]') |
21165
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1459 |
bdeaa5a7b83c
Look for JDKs on demand, add --strict-compliance flag. Allow more precise search for JDK versions (use it for IGV)
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21122
diff
changeset
|
1460 env = _igvBuildEnv() |
18983
43baadc1913a
Automatically install Batik for SVG export in IGV
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
18931
diff
changeset
|
1461 # make the jar for Batik 1.7 available. |
43baadc1913a
Automatically install Batik for SVG export in IGV
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
18931
diff
changeset
|
1462 env['IGV_BATIK_JAR'] = mx.library('BATIK').get_path(True) |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1463 if mx.run(['ant', '-f', mx._cygpathU2W(join(_suite.dir, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml')), '-l', mx._cygpathU2W(fp.name), 'run'], env=env, nonZeroIsFatal=False): |
23321
fc1036575a76
make paths in IGV error message absolute
Doug Simon <doug.simon@oracle.com>
parents:
23319
diff
changeset
|
1464 mx.abort("IGV ant build & launch failed. Check '" + logFile + "'. You can also try to delete " + join(_suite.dir, 'src/share/tools/IdealGraphVisualizer/nbplatform') + ".") |
14116
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1465 |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1466 def c1visualizer(args): |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1467 """run the Cl Compiler Visualizer""" |
22674
5ef7110c63bd
moved unzipped c1visualizer distribution and downloaded hsdis to mxbuild/ directory
Doug Simon <doug.simon@oracle.com>
parents:
22672
diff
changeset
|
1468 extractPath = join(_suite.get_output_root()) |
14116
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1469 if mx.get_os() == 'windows': |
22674
5ef7110c63bd
moved unzipped c1visualizer distribution and downloaded hsdis to mxbuild/ directory
Doug Simon <doug.simon@oracle.com>
parents:
22672
diff
changeset
|
1470 executable = join(extractPath, 'c1visualizer', 'bin', 'c1visualizer.exe') |
14116
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1471 else: |
22674
5ef7110c63bd
moved unzipped c1visualizer distribution and downloaded hsdis to mxbuild/ directory
Doug Simon <doug.simon@oracle.com>
parents:
22672
diff
changeset
|
1472 executable = join(extractPath, 'c1visualizer', 'bin', 'c1visualizer') |
14116
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1473 |
22674
5ef7110c63bd
moved unzipped c1visualizer distribution and downloaded hsdis to mxbuild/ directory
Doug Simon <doug.simon@oracle.com>
parents:
22672
diff
changeset
|
1474 # Check whether the current C1Visualizer installation is up-to-date |
16599
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1475 if exists(executable) and not exists(mx.library('C1VISUALIZER_DIST').get_path(resolve=False)): |
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1476 mx.log('Updating C1Visualizer') |
22674
5ef7110c63bd
moved unzipped c1visualizer distribution and downloaded hsdis to mxbuild/ directory
Doug Simon <doug.simon@oracle.com>
parents:
22672
diff
changeset
|
1477 shutil.rmtree(join(extractPath, 'c1visualizer')) |
16599
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1478 |
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1479 archive = mx.library('C1VISUALIZER_DIST').get_path(resolve=True) |
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1480 |
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1481 if not exists(executable): |
14116
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1482 zf = zipfile.ZipFile(archive, 'r') |
22674
5ef7110c63bd
moved unzipped c1visualizer distribution and downloaded hsdis to mxbuild/ directory
Doug Simon <doug.simon@oracle.com>
parents:
22672
diff
changeset
|
1483 zf.extractall(extractPath) |
14116
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1484 |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1485 if not exists(executable): |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1486 mx.abort('C1Visualizer binary does not exist: ' + executable) |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1487 |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1488 if mx.get_os() != 'windows': |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1489 # Make sure that execution is allowed. The zip file does not always specfiy that correctly |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1490 os.chmod(executable, 0777) |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1491 |
be7ebdf41bea
mx: new command to start c1visualizer; support for IGV download when using a proxy server
Christian Wimmer <christian.wimmer@oracle.com>
parents:
14048
diff
changeset
|
1492 mx.run([executable]) |
5089
206e68bb66c6
Made the IdealGraphVisualizer runnable from mx with new 'igv' command.
Doug Simon <doug.simon@oracle.com>
parents:
5064
diff
changeset
|
1493 |
13935
ca0e1af320f6
mx: add support for jmh benchmark suites
Bernhard Urban <bernhard.urban@jku.at>
parents:
13928
diff
changeset
|
1494 |
5596
e4b1bc5e29e0
hsdis library is downloaded into newly created Graal JDK
Doug Simon <doug.simon@oracle.com>
parents:
5517
diff
changeset
|
1495 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
|
1496 """download the hsdis library |
4482
7903b6c28f9c
Add hsdis command to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
4480
diff
changeset
|
1497 |
7903b6c28f9c
Add hsdis command to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
4480
diff
changeset
|
1498 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
|
1499 By default it downloads the Intel syntax version, use the 'att' argument to install AT&T syntax.""" |
23352
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1500 flavor = None |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1501 if mx.get_arch() == "amd64": |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1502 flavor = 'intel' |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1503 if 'att' in args: |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1504 flavor = 'att' |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1505 |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1506 libpattern = mx.add_lib_suffix('hsdis-' + mx.get_arch() + '-' + mx.get_os() + '-%s') |
16599
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1507 |
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1508 sha1s = { |
23352
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1509 'att/hsdis-amd64-windows-%s.dll' : 'bcbd535a9568b5075ab41e96205e26a2bac64f72', |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1510 'att/hsdis-amd64-linux-%s.so' : '36a0b8e30fc370727920cc089f104bfb9cd508a0', |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1511 'att/hsdis-amd64-darwin-%s.dylib' : 'c1865e9a58ca773fdc1c5eea0a4dfda213420ffb', |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1512 'intel/hsdis-amd64-windows-%s.dll' : '6a388372cdd5fe905c1a26ced614334e405d1f30', |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1513 'intel/hsdis-amd64-linux-%s.so' : '0d031013db9a80d6c88330c42c983fbfa7053193', |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1514 'intel/hsdis-amd64-darwin-%s.dylib' : '67f6d23cbebd8998450a88b5bef362171f66f11a', |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1515 'hsdis-sparcv9-solaris-%s.so': '970640a9af0bd63641f9063c11275b371a59ee60', |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1516 'hsdis-sparcv9-linux-%s.so': '0c375986d727651dee1819308fbbc0de4927d5d9', |
16599
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1517 } |
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1518 |
23352
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1519 if flavor: |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1520 flavoredLib = flavor + "/" + libpattern |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1521 else: |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1522 flavoredLib = libpattern |
16976
87fc600ec586
mx: skip downloading hsdis if not available.
Josef Eisl <josef.eisl@jku.at>
parents:
16918
diff
changeset
|
1523 if flavoredLib not in sha1s: |
23352
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1524 mx.warn("hsdis with flavor '{}' not supported on this plattform or architecture".format(flavor)) |
16976
87fc600ec586
mx: skip downloading hsdis if not available.
Josef Eisl <josef.eisl@jku.at>
parents:
16918
diff
changeset
|
1525 return |
87fc600ec586
mx: skip downloading hsdis if not available.
Josef Eisl <josef.eisl@jku.at>
parents:
16918
diff
changeset
|
1526 |
23352
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1527 sha1 = sha1s[flavoredLib] |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1528 lib = flavoredLib % (sha1) |
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1529 path = join(_suite.get_output_root(), 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
|
1530 if not exists(path): |
16599
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1531 sha1path = path + '.sha1' |
23352
3848113e3e6b
Update hsdis binaries
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23343
diff
changeset
|
1532 mx.download_file_with_sha1('hsdis', path, ['https://lafo.ssw.uni-linz.ac.at/pub/hsdis/' + lib], sha1, sha1path, True, True, sources=False) |
5596
e4b1bc5e29e0
hsdis library is downloaded into newly created Graal JDK
Doug Simon <doug.simon@oracle.com>
parents:
5517
diff
changeset
|
1533 if copyToDir is not None and exists(copyToDir): |
22653
24aa7495fec9
Fix download for hsdis on Linux/SPARC
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22646
diff
changeset
|
1534 destFileName = mx.add_lib_suffix('hsdis-' + mx.get_arch()) |
24aa7495fec9
Fix download for hsdis on Linux/SPARC
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22646
diff
changeset
|
1535 shutil.copy(path, copyToDir + os.sep + destFileName) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
1536 |
5245 | 1537 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
|
1538 """disassemble HexCodeFiles embedded in text files |
5245 | 1539 |
1540 Run a tool over the input files to convert all embedded HexCodeFiles | |
1541 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
|
1542 |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1543 parser = ArgumentParser(prog='mx hcfdis') |
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
|
1544 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
|
1545 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
|
1546 |
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
|
1547 args = parser.parse_args(args) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1548 |
16599
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1549 path = mx.library('HCFDIS').get_path(resolve=True) |
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1550 mx.run_java(['-cp', path, 'com.oracle.max.hcfdis.HexCodeFileDis'] + args.files) |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1551 |
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
|
1552 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
|
1553 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
|
1554 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
|
1555 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
|
1556 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
|
1557 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
|
1558 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
|
1559 if len(addressAndSymbol) == 2: |
11514
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1560 address, symbol = addressAndSymbol |
dc3c8df55905
added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents:
11512
diff
changeset
|
1561 if address.startswith('0x'): |
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
|
1562 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
|
1563 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
|
1564 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
|
1565 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
|
1566 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
|
1567 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
|
1568 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
|
1569 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
|
1570 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
|
1571 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
|
1572 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
|
1573 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
|
1574 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
|
1575 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
|
1576 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
|
1577 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
|
1578 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
|
1579 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
|
1580 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
|
1581 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
|
1582 print >> fp, l |
5245 | 1583 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1584 def isJVMCIEnabled(vm): |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1585 return vm != 'original' and not vm.endswith('nojvmci') |
9803
8e33b4ebfef1
add isGraalEnabled(vm) function in commands.py
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
9667
diff
changeset
|
1586 |
16167
1f4955abca9b
mx: add jol command for java object layout introspection
Andreas Woess <andreas.woess@jku.at>
parents:
16117
diff
changeset
|
1587 def jol(args): |
1f4955abca9b
mx: add jol command for java object layout introspection
Andreas Woess <andreas.woess@jku.at>
parents:
16117
diff
changeset
|
1588 """Java Object Layout""" |
16599
89be7c4db12c
made sha1 signatures mandatory for libraries; made libraries for all downloading performed by commands in mx_graal
Doug Simon <doug.simon@oracle.com>
parents:
16499
diff
changeset
|
1589 joljar = mx.library('JOL_INTERNALS').get_path(resolve=True) |
16167
1f4955abca9b
mx: add jol command for java object layout introspection
Andreas Woess <andreas.woess@jku.at>
parents:
16117
diff
changeset
|
1590 candidates = mx.findclass(args, logToConsole=False, matcher=lambda s, classname: s == classname or classname.endswith('.' + s) or classname.endswith('$' + s)) |
18218
8588db09f5e9
mx jol: let user select from found classes, skip duplicates
Andreas Woess <andreas.woess@jku.at>
parents:
18163
diff
changeset
|
1591 |
8588db09f5e9
mx jol: let user select from found classes, skip duplicates
Andreas Woess <andreas.woess@jku.at>
parents:
18163
diff
changeset
|
1592 if len(candidates) > 0: |
18601
676f1800077c
mx: removed unused _read_projects_file function
Doug Simon <doug.simon@oracle.com>
parents:
18414
diff
changeset
|
1593 candidates = mx.select_items(sorted(candidates)) |
18218
8588db09f5e9
mx jol: let user select from found classes, skip duplicates
Andreas Woess <andreas.woess@jku.at>
parents:
18163
diff
changeset
|
1594 else: |
8588db09f5e9
mx jol: let user select from found classes, skip duplicates
Andreas Woess <andreas.woess@jku.at>
parents:
18163
diff
changeset
|
1595 # mx.findclass can be mistaken, don't give up yet |
8588db09f5e9
mx jol: let user select from found classes, skip duplicates
Andreas Woess <andreas.woess@jku.at>
parents:
18163
diff
changeset
|
1596 candidates = args |
16167
1f4955abca9b
mx: add jol command for java object layout introspection
Andreas Woess <andreas.woess@jku.at>
parents:
16117
diff
changeset
|
1597 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1598 run_vm(['-javaagent:' + joljar, '-cp', os.pathsep.join([mx.classpath(), joljar]), "org.openjdk.jol.MainObjectInternals"] + candidates) |
16167
1f4955abca9b
mx: add jol command for java object layout introspection
Andreas Woess <andreas.woess@jku.at>
parents:
16117
diff
changeset
|
1599 |
23307
c75c5e73fd65
Deploy all JVM_{product,fastdebug}_{jvmci,server} variants.
Roland Schatz <roland.schatz@oracle.com>
parents:
23301
diff
changeset
|
1600 def deploy_binary(args): |
c75c5e73fd65
Deploy all JVM_{product,fastdebug}_{jvmci,server} variants.
Roland Schatz <roland.schatz@oracle.com>
parents:
23301
diff
changeset
|
1601 for vmbuild in ['product', 'fastdebug']: |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1602 for vm in ['server']: |
23308
b9114ca0c174
Fix bug in deploy_binary.
Roland Schatz <roland.schatz@oracle.com>
parents:
23307
diff
changeset
|
1603 if vmbuild != _vmbuild or vm != get_vm(): |
23307
c75c5e73fd65
Deploy all JVM_{product,fastdebug}_{jvmci,server} variants.
Roland Schatz <roland.schatz@oracle.com>
parents:
23301
diff
changeset
|
1604 mx.instantiateDistribution('JVM_<vmbuild>_<vm>', dict(vmbuild=vmbuild, vm=vm)) |
c75c5e73fd65
Deploy all JVM_{product,fastdebug}_{jvmci,server} variants.
Roland Schatz <roland.schatz@oracle.com>
parents:
23301
diff
changeset
|
1605 mx.deploy_binary(args) |
c75c5e73fd65
Deploy all JVM_{product,fastdebug}_{jvmci,server} variants.
Roland Schatz <roland.schatz@oracle.com>
parents:
23301
diff
changeset
|
1606 |
22167
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1607 mx.update_commands(_suite, { |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1608 'build': [build, ''], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1609 'buildvars': [buildvars, ''], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1610 'buildvms': [buildvms, '[-options]'], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1611 'c1visualizer' : [c1visualizer, ''], |
23307
c75c5e73fd65
Deploy all JVM_{product,fastdebug}_{jvmci,server} variants.
Roland Schatz <roland.schatz@oracle.com>
parents:
23301
diff
changeset
|
1612 'deploy-binary' : [deploy_binary, ''], |
22167
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1613 'export': [export, '[-options] [zipfile]'], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1614 'hsdis': [hsdis, '[att]'], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1615 'hcfdis': [hcfdis, ''], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1616 'igv' : [igv, ''], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1617 'jdkhome': [print_jdkhome, ''], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1618 'shortunittest' : [shortunittest, '[unittest options] [--] [VM options] [filters...]', mx_unittest.unittestHelpSuffix], |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1619 'vm': [run_vm, '[-options] class [args...]'], |
22167
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1620 'deoptalot' : [deoptalot, '[n]'], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1621 'longtests' : [longtests, ''], |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1622 'jol' : [jol, ''], |
22427
9c55f608b79e
Generate jvmci.make with all defined dependencies/bootclasspath regardless availability in the current enviornment
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
22418
diff
changeset
|
1623 'makefile' : [mx_jvmci_makefile.build_makefile, 'build makefiles for JDK build', None, {'keepUnsatisfiedDependencies': True}], |
22167
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1624 }) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
1625 |
22167
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1626 mx.add_argument('--vmcwd', dest='vm_cwd', help='current directory will be changed to <path> before the VM is executed', default=None, metavar='<path>') |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1627 mx.add_argument('--installed-jdks', help='the base directory in which the JDKs cloned from $JAVA_HOME exist. ' + |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1628 'The VM selected by --vm and --vmbuild options is under this directory (i.e., ' + |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1629 join('<path>', '<jdk-version>', '<vmbuild>', 'jre', 'lib', '<vm>', mx.add_lib_prefix(mx.add_lib_suffix('jvm'))) + ')', default=None, metavar='<path>') |
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
|
1630 |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1631 mx.add_argument('-M', '--jvmci-mode', action='store', dest='jvmci_mode', choices=_jvmciModes.keys(), help='the JVMCI mode to use (default: ' + _jvmciMode.jvmciMode + ')') |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1632 mx.add_argument('--vm', action='store', dest='vm', choices=_vmChoices.keys() + _vmAliases.keys(), help='the VM type to build/run') |
22167
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1633 mx.add_argument('--vmbuild', action='store', dest='vmbuild', choices=_vmbuildChoices, help='the VM build to build/run (default: ' + _vmbuildChoices[0] + ')') |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1634 mx.add_argument('--ecl', action='store_true', dest='make_eclipse_launch', help='create launch configuration for running VM execution(s) in Eclipse') |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1635 mx.add_argument('--vmprefix', action='store', dest='vm_prefix', help='prefix for running the VM (e.g. "/usr/bin/gdb --args")', metavar='<prefix>') |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1636 mx.add_argument('--gdb', action='store_const', const='/usr/bin/gdb --args', dest='vm_prefix', help='alias for --vmprefix "/usr/bin/gdb --args"') |
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1637 mx.add_argument('--lldb', action='store_const', const='lldb --', dest='vm_prefix', help='alias for --vmprefix "lldb --"') |
4144
34527a24bcf8
Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents:
3736
diff
changeset
|
1638 |
23343
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1639 # The mx builders are run inside the directory of their associated suite, |
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1640 # not the primary suite, so they might not see the env file of the primary |
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1641 # suite. Capture DEFAULT_VM in case it was only defined in the primary |
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1642 # suite. |
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1643 mx.add_ide_envvar('DEFAULT_VM') |
c8526451bb6b
register DEFAULT_VM as env var to be captured in IDE configs
Doug Simon <doug.simon@oracle.com>
parents:
23332
diff
changeset
|
1644 |
22041
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1645 class JVMCIArchiveParticipant: |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1646 def __init__(self, dist): |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1647 self.dist = dist |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1648 self.jvmciServices = {} |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1649 |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1650 def __opened__(self, arc, srcArc, services): |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1651 self.services = services |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1652 self.arc = arc |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1653 |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1654 def __add__(self, arcname, contents): |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1655 if arcname.startswith('META-INF/jvmci.services/'): |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1656 service = arcname[len('META-INF/jvmci.services/'):] |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1657 self.jvmciServices.setdefault(service, []).extend([provider for provider in contents.split('\n')]) |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1658 return True |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1659 return False |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1660 |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1661 def __addsrc__(self, arcname, contents): |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1662 return False |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1663 |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1664 def __closing__(self): |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1665 for service, providers in self.jvmciServices.iteritems(): |
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1666 arcname = 'META-INF/jvmci.services/' + service |
22042
db48a62aba36
only (re)make archives from build command if at least one compilation occurred
Doug Simon <doug.simon@oracle.com>
parents:
22041
diff
changeset
|
1667 # Convert providers to a set before printing to remove duplicates |
22142
8704244e4f6a
service provider configuration files must end with a new line
Doug Simon <doug.simon@oracle.com>
parents:
22141
diff
changeset
|
1668 self.arc.zf.writestr(arcname, '\n'.join(frozenset(providers))+ '\n') |
22041
56c50504d60d
mx: removed JVMCI code from Distribution.make_archive
Doug Simon <doug.simon@oracle.com>
parents:
22031
diff
changeset
|
1669 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1670 _jvmci_bootstrap_jdk = None |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1671 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1672 def get_jvmci_bootstrap_jdk(): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1673 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1674 Gets the JDK from which a JVMCI JDK is created. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1675 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1676 global _jvmci_bootstrap_jdk |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1677 if not _jvmci_bootstrap_jdk: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1678 def _versionCheck(version): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1679 return version >= _minVersion and (not _untilVersion or version >= _untilVersion) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1680 versionDesc = ">=" + str(_minVersion) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1681 if _untilVersion: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1682 versionDesc += " and <=" + str(_untilVersion) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1683 _jvmci_bootstrap_jdk = mx.get_jdk(_versionCheck, versionDescription=versionDesc, tag='default') |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1684 return _jvmci_bootstrap_jdk |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1685 |
22561
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1686 _jvmci_bootclasspath_prepends = [] |
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1687 |
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1688 def add_bootclasspath_prepend(dep): |
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1689 assert isinstance(dep, mx.ClasspathDependency) |
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1690 _jvmci_bootclasspath_prepends.append(dep) |
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1691 |
22771
994b87797b9d
rename classes to denote jvmci version
Doug Simon <doug.simon@oracle.com>
parents:
22766
diff
changeset
|
1692 class JVMCI8JDKConfig(mx.JDKConfig): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1693 def __init__(self, vmbuild): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1694 # Ignore the deployable distributions here - they are only deployed during building. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1695 # This significantly reduces the latency of the "mx java" command. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1696 self.vmbuild = vmbuild |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1697 jdkDir = get_jvmci_jdk_dir(build=self.vmbuild, create=True, deployDists=False) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1698 mx.JDKConfig.__init__(self, jdkDir, tag=_JVMCI_JDK_TAG) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1699 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1700 def parseVmArgs(self, args, addDefaultArgs=True): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1701 args = mx.expand_project_in_args(args, insitu=False) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1702 jacocoArgs = mx_gate.get_jacoco_agent_args() |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1703 if jacocoArgs: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1704 args = jacocoArgs + args |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1705 |
22561
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1706 args = ['-Xbootclasspath/p:' + dep.classpath_repr() for dep in _jvmci_bootclasspath_prepends] + args |
ba4ef98ae535
Add mx_jvmci API to prepend ClasspathDependencies to the bootclasspath of the jvmci JDK
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22534
diff
changeset
|
1707 |
22603
2448e3c0cd98
set default jvmci.compiler property explicitly based on available suites
Doug Simon <doug.simon@oracle.com>
parents:
22601
diff
changeset
|
1708 # Set the default JVMCI compiler |
2448e3c0cd98
set default jvmci.compiler property explicitly based on available suites
Doug Simon <doug.simon@oracle.com>
parents:
22601
diff
changeset
|
1709 for jdkDist in reversed(jdkDeployedDists): |
2448e3c0cd98
set default jvmci.compiler property explicitly based on available suites
Doug Simon <doug.simon@oracle.com>
parents:
22601
diff
changeset
|
1710 if isinstance(jdkDist, JvmciJDKDeployedDist): |
2448e3c0cd98
set default jvmci.compiler property explicitly based on available suites
Doug Simon <doug.simon@oracle.com>
parents:
22601
diff
changeset
|
1711 if jdkDist._compilers: |
2448e3c0cd98
set default jvmci.compiler property explicitly based on available suites
Doug Simon <doug.simon@oracle.com>
parents:
22601
diff
changeset
|
1712 jvmciCompiler = jdkDist._compilers[-1] |
23319
c1935b089c01
8151470: [JVMCI] remove up-call to HotSpotJVMCICompilerConfig.selectCompiler
Roland Schatz <roland.schatz@oracle.com>
parents:
23311
diff
changeset
|
1713 args = ['-Djvmci.Compiler=' + jvmciCompiler] + args |
22603
2448e3c0cd98
set default jvmci.compiler property explicitly based on available suites
Doug Simon <doug.simon@oracle.com>
parents:
22601
diff
changeset
|
1714 break |
2448e3c0cd98
set default jvmci.compiler property explicitly based on available suites
Doug Simon <doug.simon@oracle.com>
parents:
22601
diff
changeset
|
1715 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1716 if '-version' in args: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1717 ignoredArgs = args[args.index('-version') + 1:] |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1718 if len(ignoredArgs) > 0: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1719 mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs)) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1720 return self.processArgs(args, addDefaultArgs=addDefaultArgs) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1721 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1722 # Overrides JDKConfig |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1723 def run_java(self, args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, env=None, addDefaultArgs=True): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1724 if vm is None: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1725 vm = get_vm() |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1726 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1727 if not isVMSupported(vm): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1728 mx.abort('The ' + vm + ' is not supported on this platform') |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1729 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1730 if cwd is None: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1731 cwd = _vm_cwd |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1732 elif _vm_cwd is not None and _vm_cwd != cwd: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1733 mx.abort("conflicting working directories: do not set --vmcwd for this command") |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1734 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1735 args = self.parseVmArgs(args, addDefaultArgs=addDefaultArgs) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1736 if _make_eclipse_launch: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1737 mx.make_eclipse_launch(_suite, args, _suite.name + '-' + build, name=None, deps=mx.dependencies()) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1738 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1739 pfx = _vm_prefix.split() if _vm_prefix is not None else [] |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1740 if not vm.endswith('nojvmci'): |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1741 args = get_jvmci_mode_args() + args |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1742 cmd = pfx + [self.java] + ['-' + vm] + args |
22732
b2ffe9891356
In 'def run_java()' add missing forwarding of timeout argument
Paul Woegerer <paul.woegerer@oracle.com>
parents:
22729
diff
changeset
|
1743 return mx.run(cmd, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout) |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1744 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1745 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1746 The dict of JVMCI JDKs indexed by vmbuild names. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1747 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1748 _jvmci_jdks = {} |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1749 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1750 def get_jvmci_jdk(vmbuild=None): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1751 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1752 Gets the JVMCI JDK corresponding to 'vmbuild'. |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1753 """ |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1754 if not vmbuild: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1755 vmbuild = _vmbuild |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1756 jdk = _jvmci_jdks.get(vmbuild) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1757 if jdk is None: |
22771
994b87797b9d
rename classes to denote jvmci version
Doug Simon <doug.simon@oracle.com>
parents:
22766
diff
changeset
|
1758 jdk = JVMCI8JDKConfig(vmbuild) |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1759 _jvmci_jdks[vmbuild] = jdk |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1760 return jdk |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1761 |
22771
994b87797b9d
rename classes to denote jvmci version
Doug Simon <doug.simon@oracle.com>
parents:
22766
diff
changeset
|
1762 class JVMCI8JDKFactory(mx.JDKFactory): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1763 def getJDKConfig(self): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1764 jdk = get_jvmci_jdk(_vmbuild) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1765 check_VM_exists(get_vm(), jdk.home) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1766 return jdk |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1767 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1768 def description(self): |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1769 return "JVMCI JDK" |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1770 |
22771
994b87797b9d
rename classes to denote jvmci version
Doug Simon <doug.simon@oracle.com>
parents:
22766
diff
changeset
|
1771 mx.addJDKFactory(_JVMCI_JDK_TAG, mx.JavaCompliance('8'), JVMCI8JDKFactory()) |
22766
7d02b4097309
register JVMCIJDKFactory at module load time
Doug Simon <doug.simon@oracle.com>
parents:
22761
diff
changeset
|
1772 |
22167
22b37f37be0a
adapted to removal of mx_init() mechanism from mx2
Doug Simon <doug.simon@oracle.com>
parents:
22166
diff
changeset
|
1773 def mx_post_parse_cmd_line(opts): |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1774 mx.set_java_command_default_jdk_tag(_JVMCI_JDK_TAG) |
5729
dab877fe7c31
prevented error during mx site from corrupting an existing site
Doug Simon <doug.simon@oracle.com>
parents:
5708
diff
changeset
|
1775 |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1776 # Execute for the side-effect of checking that the |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1777 # boot strap JDK has a compatible version |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1778 get_jvmci_bootstrap_jdk() |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1779 |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1780 jdkTag = mx.get_jdk_option().tag |
22019
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
1781 if hasattr(opts, 'vm') and opts.vm is not None: |
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
1782 global _vm |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1783 _vm = dealiased_vm(opts.vm) |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1784 if jdkTag and jdkTag != _JVMCI_JDK_TAG: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1785 mx.warn('Ignoring "--vm" option as "--jdk" tag is not "' + _JVMCI_JDK_TAG + '"') |
23404
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1786 if opts.jvmci_mode is not None: |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1787 global _jvmciMode |
3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
Roland Schatz <roland.schatz@oracle.com>
parents:
23379
diff
changeset
|
1788 _jvmciMode = JVMCIMode(opts.jvmci_mode) |
22019
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
1789 if hasattr(opts, 'vmbuild') and opts.vmbuild is not None: |
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
1790 global _vmbuild |
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
1791 _vmbuild = opts.vmbuild |
22493
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1792 if jdkTag and jdkTag != _JVMCI_JDK_TAG: |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1793 mx.warn('Ignoring "--vmbuild" option as "--jdk" tag is not "' + _JVMCI_JDK_TAG + '"') |
63b12d69147d
added JVMCI JDK factory; clarified distinction between VM aliases and real VMs; removed left-over "graal" references; rename 'vm' function to 'run_vm'
Doug Simon <doug.simon@oracle.com>
parents:
22492
diff
changeset
|
1794 |
22019
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
1795 global _make_eclipse_launch |
07cfd3d7072b
removed _vmSourcesAvailable
Doug Simon <doug.simon@oracle.com>
parents:
22018
diff
changeset
|
1796 _make_eclipse_launch = getattr(opts, 'make_eclipse_launch', False) |
11401
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
1797 global _vm_cwd |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
1798 _vm_cwd = opts.vm_cwd |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
1799 global _installed_jdks |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
1800 _installed_jdks = opts.installed_jdks |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
1801 global _vm_prefix |
2d228d304247
minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents:
11395
diff
changeset
|
1802 _vm_prefix = opts.vm_prefix |
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
|
1803 |
22282
9ab88ee1f79f
spelling fix: instanciate -> instantiate
Doug Simon <doug.simon@oracle.com>
parents:
22281
diff
changeset
|
1804 mx.instantiateDistribution('JVM_<vmbuild>_<vm>', dict(vmbuild=_vmbuild, vm=get_vm())) |
22280
ac5551e3ff9c
Make the JVM a distribution
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22279
diff
changeset
|
1805 |
22139
ed35cb998428
Initial split off from monolithic basic-graal repo
Doug Simon <doug.simon@oracle.com>
parents:
22108
diff
changeset
|
1806 for jdkDist in jdkDeployedDists: |
22761
f2206f5bb62e
removed @ServiceProvider mechanism (GRAAL-1380)
Doug Simon <doug.simon@oracle.com>
parents:
22758
diff
changeset
|
1807 jdkDist.post_parse_cmd_line() |