Remove some code (#37)

Merge only with mmtk/julia#5.

- Correct prototype for `run_finalizer`.
- Remove `jl_mmtk_gc_alloc_default_llvm`, no longer needed.
- Remove calls to `gc_time_mallocd_array_*`, only needed with `GC_TIME`. 
- Remove call to `verify_parent1`, only needed with `GC_VERIFY`.

Author: kpamnany

.github/scripts/Make.user

@@ -1 +1 @@
-USE_MMTK=1
+WITH_MMTK=1

.github/scripts/ci-build.sh

@@ -20,7 +20,7 @@ if [ "$build_type" == "release" ]; then
     build_args=$build_args" --release"
 fi
 
-cd $MMTK_JULIA_DIR
+cd $MMTK_JULIA_DIR/mmtk
 cargo build --features immix $build_args
 
 cd $JULIA_PATH

.github/scripts/common.sh

@@ -5,7 +5,7 @@ RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`
 JULIA_TEST_ARGS='--check-bounds=yes --startup-file=no --depwarn=error'
 
 # Julia binding requires these
-export MMTK_JULIA_DIR=$BINDING_PATH/mmtk
+export MMTK_JULIA_DIR=$BINDING_PATH
 
 # Make sure we have enough heap to build Julia
 export MMTK_MIN_HSIZE_G=0.5

README.md

@@ -19,7 +19,7 @@ To build Julia with MMTk, create a `Make.user` file in the top-level directory o
 
 ```
 export MMTK_BUILD=release # or debug depending on how you build the Rust binding
-export MMTK_JULIA_DIR=<path-to-mmtk-julia>/mmtk
+export MMTK_JULIA_DIR=<path-to-mmtk-julia>
 ```
 
 Before building Julia, build the Rust binding in `mmtk-julia/mmtk`. Note that we currently support either immix or marksweep implementations in mmtk-core (build it with `cargo build --features immix # or marksweep`). To build Julia, navigate to `/vm/julia` and run `make` (or `make debug`). Please also make sure to install any dependency considering any particular requirement from both [Julia](https://github.com/JuliaLang/julia/blob/master/doc/src/devdocs/build/build.md#required-build-tools-and-external-libraries) and [MMTk](https://github.com/mmtk/mmtk-core#requirements). 

julia/mmtk_julia.c

@@ -5,7 +5,7 @@
 #include "gc.h"
 
 extern int64_t perm_scanned_bytes;
-extern void run_finalizer(jl_task_t *ct, jl_value_t *o, jl_value_t *ff);
+extern void run_finalizer(jl_task_t *ct, void *o, void *ff);
 extern int gc_n_threads;
 extern jl_ptls_t* gc_all_tls_states;
 extern jl_ptls_t get_next_mutator_tls(void);
@@ -34,31 +34,6 @@ JL_DLLEXPORT void (jl_mmtk_harness_end)(void)
     harness_end();
 }
 
-JL_DLLEXPORT jl_value_t *jl_mmtk_gc_alloc_default_llvm(jl_ptls_t ptls, int pool_offset, int osize)
-{
-    // safepoint
-    jl_gc_safepoint();
-
-    jl_value_t *v;
-
-    // ptls->mmtk_mutator_ptr->allocators.immix[0].cursor = ptls->cursor;
-
-    // v needs to be 16 byte aligned, therefore v_tagged needs to be offset accordingly to consider the size of header
-    jl_taggedvalue_t *v_tagged =
-        (jl_taggedvalue_t *) alloc(ptls->mmtk_mutator_ptr, osize, 16, 8, 0);
-
-    // ptls->cursor = ptls->mmtk_mutator_ptr->allocators.immix[0].cursor;
-    // ptls->limit = ptls->mmtk_mutator_ptr->allocators.immix[0].limit;
-
-    v = jl_valueof(v_tagged);
-
-    post_alloc(ptls->mmtk_mutator_ptr, v, osize, 0);
-    ptls->gc_num.allocd += osize;
-    ptls->gc_num.poolalloc++;
-
-    return v;
-}
-
 STATIC_INLINE void* alloc_default_object(jl_ptls_t ptls, size_t size, int offset) {
     int64_t delta = (-offset -(int64_t)(ptls->cursor)) & 15; // aligned to 16
     uint64_t aligned_addr = (uint64_t)ptls->cursor + delta;
@@ -137,7 +112,6 @@ JL_DLLEXPORT jl_value_t *jl_mmtk_gc_alloc_big(jl_ptls_t ptls, size_t sz)
 
 static void mmtk_sweep_malloced_arrays(void) JL_NOTSAFEPOINT
 {
-    gc_time_mallocd_array_start();
     reset_count_tls();
     jl_ptls_t ptls2 = (jl_ptls_t) get_next_mutator_tls();
     while(ptls2 != NULL) {
@@ -164,7 +138,6 @@ static void mmtk_sweep_malloced_arrays(void) JL_NOTSAFEPOINT
         }
         ptls2 = get_next_mutator_tls();
     }
-    gc_time_mallocd_array_end();
     gc_sweep_sysimg();
 }
 
@@ -759,10 +732,6 @@ JL_DLLEXPORT void scan_julia_obj(jl_value_t* obj, closure_pointer closure, Proce
                 continue;
 
             process_edge(closure, begin);
-            
-            void *vb = jl_astaggedvalue(b);
-            verify_parent1("module", binding->parent, &vb, "binding_buff");
-            (void)vb;
         }
 
         process_edge(closure, &m->parent);

mmtk/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 [package.metadata.julia]
 # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
 julia_repo = "https://github.com/mmtk/julia.git"
-julia_version = "54ca78ad9ca9e2795c6356588ed50039f2d1b23b"
+julia_version = "72a275233012a80dfd5c5ac1c83afdf9aff0a87a"
 
 [lib]
 crate-type = ["staticlib", "rlib", "dylib"]