fop interpreter working with no barrier fast path and basically nop slow path

Set mmtk-core FULL_NURSERY_GC to true as well

java -XX:+UseThirdPartyHeap -XX:MetaspaceSize=1G -XX:+UnlockDiagnosticVMOptions  -Xint -Xmx60M -Xms60M -jar /mnt
/dacapo/dacapo-evaluation-git-f480064.jar fop

Author: caizixian

openjdk/cpu/riscv/mmtkObjectBarrierSetAssembler_riscv.cpp

@@ -31,62 +31,64 @@
 //         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");
-  if (can_remove_barrier(decorators, val, /* skip_const_null */ true)) return;
+//   // 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);
+// #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
-  __ 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_post_call), 3);
-#endif
+//   __ bind(done);
+// #else
+  // __ push_reg(c_rarg0, obj);
+//   // __ 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_post_call), 3);
+//   __ pop_reg(c_rarg0, obj);
+// #endif
   __ pop_reg(saved, sp);
 }
 
 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);
-  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);
-  }
+  // 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);
+  // }
 }
 
 #undef __

openjdk/share/mmtkBarrierSet.hpp

@@ -38,7 +38,7 @@
 #include CPU_HEADER(mmtkBarrierSetAssembler)
 
 #define MMTK_ENABLE_ALLOCATION_FASTPATH true
-#define MMTK_ENABLE_BARRIER_FASTPATH true
+#define MMTK_ENABLE_BARRIER_FASTPATH false
 
 const intptr_t ALLOC_BIT_BASE_ADDRESS = GLOBAL_ALLOC_BIT_ADDRESS;