Mercurial > hg > openjdk > hsx17
changeset 1287:8e02b8f703b2
6931465: Switch off by default optimization flags in HS17
Summary: Switch off UseCompressedOops, DoEscapeAnalysis, UseLoopPredicate
Reviewed-by: never, ysr
author | kvn |
---|---|
date | Tue, 02 Mar 2010 19:29:27 -0800 |
parents | ccc11b3dad6c |
children | ca4945b3085b |
files | make/hotspot_version src/share/vm/opto/c2_globals.hpp src/share/vm/runtime/arguments.cpp |
diffstat | 3 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot_version Tue Mar 02 15:52:23 2010 -0800 +++ b/make/hotspot_version Tue Mar 02 19:29:27 2010 -0800 @@ -38,7 +38,7 @@ HS_BUILD_NUMBER=10 JDK_MAJOR_VER=1 -JDK_MINOR_VER=7 +JDK_MINOR_VER=6 JDK_MICRO_VER=0 # Previous (bootdir) JDK version
--- a/src/share/vm/opto/c2_globals.hpp Tue Mar 02 15:52:23 2010 -0800 +++ b/src/share/vm/opto/c2_globals.hpp Tue Mar 02 19:29:27 2010 -0800 @@ -154,7 +154,7 @@ notproduct(bool, TraceProfileTripCount, false, \ "Trace profile loop trip count information") \ \ - product(bool, UseLoopPredicate, true, \ + product(bool, UseLoopPredicate, false, \ "Generate a predicate to select fast/slow loop versions") \ \ develop(bool, TraceLoopPredicate, false, \ @@ -382,7 +382,7 @@ product(intx, AutoBoxCacheMax, 128, \ "Sets max value cached by the java.lang.Integer autobox cache") \ \ - product(bool, DoEscapeAnalysis, true, \ + product(bool, DoEscapeAnalysis, false, \ "Perform escape analysis") \ \ notproduct(bool, PrintEscapeAnalysis, false, \
--- a/src/share/vm/runtime/arguments.cpp Tue Mar 02 15:52:23 2010 -0800 +++ b/src/share/vm/runtime/arguments.cpp Tue Mar 02 19:29:27 2010 -0800 @@ -1263,7 +1263,8 @@ if (MaxHeapSize <= max_heap_for_compressed_oops()) { #ifndef COMPILER1 if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) { - FLAG_SET_ERGO(bool, UseCompressedOops, true); + // Disable Compressed Oops by default. Uncomment next line to enable it. + // FLAG_SET_ERGO(bool, UseCompressedOops, true); } #endif #ifdef _WIN64 @@ -1463,11 +1464,17 @@ sprintf(buffer, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax); add_property(buffer); } - if (AggressiveOpts && FLAG_IS_DEFAULT(DoEscapeAnalysis)) { - FLAG_SET_DEFAULT(DoEscapeAnalysis, true); - } - if (AggressiveOpts && FLAG_IS_DEFAULT(BiasedLockingStartupDelay)) { - FLAG_SET_DEFAULT(BiasedLockingStartupDelay, 500); + if (AggressiveOpts) { + // Switch on optimizations with AggressiveOpts. + if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) { + FLAG_SET_DEFAULT(DoEscapeAnalysis, true); + } + if (FLAG_IS_DEFAULT(UseLoopPredicate)) { + FLAG_SET_DEFAULT(UseLoopPredicate, true); + } + if (FLAG_IS_DEFAULT(BiasedLockingStartupDelay)) { + FLAG_SET_DEFAULT(BiasedLockingStartupDelay, 500); + } } #endif