Print this page
rev 6865 : 8062169: Multiple OSR compilations issued for same bci
Summary: Fixed 'SimpleThresholdPolicy::event' to always perform OSR if an OSR nmethod is available.
Reviewed-by: kvn, iveresov
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/src/share/vm/runtime/simpleThresholdPolicy.cpp
+++ new/src/share/vm/runtime/simpleThresholdPolicy.cpp
1 1 /*
2 2 * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 * or visit www.oracle.com if you need additional information or have any
21 21 * questions.
22 22 *
23 23 */
24 24
25 25 #include "precompiled.hpp"
26 26 #include "compiler/compileBroker.hpp"
27 27 #include "memory/resourceArea.hpp"
28 28 #include "runtime/arguments.hpp"
29 29 #include "runtime/simpleThresholdPolicy.hpp"
30 30 #include "runtime/simpleThresholdPolicy.inline.hpp"
31 31 #include "code/scopeDesc.hpp"
32 32
33 33
34 34 void SimpleThresholdPolicy::print_counters(const char* prefix, methodHandle mh) {
35 35 int invocation_count = mh->invocation_count();
36 36 int backedge_count = mh->backedge_count();
37 37 MethodData* mdh = mh->method_data();
38 38 int mdo_invocations = 0, mdo_backedges = 0;
39 39 int mdo_invocations_start = 0, mdo_backedges_start = 0;
40 40 if (mdh != NULL) {
41 41 mdo_invocations = mdh->invocation_count();
42 42 mdo_backedges = mdh->backedge_count();
43 43 mdo_invocations_start = mdh->invocation_count_start();
44 44 mdo_backedges_start = mdh->backedge_count_start();
45 45 }
46 46 tty->print(" %stotal=%d,%d %smdo=%d(%d),%d(%d)", prefix,
47 47 invocation_count, backedge_count, prefix,
48 48 mdo_invocations, mdo_invocations_start,
49 49 mdo_backedges, mdo_backedges_start);
50 50 tty->print(" %smax levels=%d,%d", prefix,
51 51 mh->highest_comp_level(), mh->highest_osr_comp_level());
52 52 }
53 53
54 54 // Print an event.
55 55 void SimpleThresholdPolicy::print_event(EventType type, methodHandle mh, methodHandle imh,
56 56 int bci, CompLevel level) {
57 57 bool inlinee_event = mh() != imh();
58 58
59 59 ttyLocker tty_lock;
60 60 tty->print("%lf: [", os::elapsedTime());
61 61
62 62 switch(type) {
63 63 case CALL:
64 64 tty->print("call");
65 65 break;
66 66 case LOOP:
67 67 tty->print("loop");
68 68 break;
69 69 case COMPILE:
70 70 tty->print("compile");
71 71 break;
72 72 case REMOVE_FROM_QUEUE:
73 73 tty->print("remove-from-queue");
74 74 break;
75 75 case UPDATE_IN_QUEUE:
76 76 tty->print("update-in-queue");
77 77 break;
78 78 case REPROFILE:
79 79 tty->print("reprofile");
80 80 break;
81 81 case MAKE_NOT_ENTRANT:
82 82 tty->print("make-not-entrant");
83 83 break;
84 84 default:
85 85 tty->print("unknown");
86 86 }
87 87
88 88 tty->print(" level=%d ", level);
89 89
90 90 ResourceMark rm;
91 91 char *method_name = mh->name_and_sig_as_C_string();
92 92 tty->print("[%s", method_name);
93 93 if (inlinee_event) {
94 94 char *inlinee_name = imh->name_and_sig_as_C_string();
95 95 tty->print(" [%s]] ", inlinee_name);
96 96 }
97 97 else tty->print("] ");
98 98 tty->print("@%d queues=%d,%d", bci, CompileBroker::queue_size(CompLevel_full_profile),
99 99 CompileBroker::queue_size(CompLevel_full_optimization));
100 100
101 101 print_specific(type, mh, imh, bci, level);
102 102
103 103 if (type != COMPILE) {
104 104 print_counters("", mh);
105 105 if (inlinee_event) {
106 106 print_counters("inlinee ", imh);
107 107 }
108 108 tty->print(" compilable=");
109 109 bool need_comma = false;
110 110 if (!mh->is_not_compilable(CompLevel_full_profile)) {
111 111 tty->print("c1");
112 112 need_comma = true;
113 113 }
114 114 if (!mh->is_not_osr_compilable(CompLevel_full_profile)) {
115 115 if (need_comma) tty->print(",");
116 116 tty->print("c1-osr");
117 117 need_comma = true;
118 118 }
119 119 if (!mh->is_not_compilable(CompLevel_full_optimization)) {
120 120 if (need_comma) tty->print(",");
121 121 tty->print("c2");
122 122 need_comma = true;
123 123 }
124 124 if (!mh->is_not_osr_compilable(CompLevel_full_optimization)) {
125 125 if (need_comma) tty->print(",");
126 126 tty->print("c2-osr");
127 127 }
128 128 tty->print(" status=");
129 129 if (mh->queued_for_compilation()) {
130 130 tty->print("in-queue");
131 131 } else tty->print("idle");
132 132 }
133 133 tty->print_cr("]");
134 134 }
135 135
136 136 void SimpleThresholdPolicy::initialize() {
137 137 if (FLAG_IS_DEFAULT(CICompilerCount)) {
138 138 FLAG_SET_DEFAULT(CICompilerCount, 3);
139 139 }
140 140 int count = CICompilerCount;
141 141 if (CICompilerCountPerCPU) {
142 142 count = MAX2(log2_intptr(os::active_processor_count()), 1) * 3 / 2;
143 143 }
144 144 set_c1_count(MAX2(count / 3, 1));
145 145 set_c2_count(MAX2(count - c1_count(), 1));
146 146 FLAG_SET_ERGO(intx, CICompilerCount, c1_count() + c2_count());
147 147 }
148 148
149 149 void SimpleThresholdPolicy::set_carry_if_necessary(InvocationCounter *counter) {
150 150 if (!counter->carry() && counter->count() > InvocationCounter::count_limit / 2) {
151 151 counter->set_carry_flag();
152 152 }
153 153 }
154 154
155 155 // Set carry flags on the counters if necessary
156 156 void SimpleThresholdPolicy::handle_counter_overflow(Method* method) {
157 157 MethodCounters *mcs = method->method_counters();
158 158 if (mcs != NULL) {
159 159 set_carry_if_necessary(mcs->invocation_counter());
160 160 set_carry_if_necessary(mcs->backedge_counter());
161 161 }
162 162 MethodData* mdo = method->method_data();
163 163 if (mdo != NULL) {
164 164 set_carry_if_necessary(mdo->invocation_counter());
165 165 set_carry_if_necessary(mdo->backedge_counter());
166 166 }
167 167 }
168 168
169 169 // Called with the queue locked and with at least one element
170 170 CompileTask* SimpleThresholdPolicy::select_task(CompileQueue* compile_queue) {
171 171 return compile_queue->first();
172 172 }
173 173
174 174 void SimpleThresholdPolicy::reprofile(ScopeDesc* trap_scope, bool is_osr) {
175 175 for (ScopeDesc* sd = trap_scope;; sd = sd->sender()) {
176 176 if (PrintTieredEvents) {
177 177 methodHandle mh(sd->method());
178 178 print_event(REPROFILE, mh, mh, InvocationEntryBci, CompLevel_none);
179 179 }
180 180 MethodData* mdo = sd->method()->method_data();
181 181 if (mdo != NULL) {
182 182 mdo->reset_start_counters();
183 183 }
184 184 if (sd->is_top()) break;
185 185 }
186 186 }
187 187
188 188 nmethod* SimpleThresholdPolicy::event(methodHandle method, methodHandle inlinee,
|
↓ open down ↓ |
188 lines elided |
↑ open up ↑ |
189 189 int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread) {
190 190 if (comp_level == CompLevel_none &&
191 191 JvmtiExport::can_post_interpreter_events() &&
192 192 thread->is_interp_only_mode()) {
193 193 return NULL;
194 194 }
195 195 if (CompileTheWorld || ReplayCompiles) {
196 196 // Don't trigger other compiles in testing mode
197 197 return NULL;
198 198 }
199 - nmethod *osr_nm = NULL;
200 199
201 200 handle_counter_overflow(method());
202 201 if (method() != inlinee()) {
203 202 handle_counter_overflow(inlinee());
204 203 }
205 204
206 205 if (PrintTieredEvents) {
207 206 print_event(bci == InvocationEntryBci ? CALL : LOOP, method, inlinee, bci, comp_level);
208 207 }
209 208
210 209 if (bci == InvocationEntryBci) {
211 210 method_invocation_event(method, inlinee, comp_level, nm, thread);
212 211 } else {
213 - method_back_branch_event(method, inlinee, bci, comp_level, nm, thread);
214 212 // method == inlinee if the event originated in the main method
215 - int highest_level = inlinee->highest_osr_comp_level();
216 - if (highest_level > comp_level) {
217 - osr_nm = inlinee->lookup_osr_nmethod_for(bci, highest_level, false);
213 + method_back_branch_event(method, inlinee, bci, comp_level, nm, thread);
214 + // Check if event led to a higher level OSR compilation
215 + nmethod* osr_nm = inlinee->lookup_osr_nmethod_for(bci, comp_level, false);
216 + if (osr_nm != NULL && osr_nm->comp_level() > comp_level) {
217 + // Perform OSR with new nmethod
218 + return osr_nm;
218 219 }
219 220 }
220 - return osr_nm;
221 + return NULL;
221 222 }
222 223
223 224 // Check if the method can be compiled, change level if necessary
224 225 void SimpleThresholdPolicy::compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread) {
225 226 assert(level <= TieredStopAtLevel, "Invalid compilation level");
226 227 if (level == CompLevel_none) {
227 228 return;
228 229 }
229 230 // Check if the method can be compiled. If it cannot be compiled with C1, continue profiling
230 231 // in the interpreter and then compile with C2 (the transition function will request that,
231 232 // see common() ). If the method cannot be compiled with C2 but still can with C1, compile it with
232 233 // pure C1.
233 234 if (!can_be_compiled(mh, level)) {
234 235 if (level == CompLevel_full_optimization && can_be_compiled(mh, CompLevel_simple)) {
235 236 compile(mh, bci, CompLevel_simple, thread);
236 237 }
237 238 return;
238 239 }
239 240 if (bci != InvocationEntryBci && mh->is_not_osr_compilable(level)) {
240 241 return;
241 242 }
242 243 if (!CompileBroker::compilation_is_in_queue(mh)) {
243 244 if (PrintTieredEvents) {
244 245 print_event(COMPILE, mh, mh, bci, level);
245 246 }
246 247 submit_compile(mh, bci, level, thread);
247 248 }
248 249 }
249 250
250 251 // Tell the broker to compile the method
251 252 void SimpleThresholdPolicy::submit_compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread) {
252 253 int hot_count = (bci == InvocationEntryBci) ? mh->invocation_count() : mh->backedge_count();
253 254 CompileBroker::compile_method(mh, bci, level, mh, hot_count, "tiered", thread);
254 255 }
255 256
256 257 // Call and loop predicates determine whether a transition to a higher
257 258 // compilation level should be performed (pointers to predicate functions
258 259 // are passed to common() transition function).
259 260 bool SimpleThresholdPolicy::loop_predicate(int i, int b, CompLevel cur_level) {
260 261 switch(cur_level) {
261 262 case CompLevel_none:
262 263 case CompLevel_limited_profile: {
263 264 return loop_predicate_helper<CompLevel_none>(i, b, 1.0);
264 265 }
265 266 case CompLevel_full_profile: {
266 267 return loop_predicate_helper<CompLevel_full_profile>(i, b, 1.0);
267 268 }
268 269 default:
269 270 return true;
270 271 }
271 272 }
272 273
273 274 bool SimpleThresholdPolicy::call_predicate(int i, int b, CompLevel cur_level) {
274 275 switch(cur_level) {
275 276 case CompLevel_none:
276 277 case CompLevel_limited_profile: {
277 278 return call_predicate_helper<CompLevel_none>(i, b, 1.0);
278 279 }
279 280 case CompLevel_full_profile: {
280 281 return call_predicate_helper<CompLevel_full_profile>(i, b, 1.0);
281 282 }
282 283 default:
283 284 return true;
284 285 }
285 286 }
286 287
287 288 // Determine is a method is mature.
288 289 bool SimpleThresholdPolicy::is_mature(Method* method) {
289 290 if (is_trivial(method)) return true;
290 291 MethodData* mdo = method->method_data();
291 292 if (mdo != NULL) {
292 293 int i = mdo->invocation_count();
293 294 int b = mdo->backedge_count();
294 295 double k = ProfileMaturityPercentage / 100.0;
295 296 return call_predicate_helper<CompLevel_full_profile>(i, b, k) ||
296 297 loop_predicate_helper<CompLevel_full_profile>(i, b, k);
297 298 }
298 299 return false;
299 300 }
300 301
301 302 // Common transition function. Given a predicate determines if a method should transition to another level.
302 303 CompLevel SimpleThresholdPolicy::common(Predicate p, Method* method, CompLevel cur_level) {
303 304 CompLevel next_level = cur_level;
304 305 int i = method->invocation_count();
305 306 int b = method->backedge_count();
306 307
307 308 if (is_trivial(method)) {
308 309 next_level = CompLevel_simple;
309 310 } else {
310 311 switch(cur_level) {
311 312 case CompLevel_none:
312 313 // If we were at full profile level, would we switch to full opt?
313 314 if (common(p, method, CompLevel_full_profile) == CompLevel_full_optimization) {
314 315 next_level = CompLevel_full_optimization;
315 316 } else if ((this->*p)(i, b, cur_level)) {
316 317 next_level = CompLevel_full_profile;
317 318 }
318 319 break;
319 320 case CompLevel_limited_profile:
320 321 case CompLevel_full_profile:
321 322 {
322 323 MethodData* mdo = method->method_data();
323 324 if (mdo != NULL) {
324 325 if (mdo->would_profile()) {
325 326 int mdo_i = mdo->invocation_count_delta();
326 327 int mdo_b = mdo->backedge_count_delta();
327 328 if ((this->*p)(mdo_i, mdo_b, cur_level)) {
328 329 next_level = CompLevel_full_optimization;
329 330 }
330 331 } else {
331 332 next_level = CompLevel_full_optimization;
332 333 }
333 334 }
334 335 }
335 336 break;
336 337 }
337 338 }
338 339 return MIN2(next_level, (CompLevel)TieredStopAtLevel);
339 340 }
340 341
341 342 // Determine if a method should be compiled with a normal entry point at a different level.
342 343 CompLevel SimpleThresholdPolicy::call_event(Method* method, CompLevel cur_level) {
343 344 CompLevel osr_level = MIN2((CompLevel) method->highest_osr_comp_level(),
344 345 common(&SimpleThresholdPolicy::loop_predicate, method, cur_level));
345 346 CompLevel next_level = common(&SimpleThresholdPolicy::call_predicate, method, cur_level);
346 347
347 348 // If OSR method level is greater than the regular method level, the levels should be
348 349 // equalized by raising the regular method level in order to avoid OSRs during each
349 350 // invocation of the method.
350 351 if (osr_level == CompLevel_full_optimization && cur_level == CompLevel_full_profile) {
351 352 MethodData* mdo = method->method_data();
352 353 guarantee(mdo != NULL, "MDO should not be NULL");
353 354 if (mdo->invocation_count() >= 1) {
354 355 next_level = CompLevel_full_optimization;
355 356 }
356 357 } else {
357 358 next_level = MAX2(osr_level, next_level);
358 359 }
359 360
360 361 return next_level;
361 362 }
362 363
363 364 // Determine if we should do an OSR compilation of a given method.
364 365 CompLevel SimpleThresholdPolicy::loop_event(Method* method, CompLevel cur_level) {
365 366 CompLevel next_level = common(&SimpleThresholdPolicy::loop_predicate, method, cur_level);
366 367 if (cur_level == CompLevel_none) {
367 368 // If there is a live OSR method that means that we deopted to the interpreter
368 369 // for the transition.
369 370 CompLevel osr_level = MIN2((CompLevel)method->highest_osr_comp_level(), next_level);
370 371 if (osr_level > CompLevel_none) {
371 372 return osr_level;
372 373 }
373 374 }
374 375 return next_level;
375 376 }
376 377
377 378
378 379 // Handle the invocation event.
379 380 void SimpleThresholdPolicy::method_invocation_event(methodHandle mh, methodHandle imh,
380 381 CompLevel level, nmethod* nm, JavaThread* thread) {
381 382 if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh)) {
382 383 CompLevel next_level = call_event(mh(), level);
383 384 if (next_level != level) {
384 385 compile(mh, InvocationEntryBci, next_level, thread);
385 386 }
386 387 }
387 388 }
388 389
389 390 // Handle the back branch event. Notice that we can compile the method
390 391 // with a regular entry from here.
391 392 void SimpleThresholdPolicy::method_back_branch_event(methodHandle mh, methodHandle imh,
392 393 int bci, CompLevel level, nmethod* nm, JavaThread* thread) {
393 394 // If the method is already compiling, quickly bail out.
394 395 if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh)) {
395 396 // Use loop event as an opportunity to also check there's been
396 397 // enough calls.
397 398 CompLevel cur_level = comp_level(mh());
398 399 CompLevel next_level = call_event(mh(), cur_level);
399 400 CompLevel next_osr_level = loop_event(mh(), level);
400 401
401 402 next_level = MAX2(next_level,
402 403 next_osr_level < CompLevel_full_optimization ? next_osr_level : cur_level);
403 404 bool is_compiling = false;
404 405 if (next_level != cur_level) {
405 406 compile(mh, InvocationEntryBci, next_level, thread);
406 407 is_compiling = true;
407 408 }
408 409
409 410 // Do the OSR version
410 411 if (!is_compiling && next_osr_level != level) {
411 412 compile(mh, bci, next_osr_level, thread);
412 413 }
413 414 }
414 415 }
|
↓ open down ↓ |
184 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX