Allow DynamicHeapSize (#190)

Author: qinsoon

.github/scripts/ci-test-only-normal.sh

@@ -23,6 +23,9 @@ build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHea
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar hsqldb
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar eclipse
 
+# Test heap resizing
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms20M -Xmx100M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
+
 # --- Immix ---
 export MMTK_PLAN=Immix
 
@@ -41,6 +44,9 @@ build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHea
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar hsqldb
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar eclipse
 
+# Test heap resizing
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms20M -Xmx100M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
+
 # --- Immix ---
 export MMTK_PLAN=GenImmix
 
@@ -59,6 +65,9 @@ build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHea
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar hsqldb
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar eclipse
 
+# Test heap resizing
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms20M -Xmx100M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
+
 # --- GenCopy ---
 export MMTK_PLAN=GenCopy
 

mmtk/Cargo.lock

@@ -30,7 +30,7 @@ once_cell = "1.10.0"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "4aa643773ec3ec9c4f47f696533bdd56554c03df" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "2300ce1d4a7c99053c5bb7055b377a71c9241e85" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/Cargo.toml

@@ -92,9 +92,15 @@ pub extern "C" fn openjdk_is_gc_initialized() -> bool {
 }
 
 #[no_mangle]
-pub extern "C" fn mmtk_set_heap_size(size: usize) -> bool {
+pub extern "C" fn mmtk_set_heap_size(min: usize, max: usize) -> bool {
+    use mmtk::util::options::GCTriggerSelector;
     let mut builder = BUILDER.lock().unwrap();
-    builder.options.heap_size.set(size)
+    let policy = if min == max {
+        GCTriggerSelector::FixedHeapSize(min)
+    } else {
+        GCTriggerSelector::DynamicHeapSize(min, max)
+    };
+    builder.options.gc_trigger.set(policy)
 }
 
 #[no_mangle]

mmtk/src/api.rs

@@ -184,7 +184,7 @@ typedef struct {
 extern void openjdk_gc_init(OpenJDK_Upcalls *calls);
 extern bool openjdk_is_gc_initialized();
 
-extern bool mmtk_set_heap_size(size_t size);
+extern bool mmtk_set_heap_size(size_t min, size_t max);
 
 extern size_t used_bytes();
 extern void* starting_heap_address();

openjdk/mmtk.h

@@ -73,7 +73,8 @@ jint MMTkHeap::initialize() {
   assert(!UseTLAB , "should disable UseTLAB");
   assert(!UseCompressedOops , "should disable CompressedOops");
   assert(!UseCompressedClassPointers , "should disable UseCompressedClassPointers");
-  const size_t heap_size = collector_policy()->max_heap_byte_size();
+  const size_t min_heap_size = collector_policy()->min_heap_byte_size();
+  const size_t max_heap_size = collector_policy()->max_heap_byte_size();
   //  printf("policy max heap size %zu, min heap size %zu\n", heap_size, collector_policy()->min_heap_byte_size());
 
   // Set options
@@ -82,8 +83,8 @@ jint MMTkHeap::initialize() {
     guarantee(set_options, "Failed to set MMTk options. Please check if the options are valid: %s\n", ThirdPartyHeapOptions);
   }
   // Set heap size
-  bool set_heap_size = mmtk_set_heap_size(heap_size);
-  guarantee(set_heap_size, "Failed to set MMTk heap size. Please check if the heap size is valid: %ld\n", heap_size);
+  bool set_heap_size = mmtk_set_heap_size(min_heap_size, max_heap_size);
+  guarantee(set_heap_size, "Failed to set MMTk heap size. Please check if the heap size is valid: min = %ld, max = %ld\n", min_heap_size, max_heap_size);
 
   openjdk_gc_init(&mmtk_upcalls);
   // Cache the value here. It is a constant depending on the selected plan. The plan won't change from now, so value won't change.