8262074: Consolidate the default value of MetaspaceSize

tstuefe · tstuefe · commit c9e91897aed9 · 2021-02-26T16:04:07.000Z
Reviewed-by: iklam, coleenp
diff --git a/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp
@@ -52,7 +52,6 @@ define_pd_global(bool, ProfileInterpreter,           false);
 define_pd_global(intx, CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx, CodeCacheMinBlockLength,     1);
 define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
-define_pd_global(uintx, MetaspaceSize,               12*M );
 define_pd_global(bool, NeverActAsServerClassMachine, true );
 define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
 define_pd_global(bool, CICompileOSR,                 true );
diff --git a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
@@ -77,9 +77,6 @@ define_pd_global(intx, NonNMethodCodeHeapSize,       5*M );
 define_pd_global(uintx, CodeCacheMinBlockLength,     6);
 define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
 
-// Heap related flags
-define_pd_global(uintx,MetaspaceSize,    ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
diff --git a/src/hotspot/cpu/arm/c1_globals_arm.hpp b/src/hotspot/cpu/arm/c1_globals_arm.hpp
@@ -53,7 +53,6 @@ define_pd_global(bool, ProfileInterpreter,           false);
 define_pd_global(size_t, CodeCacheExpansionSize,     32*K );
 define_pd_global(uintx, CodeCacheMinBlockLength,     1);
 define_pd_global(size_t, CodeCacheMinimumUseSpace,   400*K);
-define_pd_global(size_t, MetaspaceSize,              12*M );
 define_pd_global(bool, NeverActAsServerClassMachine, true);
 define_pd_global(uint64_t, MaxRAM,                   1ULL*G);
 define_pd_global(bool, CICompileOSR,                 true );
diff --git a/src/hotspot/cpu/arm/c2_globals_arm.hpp b/src/hotspot/cpu/arm/c2_globals_arm.hpp
@@ -100,9 +100,6 @@ define_pd_global(size_t, CodeCacheMinimumUseSpace,   400*K);
 
 define_pd_global(bool,  TrapBasedRangeChecks,        false); // Not needed
 
-// Heap related flags
-define_pd_global(size_t, MetaspaceSize,              ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
diff --git a/src/hotspot/cpu/ppc/c1_globals_ppc.hpp b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp
@@ -51,7 +51,6 @@ define_pd_global(uintx,    NonNMethodCodeHeapSize,       5*M );
 define_pd_global(uintx,    CodeCacheExpansionSize,       32*K);
 define_pd_global(uintx,    CodeCacheMinBlockLength,      1);
 define_pd_global(uintx,    CodeCacheMinimumUseSpace,     400*K);
-define_pd_global(size_t,   MetaspaceSize,                12*M);
 define_pd_global(bool,     NeverActAsServerClassMachine, true);
 define_pd_global(size_t,   NewSizeThreadIncrease,        16*K);
 define_pd_global(uint64_t, MaxRAM,                       1ULL*G);
diff --git a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
@@ -93,9 +93,6 @@ define_pd_global(uintx,    CodeCacheMinimumUseSpace,     400*K);
 
 define_pd_global(bool,     TrapBasedRangeChecks,          true);
 
-// Heap related flags
-define_pd_global(size_t,   MetaspaceSize,                ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool,     NeverActAsServerClassMachine, false);
 
diff --git a/src/hotspot/cpu/s390/c1_globals_s390.hpp b/src/hotspot/cpu/s390/c1_globals_s390.hpp
@@ -51,7 +51,6 @@ define_pd_global(uintx,    NonNMethodCodeHeapSize,       5*M);
 define_pd_global(uintx,    CodeCacheExpansionSize,       32*K);
 define_pd_global(uintx,    CodeCacheMinBlockLength,      1);
 define_pd_global(uintx,    CodeCacheMinimumUseSpace,     400*K);
-define_pd_global(size_t,   MetaspaceSize,                12*M);
 define_pd_global(bool,     NeverActAsServerClassMachine, true);
 define_pd_global(size_t,   NewSizeThreadIncrease,        16*K);
 define_pd_global(uint64_t, MaxRAM,                       1ULL*G);
diff --git a/src/hotspot/cpu/s390/c2_globals_s390.hpp b/src/hotspot/cpu/s390/c2_globals_s390.hpp
@@ -82,9 +82,6 @@ define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
 
 define_pd_global(bool,  TrapBasedRangeChecks,        false); // Not needed on z/Architecture.
 
-// Heap related flags
-define_pd_global(size_t, MetaspaceSize,              ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
diff --git a/src/hotspot/cpu/x86/c1_globals_x86.hpp b/src/hotspot/cpu/x86/c1_globals_x86.hpp
@@ -51,7 +51,6 @@ define_pd_global(bool,   ProfileInterpreter,           false);
 define_pd_global(uintx,  CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx,  CodeCacheMinBlockLength,      1    );
 define_pd_global(uintx,  CodeCacheMinimumUseSpace,     400*K);
-define_pd_global(size_t, MetaspaceSize,                12*M );
 define_pd_global(bool,   NeverActAsServerClassMachine, true );
 define_pd_global(uint64_t, MaxRAM,                    1ULL*G);
 define_pd_global(bool,   CICompileOSR,                 true );
diff --git a/src/hotspot/cpu/x86/c2_globals_x86.hpp b/src/hotspot/cpu/x86/c2_globals_x86.hpp
@@ -91,9 +91,6 @@ define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
 
 define_pd_global(bool,  TrapBasedRangeChecks,        false); // Not needed on x86.
 
-// Heap related flags
-define_pd_global(size_t, MetaspaceSize,              ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
diff --git a/src/hotspot/share/compiler/compilerDefinitions.cpp b/src/hotspot/share/compiler/compilerDefinitions.cpp
@@ -191,9 +191,6 @@ void set_client_emulation_mode_flags() {
   if (FLAG_IS_DEFAULT(CodeCacheExpansionSize)) {
     FLAG_SET_ERGO(CodeCacheExpansionSize, 32*K);
   }
-  if (FLAG_IS_DEFAULT(MetaspaceSize)) {
-    FLAG_SET_ERGO(MetaspaceSize, MIN2(12*M, MaxMetaspaceSize));
-  }
   if (FLAG_IS_DEFAULT(MaxRAM)) {
     // Do not use FLAG_SET_ERGO to update MaxRAM, as this will impact
     // heap setting done based on available phys_mem (see Arguments::set_heap_size).
@@ -444,9 +441,6 @@ void CompilerConfig::set_jvmci_specific_flags() {
       if (FLAG_IS_DEFAULT(InitialCodeCacheSize)) {
         FLAG_SET_DEFAULT(InitialCodeCacheSize, MAX2(16*M, InitialCodeCacheSize));
       }
-      if (FLAG_IS_DEFAULT(MetaspaceSize)) {
-        FLAG_SET_DEFAULT(MetaspaceSize, MIN2(MAX2(12*M, MetaspaceSize), MaxMetaspaceSize));
-      }
       if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) {
         FLAG_SET_DEFAULT(NewSizeThreadIncrease, MAX2(4*K, NewSizeThreadIncrease));
       }
diff --git a/src/hotspot/share/compiler/compiler_globals_pd.hpp b/src/hotspot/share/compiler/compiler_globals_pd.hpp
@@ -70,7 +70,6 @@ define_pd_global(uintx,  NonNMethodCodeHeapSize,     32*M);
 define_pd_global(uintx,  CodeCacheExpansionSize,     32*K);
 define_pd_global(uintx,  CodeCacheMinBlockLength,    1);
 define_pd_global(uintx,  CodeCacheMinimumUseSpace,   200*K);
-define_pd_global(size_t, MetaspaceSize,              ScaleForWordSize(4*M));
 define_pd_global(bool, NeverActAsServerClassMachine, true);
 define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
 #define CI_COMPILER_COUNT 0
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
@@ -1470,7 +1470,7 @@ const intx ObjectAlignmentInBytes = 8;
           "Force inlining of throwing methods smaller than this")           \
           range(0, max_jint)                                                \
                                                                             \
-  product_pd(size_t, MetaspaceSize,                                         \
+  product(size_t, MetaspaceSize, NOT_LP64(16 * M) LP64_ONLY(21 * M),        \
           "Initial threshold (in bytes) at which a garbage collection "     \
           "is done to reduce Metaspace usage")                              \
           constraint(MetaspaceSizeConstraintFunc,AfterErgo)                 \

Original file line number	Diff line number	Diff line change
`@@ -191,9 +191,6 @@ void set_client_emulation_mode_flags() {`
`191`	`191`	`if (FLAG_IS_DEFAULT(CodeCacheExpansionSize)) {`
`192`	`192`	`FLAG_SET_ERGO(CodeCacheExpansionSize, 32*K);`
`193`	`193`	`}`
`194`		`- if (FLAG_IS_DEFAULT(MetaspaceSize)) {`
`195`		`- FLAG_SET_ERGO(MetaspaceSize, MIN2(12*M, MaxMetaspaceSize));`
`196`		`- }`
`197`	`194`	`if (FLAG_IS_DEFAULT(MaxRAM)) {`
`198`	`195`	`// Do not use FLAG_SET_ERGO to update MaxRAM, as this will impact`
`199`	`196`	`// heap setting done based on available phys_mem (see Arguments::set_heap_size).`
`@@ -444,9 +441,6 @@ void CompilerConfig::set_jvmci_specific_flags() {`
`444`	`441`	`if (FLAG_IS_DEFAULT(InitialCodeCacheSize)) {`
`445`	`442`	`FLAG_SET_DEFAULT(InitialCodeCacheSize, MAX2(16*M, InitialCodeCacheSize));`
`446`	`443`	`}`
`447`		`- if (FLAG_IS_DEFAULT(MetaspaceSize)) {`
`448`		`- FLAG_SET_DEFAULT(MetaspaceSize, MIN2(MAX2(12*M, MetaspaceSize), MaxMetaspaceSize));`
`449`		`- }`
`450`	`444`	`if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) {`
`451`	`445`	`FLAG_SET_DEFAULT(NewSizeThreadIncrease, MAX2(4*K, NewSizeThreadIncrease));`
`452`	`446`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@ const intx ObjectAlignmentInBytes = 8;`
`1470`	`1470`	`"Force inlining of throwing methods smaller than this") \`
`1471`	`1471`	`range(0, max_jint) \`
`1472`	`1472`	`\`
`1473`		`- product_pd(size_t, MetaspaceSize, \`
	`1473`	`+ product(size_t, MetaspaceSize, NOT_LP64(16 * M) LP64_ONLY(21 * M), \`
`1474`	`1474`	`"Initial threshold (in bytes) at which a garbage collection " \`
`1475`	`1475`	`"is done to reduce Metaspace usage") \`
`1476`	`1476`	`constraint(MetaspaceSizeConstraintFunc,AfterErgo) \`