author | iklam |
Mon, 20 Aug 2018 13:58:23 -0700 | |
changeset 51467 | 12997ebbc0d8 |
parent 51341 | 09cc8813ae51 |
child 52894 | 8df9cf767f79 |
permissions | -rw-r--r-- |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
1 |
/* |
49360 | 2 |
* Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved. |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
4 |
* |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
8 |
* |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
13 |
* accompanied this code). |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
14 |
* |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
18 |
* |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
21 |
* questions. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
22 |
* |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
23 |
*/ |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
24 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
25 |
#include "precompiled.hpp" |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
26 |
#include "ci/ciMethod.hpp" |
49449
ef5d5d343e2a
8199263: Split interfaceSupport.hpp to not require including .inline.hpp files
coleenp
parents:
49360
diff
changeset
|
27 |
#include "ci/ciUtilities.inline.hpp" |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
28 |
#include "compiler/abstractCompiler.hpp" |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
29 |
#include "compiler/compilerDirectives.hpp" |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
30 |
#include "compiler/compilerOracle.hpp" |
49360 | 31 |
#include "memory/allocation.inline.hpp" |
37248 | 32 |
#include "memory/resourceArea.hpp" |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
33 |
|
51333
f6641fcf7b7e
8208670: Compiler changes to allow enabling -Wreorder
tschatzl
parents:
49449
diff
changeset
|
34 |
CompilerDirectives::CompilerDirectives() : _next(NULL), _match(NULL), _ref_count(0) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
35 |
_c1_store = new DirectiveSet(this); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
36 |
_c2_store = new DirectiveSet(this); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
37 |
}; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
38 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
39 |
CompilerDirectives::~CompilerDirectives() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
40 |
if (_c1_store != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
41 |
delete _c1_store; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
42 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
43 |
if (_c2_store != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
44 |
delete _c2_store; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
45 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
46 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
47 |
// remove all linked method matchers |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
48 |
BasicMatcher* tmp = _match; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
49 |
while (tmp != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
50 |
BasicMatcher* next = tmp->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
51 |
delete tmp; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
52 |
tmp = next; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
53 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
54 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
55 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
56 |
void CompilerDirectives::print(outputStream* st) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
57 |
assert(DirectivesStack_lock->owned_by_self(), ""); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
58 |
if (_match != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
59 |
st->cr(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
60 |
st->print("Directive:"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
61 |
if (is_default_directive()) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
62 |
st->print_cr(" (default)"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
63 |
} else { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
64 |
st->cr(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
65 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
66 |
st->print(" matching: "); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
67 |
_match->print(st); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
68 |
BasicMatcher* tmp = _match->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
69 |
while (tmp != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
70 |
st->print(", "); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
71 |
tmp->print(st); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
72 |
tmp = tmp->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
73 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
74 |
st->cr(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
75 |
} else { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
76 |
assert(0, "There should always be a match"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
77 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
78 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
79 |
if (_c1_store != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
80 |
st->print_cr(" c1 directives:"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
81 |
_c1_store->print(st); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
82 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
83 |
if (_c2_store != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
84 |
st->cr(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
85 |
st->print_cr(" c2 directives:"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
86 |
_c2_store->print(st); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
87 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
88 |
//--- |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
89 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
90 |
|
35130
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
91 |
void CompilerDirectives::finalize(outputStream* st) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
92 |
if (_c1_store != NULL) { |
35130
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
93 |
_c1_store->finalize(st); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
94 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
95 |
if (_c2_store != NULL) { |
35130
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
96 |
_c2_store->finalize(st); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
97 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
98 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
99 |
|
35130
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
100 |
void DirectiveSet::finalize(outputStream* st) { |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
101 |
// Check LogOption and warn |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
102 |
if (LogOption && !LogCompilation) { |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
103 |
st->print_cr("Warning: +LogCompilation must be set to enable compilation logging from directives"); |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
104 |
} |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
105 |
|
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
106 |
// if any flag has been modified - set directive as enabled |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
107 |
// unless it already has been explicitly set. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
108 |
if (!_modified[EnableIndex]) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
109 |
if (_inlinematchers != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
110 |
EnableOption = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
111 |
return; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
112 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
113 |
int i; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
114 |
for (i = 0; i < number_of_flags; i++) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
115 |
if (_modified[i]) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
116 |
EnableOption = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
117 |
return; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
118 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
119 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
120 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
121 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
122 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
123 |
CompilerDirectives* CompilerDirectives::next() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
124 |
return _next; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
125 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
126 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
43455
diff
changeset
|
127 |
bool CompilerDirectives::match(const methodHandle& method) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
128 |
if (is_default_directive()) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
129 |
return true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
130 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
131 |
if (method == NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
132 |
return false; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
133 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
134 |
if (_match->match(method)) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
135 |
return true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
136 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
137 |
return false; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
138 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
139 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
140 |
bool CompilerDirectives::add_match(char* str, const char*& error_msg) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
141 |
BasicMatcher* bm = BasicMatcher::parse_method_pattern(str, error_msg); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
142 |
if (bm == NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
143 |
assert(error_msg != NULL, "Must have error message"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
144 |
return false; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
145 |
} else { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
146 |
bm->set_next(_match); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
147 |
_match = bm; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
148 |
return true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
149 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
150 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
151 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
152 |
void CompilerDirectives::inc_refcount() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
153 |
assert(DirectivesStack_lock->owned_by_self(), ""); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
154 |
_ref_count++; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
155 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
156 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
157 |
void CompilerDirectives::dec_refcount() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
158 |
assert(DirectivesStack_lock->owned_by_self(), ""); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
159 |
_ref_count--; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
160 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
161 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
162 |
int CompilerDirectives::refcount() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
163 |
assert(DirectivesStack_lock->owned_by_self(), ""); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
164 |
return _ref_count; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
165 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
166 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
167 |
DirectiveSet* CompilerDirectives::get_for(AbstractCompiler *comp) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
168 |
assert(DirectivesStack_lock->owned_by_self(), ""); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
169 |
if (comp == NULL) { // Xint |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
170 |
return _c1_store; |
35563
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
171 |
} else if (comp->is_c2()) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
172 |
return _c2_store; |
35563
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
173 |
} else { |
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
174 |
// use c1_store as default |
47687 | 175 |
assert(comp->is_c1() || comp->is_jvmci(), ""); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
176 |
return _c1_store; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
177 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
178 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
179 |
|
33480
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
180 |
// In the list of disabled intrinsics, the ID of the disabled intrinsics can separated: |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
181 |
// - by ',' (if -XX:DisableIntrinsic is used once when invoking the VM) or |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
182 |
// - by '\n' (if -XX:DisableIntrinsic is used multiple times when invoking the VM) or |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
183 |
// - by ' ' (if DisableIntrinsic is used on a per-method level, e.g., with CompileCommand). |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
184 |
// |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
185 |
// To simplify the processing of the list, the canonicalize_disableintrinsic() method |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
186 |
// returns a new copy of the list in which '\n' and ' ' is replaced with ','. |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
187 |
ccstrlist DirectiveSet::canonicalize_disableintrinsic(ccstrlist option_value) { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
188 |
char* canonicalized_list = NEW_C_HEAP_ARRAY(char, strlen(option_value) + 1, mtCompiler); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
189 |
int i = 0; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
190 |
char current; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
191 |
while ((current = option_value[i]) != '\0') { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
192 |
if (current == '\n' || current == ' ') { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
193 |
canonicalized_list[i] = ','; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
194 |
} else { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
195 |
canonicalized_list[i] = current; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
196 |
} |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
197 |
i++; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
198 |
} |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
199 |
canonicalized_list[i] = '\0'; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
200 |
return canonicalized_list; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
201 |
} |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
202 |
|
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
203 |
DirectiveSet::DirectiveSet(CompilerDirectives* d) :_inlinematchers(NULL), _directive(d) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
204 |
#define init_defaults_definition(name, type, dvalue, compiler) this->name##Option = dvalue; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
205 |
compilerdirectives_common_flags(init_defaults_definition) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
206 |
compilerdirectives_c2_flags(init_defaults_definition) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
207 |
compilerdirectives_c1_flags(init_defaults_definition) |
38696
441abd3b3345
8155108: CompilerControl: tests incorrectly set states for excluded methods
neliasso
parents:
37248
diff
changeset
|
208 |
memset(_modified, 0, sizeof(_modified)); |
33480
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
209 |
|
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
210 |
// Canonicalize DisableIntrinsic to contain only ',' as a separator. |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
211 |
this->DisableIntrinsicOption = canonicalize_disableintrinsic(DisableIntrinsic); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
212 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
213 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
214 |
DirectiveSet::~DirectiveSet() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
215 |
// remove all linked methodmatchers |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
216 |
InlineMatcher* tmp = _inlinematchers; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
217 |
while (tmp != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
218 |
InlineMatcher* next = tmp->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
219 |
delete tmp; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
220 |
tmp = next; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
221 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
222 |
|
33480
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
223 |
// When constructed, DirectiveSet canonicalizes the DisableIntrinsic flag |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
224 |
// into a new string. Therefore, that string is deallocated when |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
225 |
// the DirectiveSet is destroyed. |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
226 |
assert(this->DisableIntrinsicOption != NULL, ""); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
227 |
FREE_C_HEAP_ARRAY(char, (void *)this->DisableIntrinsicOption); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
228 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
229 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
230 |
// Backward compatibility for CompileCommands |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
231 |
// Breaks the abstraction and causes lots of extra complexity |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
232 |
// - if some option is changed we need to copy directiveset since it no longer can be shared |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
233 |
// - Need to free copy after use |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
234 |
// - Requires a modified bit so we don't overwrite options that is set by directives |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
235 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
43455
diff
changeset
|
236 |
DirectiveSet* DirectiveSet::compilecommand_compatibility_init(const methodHandle& method) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
237 |
// Early bail out - checking all options is expensive - we rely on them not being used |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
238 |
// Only set a flag if it has not been modified and value changes. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
239 |
// Only copy set if a flag needs to be set |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
240 |
if (!CompilerDirectivesIgnoreCompileCommandsOption && CompilerOracle::has_any_option()) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
241 |
DirectiveSet* set = DirectiveSet::clone(this); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
242 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
243 |
bool changed = false; // Track if we actually change anything |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
244 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
245 |
// All CompileCommands are not equal so this gets a bit verbose |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
246 |
// When CompileCommands have been refactored less clutter will remain. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
247 |
if (CompilerOracle::should_break_at(method)) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
248 |
if (!_modified[BreakAtCompileIndex]) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
249 |
set->BreakAtCompileOption = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
250 |
changed = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
251 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
252 |
if (!_modified[BreakAtExecuteIndex]) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
253 |
set->BreakAtExecuteOption = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
254 |
changed = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
255 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
256 |
} |
35130
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
257 |
if (!_modified[LogIndex]) { |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
258 |
bool log = CompilerOracle::should_log(method); |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
259 |
if (log != set->LogOption) { |
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
260 |
set->LogOption = log; |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
261 |
changed = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
262 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
263 |
} |
35130
223598d44a8b
8145345: LogCompilation output is empty after JEP165: Compiler Control
neliasso
parents:
35129
diff
changeset
|
264 |
|
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
265 |
if (CompilerOracle::should_print(method)) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
266 |
if (!_modified[PrintAssemblyIndex]) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
267 |
set->PrintAssemblyOption = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
268 |
changed = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
269 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
270 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
271 |
// Exclude as in should not compile == Enabled |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
272 |
if (CompilerOracle::should_exclude(method)) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
273 |
if (!_modified[ExcludeIndex]) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
274 |
set->ExcludeOption = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
275 |
changed = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
276 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
277 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
278 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
279 |
// inline and dontinline (including exclude) are implemented in the directiveset accessors |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
280 |
#define init_default_cc(name, type, dvalue, cc_flag) { type v; if (!_modified[name##Index] && CompilerOracle::has_option_value(method, #cc_flag, v) && v != this->name##Option) { set->name##Option = v; changed = true;} } |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
281 |
compilerdirectives_common_flags(init_default_cc) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
282 |
compilerdirectives_c2_flags(init_default_cc) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
283 |
compilerdirectives_c1_flags(init_default_cc) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
284 |
|
33480
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
285 |
// Canonicalize DisableIntrinsic to contain only ',' as a separator. |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
286 |
ccstrlist option_value; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
287 |
if (!_modified[DisableIntrinsicIndex] && |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
288 |
CompilerOracle::has_option_value(method, "DisableIntrinsic", option_value)) { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
289 |
set->DisableIntrinsicOption = canonicalize_disableintrinsic(option_value); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
290 |
} |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
291 |
|
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
292 |
|
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
293 |
if (!changed) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
294 |
// We didn't actually update anything, discard. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
295 |
delete set; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
296 |
} else { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
297 |
// We are returning a (parentless) copy. The originals parent don't need to account for this. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
298 |
DirectivesStack::release(this); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
299 |
return set; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
300 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
301 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
302 |
// Nothing changed |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
303 |
return this; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
304 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
305 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
306 |
CompilerDirectives* DirectiveSet::directive() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
307 |
assert(_directive != NULL, "Must have been initialized"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
308 |
return _directive; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
309 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
310 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
43455
diff
changeset
|
311 |
bool DirectiveSet::matches_inline(const methodHandle& method, int inline_action) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
312 |
if (_inlinematchers != NULL) { |
35131
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
313 |
if (_inlinematchers->match(method, inline_action)) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
314 |
return true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
315 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
316 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
317 |
return false; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
318 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
319 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
320 |
bool DirectiveSet::should_inline(ciMethod* inlinee) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
321 |
inlinee->check_is_loaded(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
322 |
VM_ENTRY_MARK; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
323 |
methodHandle mh(THREAD, inlinee->get_Method()); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
324 |
|
35131
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
325 |
if (_inlinematchers != NULL) { |
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
326 |
return matches_inline(mh, InlineMatcher::force_inline); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
327 |
} |
35131
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
328 |
if (!CompilerDirectivesIgnoreCompileCommandsOption) { |
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
329 |
return CompilerOracle::should_inline(mh); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
330 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
331 |
return false; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
332 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
333 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
334 |
bool DirectiveSet::should_not_inline(ciMethod* inlinee) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
335 |
inlinee->check_is_loaded(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
336 |
VM_ENTRY_MARK; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
337 |
methodHandle mh(THREAD, inlinee->get_Method()); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
338 |
|
35131
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
339 |
if (_inlinematchers != NULL) { |
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
340 |
return matches_inline(mh, InlineMatcher::dont_inline); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
341 |
} |
35131
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
342 |
if (!CompilerDirectivesIgnoreCompileCommandsOption) { |
d231aa9f57ba
8144091: CompilerControl: directive file doesn't override inlining rules
neliasso
parents:
35130
diff
changeset
|
343 |
return CompilerOracle::should_not_inline(mh); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
344 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
345 |
return false; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
346 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
347 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
348 |
bool DirectiveSet::parse_and_add_inline(char* str, const char*& error_msg) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
349 |
InlineMatcher* m = InlineMatcher::parse_inline_pattern(str, error_msg); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
350 |
if (m != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
351 |
// add matcher last in chain - the order is significant |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
352 |
append_inline(m); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
353 |
return true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
354 |
} else { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
355 |
assert(error_msg != NULL, "Error message must be set"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
356 |
return false; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
357 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
358 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
359 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
360 |
void DirectiveSet::append_inline(InlineMatcher* m) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
361 |
if (_inlinematchers == NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
362 |
_inlinematchers = m; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
363 |
return; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
364 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
365 |
InlineMatcher* tmp = _inlinematchers; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
366 |
while (tmp->next() != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
367 |
tmp = tmp->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
368 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
369 |
tmp->set_next(m); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
370 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
371 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
372 |
void DirectiveSet::print_inline(outputStream* st) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
373 |
if (_inlinematchers == NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
374 |
st->print_cr(" inline: -"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
375 |
} else { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
376 |
st->print(" inline: "); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
377 |
_inlinematchers->print(st); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
378 |
InlineMatcher* tmp = _inlinematchers->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
379 |
while (tmp != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
380 |
st->print(", "); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
381 |
tmp->print(st); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
382 |
tmp = tmp->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
383 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
384 |
st->cr(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
385 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
386 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
387 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
43455
diff
changeset
|
388 |
bool DirectiveSet::is_intrinsic_disabled(const methodHandle& method) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
389 |
vmIntrinsics::ID id = method->intrinsic_id(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
390 |
assert(id != vmIntrinsics::_none, "must be a VM intrinsic"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
391 |
|
33480
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
392 |
ResourceMark rm; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
393 |
|
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
394 |
// Create a copy of the string that contains the list of disabled |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
395 |
// intrinsics. The copy is created because the string |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
396 |
// will be modified by strtok(). Then, the list is tokenized with |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
397 |
// ',' as a separator. |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
398 |
size_t length = strlen(DisableIntrinsicOption); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
399 |
char* local_list = NEW_RESOURCE_ARRAY(char, length + 1); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
400 |
strncpy(local_list, DisableIntrinsicOption, length + 1); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
401 |
|
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
402 |
char* token = strtok(local_list, ","); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
403 |
while (token != NULL) { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
404 |
if (strcmp(token, vmIntrinsics::name_at(id)) == 0) { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
405 |
return true; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
406 |
} else { |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
407 |
token = strtok(NULL, ","); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
408 |
} |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
409 |
} |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
410 |
|
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
411 |
return false; |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
412 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
413 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
414 |
DirectiveSet* DirectiveSet::clone(DirectiveSet const* src) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
415 |
DirectiveSet* set = new DirectiveSet(NULL); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
416 |
memcpy(set->_modified, src->_modified, sizeof(src->_modified)); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
417 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
418 |
InlineMatcher* tmp = src->_inlinematchers; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
419 |
while (tmp != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
420 |
set->append_inline(tmp->clone()); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
421 |
tmp = tmp->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
422 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
423 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
424 |
#define copy_members_definition(name, type, dvalue, cc_flag) set->name##Option = src->name##Option; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
425 |
compilerdirectives_common_flags(copy_members_definition) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
426 |
compilerdirectives_c2_flags(copy_members_definition) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
427 |
compilerdirectives_c1_flags(copy_members_definition) |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
428 |
|
33480
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
429 |
// Create a local copy of the DisableIntrinsicOption. |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
430 |
assert(src->DisableIntrinsicOption != NULL, ""); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
431 |
size_t len = strlen(src->DisableIntrinsicOption) + 1; |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
432 |
char* s = NEW_C_HEAP_ARRAY(char, len, mtCompiler); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
433 |
strncpy(s, src->DisableIntrinsicOption, len); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
434 |
assert(s[len-1] == '\0', ""); |
e4cef6796874
8138651: -XX:DisableIntrinsic matches intrinsics overly eagerly
zmajo
parents:
33479
diff
changeset
|
435 |
set->DisableIntrinsicOption = s; |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
436 |
return set; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
437 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
438 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
439 |
// Create a new dirstack and push a default directive |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
440 |
void DirectivesStack::init() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
441 |
CompilerDirectives* _default_directives = new CompilerDirectives(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
442 |
char str[] = "*.*"; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
443 |
const char* error_msg = NULL; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
444 |
_default_directives->add_match(str, error_msg); |
51341 | 445 |
#if defined(COMPILER1) || INCLUDE_JVMCI |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
446 |
_default_directives->_c1_store->EnableOption = true; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
447 |
#endif |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
448 |
#ifdef COMPILER2 |
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
38696
diff
changeset
|
449 |
if (is_server_compilation_mode_vm()) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
38696
diff
changeset
|
450 |
_default_directives->_c2_store->EnableOption = true; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
38696
diff
changeset
|
451 |
} |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
452 |
#endif |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
453 |
assert(error_msg == NULL, "Must succeed."); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
454 |
push(_default_directives); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
455 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
456 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
457 |
DirectiveSet* DirectivesStack::getDefaultDirective(AbstractCompiler* comp) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
458 |
MutexLockerEx locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
459 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
460 |
assert(_bottom != NULL, "Must never be empty"); |
35563
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
461 |
_bottom->inc_refcount(); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
462 |
return _bottom->get_for(comp); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
463 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
464 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
465 |
void DirectivesStack::push(CompilerDirectives* directive) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
466 |
MutexLockerEx locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
467 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
468 |
directive->inc_refcount(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
469 |
if (_top == NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
470 |
assert(_bottom == NULL, "There can only be one default directive"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
471 |
_bottom = directive; // default directive, can never be removed. |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
472 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
473 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
474 |
directive->set_next(_top); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
475 |
_top = directive; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
476 |
_depth++; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
477 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
478 |
|
36597
ee256e343585
8150646: Add support for blocking compiles though whitebox API
simonis
parents:
35563
diff
changeset
|
479 |
void DirectivesStack::pop(int count) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
480 |
MutexLockerEx locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag); |
36597
ee256e343585
8150646: Add support for blocking compiles though whitebox API
simonis
parents:
35563
diff
changeset
|
481 |
assert(count > -1, "No negative values"); |
ee256e343585
8150646: Add support for blocking compiles though whitebox API
simonis
parents:
35563
diff
changeset
|
482 |
for (int i = 0; i < count; i++) { |
ee256e343585
8150646: Add support for blocking compiles though whitebox API
simonis
parents:
35563
diff
changeset
|
483 |
pop_inner(); |
ee256e343585
8150646: Add support for blocking compiles though whitebox API
simonis
parents:
35563
diff
changeset
|
484 |
} |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
485 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
486 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
487 |
void DirectivesStack::pop_inner() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
488 |
assert(DirectivesStack_lock->owned_by_self(), ""); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
489 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
490 |
if (_top->next() == NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
491 |
return; // Do nothing - don't allow an empty stack |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
492 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
493 |
CompilerDirectives* tmp = _top; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
494 |
_top = _top->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
495 |
_depth--; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
496 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
497 |
DirectivesStack::release(tmp); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
498 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
499 |
|
35129
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
500 |
bool DirectivesStack::check_capacity(int request_size, outputStream* st) { |
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
501 |
if ((request_size + _depth) > CompilerDirectivesLimit) { |
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
502 |
st->print_cr("Could not add %i more directives. Currently %i/%i directives.", request_size, _depth, CompilerDirectivesLimit); |
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
503 |
return false; |
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
504 |
} |
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
505 |
return true; |
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
506 |
} |
8b93709bf4e5
8144246: adding lots of directives via jcmd may produce OOM crash
neliasso
parents:
34191
diff
changeset
|
507 |
|
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
508 |
void DirectivesStack::clear() { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
509 |
// holding the lock during the whole operation ensuring consistent result |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
510 |
MutexLockerEx locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
511 |
while (_top->next() != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
512 |
pop_inner(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
513 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
514 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
515 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
516 |
void DirectivesStack::print(outputStream* st) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
517 |
MutexLockerEx locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
518 |
CompilerDirectives* tmp = _top; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
519 |
while (tmp != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
520 |
tmp->print(st); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
521 |
tmp = tmp->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
522 |
st->cr(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
523 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
524 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
525 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
526 |
void DirectivesStack::release(DirectiveSet* set) { |
35563
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
527 |
assert(set != NULL, "Never NULL"); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
528 |
MutexLockerEx locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
529 |
if (set->is_exclusive_copy()) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
530 |
// Old CompilecCmmands forced us to create an exclusive copy |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
531 |
delete set; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
532 |
} else { |
35563
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
533 |
assert(set->directive() != NULL, "Never NULL"); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
534 |
release(set->directive()); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
535 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
536 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
537 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
538 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
539 |
void DirectivesStack::release(CompilerDirectives* dir) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
540 |
assert(DirectivesStack_lock->owned_by_self(), ""); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
541 |
dir->dec_refcount(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
542 |
if (dir->refcount() == 0) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
543 |
delete dir; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
544 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
545 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
546 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
43455
diff
changeset
|
547 |
DirectiveSet* DirectivesStack::getMatchingDirective(const methodHandle& method, AbstractCompiler *comp) { |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
548 |
assert(_depth > 0, "Must never be empty"); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
549 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
550 |
DirectiveSet* match = NULL; |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
551 |
{ |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
552 |
MutexLockerEx locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag); |
34191
8287a25df277
8141585: CompilerDirectivesDCMDTest intermittently SEGVs in MethodMatcher::matcher
neliasso
parents:
33480
diff
changeset
|
553 |
|
8287a25df277
8141585: CompilerDirectivesDCMDTest intermittently SEGVs in MethodMatcher::matcher
neliasso
parents:
33480
diff
changeset
|
554 |
CompilerDirectives* dir = _top; |
8287a25df277
8141585: CompilerDirectivesDCMDTest intermittently SEGVs in MethodMatcher::matcher
neliasso
parents:
33480
diff
changeset
|
555 |
assert(dir != NULL, "Must be initialized"); |
8287a25df277
8141585: CompilerDirectivesDCMDTest intermittently SEGVs in MethodMatcher::matcher
neliasso
parents:
33480
diff
changeset
|
556 |
|
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
557 |
while (dir != NULL) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
558 |
if (dir->is_default_directive() || dir->match(method)) { |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
559 |
match = dir->get_for(comp); |
35563
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
560 |
assert(match != NULL, "Consistency"); |
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
561 |
if (match->EnableOption) { |
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
562 |
// The directiveSet for this compile is also enabled -> success |
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
563 |
dir->inc_refcount(); |
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
564 |
break; |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
565 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
566 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
567 |
dir = dir->next(); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
568 |
} |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
569 |
} |
35563
d5ac28780cda
8145331: SEGV in DirectivesStack::release(DirectiveSet*)
neliasso
parents:
35141
diff
changeset
|
570 |
guarantee(match != NULL, "There should always be a default directive that matches"); |
33451
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
571 |
|
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
572 |
// Check for legacy compile commands update, without DirectivesStack_lock |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
573 |
return match->compilecommand_compatibility_init(method); |
0712796e4039
8137167: JEP165: Compiler Control: Implementation task
neliasso
parents:
diff
changeset
|
574 |
} |