diff options
author | amurillo <none@none> | 2014-05-01 14:57:00 -0700 |
---|---|---|
committer | amurillo <none@none> | 2014-05-01 14:57:00 -0700 |
commit | e749c3a1b5de06a870b6661a324c6930a73c4b11 (patch) | |
tree | 9ac4cc3e311ec41dcdcb8cb7124fd74d3ed9e539 | |
parent | 6322fb924d2e25c731cd19a04bc569093f42de57 (diff) | |
parent | 1533200b0a178cf42cc768db38323e9f3783436d (diff) |
Mergehs25.20-b13
-rw-r--r-- | make/hotspot_version | 2 | ||||
-rw-r--r-- | src/share/vm/runtime/advancedThresholdPolicy.cpp | 3 | ||||
-rw-r--r-- | src/share/vm/runtime/arguments.cpp | 4 | ||||
-rw-r--r-- | src/share/vm/runtime/compilationPolicy.cpp | 1 | ||||
-rw-r--r-- | src/share/vm/runtime/simpleThresholdPolicy.cpp | 3 |
5 files changed, 10 insertions, 3 deletions
diff --git a/make/hotspot_version b/make/hotspot_version index 0559e053f..d02e03942 100644 --- a/make/hotspot_version +++ b/make/hotspot_version @@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2014 HS_MAJOR_VER=25 HS_MINOR_VER=20 -HS_BUILD_NUMBER=12 +HS_BUILD_NUMBER=13 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 diff --git a/src/share/vm/runtime/advancedThresholdPolicy.cpp b/src/share/vm/runtime/advancedThresholdPolicy.cpp index 7d72ca7f3..1680c48e9 100644 --- a/src/share/vm/runtime/advancedThresholdPolicy.cpp +++ b/src/share/vm/runtime/advancedThresholdPolicy.cpp @@ -53,7 +53,8 @@ void AdvancedThresholdPolicy::initialize() { } set_c1_count(MAX2(count / 3, 1)); - set_c2_count(MAX2(count - count / 3, 1)); + set_c2_count(MAX2(count - c1_count(), 1)); + FLAG_SET_ERGO(intx, CICompilerCount, c1_count() + c2_count()); // Some inlining tuning #ifdef X86 diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp index 7441f2610..b859c15af 100644 --- a/src/share/vm/runtime/arguments.cpp +++ b/src/share/vm/runtime/arguments.cpp @@ -2383,6 +2383,10 @@ bool Arguments::check_vm_args_consistency() { status &= verify_interval(NmethodSweepFraction, 1, ReservedCodeCacheSize/K, "NmethodSweepFraction"); status &= verify_interval(NmethodSweepActivity, 0, 2000, "NmethodSweepActivity"); + if (!FLAG_IS_DEFAULT(CICompilerCount) && !FLAG_IS_DEFAULT(CICompilerCountPerCPU) && CICompilerCountPerCPU) { + warning("The VM option CICompilerCountPerCPU overrides CICompilerCount."); + } + return status; } diff --git a/src/share/vm/runtime/compilationPolicy.cpp b/src/share/vm/runtime/compilationPolicy.cpp index 23fbc87f7..3431f3cc3 100644 --- a/src/share/vm/runtime/compilationPolicy.cpp +++ b/src/share/vm/runtime/compilationPolicy.cpp @@ -182,6 +182,7 @@ void NonTieredCompPolicy::initialize() { // max(log2(8)-1,1) = 2 compiler threads on an 8-way machine. // May help big-app startup time. _compiler_count = MAX2(log2_intptr(os::active_processor_count())-1,1); + FLAG_SET_ERGO(intx, CICompilerCount, _compiler_count); } else { _compiler_count = CICompilerCount; } diff --git a/src/share/vm/runtime/simpleThresholdPolicy.cpp b/src/share/vm/runtime/simpleThresholdPolicy.cpp index ad4c27cf2..1e78f215d 100644 --- a/src/share/vm/runtime/simpleThresholdPolicy.cpp +++ b/src/share/vm/runtime/simpleThresholdPolicy.cpp @@ -142,7 +142,8 @@ void SimpleThresholdPolicy::initialize() { count = MAX2(log2_intptr(os::active_processor_count()), 1) * 3 / 2; } set_c1_count(MAX2(count / 3, 1)); - set_c2_count(MAX2(count - count / 3, 1)); + set_c2_count(MAX2(count - c1_count(), 1)); + FLAG_SET_ERGO(intx, CICompilerCount, c1_count() + c2_count()); } void SimpleThresholdPolicy::set_carry_if_necessary(InvocationCounter *counter) { |