Print this page
rev 6907 : 8056071: compiler/whitebox/IsMethodCompilableTest.java fails with 'method() is not compilable after 3 iterations'
Summary: Always use MDO if valid and always compile trivial methods with C1 if available.
Reviewed-by: kvn, iveresov
Split |
Split |
Close |
Expand all |
Collapse all |
--- old/hotspot/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp
+++ new/hotspot/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp
1 1 /*
2 2 * Copyright (c) 2001, 2012, 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 #ifndef SHARE_VM_RUNTIME_SIMPLETHRESHOLDPOLICY_INLINE_HPP
26 26 #define SHARE_VM_RUNTIME_SIMPLETHRESHOLDPOLICY_INLINE_HPP
27 27
28 28 template<CompLevel level>
29 29 bool SimpleThresholdPolicy::call_predicate_helper(int i, int b, double scale) {
30 30 switch(level) {
31 31 case CompLevel_none:
32 32 case CompLevel_limited_profile:
33 33 return (i > Tier3InvocationThreshold * scale) ||
34 34 (i > Tier3MinInvocationThreshold * scale && i + b > Tier3CompileThreshold * scale);
35 35 case CompLevel_full_profile:
36 36 return (i > Tier4InvocationThreshold * scale) ||
37 37 (i > Tier4MinInvocationThreshold * scale && i + b > Tier4CompileThreshold * scale);
38 38 }
39 39 return true;
40 40 }
41 41
42 42 template<CompLevel level>
43 43 bool SimpleThresholdPolicy::loop_predicate_helper(int i, int b, double scale) {
44 44 switch(level) {
45 45 case CompLevel_none:
46 46 case CompLevel_limited_profile:
↓ open down ↓ |
46 lines elided |
↑ open up ↑ |
47 47 return b > Tier3BackEdgeThreshold * scale;
48 48 case CompLevel_full_profile:
49 49 return b > Tier4BackEdgeThreshold * scale;
50 50 }
51 51 return true;
52 52 }
53 53
54 54 // Simple methods are as good being compiled with C1 as C2.
55 55 // Determine if a given method is such a case.
56 56 bool SimpleThresholdPolicy::is_trivial(Method* method) {
57 - if (method->is_accessor()) return true;
58 - if (method->code() != NULL) {
59 - MethodData* mdo = method->method_data();
60 - if (mdo != NULL && mdo->num_loops() == 0 &&
61 - (method->code_size() < 5 || (mdo->num_blocks() < 4) && (method->code_size() < 15))) {
62 - return !mdo->would_profile();
63 - }
57 + if (method->is_accessor() ||
58 + method->is_constant_getter()) {
59 + return true;
60 + }
61 + if (method->has_loops() || method->code_size() >= 15) {
62 + return false;
63 + }
64 + MethodData* mdo = method->method_data();
65 + if (mdo != NULL && !mdo->would_profile() &&
66 + (method->code_size() < 5 || (mdo->num_blocks() < 4))) {
67 + return true;
64 68 }
65 69 return false;
66 70 }
67 71
68 72 #endif // SHARE_VM_RUNTIME_SIMPLETHRESHOLDPOLICY_INLINE_HPP
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX