Rename to match similar functions on other architectures

dotnet · tomeksowi · May 2, 2024 · May 6, 2024 · May 6, 2024 · May 8, 2024
commit c3e85787601d29350fd25c2b31b57096e98ac4c1
diff --git a/src/coreclr/inc/corinfo.h b/src/coreclr/inc/corinfo.h
@@ -357,8 +357,8 @@ enum StructFloatFieldInfoFlags
 };
 
 // On RISC-V and LoongArch a struct with up to two non-empty fields, at least one of them floating,
-// can be passed in registers. FPStructInfo represents passing information for such structs.
-struct FPStructInfo
+// can be passed in registers. FpStructInRegistersInfo represents passing information for such structs.
+struct FpStructInRegistersInfo
 {
     struct Field
     {
@@ -390,7 +390,7 @@ struct FPStructInfo
         return !fields[0].Empty() + !fields[1].Empty();
     }
 
-    // TODO: Remove, unless there are places where field offsets are unnecessary and it's difficult to pass FPStructInfo (CallDescrWorker?)
+    // TODO: Remove, unless there are places where field offsets are unnecessary and it's difficult to pass FpStructInRegistersInfo (CallDescrWorker?)
     StructFloatFieldInfoFlags ToFlags() const
     {
         int flags =

diff --git a/src/coreclr/vm/callingconvention.h b/src/coreclr/vm/callingconvention.h
@@ -536,7 +536,7 @@ class ArgIteratorTemplate : public ARGITERATOR_BASE
 
             // Struct larger than 16 can still be passed in registers according to FP call conv if it has empty fields or
             // more padding, so make sure it's passed according to integer call conv which bounds struct to 16 bytes.
-            return MethodTable::GetRiscV64PassFPStructInfo(th).IsPassedWithIntegerCallConv();
+            return MethodTable::GetRiscV64PassFpStructInRegistersInfo(th).IsPassedWithIntegerCallConv();
         }
         return FALSE;
 #else
@@ -601,7 +601,7 @@ class ArgIteratorTemplate : public ARGITERATOR_BASE
             if (m_argSize <= ENREGISTERED_PARAMTYPE_MAXSIZE)
                 return FALSE;
 
-            return MethodTable::GetRiscV64PassFPStructInfo(m_argTypeHandle).IsPassedWithIntegerCallConv();
+            return MethodTable::GetRiscV64PassFpStructInRegistersInfo(m_argTypeHandle).IsPassedWithIntegerCallConv();
         #else
             return (m_argSize > ENREGISTERED_PARAMTYPE_MAXSIZE);
         #endif
@@ -1795,7 +1795,7 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetNextOffset()
 #elif defined(TARGET_RISCV64)
     assert(!this->IsVarArg()); // Varargs on RISC-V not supported yet
     int cFPRegs = 0;
-    FPStructInfo info = {};
+    FpStructInRegistersInfo info = {};
 
     switch (argType)
     {
@@ -1806,12 +1806,8 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetNextOffset()
         break;
 
     case ELEMENT_TYPE_VALUETYPE:
-        info = MethodTable::GetRiscV64PassFPStructInfo(thValueType);
-        if (!info.IsPassedWithIntegerCallConv())
-        {
-            // Struct may be passed according to hardware floating-point calling convention
-            cFPRegs = info.fields[0].isFloating + info.fields[1].isFloating;
-        }
+        info = MethodTable::GetRiscV64PassFpStructInRegistersInfo(thValueType);
+        cFPRegs = info.fields[0].isFloating + info.fields[1].isFloating;
         break;
 
     default:

diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp
@@ -9653,7 +9653,7 @@ uint32_t CEEInfo::getRISCV64PassStructInRegisterFlags(CORINFO_CLASS_HANDLE cls)
     uint32_t size = STRUCT_NO_FLOAT_FIELD;
 
 #if defined(TARGET_RISCV64)
-    size = (uint32_t)MethodTable::GetRiscV64PassFPStructInfo(TypeHandle(cls)).ToFlags();
+    size = (uint32_t)MethodTable::GetRiscV64PassFpStructInRegistersInfo(TypeHandle(cls)).ToFlags();
 #endif // TARGET_RISCV64
 
     EE_TO_JIT_TRANSITION_LEAF();

diff --git a/src/coreclr/vm/methodtable.cpp b/src/coreclr/vm/methodtable.cpp
@@ -3014,7 +3014,7 @@ int MethodTable::GetRiscV64PassStructInRegisterFlags(TypeHandle th)
 #endif
 
 #if defined(TARGET_RISCV64) || defined(TARGET_LOONGARCH64)
-static bool HandleInlineArray(int elementTypeIndex, int nElements, FPStructInfo& info DEBUG_ARG(const char* fieldNames[2]))
+static bool HandleInlineArray(int elementTypeIndex, int nElements, FpStructInRegistersInfo& info DEBUG_ARG(const char* fieldNames[2]))
 {
     int typeIndex = info.NumFields();
     int nFlattenedFieldsPerElement = typeIndex - elementTypeIndex;
@@ -3040,7 +3040,7 @@ static bool HandleInlineArray(int elementTypeIndex, int nElements, FPStructInfo&
     return true;
 }
 
-static bool FlattenFields(TypeHandle th, uint32_t offset, FPStructInfo& info DEBUG_ARG(const char* fieldNames[2]))
+static bool FlattenFields(TypeHandle th, uint32_t offset, FpStructInRegistersInfo& info DEBUG_ARG(const char* fieldNames[2]))
 {
     bool isManaged = !th.IsTypeDesc();
     MethodTable* pMT = isManaged ? th.AsMethodTable() : th.AsNativeValueType();
@@ -3137,14 +3137,14 @@ static bool FlattenFields(TypeHandle th, uint32_t offset, FPStructInfo& info DEB
 #endif
 
 #if defined(TARGET_RISCV64)
-static void LogFPStructInfo(TypeHandle th, FPStructInfo info, const char* fieldNames[2], const char* message)
+static void LogFpStructInRegistersInfo(TypeHandle th, FpStructInRegistersInfo info, const char* fieldNames[2], const char* message)
 {
     if (!LoggingOn(LF_JIT, LL_EVERYTHING))
         return;
 
     SString name;
     th.GetName(name);
-    LOG((LF_JIT, LL_EVERYTHING, "GetRiscV64PassFPStructInfo: Struct %s %s, %u fields%s\n",
+    LOG((LF_JIT, LL_EVERYTHING, "GetRiscV64PassFpStructInRegistersInfo: Struct %s %s, %u fields%s\n",
          name.GetUTF8(), message, info.NumFields(), (info.NumFields() > 0 ? ":" : "")));
 
     if (!info.fields[0].Empty())
@@ -3159,31 +3159,31 @@ static void LogFPStructInfo(TypeHandle th, FPStructInfo info, const char* fieldN
     }
 }
 
-static FPStructInfo GetRiscV64PassFPStructInfoImpl(TypeHandle th)
+static FpStructInRegistersInfo GetRiscV64PassFpStructInRegistersInfoImpl(TypeHandle th)
 {
-    FPStructInfo info = {};
+    FpStructInRegistersInfo info = {};
     INDEBUG(const char* fieldNames[2] = {};)
     if (!FlattenFields(th, 0, info DEBUG_ARG(fieldNames)))
     {
-        INDEBUG(LogFPStructInfo(th, info, fieldNames, "cannot be passed according to floating-point calling convention");)
-        return FPStructInfo{};
+        INDEBUG(LogFpStructInRegistersInfo(th, info, fieldNames, "cannot be passed according to floating-point calling convention");)
+        return FpStructInRegistersInfo{};
     }
 
     assert(!(info.fields[0].Empty() && !info.fields[1].Empty()));
 
     if (!info.fields[0].isFloating && !info.fields[1].isFloating)
     {
-        INDEBUG(LogFPStructInfo(th, info, fieldNames, "does not have any floating fields");)
-        return FPStructInfo{};
+        INDEBUG(LogFpStructInRegistersInfo(th, info, fieldNames, "does not have any floating fields");)
+        return FpStructInRegistersInfo{};
     }
 
-    INDEBUG(LogFPStructInfo(th, info, fieldNames, "can be passed according to floating-point calling convention");)
+    INDEBUG(LogFpStructInRegistersInfo(th, info, fieldNames, "can be passed according to floating-point calling convention");)
     return info;
 }
 
-FPStructInfo MethodTable::GetRiscV64PassFPStructInfo(TypeHandle th)
+FpStructInRegistersInfo MethodTable::GetRiscV64PassFpStructInRegistersInfo(TypeHandle th)
 {
-    FPStructInfo info = GetRiscV64PassFPStructInfoImpl(th);
+    FpStructInRegistersInfo info = GetRiscV64PassFpStructInRegistersInfoImpl(th);
     int flags = GetRiscV64PassStructInRegisterFlags(th);
 
     if (info.IsPassedWithIntegerCallConv())

diff --git a/src/coreclr/vm/methodtable.h b/src/coreclr/vm/methodtable.h
@@ -828,7 +828,7 @@ class MethodTable
     static int GetLoongArch64PassStructInRegisterFlags(TypeHandle th);
 #elif defined(TARGET_RISCV64)
     static int GetRiscV64PassStructInRegisterFlags(TypeHandle th);
-    static FPStructInfo GetRiscV64PassFPStructInfo(TypeHandle th);
+    static FpStructInRegistersInfo GetRiscV64PassFpStructInRegistersInfo(TypeHandle th);
 #endif
 
 #if defined(UNIX_AMD64_ABI_ITF)