Mercurial > hg > truffle
changeset 5117:b6d1ba51d163
minor changes
| author | Christian Haeubl <christian.haeubl@oracle.com> |
|---|---|
| date | Mon, 19 Mar 2012 15:47:35 -0700 |
| parents | 312b18b9cc3a |
| children | e5427faad192 |
| files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java src/share/vm/runtime/deoptimization.hpp src/share/vm/runtime/vmStructs.cpp |
| diffstat | 4 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java Mon Mar 19 15:08:07 2012 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java Mon Mar 19 15:47:35 2012 -0700 @@ -81,7 +81,7 @@ public static int LoopFrequencyPropagationPolicy = -2; // profiling information - public static int MaximumDeoptsBeforeDisablingOptimisticOptimization = 25; + public static int DeoptsToDisableOptimisticOptimization = 25; public static boolean PrintDisabledOptimisticOptimizations = true; public static int MatureExecutionsBranch = 1; public static int MatureExecutionsPerSwitchCase = 1;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java Mon Mar 19 15:08:07 2012 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java Mon Mar 19 15:47:35 2012 -0700 @@ -47,7 +47,7 @@ } private static boolean checkDeoptimization(RiProfilingInfo profilingInfo, RiDeoptReason reason) { - boolean result = profilingInfo.getDeoptimizationCount(reason) < GraalOptions.MaximumDeoptsBeforeDisablingOptimisticOptimization; + boolean result = profilingInfo.getDeoptimizationCount(reason) < GraalOptions.DeoptsToDisableOptimisticOptimization; if (!result) { if (GraalOptions.PrintDisabledOptimisticOptimizations) { TTY.println("WARN: deactivated optimistic optimization because of %s", reason.name());
--- a/src/share/vm/runtime/deoptimization.hpp Mon Mar 19 15:08:07 2012 -0700 +++ b/src/share/vm/runtime/deoptimization.hpp Mon Mar 19 15:47:35 2012 -0700 @@ -87,9 +87,9 @@ Reason_predicate, // compiler generated predicate failed Reason_loop_limit_check, // compiler generated loop limits check failed Reason_LIMIT, - // Note: Keep this enum in sync. with _trap_reason_name. Reason_RECORDED_LIMIT = Reason_bimorphic // some are not recorded per bc #endif + // Note: Keep this enum in sync. with _trap_reason_name. // Note: Reason_RECORDED_LIMIT should be < 8 to fit into 3 bits of // DataLayout::trap_bits. This dependency is enforced indirectly // via asserts, to avoid excessive direct header-to-header dependencies.
--- a/src/share/vm/runtime/vmStructs.cpp Mon Mar 19 15:08:07 2012 -0700 +++ b/src/share/vm/runtime/vmStructs.cpp Mon Mar 19 15:47:35 2012 -0700 @@ -2452,31 +2452,31 @@ declare_constant(Location::on_stack) \ declare_constant(Location::in_register) \ \ - declare_constant(Deoptimization::Reason_many) \ - declare_constant(Deoptimization::Reason_none) \ - declare_constant(Deoptimization::Reason_null_check) \ + /*declare_constant(Deoptimization::Reason_many)*/ \ + /*declare_constant(Deoptimization::Reason_none)*/ \ + /*declare_constant(Deoptimization::Reason_null_check)*/ \ + /*declare_constant(Deoptimization::Reason_range_check)*/ \ + /*declare_constant(Deoptimization::Reason_class_check)*/ \ + /*declare_constant(Deoptimization::Reason_array_check)*/ \ + /*declare_constant(Deoptimization::Reason_unreached)*/ \ + /*declare_constant(Deoptimization::Reason_constraint)*/ \ + /*declare_constant(Deoptimization::Reason_div0_check)*/ \ + /*declare_constant(Deoptimization::Reason_type_checked_inlining)*/ \ + /*declare_constant(Deoptimization::Reason_optimized_type_check)*/ \ + /*declare_constant(Deoptimization::Reason_not_compiled_exception_handler)*/ \ + /*declare_constant(Deoptimization::Reason_unresolved)*/ \ + /*declare_constant(Deoptimization::Reason_jsr_mismatch)*/ \ + /*declare_constant(Deoptimization::Reason_LIMIT)*/ \ + /*declare_constant(Deoptimization::Reason_RECORDED_LIMIT)*/ \ /*declare_constant(Deoptimization::Reason_null_assert)*/ \ - declare_constant(Deoptimization::Reason_range_check) \ - declare_constant(Deoptimization::Reason_class_check) \ - declare_constant(Deoptimization::Reason_array_check) \ /*declare_constant(Deoptimization::Reason_intrinsic)*/ \ /*declare_constant(Deoptimization::Reason_bimorphic)*/ \ /*declare_constant(Deoptimization::Reason_unloaded)*/ \ /*declare_constant(Deoptimization::Reason_uninitialized) */ \ - declare_constant(Deoptimization::Reason_unreached) \ /*declare_constant(Deoptimization::Reason_unhandled)*/ \ - declare_constant(Deoptimization::Reason_constraint) \ - declare_constant(Deoptimization::Reason_div0_check) \ /*declare_constant(Deoptimization::Reason_age)*/ \ /*declare_constant(Deoptimization::Reason_predicate)*/ \ /*declare_constant(Deoptimization::Reason_loop_limit_check)*/ \ - declare_constant(Deoptimization::Reason_type_checked_inlining) \ - declare_constant(Deoptimization::Reason_optimized_type_check) \ - declare_constant(Deoptimization::Reason_not_compiled_exception_handler) \ - declare_constant(Deoptimization::Reason_unresolved) \ - declare_constant(Deoptimization::Reason_jsr_mismatch) \ - declare_constant(Deoptimization::Reason_LIMIT) \ - declare_constant(Deoptimization::Reason_RECORDED_LIMIT) \ \ /*********************/ \ /* Matcher (C2 only) */ \