Update (2023.12.08, 3rd)

32922: LA port of 8318609: Upcall stubs should be smaller
32921: LA port of 8318598: FFM stylistic cleanups

Author: loongson-jvm

src/hotspot/cpu/loongarch/stubGenerator_loongarch_64.cpp

@@ -36,6 +36,7 @@
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/methodHandles.hpp"
+#include "prims/upcallLinker.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/continuationEntry.inline.hpp"
 #include "runtime/frame.inline.hpp"
@@ -4898,6 +4899,20 @@ class StubGenerator: public StubCodeGenerator {
 
 #endif // INCLUDE_JFR
 
+  // exception handler for upcall stubs
+  address generate_upcall_stub_exception_handler() {
+    StubCodeMark mark(this, "StubRoutines", "upcall stub exception handler");
+    address start = __ pc();
+
+    // Native caller has no idea how to handle exceptions,
+    // so we just crash here. Up to callee to catch exceptions.
+    __ verify_oop(A0); // return a exception oop in a0
+    __ call(CAST_FROM_FN_PTR(address, UpcallLinker::handle_uncaught_exception), relocInfo::runtime_call_type);
+    __ should_not_reach_here();
+
+    return start;
+  }
+
 #undef __
 #define __ masm->
 
@@ -5635,6 +5650,8 @@ class StubGenerator: public StubCodeGenerator {
     if (bs_nm != nullptr) {
       StubRoutines::la::_method_entry_barrier = generate_method_entry_barrier();
     }
+
+    StubRoutines::_upcall_stub_exception_handler = generate_upcall_stub_exception_handler();
   }
 
   void generate_compiler_stubs() {

src/hotspot/cpu/loongarch/upcallLinker_loongarch_64.cpp

@@ -217,6 +217,7 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
 
   __ block_comment("{ on_entry");
   __ lea(c_rarg0, Address(SP, frame_data_offset));
+  __ li(c_rarg1, (intptr_t)receiver);
   __ call(CAST_FROM_FN_PTR(address, UpcallLinker::on_entry), relocInfo::runtime_call_type);
   __ move(TREG, V0);
   __ reinit_heapbase();
@@ -232,9 +233,7 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
   __ block_comment("} argument shuffle");
 
   __ block_comment("{ receiver ");
-  __ li(shuffle_reg, (intptr_t)receiver);
-  __ resolve_jobject(shuffle_reg, SCR2, SCR1);
-  __ move(j_rarg0, shuffle_reg);
+  __ get_vm_result(j_rarg0, TREG);
   __ block_comment("} receiver ");
 
   __ mov_metadata(Rmethod, entry);
@@ -304,18 +303,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
 
   //////////////////////////////////////////////////////////////////////////////
 
-  __ block_comment("{ exception handler");
-
-  intptr_t exception_handler_offset = __ pc() - start;
-
-  // Native caller has no idea how to handle exceptions,
-  // so we just crash here. Up to callee to catch exceptions.
-  __ verify_oop(V0);
-  __ call(CAST_FROM_FN_PTR(address, UpcallLinker::handle_uncaught_exception), relocInfo::runtime_call_type);
-  __ should_not_reach_here();
-
-  __ block_comment("} exception handler");
-
   _masm->flush();
 
 #ifndef PRODUCT
@@ -331,7 +318,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
   UpcallStub* blob
     = UpcallStub::create(name,
                          &buffer,
-                         exception_handler_offset,
                          receiver,
                          in_ByteSize(frame_data_offset));
 

src/java.base/share/classes/jdk/internal/foreign/abi/loongarch64/LoongArch64Architecture.java

@@ -30,7 +30,6 @@
 import jdk.internal.foreign.abi.Architecture;
 import jdk.internal.foreign.abi.StubLocations;
 import jdk.internal.foreign.abi.VMStorage;
-import jdk.internal.foreign.abi.loongarch64.linux.TypeClass;
 
 public final class LoongArch64Architecture implements Architecture {
     public static final Architecture INSTANCE = new LoongArch64Architecture();

src/java.base/share/classes/jdk/internal/foreign/abi/loongarch64/linux/LinuxLoongArch64CallArranger.java

@@ -38,12 +38,10 @@
 import jdk.internal.foreign.abi.CallingSequenceBuilder;
 import jdk.internal.foreign.abi.DowncallLinker;
 import jdk.internal.foreign.abi.LinkerOptions;
-import jdk.internal.foreign.abi.UpcallLinker;
 import jdk.internal.foreign.abi.SharedUtils;
 import jdk.internal.foreign.abi.VMStorage;
 import jdk.internal.foreign.Utils;
 
-import java.lang.foreign.ValueLayout;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
 import java.util.List;
@@ -149,7 +147,7 @@ public StorageCalculator(boolean forArguments) {
             this.forArguments = forArguments;
         }
 
-        // Aggregates or scalars passed on the stack are aligned to the greater of
+        // Aggregates or scalars passed on the stack are aligned to the greatest of
         // the type alignment and XLEN bits, but never more than the stack alignment.
         void alignStack(long alignment) {
             alignment = Utils.alignUp(Math.clamp(alignment, STACK_SLOT_SIZE, 16), STACK_SLOT_SIZE);
@@ -252,8 +250,8 @@ protected BindingCalculator(boolean forArguments) {
                               Map.entry(STRUCT_REGISTER_XF, STRUCT_REGISTER_X));
     }
 
-    static class UnboxBindingCalculator extends BindingCalculator {
-        boolean forArguments;
+    static final class UnboxBindingCalculator extends BindingCalculator {
+        final boolean forArguments;
 
         UnboxBindingCalculator(boolean forArguments) {
             super(forArguments);

src/java.base/share/classes/jdk/internal/foreign/abi/loongarch64/linux/TypeClass.java

@@ -75,7 +75,7 @@ public enum TypeClass {
      * Struct will be flattened while classifying. That is, struct{struct{int, double}} will be treated
      * same as struct{int, double} and struct{int[2]} will be treated same as struct{int, int}.
      * */
-    private static record FieldCounter(long integerCnt, long floatCnt, long pointerCnt) {
+    private record FieldCounter(long integerCnt, long floatCnt, long pointerCnt) {
         static final FieldCounter EMPTY = new FieldCounter(0, 0, 0);
         static final FieldCounter SINGLE_INTEGER = new FieldCounter(1, 0, 0);
         static final FieldCounter SINGLE_FLOAT = new FieldCounter(0, 1, 0);
@@ -125,39 +125,40 @@ FieldCounter add(FieldCounter other) {
         }
     }
 
-    public static record FlattenedFieldDesc(TypeClass typeClass, long offset, ValueLayout layout) {
-
-    }
+    public record FlattenedFieldDesc(TypeClass typeClass, long offset, ValueLayout layout) { }
 
     private static List<FlattenedFieldDesc> getFlattenedFieldsInner(long offset, MemoryLayout layout) {
-        if (layout instanceof ValueLayout valueLayout) {
-            TypeClass typeClass = classifyValueType(valueLayout);
-            return List.of(switch (typeClass) {
-                case INTEGER, FLOAT -> new FlattenedFieldDesc(typeClass, offset, valueLayout);
-                default -> throw new IllegalStateException("Should not reach here.");
-            });
-        } else if (layout instanceof GroupLayout groupLayout) {
-            List<FlattenedFieldDesc> fields = new ArrayList<>();
-            for (MemoryLayout memberLayout : groupLayout.memberLayouts()) {
-                if (memberLayout instanceof PaddingLayout) {
+        return switch (layout) {
+            case ValueLayout valueLayout -> {
+                TypeClass typeClass = classifyValueType(valueLayout);
+                yield List.of(switch (typeClass) {
+                    case INTEGER, FLOAT -> new FlattenedFieldDesc(typeClass, offset, valueLayout);
+                    default -> throw new IllegalStateException("Should not reach here.");
+                });
+            }
+            case GroupLayout groupLayout -> {
+                List<FlattenedFieldDesc> fields = new ArrayList<>();
+                for (MemoryLayout memberLayout : groupLayout.memberLayouts()) {
+                    if (memberLayout instanceof PaddingLayout) {
+                        offset += memberLayout.byteSize();
+                        continue;
+                    }
+                    fields.addAll(getFlattenedFieldsInner(offset, memberLayout));
                     offset += memberLayout.byteSize();
-                    continue;
                 }
-                fields.addAll(getFlattenedFieldsInner(offset, memberLayout));
-                offset += memberLayout.byteSize();
+                yield fields;
             }
-            return fields;
-        } else if (layout instanceof SequenceLayout sequenceLayout) {
-            List<FlattenedFieldDesc> fields = new ArrayList<>();
-            MemoryLayout elementLayout = sequenceLayout.elementLayout();
-            for (long i = 0; i < sequenceLayout.elementCount(); i++) {
-                fields.addAll(getFlattenedFieldsInner(offset, elementLayout));
-                offset += elementLayout.byteSize();
+            case SequenceLayout sequenceLayout -> {
+                List<FlattenedFieldDesc> fields = new ArrayList<>();
+                MemoryLayout elementLayout = sequenceLayout.elementLayout();
+                for (long i = 0; i < sequenceLayout.elementCount(); i++) {
+                    fields.addAll(getFlattenedFieldsInner(offset, elementLayout));
+                    offset += elementLayout.byteSize();
+                }
+                yield fields;
             }
-            return fields;
-        } else {
-            throw new IllegalStateException("Cannot get here: " + layout);
-        }
+            case null, default -> throw new IllegalStateException("Cannot get here: " + layout);
+        };
     }
 
     public static List<FlattenedFieldDesc> getFlattenedFields(GroupLayout layout) {