Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/hotspot_version	Wed Apr 30 11:16:33 2014 -0700
     1.2 +++ b/make/hotspot_version	Thu May 01 14:57:00 2014 -0700
     1.3 @@ -35,7 +35,7 @@
     1.4  
     1.5  HS_MAJOR_VER=25
     1.6  HS_MINOR_VER=20
     1.7 -HS_BUILD_NUMBER=12
     1.8 +HS_BUILD_NUMBER=13
     1.9  
    1.10  JDK_MAJOR_VER=1
    1.11  JDK_MINOR_VER=8

     2.1 --- a/src/share/vm/runtime/advancedThresholdPolicy.cpp	Wed Apr 30 11:16:33 2014 -0700
     2.2 +++ b/src/share/vm/runtime/advancedThresholdPolicy.cpp	Thu May 01 14:57:00 2014 -0700
     2.3 @@ -53,7 +53,8 @@
     2.4    }
     2.5  
     2.6    set_c1_count(MAX2(count / 3, 1));
     2.7 -  set_c2_count(MAX2(count - count / 3, 1));
     2.8 +  set_c2_count(MAX2(count - c1_count(), 1));
     2.9 +  FLAG_SET_ERGO(intx, CICompilerCount, c1_count() + c2_count());
    2.10  
    2.11    // Some inlining tuning
    2.12  #ifdef X86

     3.1 --- a/src/share/vm/runtime/arguments.cpp	Wed Apr 30 11:16:33 2014 -0700
     3.2 +++ b/src/share/vm/runtime/arguments.cpp	Thu May 01 14:57:00 2014 -0700
     3.3 @@ -2383,6 +2383,10 @@
     3.4    status &= verify_interval(NmethodSweepFraction, 1, ReservedCodeCacheSize/K, "NmethodSweepFraction");
     3.5    status &= verify_interval(NmethodSweepActivity, 0, 2000, "NmethodSweepActivity");
     3.6  
     3.7 +  if (!FLAG_IS_DEFAULT(CICompilerCount) && !FLAG_IS_DEFAULT(CICompilerCountPerCPU) && CICompilerCountPerCPU) {
     3.8 +    warning("The VM option CICompilerCountPerCPU overrides CICompilerCount.");
     3.9 +  }
    3.10 +
    3.11    return status;
    3.12  }
    3.13  

     4.1 --- a/src/share/vm/runtime/compilationPolicy.cpp	Wed Apr 30 11:16:33 2014 -0700
     4.2 +++ b/src/share/vm/runtime/compilationPolicy.cpp	Thu May 01 14:57:00 2014 -0700
     4.3 @@ -182,6 +182,7 @@
     4.4      // max(log2(8)-1,1) = 2 compiler threads on an 8-way machine.
     4.5      // May help big-app startup time.
     4.6      _compiler_count = MAX2(log2_intptr(os::active_processor_count())-1,1);
     4.7 +    FLAG_SET_ERGO(intx, CICompilerCount, _compiler_count);
     4.8    } else {
     4.9      _compiler_count = CICompilerCount;
    4.10    }

     5.1 --- a/src/share/vm/runtime/simpleThresholdPolicy.cpp	Wed Apr 30 11:16:33 2014 -0700
     5.2 +++ b/src/share/vm/runtime/simpleThresholdPolicy.cpp	Thu May 01 14:57:00 2014 -0700
     5.3 @@ -142,7 +142,8 @@
     5.4      count = MAX2(log2_intptr(os::active_processor_count()), 1) * 3 / 2;
     5.5    }
     5.6    set_c1_count(MAX2(count / 3, 1));
     5.7 -  set_c2_count(MAX2(count - count / 3, 1));
     5.8 +  set_c2_count(MAX2(count - c1_count(), 1));
     5.9 +  FLAG_SET_ERGO(intx, CICompilerCount, c1_count() + c2_count());
    5.10  }
    5.11  
    5.12  void SimpleThresholdPolicy::set_carry_if_necessary(InvocationCounter *counter) {