Update (2023.10.25)

32674: LA port of 8315966: Relativize initial_sp in interpreter frames

Author: loongson-jvm

src/hotspot/cpu/loongarch/continuationFreezeThaw_loongarch.inline.hpp

@@ -128,25 +128,17 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
   }
 }
 
-static inline void relativize_one(intptr_t* const vfp, intptr_t* const hfp, int offset) {
-  assert(*(hfp + offset) == *(vfp + offset), "");
-  intptr_t* addr = hfp + offset;
-  intptr_t value = *(intptr_t**)addr - vfp;
-  *addr = value;
-}
-
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
-  intptr_t* vfp = f.fp();
-  intptr_t* hfp = hf.fp();
-  assert(hfp == hf.unextended_sp() + (f.fp() - f.unextended_sp()), "");
+  assert(hf.fp() == hf.unextended_sp() + (f.fp() - f.unextended_sp()), "");
   assert((f.at(frame::interpreter_frame_last_sp_offset) != 0)
     || (f.unextended_sp() == f.sp()), "");
-  assert(f.fp() > (intptr_t*)f.at(frame::interpreter_frame_initial_sp_offset), "");
+  assert(f.fp() > (intptr_t*)f.at_relative(frame::interpreter_frame_initial_sp_offset), "");
 
   // Make sure that last_sp is already relativized.
   assert((intptr_t*)hf.at_relative(frame::interpreter_frame_last_sp_offset) == hf.unextended_sp(), "");
 
-  relativize_one(vfp, hfp, frame::interpreter_frame_initial_sp_offset); // == block_top == block_bottom
+  // Make sure that monitor_block_top is already relativized.
+  assert(hf.at_absolute(frame::interpreter_frame_monitor_block_top_offset) <= frame::interpreter_frame_initial_sp_offset, "");
 
   assert((hf.fp() - hf.unextended_sp()) == (f.fp() - f.unextended_sp()), "");
   assert(hf.unextended_sp() == (intptr_t*)hf.at(frame::interpreter_frame_last_sp_offset), "");
@@ -269,18 +261,12 @@ inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   patch_callee_link(caller, caller.fp());
 }
 
-static inline void derelativize_one(intptr_t* const fp, int offset) {
-  intptr_t* addr = fp + offset;
-  *addr = (intptr_t)(fp + *addr);
-}
-
 inline void ThawBase::derelativize_interpreted_frame_metadata(const frame& hf, const frame& f) {
-  intptr_t* vfp = f.fp();
-
   // Make sure that last_sp is kept relativized.
   assert((intptr_t*)f.at_relative(frame::interpreter_frame_last_sp_offset) == f.unextended_sp(), "");
 
-  derelativize_one(vfp, frame::interpreter_frame_initial_sp_offset);
+  // Make sure that monitor_block_top is still relativized.
+  assert(f.at_absolute(frame::interpreter_frame_monitor_block_top_offset) <= frame::interpreter_frame_initial_sp_offset, "");
 }
 
 #endif // CPU_LOONGARCH_CONTINUATIONFREEZETHAW_LOONGARCH_INLINE_HPP

src/hotspot/cpu/loongarch/continuationHelper_loongarch.inline.hpp

