Merge pull request #326 from Pivot-Studio/fix/bugs0814

Fix/bugs0814

Author: Chronostasys

.github/workflows/bench.yml

@@ -8,6 +8,9 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+  RUST_TEST_NOCAPTURE: 1
+  PL_IMMIX_HEAP_SIZE: 1073741824
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

Cargo.lock

@@ -44,6 +44,7 @@ parking_lot = "0.12"
 derivative = "2.2"
 console = "0.15"
 anstyle = "1.0"
+regex = "1.9"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "0.2"

Cargo.toml

@@ -14,9 +14,12 @@ lazy_static = "1.4"
 vector-map = "1.0"
 backtrace = "0.3"
 log = "0.4"
+memory-stats = "1.1"
+
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winuser","memoryapi"] }
 
+
 [dev-dependencies]
 rand = "0.8"
 criterion = "0.4"

immix/Cargo.toml

@@ -19,10 +19,7 @@ fn bench_n_threads(n: usize) -> impl Fn(&mut Criterion) {
                 n, OBJ_NUM
             ),
             |b| {
-                b.iter_custom(|t| {
-                    let total = test_complecated_multiple_thread_gc(t as usize, n);
-                    total.0 + total.1
-                });
+                b.iter_custom(|t| test_complecated_multiple_thread_gc(t as usize, n));
             },
         );
     }
@@ -34,40 +31,37 @@ fn immix_benchmark_single_thread(c: &mut Criterion) {
     c.bench_function(
         &format!("singlethread gc benchmark--{} small objects", OBJ_NUM),
         |b| {
-            b.iter_custom(|t| {
-                let total = test_complecated_single_thread_gc(t as usize);
-                total.0 + total.1
-            });
+            b.iter_custom(|t| test_complecated_single_thread_gc(t as usize));
         },
     );
 }
 
