[RISC-V] Fix struct types passed by floating-point calling convention #4
Conversation
tomeksowi
changed the title
|
Thanks for looking at this. Feel free to submit it upstream since it looks like it doesn't interact with any of the things I was doing in this branch. |
On a related note I think this assert can/should be tightened back to the same as all other targets; it should be possible after the dotnet#97368 (related comment: dotnet#97368 (comment)). |
…ting-point calling convention
…atforms because after dotnet#97368 we don't need an exception
tomeksowi
changed the title
|
Should work now, albeit platform-specific fix-ups are not the nicest thing. I phrased it utilizing new ABI passing info to make it easier when the old ones will eventually go. |
| #if defined(TARGET_RISCV64) || defined(TARGET_LOONGARCH64) | ||
| if (arg.NewAbiInfo.HasAnyFloatingRegisterSegment()) | ||
| { | ||
| // Struct passed according to hardware floating-point calling convention | ||
| assert(arg.NewAbiInfo.NumSegments <= 2); | ||
| assert(!arg.NewAbiInfo.HasAnyStackSegment()); | ||
| if (arg.NewAbiInfo.NumSegments == 2) | ||
| { | ||
| // On LoongArch64, "getPrimitiveTypeForStruct" will incorrectly return "TYP_LONG" | ||
| // for "struct { float, float }", and retyping to a primitive here will cause the | ||
| // multi-reg morphing to not kick in (the struct in question needs to be passed in | ||
| // two FP registers). Here is just keep "structBaseType" as "TYP_STRUCT". | ||
| // TODO-LoongArch64: fix "getPrimitiveTypeForStruct". | ||
| structBaseType = TYP_STRUCT; | ||
| } | ||
| else | ||
| { | ||
| assert(arg.NewAbiInfo.NumSegments == 1); | ||
| structBaseType = arg.NewAbiInfo.Segments[0].GetRegisterType(); | ||
| } | ||
|
|
||
| for (unsigned i = 0; i < arg.NewAbiInfo.NumSegments; ++i) | ||
| { | ||
| arg.AbiInfo.StructFloatFieldType[i] = arg.NewAbiInfo.Segments[i].GetRegisterType(); | ||
| } | ||
| } | ||
| #endif // defined(TARGET_RISCV64) || defined(TARGET_LOONGARCH64) |
There was a problem hiding this comment.
LGTM, thanks. I think we need some test further on LA64 after the relate refactor of these.
Looks good to me. I think this platform-specific fixup will disappear once the multireg morphing code is adapted to use the new ABI representation directly. |
dotnet#103537 (comment)
Part of dotnet#84834, cc @dotnet/samsung