@@ -122,7 +122,7 @@ inline intptr_t* ContinuationHelper::InterpretedFrame::frame_top(const frame& f,
   // interpreter_frame_last_sp_offset, points to unextended_sp includes arguments in the frame
   // interpreter_frame_initial_sp_offset excludes expression stack slots
   int expression_stack_sz = expression_stack_size(f, mask);
-  intptr_t* res = *(intptr_t**)f.addr_at(frame::interpreter_frame_initial_sp_offset) - expression_stack_sz;
+  intptr_t* res = (intptr_t*)f.at_relative(frame::interpreter_frame_initial_sp_offset) - expression_stack_sz;
   assert(res == (intptr_t*)f.interpreter_frame_monitor_end() - expression_stack_sz, "");
   assert(res >= f.unextended_sp(),
     "res: " INTPTR_FORMAT " initial_sp: " INTPTR_FORMAT " last_sp: " INTPTR_FORMAT " unextended_sp: " INTPTR_FORMAT " expression_stack_size: %d",

src/hotspot/cpu/loongarch/frame_loongarch.cpp

@@ -315,15 +315,18 @@ BasicObjectLock* frame::interpreter_frame_monitor_begin() const {
 }
 
 BasicObjectLock* frame::interpreter_frame_monitor_end() const {
-  BasicObjectLock* result = (BasicObjectLock*) at(interpreter_frame_monitor_block_top_offset);
+  BasicObjectLock* result = (BasicObjectLock*) at_relative(interpreter_frame_monitor_block_top_offset);
   // make sure the pointer points inside the frame
   assert(sp() <= (intptr_t*) result, "monitor end should be above the stack pointer");
   assert((intptr_t*) result < fp(), "monitor end should be strictly below the frame pointer");
   return result;
 }
 
 void frame::interpreter_frame_set_monitor_end(BasicObjectLock* value) {
-  *((BasicObjectLock**)addr_at(interpreter_frame_monitor_block_top_offset)) = value;
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  // set relativized monitor_block_top
+  ptr_at_put(interpreter_frame_monitor_block_top_offset, (intptr_t*)value - fp());
+  assert(at_absolute(interpreter_frame_monitor_block_top_offset) <= interpreter_frame_monitor_block_top_offset, "");
 }
 
 // Used by template based interpreter deoptimization

src/hotspot/cpu/loongarch/interp_masm_loongarch.hpp

@@ -156,7 +156,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void push(TosState state); // transition state -> vtos
 
   void empty_expression_stack() {
-    ld_d(SP, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+    ld_d(AT, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+    alsl_d(SP, AT, FP, LogBytesPerWord-1);
     // null last_sp until next java call
     st_d(R0, FP, frame::interpreter_frame_last_sp_offset * wordSize);
   }

src/hotspot/cpu/loongarch/interp_masm_loongarch_64.cpp

@@ -730,6 +730,7 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
     bind(restart);
     // points to current entry, starting with top-most entry
     ld_d(monitor_reg, monitor_block_top);
+    alsl_d(monitor_reg, monitor_reg, FP, LogBytesPerWord-1);
     // points to word before bottom of monitor block, should be callee-saved
     addi_d(TSR, FP, frame::interpreter_frame_initial_sp_offset * wordSize);
     b(entry);

src/hotspot/cpu/loongarch/templateInterpreterGenerator_loongarch.cpp

@@ -503,9 +503,11 @@ address TemplateInterpreterGenerator::generate_StackOverflowError_handler() {
 #ifdef ASSERT
   {
     Label L;
-    __ addi_d(T1, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
-    __ sub_d(T1, T1, SP); // T1 = maximal sp for current fp
-    __ bge(T1, R0, L);     // check if frame is complete
+    __ ld_d(T1, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+    __ alsl_d(T1, T1, FP, LogBytesPerWord-1);
+    // maximal sp for current fp (stack grows negative)
+    // check if frame is complete
+    __ bge(T1, SP, L);
     __ stop("interpreter frame not set up");
     __ bind(L);
   }
@@ -867,7 +869,9 @@ void TemplateInterpreterGenerator::lock_method(void) {
   }
   // add space for monitor & lock
   __ addi_d(SP, SP, (-1) * entry_size);           // add space for a monitor entry
-  __ st_d(SP, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+  __ sub_d(AT, SP, FP);
+  __ srai_d(AT, AT, Interpreter::logStackElementSize);
+  __ st_d(AT, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
   // set new monitor block top
   __ st_d(T0, Address(SP, BasicObjectLock::obj_offset()));   // store object
 
@@ -929,7 +933,8 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   } else {
     __ st_d(BCP, FP, (-++i) * wordSize);          // set bcp
   }
-  __ st_d(SP, FP, (-++i) * wordSize);               // reserve word for pointer to expression stack bottom
+  __ li(AT, frame::interpreter_frame_initial_sp_offset);
+  __ st_d(AT, FP, (-++i) * wordSize);               // reserve word for pointer to expression stack bottom
   assert(i == frame_size, "i should be equal to frame_size");
 }
 
@@ -1150,6 +1155,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   {
     Label L;
     __ ld_d(AT, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+    __ alsl_d(AT, AT, FP, LogBytesPerWord-1);
     __ beq(AT, SP, L);
     __ stop("broken stack frame setup in interpreter in asm");
     __ bind(L);
@@ -1744,6 +1750,7 @@ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
   {
     Label L;
     __ ld_d(AT, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+    __ alsl_d(AT, AT, FP, LogBytesPerWord-1);
     __ beq(AT, SP, L);
     __ stop("broken stack frame setup in interpreter in native");
     __ bind(L);

src/hotspot/cpu/loongarch/templateTable_loongarch_64.cpp

@@ -3946,6 +3946,7 @@ void TemplateTable::monitorenter() {
   {
     Label entry, loop, exit, next;
     __ ld_d(T2, monitor_block_top);
+    __ alsl_d(T2, T2, FP, LogBytesPerWord-1);
     __ addi_d(T3, FP, frame::interpreter_frame_initial_sp_offset * wordSize);
     __ b(entry);
 
@@ -3971,9 +3972,12 @@ void TemplateTable::monitorenter() {
     Label entry, loop;
     // 1. compute new pointers                   // SP: old expression stack top
     __ ld_d(monitor_reg, monitor_block_top);
+    __ alsl_d(monitor_reg, monitor_reg, FP, LogBytesPerWord-1);
     __ addi_d(SP, SP, -entry_size);
     __ addi_d(monitor_reg, monitor_reg, -entry_size);
-    __ st_d(monitor_reg, monitor_block_top);
+    __ sub_d(AT, monitor_reg, FP);
+    __ srai_d(AT, AT, Interpreter::logStackElementSize);
+    __ st_d(AT, monitor_block_top);
     __ move(T3, SP);
     __ b(entry);
 
@@ -4020,6 +4024,7 @@ void TemplateTable::monitorexit() {
   {
     Label entry, loop;
     __ ld_d(monitor_top, FP, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+    __ alsl_d(monitor_top, monitor_top, FP, LogBytesPerWord-1);
     __ addi_d(monitor_bot, FP, frame::interpreter_frame_initial_sp_offset * wordSize);
     __ b(entry);