-fn immix_benchmark_single_thread_mark(c: &mut Criterion) {
-    gc_disable_auto_collect();
-    set_evacuation(false);
-    c.bench_function(
-        &format!("singlethread gc mark benchmark--{} small objects", OBJ_NUM),
-        |b| {
-            b.iter_custom(|t| {
-                let total = test_complecated_single_thread_gc(t as usize);
-                total.0
-            });
-        },
-    );
-}
-fn immix_benchmark_single_thread_sweep(c: &mut Criterion) {
-    gc_disable_auto_collect();
-    set_evacuation(false);
-    c.bench_function(
-        &format!("singlethread gc sweep benchmark--{} small objects", OBJ_NUM),
-        |b| {
-            b.iter_custom(|t| {
-                let total = test_complecated_single_thread_gc(t as usize);
-                total.1
-            });
-        },
-    );
-}
+// fn immix_benchmark_single_thread_mark(c: &mut Criterion) {
+//     gc_disable_auto_collect();
+//     set_evacuation(false);
+//     c.bench_function(
+//         &format!("singlethread gc mark benchmark--{} small objects", OBJ_NUM),
+//         |b| {
+//             b.iter_custom(|t| {
+//                 let total = test_complecated_single_thread_gc(t as usize);
+//                 total.0
+//             });
+//         },
+//     );
+// }
+// fn immix_benchmark_single_thread_sweep(c: &mut Criterion) {
+//     gc_disable_auto_collect();
+//     set_evacuation(false);
+//     c.bench_function(
+//         &format!("singlethread gc sweep benchmark--{} small objects", OBJ_NUM),
+//         |b| {
+//             b.iter_custom(|t| {
+//                 let total = test_complecated_single_thread_gc(t as usize);
+//                 total.1
+//             });
+//         },
+//     );
+// }
 
 fn immix_benchmark_single_thread_alloc(c: &mut Criterion) {
     gc_disable_auto_collect();
@@ -124,13 +118,12 @@ unsafe fn alloc_test_obj(gc: &mut Collector) -> *mut GCTestObj {
     a
 }
 
-fn test_complecated_single_thread_gc(num_iter: usize) -> (Duration, Duration) {
+fn test_complecated_single_thread_gc(num_iter: usize) -> Duration {
     #[cfg(feature = "shadow_stack")]
     return {
         SPACE.with(|gc| unsafe {
             let mut gc = gc.borrow_mut();
-            let mut total_mark = Duration::new(0, 0);
-            let mut total_sweep = Duration::new(0, 0);
+            let mut total = Duration::new(0, 0);
             for _ in 0..num_iter {
                 let mut first_obj = alloc_test_obj(&mut gc);
                 let rustptr = (&mut first_obj) as *mut *mut GCTestObj as *mut u8;
@@ -149,7 +142,9 @@ fn test_complecated_single_thread_gc(num_iter: usize) -> (Duration, Duration) {
                 gc.add_root(rustptr, ObjectType::Pointer);
                 let size1 = gc.get_size();
                 assert_eq!(size1, OBJ_NUM + 1);
-                let ctime = gc.collect();
+                let now = std::time::Instant::now();
+                gc.collect();
+                total += now.elapsed();
                 // println!("gc{} gc time = {:?}", gc.get_id(), ctime);
                 let size2 = gc.get_size();
                 assert_eq!(live_obj, size2);
@@ -158,10 +153,8 @@ fn test_complecated_single_thread_gc(num_iter: usize) -> (Duration, Duration) {
                 gc.collect();
                 let size3 = gc.get_size();
                 assert_eq!(size3, 0);
-                total_mark += ctime.0;
-                total_sweep += ctime.1;
             }
-            (total_mark, total_sweep)
+            total
         })
     };
     #[cfg(not(feature = "shadow_stack"))]
@@ -170,7 +163,7 @@ fn test_complecated_single_thread_gc(num_iter: usize) -> (Duration, Duration) {
     (Duration::new(0, 100), Duration::new(0, 100))
 }
 
-fn test_complecated_multiple_thread_gc(num_iter: usize, threads: usize) -> (Duration, Duration) {
+fn test_complecated_multiple_thread_gc(num_iter: usize, threads: usize) -> Duration {
     let mut handles = vec![];
     for _ in 0..threads {
         let t = std::thread::spawn(move || test_complecated_single_thread_gc(num_iter));
@@ -180,7 +173,7 @@ fn test_complecated_multiple_thread_gc(num_iter: usize, threads: usize) -> (Dura
     for h in handles {
         times.push(h.join().unwrap());
     }
-    times.sort_by(|k1, k2| (k1.0 + k1.1).cmp(&(k2.0 + k2.1)));
+    times.sort_by(|k1, k2| (k1).cmp(k2));
     times.pop().unwrap()
 }
 
@@ -200,8 +193,8 @@ criterion_group!(
     benches,
     immix_benchmark_multi_thread,
     immix_benchmark_single_thread,
-    immix_benchmark_single_thread_mark,
-    immix_benchmark_single_thread_sweep,
+    // immix_benchmark_single_thread_mark,
+    // immix_benchmark_single_thread_sweep,
     immix_benchmark_single_thread_alloc,
 );
 criterion_main!(benches);

immix/benches/immix_bench.rs

@@ -76,6 +76,9 @@ extern "C" fn gctest_vtable(
 
 unsafe fn alloc_test_obj(gc: &mut Collector) -> *mut GCTestObj {
     let a = gc.alloc(size_of::<GCTestObj>(), ObjectType::Complex) as *mut GCTestObj;
+    if a.is_null() {
+        panic!("oom")
+    }
     a.write(GCTestObj {
         _vtable: gctest_vtable,
         b: std::ptr::null_mut(),

immix/benches/immix_stress_bench.rs

@@ -39,7 +39,7 @@ void PLImmixGCPrinter::finishAssembly(Module &M, GCModuleInfo &Info, AsmPrinter
   AP.emitAlignment(llvm::Align(8));
   // Put this in the data section.
   AP.OutStreamer.get()->SwitchSection(AP.getObjFileLowering().getDataSection());
-  std::string symbol ;
+  std::string symbol;
   symbol += "_IMMIX_GC_MAP_";
   symbol += M.getSourceFileName();
   // printf("symbol: %s \n", symbol.c_str());
@@ -140,10 +140,23 @@ void PLImmixGCPrinter::finishAssembly(Module &M, GCModuleInfo &Info, AsmPrinter
   for (auto GI = M.global_begin(), GE = M.global_end(); GI != GE; ++GI)
   {
     const GlobalValue *GV = &*GI;
-    if (GV->getName().contains("llvm."))
+    if (GV->getName().contains("llvm.")) // skip magic variables e.g. @llvm.global_ctors
+    {
+      continue;
+    }
+
+    if (GV->isManifestConstant()) // skip constants
     {
       continue;
     }
+
+    if (GV->getName().startswith("_IMMIX_GC_MAP") ||
+        GV->getName().contains("_@IMMIX_OBJTYPE_") ||
+        GV->getName().startswith(".str")) // skip generated globals
+    {
+      continue;
+    }
+
     ii++;
   }
   auto g = ii; // skip magic variables e.g. @llvm.global_ctors