Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JIT: Support frozen structs for Swift pinvokes #99294

Merged
merged 33 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
53093b8
JIT: Support frozen structs for Swift pinvokes
jakobbotsch Mar 5, 2024
72a7821
Update tests
jakobbotsch Mar 5, 2024
6a66868
Fix some format strings
jakobbotsch Mar 5, 2024
21511f3
Only enable new test for crossgen2/NAOT
jakobbotsch Mar 5, 2024
16436cb
Use TypeWithRepeatedFields in the FieldLayoutIntervalCalculator to en…
jkoritzinsky Mar 6, 2024
0e7c7cc
Merge branch 'pr-99337' into swift-abi
jakobbotsch Mar 6, 2024
df58918
Add some JITDUMP and comments
jakobbotsch Mar 6, 2024
9fbe1d4
Merge branch 'main' of github.com:dotnet/runtime into swift-abi
jakobbotsch Mar 8, 2024
102845a
Get offsets from EE side
jakobbotsch Mar 8, 2024
a5acee3
Expand JITDUMP
jakobbotsch Mar 8, 2024
e8412d5
Fix byte case for lowering
jakobbotsch Mar 8, 2024
0cbe02b
Run jit-format
jakobbotsch Mar 11, 2024
6ae6927
Merge branch 'main' of github.com:dotnet/runtime into swift-abi
jakobbotsch Mar 11, 2024
7b416a1
Handle no args case
jakobbotsch Mar 11, 2024
62980ab
Revert back some unnecessary changes
jakobbotsch Mar 12, 2024
f685274
Merge branch 'main' of github.com:dotnet/runtime into swift-abi
jakobbotsch Mar 12, 2024
5672712
Clean up
jakobbotsch Mar 12, 2024
baf481d
Run jit-format
jakobbotsch Mar 12, 2024
cfd6f57
Fix merge
jakobbotsch Mar 12, 2024
8155e15
Clean up
jakobbotsch Mar 12, 2024
25164fc
Implement getSwiftLowering on EE side
jakobbotsch Mar 12, 2024
710f68c
Disable tests on Mono only
jakobbotsch Mar 12, 2024
e1b0081
Fix contract
jakobbotsch Mar 12, 2024
c30cdf1
Fix lowering
jakobbotsch Mar 12, 2024
a3cacfe
Fix lowering 2
jakobbotsch Mar 12, 2024
e52b8d4
Fix lowering 3
jakobbotsch Mar 12, 2024
ce34d99
Fix lowering 4
jakobbotsch Mar 12, 2024
0c5c9e1
Fix lowering 5
jakobbotsch Mar 12, 2024
c9ca283
Reduce amount of tests
jakobbotsch Mar 12, 2024
1a8fef7
Feedback
jakobbotsch Mar 12, 2024
4fcbe2a
Test feedback
jakobbotsch Mar 12, 2024
83e4513
Indentation
jakobbotsch Mar 12, 2024
c097b48
Revert "Test feedback"
jakobbotsch Mar 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/coreclr/inc/corinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -3080,6 +3080,9 @@ class ICorStaticInfo
SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR* structPassInRegDescPtr /* OUT */
) = 0;

// Classifies a swift structure into primitives or an implicit byref for ABI purposes.
virtual void getSwiftLowering(CORINFO_CLASS_HANDLE structHnd, CORINFO_SWIFT_LOWERING* pLowering) = 0;

virtual uint32_t getLoongArch64PassStructInRegisterFlags(CORINFO_CLASS_HANDLE cls) = 0;
virtual uint32_t getRISCV64PassStructInRegisterFlags(CORINFO_CLASS_HANDLE cls) = 0;
};
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/inc/icorjitinfoimpl_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,10 @@ bool getSystemVAmd64PassStructInRegisterDescriptor(
CORINFO_CLASS_HANDLE structHnd,
SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR* structPassInRegDescPtr) override;

void getSwiftLowering(
CORINFO_CLASS_HANDLE structHnd,
CORINFO_SWIFT_LOWERING* pLowering) override;

