Merge pull request #1 from caizixian/jdk-20+15-mmtk-zero

Zero interpreter support + merge mmtk-openjdk 0.15

Author: caizixian

CHANGELOG.md

@@ -1,3 +1,10 @@
+0.15.0 (2022-09-20)
+===
+
+* Add MMTk build info to `-Xinternalversion`.
+* Implement `arraycopy` barriers.
+* Update to mmtk-core 0.15.0.
+
 0.14.1 (2022-08-10)
 ===
 

mmtk/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mmtk_openjdk"
-version = "0.14.1"
+version = "0.15.0"
 authors = [" <>"]
 rust-version = "1.57.0"
 build = "build.rs"
@@ -29,7 +29,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 = "4ae23b1dc0e14f62c196c12c93818e00e9de7cc5" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "c5d62c4354fe091b7bc4d3bc39d570b7986b93de" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 
@@ -58,3 +58,5 @@ gencopy = []
 marksweep = []
 pageprotect = []
 immix = []
+
+jfr = []

mmtk/Cargo.toml

@@ -66,6 +66,7 @@ pub struct Klass {
     pub class_loader_data: OpaquePointer, // ClassLoaderData*
     pub vtable_len: i32,
     pub access_flags: i32, // AccessFlags
+    #[cfg(feature = "jfr")]
     pub trace_id: u64,     // JFR_ONLY(traceid _trace_id;)
     pub shared_class_flags: u16,
     pub archived_mirror_index: i32,

mmtk/src/abi.rs

@@ -9,6 +9,7 @@ use mmtk::plan::BarrierSelector;
 use mmtk::scheduler::GCController;
 use mmtk::scheduler::GCWorker;
 use mmtk::util::alloc::AllocatorSelector;
+use mmtk::util::constants::LOG_BYTES_IN_ADDRESS;
 use mmtk::util::opaque_pointer::*;
 use mmtk::util::{Address, ObjectReference};
 use mmtk::AllocationSemantics;
@@ -308,21 +309,71 @@ pub extern "C" fn executable() -> bool {
     true
 }
 
+/// Full pre barrier
 #[no_mangle]
-pub extern "C" fn post_write_barrier(mutator: &'static mut Mutator<OpenJDK>, obj: ObjectReference) {
+pub extern "C" fn mmtk_object_reference_write_pre(
+    mutator: &'static mut Mutator<OpenJDK>,
+    src: ObjectReference,
+    slot: Address,
+    target: ObjectReference,
+) {
+    mutator
+        .barrier()
+        .object_reference_write_pre(src, slot, target);
+}
+
+/// Full post barrier
+#[no_mangle]
+pub extern "C" fn mmtk_object_reference_write_post(
+    mutator: &'static mut Mutator<OpenJDK>,
+    src: ObjectReference,
+    slot: Address,
+    target: ObjectReference,
+) {
+    mutator
+        .barrier()
+        .object_reference_write_post(src, slot, target);
+}
+
+/// Barrier slow-path call
+#[no_mangle]
+pub extern "C" fn mmtk_object_reference_write_slow(
+    mutator: &'static mut Mutator<OpenJDK>,
+    src: ObjectReference,
+    slot: Address,
+    target: ObjectReference,
+) {
+    mutator
+        .barrier()
+        .object_reference_write_slow(src, slot, target);
+}
+
+/// Array-copy pre-barrier
+#[no_mangle]
+pub extern "C" fn mmtk_array_copy_pre(
+    mutator: &'static mut Mutator<OpenJDK>,
+    src: Address,
+    dst: Address,
+    count: usize,
+) {
+    let bytes = count << LOG_BYTES_IN_ADDRESS;
     mutator
         .barrier()
-        .post_write_barrier(mmtk::plan::BarrierWriteTarget::Object(obj))
+        .memory_region_copy_pre(src..src + bytes, dst..dst + bytes);
 }
 
+/// Array-copy post-barrier
 #[no_mangle]
-pub extern "C" fn post_write_barrier_slow(
+pub extern "C" fn mmtk_array_copy_post(
     mutator: &'static mut Mutator<OpenJDK>,
-    obj: ObjectReference,
+    src: Address,
+    dst: Address,
+    count: usize,
 ) {
+    let bytes = count << LOG_BYTES_IN_ADDRESS;
     mutator
         .barrier()
-        .post_write_barrier_slow(mmtk::plan::BarrierWriteTarget::Object(obj))
+        .memory_region_copy_post(src..src + bytes, dst..dst + bytes);
 }
 
 // finalization

mmtk/src/api.rs

@@ -5,6 +5,7 @@ extern crate lazy_static;
 extern crate once_cell;
 
 use std::collections::HashMap;
+use std::ops::Range;
 use std::ptr::null_mut;
 use std::sync::atomic::AtomicUsize;
 use std::sync::Mutex;
@@ -122,6 +123,7 @@ impl VMBinding for OpenJDK {
     type VMReferenceGlue = reference_glue::VMReferenceGlue;
 
     type VMEdge = OpenJDKEdge;
+    type VMMemorySlice = Range<Address>;
 }
 
 use std::sync::atomic::AtomicBool;

mmtk/src/lib.rs

@@ -38,6 +38,14 @@ ifeq ($(MMTK_EXTREME_ASSERTIONS), 1)
   endif
 endif
 
+ifeq ($(call check-jvm-feature, jfr), true)
+  ifndef GC_FEATURES
+    GC_FEATURES=--features jfr
+  else
+    GC_FEATURES:=$(strip $(GC_FEATURES))",jfr"
+  endif
+endif
+
 LIB_MMTK := $(JVM_LIB_OUTPUTDIR)/libmmtk_openjdk.so
 
 ifeq ($(DEBUG_LEVEL), release)
@@ -63,8 +71,8 @@ JVM_LDFLAGS += '-Wl,-rpath,$$ORIGIN'
 FORCE:
 
 TARGETS += $(LIB_MMTK)
-JVM_SRC_DIRS += $(MMTK_CPP_ROOT) $(MMTK_CPP_ROOT)/barriers
-JVM_CFLAGS += -std=c++14 -fpermissive -DINCLUDE_THIRD_PARTY_HEAP -DTHIRD_PARTY_HEAP_SRC=$(MMTK_CPP_ROOT)
+JVM_SRC_DIRS += $(MMTK_CPP_ROOT)/share $(MMTK_CPP_ROOT)/share/barriers $(MMTK_CPP_ROOT)/cpu/$(HOTSPOT_TARGET_CPU_ARCH)
+JVM_CFLAGS += -std=c++14 -fpermissive -DINCLUDE_THIRD_PARTY_HEAP -DTHIRD_PARTY_HEAP_SRC=$(MMTK_CPP_ROOT)/share -I$(MMTK_CPP_ROOT)/share -I$(MMTK_CPP_ROOT)/cpu/$(HOTSPOT_TARGET_CPU_ARCH)
 ifeq ($(GLOBAL_ALLOC_BIT), 1)
   JVM_CFLAGS += -DMMTK_ENABLE_GLOBAL_ALLOC_BIT
 endif