Skip to content

[release/6.0] Skip test suites crashing on CI for iOS/tvOS/MacCatalyst and test fixes for Android #58841

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
steveisok merged 10 commits into from
Sep 13, 2021
Merged

[release/6.0] Skip test suites crashing on CI for iOS/tvOS/MacCatalyst and test fixes for Android #58841

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1f270e9
[libraries] Skip test suites crashing on CI for iOS/tvOS/MacCatalyst
mdh1418 Sep 3, 2021
675d340
[libraries] Restrict ILLink Suppression xml to mobile platforms (#58519)
mdh1418 Sep 6, 2021
4e2986d
[Libraries] Fix TimeZoneInfoTests IsIanaIdTest for iOS/MacCatalyst/tv…
mdh1418 Sep 6, 2021
65350e4
[iOS/tvOS] Skip System.Security.Cryptography.Pkcs PNSE, System.Diagno…
mdh1418 Aug 27, 2021
68b6c0a
[libraries] Fix System.Runtime.Tests TimeZoneInfoTests for iOS/MacCat…
mdh1418 Aug 19, 2021
2bb7a34
Reenable a few OperatingSystem tests on MacCatalyst (#58428)
akoeplinger Sep 2, 2021
6ecf2ba
Fix Android device issues related to filesystem/IO (#58586)
akoeplinger Sep 3, 2021
b138558
System.Net.Ping: Skip TimeoutIsRespected test if network is unreachab…
akoeplinger Sep 9, 2021
f3ec696
Add special Mac Catalyst values for mtriple to MonoAOTCompiler.props …
directhex Aug 19, 2021
828d5dd
Merge remote-tracking branch 'upstream/release/6.0' into pr-57208-to-…
Sep 10, 2021
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
Add special Mac Catalyst values for mtriple to MonoAOTCompiler.props (#… 
…57687)

Effectively, we are correctly saying "build a Mac Catalyst app from runtime
and these `-llvm.o` files, but the `-llvm.o` files are not correctly being
built in a Mac Catalyst compatible way, resulting in the error

```
  ld: building for Mac Catalyst, but linking in object file built for , file '/Users/filipnavara/Projects/llvmbug/obj/Debug/net6.0-maccatalyst/maccatalyst-arm64/nativelibraries/aot-output/arm64/llvmbug.dll.llvm.o'
```

The target platform parameter gets passed around a LOT -
`src/tasks/AotCompilerTask/MonoAOTCompiler.props` specifies
`<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'arm64'" Include="mtriple=arm64-ios" />`
which passes through to MonoAOTCompiler.cs task which passes through to
the `mono --aot=llvmopts=mtriple=arm64-ios` flag, which is processed by
`src/mono/mono/mini/aot-compiler.c` and eventually regurgitated as
`llc -mtriple=arm64-ios -march=aarch64`, which results in .o files which
lack the required annotations to be considered Catalyst compatible.

Thankfully, it seems that `llc` accepts `clang`'s `-target` triplet
values as valid for `-mtriple`, so passing through Catalyst specific
values for `mtriple` in `MonoAOTCompiler.props` results in .o files
which are correctly linked later by `clang` during the AppleAppBuilder
task.

It's slow though! 🙀

Fixes #57589
  • Loading branch information
@directhex
directhex authored and Mitchell Hwang committed Sep 9, 2021
commit f3ec696f9142e5be94b752bad56246223bc491f3
6 changes: 4 additions & 2 deletions src/tasks/AotCompilerTask/MonoAOTCompiler.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<Project>
<ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'MacCatalyst'">
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'arm64'" Include="mtriple=arm64-ios" />
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' != 'MacCatalyst'" Include="mtriple=arm64-ios" />
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'MacCatalyst'" Include="mtriple=arm64-apple-ios14.2-macabi" />
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'arm'" Include="mtriple=armv7-ios" />
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'x64'" Include="mtriple=x86_64-ios" />
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' != 'MacCatalyst'" Include="mtriple=x86_64-ios" />
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' == 'MacCatalyst'" Include="mtriple=x86_64-apple-ios13.5-macabi" />
<MonoAOTCompilerDefaultAotArguments Condition="'$(TargetArchitecture)' == 'x86'" Include="mtriple=i386-ios" />
<MonoAOTCompilerDefaultAotArguments Include="static" />
<MonoAOTCompilerDefaultAotArguments Include="dwarfdebug" />
Expand Down