uint32_t getLoongArch64PassStructInRegisterFlags(
CORINFO_CLASS_HANDLE structHnd) override;

Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/inc/jiteeversionguid.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ typedef const GUID *LPCGUID;
#define GUID_DEFINED
#endif // !GUID_DEFINED

constexpr GUID JITEEVersionIdentifier = { /* 86eab154-5d93-4fad-bc07-e94fd9268b70 */
0x86eab154,
0x5d93,
0x4fad,
{0xbc, 0x07, 0xe9, 0x4f, 0xd9, 0x26, 0x8b, 0x70}
constexpr GUID JITEEVersionIdentifier = { /* e5f629d4-edc8-48f1-a75d-0fa1f0b5af6f */
0xe5f629d4,
0xedc8,
0x48f1,
{0xa7, 0x5d, 0x0f, 0xa1, 0xf0, 0xb5, 0xaf, 0x6f}
};

//////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/jit/ICorJitInfo_names_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ DEF_CLR_API(printMethodName)
DEF_CLR_API(getMethodNameFromMetadata)
DEF_CLR_API(getMethodHash)
DEF_CLR_API(getSystemVAmd64PassStructInRegisterDescriptor)
DEF_CLR_API(getSwiftLowering)
DEF_CLR_API(getLoongArch64PassStructInRegisterFlags)
DEF_CLR_API(getRISCV64PassStructInRegisterFlags)
DEF_CLR_API(getThreadTLSIndex)
Expand Down
9 changes: 9 additions & 0 deletions src/coreclr/jit/ICorJitInfo_wrapper_generated.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,15 @@ bool WrapICorJitInfo::getSystemVAmd64PassStructInRegisterDescriptor(
return temp;
}

void WrapICorJitInfo::getSwiftLowering(
CORINFO_CLASS_HANDLE structHnd,
CORINFO_SWIFT_LOWERING* pLowering)
{
API_ENTER(getSwiftLowering);
wrapHnd->getSwiftLowering(structHnd, pLowering);
API_LEAVE(getSwiftLowering);
}

uint32_t WrapICorJitInfo::getLoongArch64PassStructInRegisterFlags(
CORINFO_CLASS_HANDLE structHnd)
{
Expand Down
4 changes: 3 additions & 1 deletion src/coreclr/jit/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -4377,7 +4377,9 @@ class Compiler
void impCheckForPInvokeCall(
GenTreeCall* call, CORINFO_METHOD_HANDLE methHnd, CORINFO_SIG_INFO* sig, unsigned mflags, BasicBlock* block);
GenTreeCall* impImportIndirectCall(CORINFO_SIG_INFO* sig, const DebugInfo& di = DebugInfo());
void impPopArgsForUnmanagedCall(GenTreeCall* call, CORINFO_SIG_INFO* sig, /* OUT */ CallArg** swiftErrorArg);
void impPopArgsForUnmanagedCall(GenTreeCall* call, CORINFO_SIG_INFO* sig, CallArg** swiftErrorArg);
void impPopArgsForSwiftCall(GenTreeCall* call, CORINFO_SIG_INFO* sig, CallArg** swiftErrorArg);
void impRetypeUnmanagedCallArgs(GenTreeCall* call);

#ifdef SWIFT_SUPPORT
void impAppendSwiftErrorStore(GenTreeCall* call, CallArg* const swiftErrorArg);
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/jit/gentree.h
Original file line number Diff line number Diff line change
Expand Up @@ -4726,7 +4726,6 @@ class CallArg
CORINFO_CLASS_HANDLE GetSignatureClassHandle() { return m_signatureClsHnd; }
var_types GetSignatureType() { return m_signatureType; }
WellKnownArg GetWellKnownArg() { return m_wellKnownArg; }
void SetWellKnownArg(const WellKnownArg argType) { m_wellKnownArg = argType; }
bool IsTemp() { return m_isTmp; }
// clang-format on

Expand Down
Loading
Loading