Skip to content

[mono] Add runtime support for Swift calling convention on x64 and arm64 #94764

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.

Sign up for GitHub

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

Merged
kotlarmilos merged 156 commits into from
Feb 6, 2024
Merged

[mono] Add runtime support for Swift calling convention on x64 and arm64 #94764

Changes from 1 commit
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
5136aaf
Add README.md
kotlarmilos Sep 13, 2023
674a156
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Sep 13, 2023
9fc9402
Update build steps
kotlarmilos Sep 13, 2023
d279a03
Add experiment templates as unit tests
kotlarmilos Sep 13, 2023
de27030
Update README.md
kotlarmilos Sep 13, 2023
476a605
Update README.md
kotlarmilos Sep 13, 2023
b1b69d3
Update README.md
kotlarmilos Sep 14, 2023
a95aca8
Update README.md
kotlarmilos Sep 14, 2023
6c8e477
Update README.md
kotlarmilos Sep 14, 2023
b06c840
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Sep 19, 2023
7810e56
Fix the MathLibrary.swift
kotlarmilos Sep 19, 2023
6d9d67f
Update README.md
kotlarmilos Sep 19, 2023
87adeed
Update README.md
kotlarmilos Sep 20, 2023
0716fda
Add Swift ABI details
kotlarmilos Sep 21, 2023
ab53067
Merge branch 'poc/swift-interop-direct-pinvoke' of https://github.com…
kotlarmilos Sep 21, 2023
675619f
Update README.md
kotlarmilos Sep 21, 2023
24a8a01
Add tasks to the README.md
kotlarmilos Sep 21, 2023
11d60cc
Script that exports and demangles Swift symbols
kotlarmilos Sep 21, 2023
e8169f0
Update README.md
kotlarmilos Sep 21, 2023
8584918
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Oct 9, 2023
279a594
Add custom attributes for Swift calling convention
kotlarmilos Oct 12, 2023
acc15a0
Add runtime support for Swift error handling
kotlarmilos Oct 12, 2023
5ea8755
Add sample test
kotlarmilos Oct 12, 2023
7a69077
Add Swift error handling on minijit arm64
kotlarmilos Oct 15, 2023
ebe4116
Update README.md
kotlarmilos Oct 16, 2023
0c40694
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Oct 26, 2023
71d33f4
Add mini arm64 support for Swift self context
kotlarmilos Oct 27, 2023
7bcf61f
Remove redundant movx instruction
kotlarmilos Oct 27, 2023
7d9f73d
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Oct 30, 2023
5973ff5
Update Swift types according to the design document
kotlarmilos Oct 31, 2023
ffc173a
Add mini arm64 support for Swift self and error registers
kotlarmilos Oct 31, 2023
907c69a
[interp] Add interpreter support for Swift calling convention
kotlarmilos Nov 2, 2023
42680b1
[inter] Simplify Swift calling convention support
kotlarmilos Nov 2, 2023
2cce70f
[mono] Add mini and interpreter support for swift calling convention …
kotlarmilos Nov 2, 2023
a702f0d
[mono] Update Swift interop smoke test
kotlarmilos Nov 2, 2023
5bc2693
[mono] Update Swift interop smoke test
kotlarmilos Nov 2, 2023
78b974a
[mono] Add ArgSwiftError in emit_move_args
kotlarmilos Nov 3, 2023
a4ab558
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Nov 3, 2023
ece53c2
Force ArgSwiftError to be allocated on stack
matouskozak Nov 6, 2023
a862485
Revert "[mono] Add ArgSwiftError in emit_move_args"
matouskozak Nov 6, 2023
6a5dda2
[mono] Add helper functions for checking for Swift context classes
kotlarmilos Nov 6, 2023
e2b6fe9
[mono] Fix ArgSwift registers index
kotlarmilos Nov 6, 2023
b3cb4cb
[mono] Avoid allocating context registers on arm64
kotlarmilos Nov 7, 2023
68ad76d
[mono] Add smoke tests for Swift calling convention
kotlarmilos Nov 7, 2023
1efac9d
[mono] Avoid allocating context registers on x64
kotlarmilos Nov 7, 2023
74dc8c9
[mono] Simplify interp support for amd64
kotlarmilos Nov 7, 2023
fd1b036
Exclude coreclr runtime flavor
kotlarmilos Nov 7, 2023
458c1e4
Update README.md
kotlarmilos Nov 7, 2023
2939996
Remove helper script
kotlarmilos Nov 7, 2023
8298058
[mono] Simplify arguments check with helper macros
kotlarmilos Nov 7, 2023
5447ccd
Add build script for native libs
kotlarmilos Nov 9, 2023
7e04140
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Nov 9, 2023
64157c5
Build native Swift libraries after test build
matouskozak Nov 10, 2023
6b3a52f
Revert "Build native Swift libraries after test build"
matouskozak Nov 14, 2023
6077b22
[mono] Add params check for Swift calling convention in mini runtime
kotlarmilos Nov 14, 2023
af416eb
[mono] Add basic runtime tests for the Swift calling convention
kotlarmilos Nov 14, 2023
cc9c619
Update README.md
matouskozak Nov 15, 2023
89f46b8
Fix README.md formatting
kotlarmilos Nov 15, 2023
20eb7a6
Add comments for the Swift types
kotlarmilos Nov 15, 2023
ae08445
Fix lint; remove trailing spaces
kotlarmilos Nov 15, 2023
5a225b5
Resolve CI failures
kotlarmilos Nov 15, 2023
ac7f565
Remove static functions from mini.h file
kotlarmilos Nov 15, 2023
b945d4d
Fix CI failures
kotlarmilos Nov 15, 2023
18fcbae
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Nov 15, 2023
4c6c0c1
Revert API changes
kotlarmilos Nov 15, 2023
0587a55
Update README.md
kotlarmilos Nov 15, 2023
56bcb1b
[interp] Simplify register allocation in CallContext
kotlarmilos Nov 16, 2023
a5afdbe
[mono] Remove mono_arch_get_swift_error from unsupported architectures
kotlarmilos Nov 17, 2023
2faea55
Update src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeM…
kotlarmilos Nov 17, 2023
05a8c1c
[mono] Add ext_callconv to the MonoMethodSignature
kotlarmilos Nov 17, 2023
b67c3c6
[mono] Throw NotImplementedException Swift calling convention on not …
kotlarmilos Nov 17, 2023
4dad320
[mono] Simplify runtime tests and add error logging
kotlarmilos Nov 17, 2023
c088a57
[mono] Add better error logging in test cases
kotlarmilos Nov 17, 2023
91e6955
Update src/native/public/mono/metadata/details/metadata-types.h
kotlarmilos Nov 21, 2023
9327d1e
Update src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.cs
kotlarmilos Nov 21, 2023
5df0523
[tests] Update Swift tests to utilize Assert.True with error message
kotlarmilos Nov 21, 2023
fc9178e
Remove README.md
kotlarmilos Nov 21, 2023
738d14d
[tests] Document Swift error offset constants in the tests
kotlarmilos Nov 21, 2023
dccf89e
Update MONO_ARCH_HAVE_SWIFTCALL condition
kotlarmilos Nov 21, 2023
9a8cc67
Update src/tests/Interop/Swift/SwiftInvalidCallConv/SwiftInvalidCallC…
kotlarmilos Nov 22, 2023
8c5cf81
disable swift interop tests on mono windows
Nov 22, 2023
6ee1c1e
[tests] Update conditions to match Assert.True
kotlarmilos Nov 22, 2023
5c5daad
[tests] Simplify error handling tests by taking Error instead of Unsa…
kotlarmilos Nov 23, 2023
f412721
add process isolation to runtime tests
Nov 27, 2023
8c53ad6
Merge branch 'poc/swift-interop-direct-pinvoke' of github.com:kotlarm…
Nov 27, 2023
9482a79
enable Swift tests on Apple OS
matouskozak Nov 27, 2023
883d645
Revert "enable Swift tests on Apple OS"
matouskozak Nov 27, 2023
4f788fc
enable Swift tests on OSX
matouskozak Nov 27, 2023
1e19be8
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Dec 4, 2023
7b689a2
Add pointer deallocation in SwiftError test
kotlarmilos Dec 4, 2023
152fa6e
Use NativeLibrary.Free for Swift interop scenarios
kotlarmilos Dec 4, 2023
c732e25
Update src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.cs
kotlarmilos Dec 4, 2023
40f6e35
Use ReadOnlySpan in GetErrorMessageFromSwift
kotlarmilos Dec 4, 2023
ab3e840
Use ReadOnlySpan in GetErrorMessageFromSwift
kotlarmilos Dec 4, 2023
c29a35f
Use NativeMemory.Free in GetErrorMessageFromSwift
kotlarmilos Dec 4, 2023
8663c3c
Simplify GetErrorMessageFromSwift to copy zero-terminated C string
kotlarmilos Dec 5, 2023
3ed6733
remove OutputType Exe from tests
matouskozak Dec 5, 2023
cb20690
[mono][interp] Implement context register backup and restore mechanism
kotlarmilos Dec 6, 2023
da5279b
remove BuildAsStandalone
matouskozak Dec 7, 2023
a32421a
[mono][interp] Refactor context register backup and restore mechanism
kotlarmilos Dec 7, 2023
3b1b4dd
add expected error printout
matouskozak Dec 7, 2023
37230be
null-terminate error message string
matouskozak Dec 7, 2023
c25d435
Revert "null-terminate error message string"
matouskozak Dec 8, 2023
a57307f
refactor SwiftErrorHandling to use NSString
matouskozak Dec 8, 2023
1fe9611
Update src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.cs
matouskozak Dec 9, 2023
e256556
Update src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.cs
matouskozak Dec 9, 2023
e9ce7d9
Change PtrToStringUTF8 to PtrToStringUni
matouskozak Dec 9, 2023
91a3263
Change Swift to receive Int32 instead of Int
matouskozak Dec 11, 2023
5e9f6fc
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Dec 11, 2023
97a74cc
null-terminate error message in swift
matouskozak Dec 12, 2023
5384dce
Revert "null-terminate error message in swift"
matouskozak Dec 12, 2023
7103cfc
Retrieve both content and length of error message
matouskozak Dec 12, 2023
ed2a7dc
Don't allocate amd64_rbx for Swift calling convention
kotlarmilos Dec 13, 2023
8e18dc3
Merge branch 'poc/swift-interop-direct-pinvoke' of https://github.com…
kotlarmilos Dec 13, 2023
7961e29
Update src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.cs
matouskozak Dec 13, 2023
5e1afb5
Add missing case for ArgSwiftSelf
kotlarmilos Dec 13, 2023
d9da03d
[mono] Fix invalid calling convention counter
kotlarmilos Dec 15, 2023
061934d
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Jan 3, 2024
eb3103e
Merge branch 'main' of https://github.com/kotlarmilos/runtime into po…
kotlarmilos Jan 11, 2024
672ac92
[mono] Resolve conflicts in SwiftTypes.cs and CallConvSwift class
kotlarmilos Jan 11, 2024
dfc5de6
[mono] Copy ext_callconv property
kotlarmilos Jan 11, 2024
0984ffc
Refactor mono_marshal_get_native_wrapper to add non-primitive argumen…
kotlarmilos Jan 11, 2024
eaf9aa2
[mono] Implement sig->ext_callconv encoding and decoding
kotlarmilos Jan 15, 2024
fe19a09
[mini] Use MONO_ARCH_HAVE_SWIFTCALL to condition ctx regs on supporte…
kotlarmilos Jan 15, 2024
f93e231
[mono] Resolve tramp warnings
kotlarmilos Jan 15, 2024
2d5b9f5
[mini] Remove unused func
kotlarmilos Jan 15, 2024
60749f4
[mono] Add ext_callconv flag for encoding and decoding
kotlarmilos Jan 15, 2024
fa085d9
move swift defines and macros to mini.h
matouskozak Jan 16, 2024
bc19659
Merge branch 'main' into poc/swift-interop-direct-pinvoke
matouskozak Jan 16, 2024
5309a58
Revert "move swift defines and macros to mini.h"
matouskozak Jan 16, 2024
735b84e
initialize ext_callconv
matouskozak Jan 16, 2024
f444eae
ifdef mono_arch_get_swift_error
matouskozak Jan 16, 2024
fe6e270
refactor swift error and self class getters
matouskozak Jan 16, 2024
39b8bd0
make cmake architecture specific
matouskozak Jan 17, 2024
eccc6a3
[mono] Use SwiftError as a ref argument instead of raw pointer
kotlarmilos Jan 18, 2024
a6f3369
[mono] Refactor mini to store and load Swift context regs directly in…
kotlarmilos Jan 18, 2024
0b3920e
Revert unnecessary changes
kotlarmilos Jan 18, 2024
0e4a48c
[mini] Always pass SwiftSelf as ArgVtypeInIRegs via dedicated ctx reg
kotlarmilos Jan 18, 2024
2b3d6ff
[mono] Update Swift context registers allocation for P/Invoke
kotlarmilos Jan 22, 2024
f7528f8
[mini] Fix formatting and remove unnecessary code
kotlarmilos Jan 23, 2024
2a1b7c2
[mini] Resolve feedback and remove unnecessary code
kotlarmilos Jan 23, 2024
cdaff6c
[mini] Align arm64 and amd64 implementation to use the existing arg i…
kotlarmilos Jan 23, 2024
1af3d21
[mini] Add swift_error_index to the CallInfo to mark the arg ins as v…
kotlarmilos Jan 23, 2024
d243462
[mini] Move selferror store ins to emit_move_return_value
kotlarmilos Jan 24, 2024
6f36c21
Fix lint
kotlarmilos Jan 24, 2024
a60f392
[mini] Preserve Swift error register value during the P/Invoke call
kotlarmilos Jan 25, 2024
bd11b7b
Merge branch 'dotnet:main' into poc/swift-interop-direct-pinvoke
kotlarmilos Jan 26, 2024
2b2b75e
[mono] Allow SwiftError*, ref SwiftError, and function pointers in Ca…
kotlarmilos Jan 26, 2024
6e54b5b
[mono] Remove unused code and fix lint
kotlarmilos Jan 30, 2024
426802e
[mono] Avoid g_assert for Swift ctx regs
kotlarmilos Jan 30, 2024
4e09785
Update src/mono/mono/metadata/marshal.c
kotlarmilos Jan 31, 2024
89d211c
Update src/mono/mono/metadata/marshal.h
kotlarmilos Jan 31, 2024
d450fb1
Update Swift runtime tests to use blittable types
kotlarmilos Jan 31, 2024
1a39a88
[mono] Simplify register allocation and interp native call context
kotlarmilos Feb 2, 2024
c2e354f
Merge branch 'poc/swift-interop-direct-pinvoke' of github.com:kotlarm…
matouskozak Feb 4, 2024
1405a98
align ArgSwiftError on x64
matouskozak Feb 5, 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
Prev Previous commit
Next Next commit
Update README.md
  • Loading branch information
@kotlarmilos
kotlarmilos committed Sep 13, 2023
commit 476a605e90b3c2fbd23e1d7078ec838c598f2c82
2 changes: 1 addition & 1 deletion src/tests/Interop/Swift/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Here's the planned flow for invoking a Swift function from .NET if a developer u

## Template

Templates are used to set the definition of done (DoD) and contain of a set of unit tests that must be implemented. Each unit test is designed to cover a specific invocation type using different input types. The tests should be expanded with all Swift types.
Template is used to set the definition of done (DoD) and contains of a set of unit tests that must be implemented. Each unit test is designed to cover a specific invocation type using different input types. The tests should be expanded with all Swift types.

### Global/Static functions

Expand Down