Update (2023.03.10)

29885: LA port of 8302369: Reduce the stack size of the C1 compiler
29991: LA port of 8302070: Factor null-check into load_klass() calls

Author: loongson-jvm

src/hotspot/cpu/loongarch/c1_CodeStubs_loongarch_64.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2022, Loongson Technology. All rights reserved.
+ * Copyright (c) 2021, 2023, Loongson Technology. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,18 +62,6 @@ void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
   __ b(_continuation);
 }
 
-RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array)
-  : _index(index), _array(array), _throw_index_out_of_bounds_exception(false) {
-  assert(info != NULL, "must have info");
-  _info = new CodeEmitInfo(info);
-}
-
-RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index)
-  : _index(index), _array(), _throw_index_out_of_bounds_exception(true) {
-  assert(info != NULL, "must have info");
-  _info = new CodeEmitInfo(info);
-}
-
 void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   __ bind(_entry);
   if (_info->deoptimize_on_exception()) {
@@ -200,13 +188,6 @@ void NewObjectArrayStub::emit_code(LIR_Assembler* ce) {
   __ b(_continuation);
 }
 
-// Implementation of MonitorAccessStubs
-
-MonitorEnterStub::MonitorEnterStub(LIR_Opr obj_reg, LIR_Opr lock_reg, CodeEmitInfo* info)
-  : MonitorAccessStub(obj_reg, lock_reg) {
-  _info = new CodeEmitInfo(info);
-}
-
 void MonitorEnterStub::emit_code(LIR_Assembler* ce) {
   assert(__ rsp_offset() == 0, "frame size should be fixed");
   __ bind(_entry);

src/hotspot/cpu/loongarch/c1_Defs_loongarch.hpp

@@ -80,4 +80,9 @@ enum {
   pd_two_operand_lir_form = false
 };
 
+// the number of stack required by ArrayCopyStub
+enum {
+  pd_arraycopystub_reserved_argument_area_size = 2
+};
+
 #endif // CPU_LOONGARCH_C1_DEFS_LOONGARCH_HPP

src/hotspot/cpu/loongarch/macroAssembler_loongarch.cpp

@@ -1680,6 +1680,11 @@ void MacroAssembler::load_klass(Register dst, Register src) {
   }
 }
 
+void MacroAssembler::load_klass_check_null(Register dst, Register src) {
+  null_check(src, oopDesc::klass_offset_in_bytes());
+  load_klass(dst, src);
+}
+
 void MacroAssembler::store_klass(Register dst, Register src) {
   if(UseCompressedClassPointers){
     encode_klass_not_null(src);

src/hotspot/cpu/loongarch/macroAssembler_loongarch.hpp

@@ -252,6 +252,7 @@ class MacroAssembler: public Assembler {
 
   // oop manipulations
   void load_klass(Register dst, Register src);
+  void load_klass_check_null(Register dst, Register src);
   void store_klass(Register dst, Register src);
 
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,

src/hotspot/cpu/loongarch/methodHandles_loongarch.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved.
+ * Copyright (c) 2015, 2023, Loongson Technology. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -326,8 +326,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
         __ null_check(receiver_reg);
       } else {
         // load receiver klass itself
-        __ null_check(receiver_reg, oopDesc::klass_offset_in_bytes());
-        __ load_klass(temp1_recv_klass, receiver_reg);
+        __ load_klass_check_null(temp1_recv_klass, receiver_reg);
         __ verify_klass_ptr(temp1_recv_klass);
       }
       BLOCK_COMMENT("check_receiver {");

src/hotspot/cpu/loongarch/templateTable_loongarch_64.cpp

@@ -3262,8 +3262,7 @@ void TemplateTable::invokevirtual_helper(Register index,
   __ bind(notFinal);
 
   // get receiver klass
-  __ null_check(recv, oopDesc::klass_offset_in_bytes());
-  __ load_klass(T2, recv);
+  __ load_klass_check_null(T2, recv);
 
   // profile this call
   __ profile_virtual_call(T2, T0, T1);
@@ -3366,8 +3365,7 @@ void TemplateTable::invokeinterface(int byte_no) {
   __ beq(AT, R0, notVFinal);
 
   // Get receiver klass into FSR - also a null check
-  __ null_check(T3, oopDesc::klass_offset_in_bytes());
-  __ load_klass(FSR, T3);
+  __ load_klass_check_null(FSR, T3);
 
   Label subtype;
   __ check_klass_subtype(FSR, T2, T0, subtype);
@@ -3389,8 +3387,7 @@ void TemplateTable::invokeinterface(int byte_no) {
 
   // Get receiver klass into T1 - also a null check
   __ restore_locals();
-  __ null_check(T3, oopDesc::klass_offset_in_bytes());
-  __ load_klass(T1, T3);
+  __ load_klass_check_null(T1, T3);
 
   Label no_such_method;