Mercurial > hg > graal-compiler
annotate mx.graal/mx_graal_9.py @ 22955:60f01ca8f1bd
Factor out common deopt stub code
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Fri, 06 Nov 2015 12:14:51 +0100 |
parents | 1ba34f16d176 |
children | 6bbdf92109e6 |
rev | line source |
---|---|
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
1 # |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
2 # ---------------------------------------------------------------------------------------------------- |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
3 # |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
4 # Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
6 # |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
7 # This code is free software; you can redistribute it and/or modify it |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
8 # under the terms of the GNU General Public License version 2 only, as |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
9 # published by the Free Software Foundation. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
10 # |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
11 # This code is distributed in the hope that it will be useful, but WITHOUT |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
14 # version 2 for more details (a copy is included in the LICENSE file that |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
15 # accompanied this code). |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
16 # |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
17 # You should have received a copy of the GNU General Public License version |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
18 # 2 along with this work; if not, write to the Free Software Foundation, |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
20 # |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
22 # or visit www.oracle.com if you need additional information or have any |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
23 # questions. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
24 # |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
25 # ---------------------------------------------------------------------------------------------------- |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
26 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
27 import os |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
28 from os.path import join |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
29 from argparse import ArgumentParser |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
30 import sanitycheck |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
31 import re |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
32 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
33 import mx |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
34 from mx_gate import Task |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
35 from sanitycheck import _noneAsEmptyList |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
36 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
37 from mx_unittest import unittest |
22952
1ba34f16d176
Factor out benchmarks from mx_graal_n.py and add specjbb2015
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22951
diff
changeset
|
38 from mx_graal_bench import dacapo |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
39 import mx_gate |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
40 import mx_unittest |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
41 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
42 _suite = mx.suite('graal') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
43 |
22951
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
44 _jdk = mx.get_jdk(tag='default') |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
45 assert _jdk.javaCompliance >= "1.9" |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
46 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
47 def isJVMCIEnabled(vm): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
48 return True |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
49 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
50 _jvmciModes = { |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
51 'hosted' : ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI'], |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
52 'jit' : ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI', '-XX:+UseJVMCICompiler'], |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
53 'disabled' : [] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
54 } |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
55 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
56 def get_vm(): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
57 """ |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
58 Gets the name of the currently selected JVM variant. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
59 """ |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
60 return 'server' |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
61 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
62 class JVMCIMode: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
63 """ |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
64 A context manager for setting the current JVMCI mode. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
65 """ |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
66 def __init__(self, jvmciMode=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
67 self.update(jvmciMode) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
68 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
69 def update(self, jvmciMode=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
70 assert jvmciMode is None or jvmciMode in _jvmciModes, jvmciMode |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
71 self.jvmciMode = jvmciMode or _vm.jvmciMode |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
72 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
73 def __enter__(self): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
74 global _vm |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
75 self.previousVm = _vm |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
76 _vm = self |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
77 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
78 def __exit__(self, exc_type, exc_value, traceback): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
79 global _vm |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
80 _vm = self.previousVm |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
81 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
82 _vm = JVMCIMode(jvmciMode='hosted') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
83 |
22887
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
84 class BootClasspathDist(object): |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
85 """ |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
86 Extra info for a Distribution that must be put onto the boot class path. |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
87 """ |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
88 def __init__(self, name): |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
89 self._name = name |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
90 |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
91 def dist(self): |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
92 return mx.distribution(self._name) |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
93 |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
94 def get_classpath_repr(self): |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
95 return self.dist().classpath_repr() |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
96 |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
97 _compilers = ['graal-economy', 'graal'] |
22887
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
98 _bootClasspathDists = [ |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
99 BootClasspathDist('GRAAL_NODEINFO'), |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
100 BootClasspathDist('GRAAL_API'), |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
101 BootClasspathDist('GRAAL_COMPILER'), |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
102 BootClasspathDist('GRAAL'), |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
103 BootClasspathDist('GRAAL_HOTSPOT'), |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
104 BootClasspathDist('GRAAL_TRUFFLE'), |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
105 BootClasspathDist('GRAAL_TRUFFLE_HOTSPOT'), |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
106 ] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
107 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
108 def add_compiler(compilerName): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
109 _compilers.append(compilerName) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
110 |
22887
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
111 def add_boot_classpath_dist(dist): |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
112 _bootClasspathDists.append(dist) |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
113 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
114 mx_gate.add_jacoco_includes(['com.oracle.graal.*']) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
115 mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution']) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
116 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
117 # This is different than the 'jmh' commmand in that it |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
118 # looks for internal JMH benchmarks (i.e. those that |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
119 # depend on the JMH library). |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
120 def microbench(args): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
121 """run JMH microbenchmark projects""" |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
122 parser = ArgumentParser(prog='mx microbench', description=microbench.__doc__, |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
123 usage="%(prog)s [command options|VM options] [-- [JMH options]]") |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
124 parser.add_argument('--jar', help='Explicitly specify micro-benchmark location') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
125 known_args, args = parser.parse_known_args(args) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
126 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
127 vmArgs, jmhArgs = mx.extract_VM_args(args, useDoubleDash=True) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
128 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
129 # look for -f in JMH arguments |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
130 containsF = False |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
131 forking = True |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
132 for i in range(len(jmhArgs)): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
133 arg = jmhArgs[i] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
134 if arg.startswith('-f'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
135 containsF = True |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
136 if arg == '-f' and (i+1) < len(jmhArgs): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
137 arg += jmhArgs[i+1] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
138 try: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
139 if int(arg[2:]) == 0: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
140 forking = False |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
141 except ValueError: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
142 pass |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
143 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
144 if known_args.jar: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
145 # use the specified jar |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
146 args = ['-jar', known_args.jar] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
147 if not forking: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
148 args += vmArgs |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
149 else: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
150 # default to -f1 if not specified otherwise |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
151 if not containsF: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
152 jmhArgs += ['-f1'] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
153 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
154 # find all projects with a direct JMH dependency |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
155 jmhProjects = [] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
156 for p in mx.projects_opt_limit_to_suites(): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
157 if 'JMH' in [x.name for x in p.deps]: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
158 jmhProjects.append(p.name) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
159 cp = mx.classpath(jmhProjects) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
160 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
161 # execute JMH runner |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
162 args = ['-cp', cp] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
163 if not forking: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
164 args += vmArgs |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
165 args += ['org.openjdk.jmh.Main'] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
166 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
167 if forking: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
168 jvm = get_vm() |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
169 def quoteSpace(s): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
170 if " " in s: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
171 return '"' + s + '"' |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
172 return s |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
173 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
174 forkedVmArgs = map(quoteSpace, _parseVmArgs(_jdk, vmArgs)) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
175 args += ['--jvmArgsPrepend', ' '.join(['-' + jvm] + forkedVmArgs)] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
176 run_vm(args + jmhArgs) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
177 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
178 def ctw(args, extraVMarguments=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
179 """run CompileTheWorld""" |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
180 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
181 defaultCtwopts = '-Inline' |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
182 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
183 parser = ArgumentParser(prog='mx ctw') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
184 parser.add_argument('--ctwopts', action='store', help='space separated JVMCI options used for CTW compilations (default: --ctwopts="' + defaultCtwopts + '")', default=defaultCtwopts, metavar='<options>') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
185 parser.add_argument('--cp', '--jar', action='store', help='jar or class path denoting classes to compile', metavar='<path>') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
186 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
187 args, vmargs = parser.parse_known_args(args) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
188 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
189 if args.ctwopts: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
190 # Replace spaces with '#' since -G: options cannot contain spaces |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
191 # when they are collated in the "jvmci.options" system property |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
192 vmargs.append('-G:CompileTheWorldConfig=' + re.sub(r'\s+', '#', args.ctwopts)) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
193 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
194 if args.cp: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
195 cp = os.path.abspath(args.cp) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
196 else: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
197 cp = join(_jdk.home, 'lib', 'modules', 'bootmodules.jimage') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
198 vmargs.append('-G:CompileTheWorldExcludeMethodFilter=sun.awt.X11.*.*') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
199 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
200 # suppress menubar and dock when running on Mac; exclude x11 classes as they may cause vm crashes (on Solaris) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
201 vmargs = ['-Djava.awt.headless=true'] + vmargs |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
202 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
203 if _vm.jvmciMode == 'disabled': |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
204 vmargs += ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + cp] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
205 else: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
206 if _vm.jvmciMode == 'jit': |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
207 vmargs += ['-XX:+BootstrapJVMCI'] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
208 vmargs += ['-G:CompileTheWorldClasspath=' + cp, 'com.oracle.graal.hotspot.CompileTheWorld'] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
209 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
210 run_vm(vmargs + _noneAsEmptyList(extraVMarguments)) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
211 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
212 class UnitTestRun: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
213 def __init__(self, name, args): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
214 self.name = name |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
215 self.args = args |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
216 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
217 def run(self, suites, tasks, extraVMarguments=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
218 for suite in suites: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
219 with Task(self.name + ': hosted-product ' + suite, tasks) as t: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
220 if t: unittest(['--suite', suite, '--enable-timing', '--verbose', '--fail-fast'] + self.args + _noneAsEmptyList(extraVMarguments)) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
221 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
222 class BootstrapTest: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
223 def __init__(self, name, vmbuild, args, suppress=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
224 self.name = name |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
225 self.args = args |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
226 self.suppress = suppress |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
227 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
228 def run(self, tasks, extraVMarguments=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
229 with JVMCIMode('jit'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
230 with Task(self.name, tasks) as t: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
231 if t: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
232 if self.suppress: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
233 out = mx.DuplicateSuppressingStream(self.suppress).write |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
234 else: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
235 out = None |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
236 run_vm(self.args + _noneAsEmptyList(extraVMarguments) + ['-XX:-TieredCompilation', '-XX:+BootstrapJVMCI', '-version'], out=out) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
237 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
238 def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVMarguments=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
239 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
240 # Run unit tests in hosted mode |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
241 with JVMCIMode('hosted'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
242 for r in unit_test_runs: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
243 r.run(suites, tasks, extraVMarguments) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
244 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
245 # Run ctw against rt.jar on server-hosted-jvmci |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
246 with JVMCIMode('hosted'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
247 with Task('CTW:hosted', tasks) as t: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
248 if t: ctw(['--ctwopts', '-Inline +ExitVMOnException', '-esa', '-G:+CompileTheWorldMultiThreaded', '-G:-InlineDuringParsing', '-G:-CompileTheWorldVerbose', '-XX:ReservedCodeCacheSize=300m'], _noneAsEmptyList(extraVMarguments)) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
249 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
250 # bootstrap tests |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
251 for b in bootstrap_tests: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
252 b.run(tasks, extraVMarguments) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
253 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
254 # run dacapo sanitychecks |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
255 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel='release', extraVmArguments=extraVMarguments) \ |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
256 + sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel='release', extraVmArguments=extraVMarguments): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
257 with Task(str(test) + ':' + 'release', tasks) as t: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
258 if t and not test.test('jvmci'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
259 t.abort(test.name + ' Failed') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
260 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
261 # ensure -Xbatch still works |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
262 with JVMCIMode('jit'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
263 with Task('DaCapo_pmd:BatchMode', tasks) as t: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
264 if t: dacapo(_noneAsEmptyList(extraVMarguments) + ['-Xbatch', 'pmd']) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
265 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
266 # ensure -Xcomp still works |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
267 with JVMCIMode('jit'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
268 with Task('XCompMode:product', tasks) as t: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
269 if t: run_vm(_noneAsEmptyList(extraVMarguments) + ['-Xcomp', '-version']) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
270 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
271 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
272 graal_unit_test_runs = [ |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
273 UnitTestRun('UnitTests', []), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
274 ] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
275 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
276 _registers = 'o0,o1,o2,o3,f8,f9,d32,d34' if mx.get_arch() == 'sparcv9' else 'rbx,r11,r10,r14,xmm3,xmm11,xmm14' |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
277 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
278 graal_bootstrap_tests = [ |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
279 BootstrapTest('BootstrapWithSystemAssertions', 'fastdebug', ['-esa']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
280 BootstrapTest('BootstrapWithSystemAssertionsNoCoop', 'fastdebug', ['-esa', '-XX:-UseCompressedOops', '-G:+ExitVMOnException']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
281 BootstrapTest('BootstrapWithGCVecification', 'product', ['-XX:+UnlockDiagnosticVMOptions', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-G:+ExitVMOnException'], suppress=['VerifyAfterGC:', 'VerifyBeforeGC:']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
282 BootstrapTest('BootstrapWithG1GCVecification', 'product', ['-XX:+UnlockDiagnosticVMOptions', '-XX:-UseSerialGC', '-XX:+UseG1GC', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-G:+ExitVMOnException'], suppress=['VerifyAfterGC:', 'VerifyBeforeGC:']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
283 BootstrapTest('BootstrapEconomyWithSystemAssertions', 'fastdebug', ['-esa', '-Djvmci.compiler=graal-economy', '-G:+ExitVMOnException']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
284 BootstrapTest('BootstrapWithExceptionEdges', 'fastdebug', ['-esa', '-G:+StressInvokeWithExceptionNode', '-G:+ExitVMOnException']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
285 BootstrapTest('BootstrapWithRegisterPressure', 'product', ['-esa', '-G:RegisterPressure=' + _registers, '-G:+ExitVMOnException']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
286 BootstrapTest('BootstrapTraceRAWithRegisterPressure', 'product', ['-esa', '-G:+TraceRA', '-G:RegisterPressure=' + _registers, '-G:+ExitVMOnException']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
287 BootstrapTest('BootstrapWithImmutableCode', 'product', ['-esa', '-G:+ImmutableCode', '-G:+VerifyPhases', '-G:+ExitVMOnException']), |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
288 ] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
289 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
290 def _graal_gate_runner(args, tasks): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
291 compiler_gate_runner(['graal'], graal_unit_test_runs, graal_bootstrap_tests, tasks, args.extra_vm_argument) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
292 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
293 mx_gate.add_gate_runner(_suite, _graal_gate_runner) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
294 mx_gate.add_gate_argument('--extra-vm-argument', action='append', help='add extra vm argument to gate tasks if applicable (multiple occurrences allowed)') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
295 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
296 def _unittest_vm_launcher(vmArgs, mainClass, mainClassArgs): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
297 run_vm(vmArgs + [mainClass] + mainClassArgs) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
298 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
299 mx_unittest.set_vm_launcher('JDK9 VM launcher', _unittest_vm_launcher) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
300 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
301 def _parseVmArgs(jdk, args, addDefaultArgs=True): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
302 args = mx.expand_project_in_args(args, insitu=False) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
303 jacocoArgs = mx_gate.get_jacoco_agent_args() |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
304 if jacocoArgs: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
305 args = jacocoArgs + args |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
306 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
307 # Support for -G: options |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
308 def translateGOption(arg): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
309 if arg.startswith('-G:+'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
310 if '=' in arg: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
311 mx.abort('Mixing + and = in -G: option specification: ' + arg) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
312 arg = '-Djvmci.option.' + arg[len('-G:+'):] + '=true' |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
313 elif arg.startswith('-G:-'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
314 if '=' in arg: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
315 mx.abort('Mixing - and = in -G: option specification: ' + arg) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
316 arg = '-Djvmci.option.' + arg[len('-G:+'):] + '=false' |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
317 elif arg.startswith('-G:'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
318 arg = '-Djvmci.option.' + arg[len('-G:'):] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
319 return arg |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
320 args = map(translateGOption, args) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
321 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
322 bcp = [mx.distribution('truffle:TRUFFLE_API').classpath_repr()] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
323 if _jvmciModes[_vm.jvmciMode]: |
22887
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
324 bcp.extend([d.get_classpath_repr() for d in _bootClasspathDists]) |
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
325 |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
326 args = ['-Xbootclasspath/p:' + os.pathsep.join(bcp)] + args |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
327 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
328 # Set the default JVMCI compiler |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
329 jvmciCompiler = _compilers[-1] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
330 args = ['-Djvmci.compiler=' + jvmciCompiler] + args |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
331 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
332 if '-version' in args: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
333 ignoredArgs = args[args.index('-version') + 1:] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
334 if len(ignoredArgs) > 0: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
335 mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs)) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
336 return jdk.processArgs(args, addDefaultArgs=addDefaultArgs) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
337 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
338 def run_java(jdk, args, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, env=None, addDefaultArgs=True): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
339 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
340 args = _parseVmArgs(jdk, args, addDefaultArgs=addDefaultArgs) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
341 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
342 jvmciModeArgs = _jvmciModes[_vm.jvmciMode] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
343 cmd = [jdk.java] + ['-' + get_vm()] + jvmciModeArgs + args |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
344 return mx.run(cmd, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
345 |
22951
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
346 _GRAAL_JVMCI_TAG = 'graal' |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
347 |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
348 class GraalJVMCI9JDKConfig(mx.JDKConfig): |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
349 def __init__(self, original): |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
350 self._original = original |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
351 mx.JDKConfig.__init__(self, original.home, tag=_GRAAL_JVMCI_TAG) |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
352 |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
353 def run_java(self, args, **kwArgs): |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
354 run_java(self._original, args, **kwArgs) |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
355 |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
356 class GraalJDKFactory(mx.JDKFactory): |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
357 def getJDKConfig(self): |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
358 return GraalJVMCI9JDKConfig(_jdk) |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
359 |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
360 def description(self): |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
361 return "JVMCI JDK with Graal" |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
362 |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
363 mx.addJDKFactory(_GRAAL_JVMCI_TAG, mx.JavaCompliance('9'), GraalJDKFactory()) |
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
364 |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
365 def run_vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, debugLevel=None, vmbuild=None): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
366 """run a Java program by executing the java executable in a JVMCI JDK""" |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
367 |
22951
d74202a599fe
Support running Truffle using Graal on a JVMCI-enabled JDK9 image.
Roland Schatz <roland.schatz@oracle.com>
parents:
22887
diff
changeset
|
368 return run_java(_jdk, args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout) |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
369 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
370 class GraalArchiveParticipant: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
371 def __init__(self, dist): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
372 self.dist = dist |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
373 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
374 def __opened__(self, arc, srcArc, services): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
375 self.services = services |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
376 self.arc = arc |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
377 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
378 def __add__(self, arcname, contents): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
379 if arcname.startswith('META-INF/jvmci.providers/'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
380 provider = arcname[len('META-INF/jvmci.providers/'):] |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
381 for service in contents.strip().split(os.linesep): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
382 assert service |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
383 self.services.setdefault(service, []).append(provider) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
384 return True |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
385 elif arcname.endswith('_OptionDescriptors.class'): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
386 # Need to create service files for the providers of the |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
387 # jdk.vm.ci.options.Options service created by |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
388 # jdk.vm.ci.options.processor.OptionProcessor. |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
389 provider = arcname[:-len('.class'):].replace('/', '.') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
390 self.services.setdefault('jdk.vm.ci.options.OptionDescriptors', []).append(provider) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
391 return False |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
392 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
393 def __addsrc__(self, arcname, contents): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
394 return False |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
395 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
396 def __closing__(self): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
397 pass |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
398 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
399 mx.update_commands(_suite, { |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
400 'vm': [run_vm, '[-options] class [args...]'], |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
401 'ctw': [ctw, '[-vmoptions|noinline|nocomplex|full]'], |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
402 'microbench' : [microbench, '[VM options] [-- [JMH options]]'], |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
403 }) |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
404 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
405 mx.add_argument('-M', '--jvmci-mode', action='store', choices=sorted(_jvmciModes.viewkeys()), help='the JVM variant type to build/run (default: ' + _vm.jvmciMode + ')') |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
406 |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
407 def mx_post_parse_cmd_line(opts): |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
408 if opts.jvmci_mode is not None: |
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
409 _vm.update(opts.jvmci_mode) |
22887
a9b332b34123
mx: added BootClasspathDist
Doug Simon <doug.simon@oracle.com>
parents:
22882
diff
changeset
|
410 for dist in [d.dist() for d in _bootClasspathDists]: |
22882
9fed99d7f32d
made Graal work on a JDK9 image without needing the jvmci mx suite or extensions
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
411 dist.set_archiveparticipant(GraalArchiveParticipant(dist)) |