No barrier fast path but with slow path call (only pass the first argument)

fop working with interpreter with no mmtk-core change

MMTK_PLAN=GenCopy /mnt/jdk/build/linux-riscv64-server-slowdebug/jdk/bin/java -XX:+UseThirdPartyHeap -XX:MetaspaceSize=1G -XX:+UnlockDiagnosticVMOptions -Xint -Xmx60M -Xms60M -jar /mnt/dacapo/dacapo-evaluation-git-f480064.jar fop

Author: caizixian

mmtk/Cargo.toml

@@ -17,7 +17,7 @@ lto = true
 [package.metadata.openjdk]
 # Our CI matches the following line and extract mmtk/openjdk. If this line is updated, please check ci yaml files and make sure it works.
 openjdk_repo = "https://github.com/caizixian/jdk-mmtk.git"
-openjdk_version = "118483bfe38ddc716272cc92461dfbefdffb7047"
+openjdk_version = "e6c607ee6cae86a54cb5f061ddbd29585a517fe0"
 
 [dependencies]
 libc = "0.2"

openjdk/cpu/riscv/mmtkBarrierSetAssembler_riscv.cpp

@@ -146,7 +146,7 @@ void MMTkBarrierSetAssembler::generate_c1_write_barrier_runtime_stub(StubAssembl
 
   // void C1_MacroAssembler::load_parameter(int offset_in_words, Register reg)
   // ld(reg, Address(fp, offset_in_words * BytesPerWord));
-  // ra is free to use here, because calll prologue/epilogue handles it
+  // ra is free to use here, because call prologue/epilogue handles it
   const Register src = t0;
   const Register slot = t1;
   const Register new_val = ra;

openjdk/cpu/riscv/mmtkObjectBarrierSetAssembler_riscv.cpp

@@ -31,64 +31,69 @@
 //         mv      a0,a4
 //         tail    _Z32object_reference_write_slow_callPvS_m
 void MMTkObjectBarrierSetAssembler::object_reference_write_post(MacroAssembler* masm, DecoratorSet decorators, Address dst, Register val, Register tmp1, Register tmp2) const {
-//   // tmp1 and tmp2 is from MacroAssembler::access_store_at
-//   // For do_oop_store, we have three tmps, x28/t3, x29/t4, x13/a3
-//   // printf("object_reference_write_post\n");
+  // tmp1 and tmp2 is from MacroAssembler::access_store_at
+  // For do_oop_store, we have three tmps, x28/t3, x29/t4, x13/a3
+  // printf("object_reference_write_post\n");
 //   if (can_remove_barrier(decorators, val, /* skip_const_null */ true)) return;
-  Register obj = dst.base();
-  assert(obj->is_valid(), "dst must be an offset from a base register");
-  RegSet saved = RegSet::of(obj); // see void G1BarrierSetAssembler::g1_write_barrier_post
-  __ push_reg(saved, sp);
-// #if MMTK_ENABLE_BARRIER_FASTPATH
-//   Label done;
-//   assert_different_registers(obj, tmp1, tmp2);
-//   assert_different_registers(val, tmp1, tmp2);
-//   assert(tmp1->is_valid(), "need temp reg");
-//   assert(tmp2->is_valid(), "need temp reg");
-//   // tmp1 = load-byte (SIDE_METADATA_BASE_ADDRESS + (obj >> 6));
-//   __ mv(tmp1, obj);
-//   __ srli(tmp1, tmp1, 6); // tmp1 = obj >> 6;
-//   __ li(tmp2, SIDE_METADATA_BASE_ADDRESS);
-//   __ add(tmp1, tmp1, tmp2); // tmp1 = SIDE_METADATA_BASE_ADDRESS + (obj >> 6);
-//   __ lbu(tmp1, Address(tmp1, 0));
-//   // tmp2 = (obj >> 3) & 7
-//   __ mv(tmp2, obj);
-//   __ srli(tmp2, tmp2, 3);
-//   __ andi(tmp2, tmp2, 7);
-//   // tmp1 = tmp1 >> tmp2
-//   __ sraw(tmp1, tmp1, tmp2);
-//   // if ((tmp1 & 1) == 1) fall through to slowpath;
-//   __ andi(tmp1, tmp1, 1);
-//   __ bnez(tmp1, done); // (tmp1 & 1) == 1 is equivalent to (tmp1 & 1) != 0
-//   // setup calling convention
-//   __ mv(c_rarg0, obj);
-//   __ la(c_rarg1, dst);
-//   __ mv(c_rarg2, val == noreg ? zr : val);
-//   __ call_VM_leaf_base(FN_ADDR(MMTkBarrierSetRuntime::object_reference_write_slow_call), 3);
+  Register obj = dst._obj_start;
+  assert(obj->is_valid(), "RISC-V template interpreter originally passes the slot instead of the object reference. MMTk barriers require the object reference.");
+  // see void G1BarrierSetAssembler::g1_write_barrier_post
+  // the slot is still alive after the post barrier
+  if (dst.base()->is_valid()) {
+    __ push_reg(dst.base());
+  }
+  
+#if MMTK_ENABLE_BARRIER_FASTPATH
+  Label done;
+  assert_different_registers(obj, tmp1, tmp2);
+  assert_different_registers(val, tmp1, tmp2);
+  assert(tmp1->is_valid(), "need temp reg");
+  assert(tmp2->is_valid(), "need temp reg");
+  // tmp1 = load-byte (SIDE_METADATA_BASE_ADDRESS + (obj >> 6));
+  __ mv(tmp1, obj);
+  __ srli(tmp1, tmp1, 6); // tmp1 = obj >> 6;
+  __ li(tmp2, SIDE_METADATA_BASE_ADDRESS);
+  __ add(tmp1, tmp1, tmp2); // tmp1 = SIDE_METADATA_BASE_ADDRESS + (obj >> 6);
+  __ lbu(tmp1, Address(tmp1, 0));
+  // tmp2 = (obj >> 3) & 7
+  __ mv(tmp2, obj);
+  __ srli(tmp2, tmp2, 3);
+  __ andi(tmp2, tmp2, 7);
+  // tmp1 = tmp1 >> tmp2
+  __ sraw(tmp1, tmp1, tmp2);
+  // if ((tmp1 & 1) == 1) fall through to slowpath;
+  __ andi(tmp1, tmp1, 1);
+  __ bnez(tmp1, done); // (tmp1 & 1) == 1 is equivalent to (tmp1 & 1) != 0
+  // setup calling convention
+  __ mv(c_rarg0, obj);
+  __ la(c_rarg1, dst);
+  __ mv(c_rarg2, val == noreg ? zr : val);
+  __ call_VM_leaf_base(FN_ADDR(MMTkBarrierSetRuntime::object_reference_write_slow_call), 3);
 
-//   __ bind(done);
-// #else
-  // __ push_reg(c_rarg0, obj);
+  __ bind(done);
+#else
   __ mv(c_rarg0, obj);
-//   // //__ la(c_rarg1, dst);
-//   // //__ mv(c_rarg2, val == noreg ? zr : val);
+  // __ la(c_rarg1, dst);
+  // __ mv(c_rarg2, val == noreg ? zr : val);
   __ call_VM_leaf_base(FN_ADDR(MMTkBarrierSetRuntime::object_reference_write_post_call), 3);
-//   __ pop_reg(c_rarg0, obj);
-// #endif
-  __ pop_reg(saved, sp);
+#endif
+  if (dst.base()->is_valid()) {
+    __ pop_reg(dst.base());
+  }
 }
 
 void MMTkObjectBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
                                   Register src, Register dst, Register count, Register tmp, RegSet saved_regs) {
   // see also void G1BarrierSetAssembler::gen_write_ref_array_post_barrier
-  // assert_different_registers(src, dst, count);
+  assert_different_registers(src, dst, count);
   // const bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
   // if (is_oop && !dest_uninitialized) {
-  //   // in address generate_checkcast_copy, caller tells us to save count
-  //   __ push_reg(saved_regs, sp);
-  //   __ call_VM_leaf(FN_ADDR(MMTkBarrierSetRuntime::object_reference_array_copy_post_call), src, dst, count);
-  //   __ pop_reg(saved_regs, sp);
-  // }
+  if (is_oop) {
+    // in address generate_checkcast_copy, caller tells us to save count
+    __ push_reg(saved_regs, sp);
+    __ call_VM_leaf(FN_ADDR(MMTkBarrierSetRuntime::object_reference_array_copy_post_call), zr, dst, count);
+    __ pop_reg(saved_regs, sp);
+  }
 }
 
 #undef __