nuke region0.rs; change type of use_stable_regions arg to u32 (bool, …

…really); change assert in get_region0 to debug assert for perf
dfinity · Aug 16, 2023 · db9038b · db9038b
1 parent 557419c
commit db9038b
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 29 deletions.
diff --git a/rts/motoko-rts/src/gc/copying.rs b/rts/motoko-rts/src/gc/copying.rs
@@ -36,7 +36,7 @@ unsafe fn copying_gc<M: Memory>(mem: &mut M) {
         |hp| linear_memory::set_hp_unskewed(hp),
         ic::get_static_roots(),
         crate::continuation_table::continuation_table_loc(),
-        crate::region0::region0_get_ptr_loc(),
+        crate::region::region0_get_ptr_loc(),
         // note_live_size
         |live_size| ic::MAX_LIVE = ::core::cmp::max(ic::MAX_LIVE, live_size),
         // note_reclaimed

diff --git a/rts/motoko-rts/src/gc/generational.rs b/rts/motoko-rts/src/gc/generational.rs
@@ -48,7 +48,7 @@ unsafe fn generational_gc<M: Memory>(mem: &mut M) {
     let old_limits = get_limits();
     let roots = Roots {
         static_roots: ic::get_static_roots(),
-        region0_ptr_loc: crate::region0::region0_get_ptr_loc(),
+        region0_ptr_loc: crate::region::region0_get_ptr_loc(),
         continuation_table_ptr_loc: crate::continuation_table::continuation_table_loc(),
     };
     let heap = Heap {

diff --git a/rts/motoko-rts/src/gc/incremental/roots.rs b/rts/motoko-rts/src/gc/incremental/roots.rs
@@ -15,7 +15,7 @@ pub unsafe fn root_set() -> Roots {
     Roots {
         static_roots: ic::get_static_roots(),
         continuation_table_location: crate::continuation_table::continuation_table_loc(),
-        region0_ptr_location: crate::region0::region0_get_ptr_loc(),
+        region0_ptr_location: crate::region::region0_get_ptr_loc(),
     }
 }
 

diff --git a/rts/motoko-rts/src/gc/mark_compact.rs b/rts/motoko-rts/src/gc/mark_compact.rs
@@ -51,7 +51,7 @@ unsafe fn compacting_gc<M: Memory>(mem: &mut M) {
         |hp| linear_memory::set_hp_unskewed(hp),
         ic::get_static_roots(),
         crate::continuation_table::continuation_table_loc(),
-        crate::region0::region0_get_ptr_loc(),
+        crate::region::region0_get_ptr_loc(),
         // note_live_size
         |live_size| ic::MAX_LIVE = ::core::cmp::max(ic::MAX_LIVE, live_size),
         // note_reclaimed

diff --git a/rts/motoko-rts/src/lib.rs b/rts/motoko-rts/src/lib.rs
@@ -35,8 +35,6 @@ pub mod principal_id;
 pub mod region;
 //#[cfg(feature = "ic")]
 mod stable_mem;
-//#[cfg(feature = "ic")]
-pub mod region0;
 mod static_checks;
 pub mod stream;
 pub mod text;

diff --git a/rts/motoko-rts/src/region.rs b/rts/motoko-rts/src/region.rs
@@ -424,6 +424,19 @@ unsafe fn region_reserve_id_span<M: Memory>(
     }
 }
 
+#[ic_mem_fn]
+pub unsafe fn region0_get<M: Memory>(_mem: &mut M) -> Value {
+    debug_assert_ne!(REGION_0, NO_REGION);
+    REGION_0
+}
+
+// Expose Region0 object to GC algorithms as root
+#[allow(dead_code)]
+#[cfg(feature = "ic")]
+pub(crate) unsafe fn region0_get_ptr_loc() -> *mut Value {
+    &mut REGION_0
+}
+
 #[ic_mem_fn]
 pub unsafe fn region_new<M: Memory>(mem: &mut M) -> Value {
     match crate::stable_mem::get_version() {
@@ -675,7 +688,7 @@ pub(crate) unsafe fn region_migration_from_regions_plus<M: Memory>(mem: &mut M)
 // region manager migration/initialization, with pre-existing stable data.
 //
 #[ic_mem_fn]
-pub(crate) unsafe fn region_init<M: Memory>(mem: &mut M, use_stable_regions: i32) {
+pub(crate) unsafe fn region_init<M: Memory>(mem: &mut M, use_stable_regions: u32) {
     debug_assert!(meta_data::offset::FREE < meta_data::offset::BLOCK_ZERO);
     match crate::stable_mem::get_version() {
         VERSION_NO_STABLE_MEMORY => {

diff --git a/rts/motoko-rts/src/region0.rs b/rts/motoko-rts/src/region0.rs
diff --git a/test/bench/ok/heap-32.drun-run-opt.ok b/test/bench/ok/heap-32.drun-run-opt.ok
@@ -1,5 +1,5 @@
 ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
 ingress Completed: Reply: 0x4449444c0000
-debug.print: (50_227, +30_261_252, 620_394_339)
+debug.print: (50_227, +30_261_252, 620_394_352)
 debug.print: (50_070, +32_992_212, 671_304_527)
 ingress Completed: Reply: 0x4449444c0000
diff --git a/test/bench/ok/heap-32.drun-run.ok b/test/bench/ok/heap-32.drun-run.ok
@@ -1,5 +1,5 @@
 ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
 ingress Completed: Reply: 0x4449444c0000
-debug.print: (50_227, +30_261_252, 667_797_563)
+debug.print: (50_227, +30_261_252, 667_797_588)
 debug.print: (50_070, +32_992_212, 720_521_435)
 ingress Completed: Reply: 0x4449444c0000
diff --git a/test/bench/ok/region0-mem.drun-run-opt.ok b/test/bench/ok/region0-mem.drun-run-opt.ok
@@ -1,4 +1,4 @@
 ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
 ingress Completed: Reply: 0x4449444c0000
-debug.print: {heap_diff = 0; instr_diff = 5_549_064_476}
+debug.print: {heap_diff = 0; instr_diff = 5_196_742_940}
 ingress Completed: Reply: 0x4449444c0000
diff --git a/test/bench/ok/region0-mem.drun-run.ok b/test/bench/ok/region0-mem.drun-run.ok
@@ -1,4 +1,4 @@
 ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
 ingress Completed: Reply: 0x4449444c0000
-debug.print: {heap_diff = 0; instr_diff = 5_863_637_298}
+debug.print: {heap_diff = 0; instr_diff = 5_561_647_410}
 ingress Completed: Reply: 0x4449444c0000