# HG changeset patch
# User amurillo
# Date 1398981420 25200
# Node ID 798f5b02be897151fdad44d695446088b1cca6b1
# Parent  47951595af60460a479b8574622375bfbf5c8ed2# Parent  7150b16fda528d6c3f4d0768bd9456e67b8e604f
Merge

diff -r 47951595af60 -r 798f5b02be89 make/hotspot_version
--- a/make/hotspot_version	Wed Apr 30 11:16:33 2014 -0700
+++ b/make/hotspot_version	Thu May 01 14:57:00 2014 -0700
@@ -35,7 +35,7 @@
 
 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 -r 47951595af60 -r 798f5b02be89 src/share/vm/runtime/advancedThresholdPolicy.cpp
--- a/src/share/vm/runtime/advancedThresholdPolicy.cpp	Wed Apr 30 11:16:33 2014 -0700
+++ b/src/share/vm/runtime/advancedThresholdPolicy.cpp	Thu May 01 14:57:00 2014 -0700
@@ -53,7 +53,8 @@
   }
 
   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 -r 47951595af60 -r 798f5b02be89 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Wed Apr 30 11:16:33 2014 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Thu May 01 14:57:00 2014 -0700
@@ -2383,6 +2383,10 @@
   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 -r 47951595af60 -r 798f5b02be89 src/share/vm/runtime/compilationPolicy.cpp
--- a/src/share/vm/runtime/compilationPolicy.cpp	Wed Apr 30 11:16:33 2014 -0700
+++ b/src/share/vm/runtime/compilationPolicy.cpp	Thu May 01 14:57:00 2014 -0700
@@ -182,6 +182,7 @@
     // 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 -r 47951595af60 -r 798f5b02be89 src/share/vm/runtime/simpleThresholdPolicy.cpp
--- a/src/share/vm/runtime/simpleThresholdPolicy.cpp	Wed Apr 30 11:16:33 2014 -0700
+++ b/src/share/vm/runtime/simpleThresholdPolicy.cpp	Thu May 01 14:57:00 2014 -0700
@@ -142,7 +142,8 @@
     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) {