Skip to content

Commit

Permalink
[mono] Force AOT+interpreter for iOSSimulator arm64 library test loca…
Browse files Browse the repository at this point in the history
…l build (dotnet#76551)

* [mono] Force AOT and interpreter for iOSSimulator arm64 library test build

* [mono] Extend Force AOT+interpreter to iOS device

* [mono] Enable Force Interp+AOT for tvOS device and arm64 sim

* [iOS][tvOS] Update build with auto populated RunAOTCompilation and MonoForceInterpreter properties

* Remove RunAOTCompilation and MonoForceInterpreter from iOS/tvOS pipelines

* Revert "Remove RunAOTCompilation and MonoForceInterpreter from iOS/tvOS pipelines"

This reverts commit f27b1ae15a6434e95415f30e7e01c74258e3046c.
  • Loading branch information
mdh1418 committed Nov 15, 2022
1 parent 1a476d7 commit 49ac27f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/mono/msbuild/apple/build/AppleApp.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
<Project>
<!-- iOS/tvOS device + arm64 simulators need to AOT -->
<PropertyGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS' or (('$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOSSimulator') And '$(TargetArchitecture)' == 'arm64')">
<RunAOTCompilation Condition="'$(RunAOTCompilation)' == ''">true</RunAOTCompilation>
</PropertyGroup>

<!-- iOS/tvOS arm64 simulators do not support JIT, so force interpreter fallback, devices should FullAOT -->
<PropertyGroup Condition="('$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOSSimulator') And '$(TargetArchitecture)' == 'arm64'">
<MonoForceInterpreter Condition="'$(MonoForceInterpreter)' == ''">true</MonoForceInterpreter>
</PropertyGroup>

<PropertyGroup>
<RuntimeIdentifier>$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())</RuntimeIdentifier>
<UseMonoRuntime>true</UseMonoRuntime>
Expand Down
1 change: 1 addition & 0 deletions src/tests/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
</PropertyGroup>

<ItemGroup>
<MonoAotOption Condition="'$(MonoForceInterpreter)' == 'true'" Include="interp" />
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="full" />
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="nimt-trampolines=2000" />
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="ntrampolines=20000" />
Expand Down

0 comments on commit 49ac27f

Please sign in to comment.