Skip to content

[mono] Enable LLVM for iOS by default for AppleAppBuilder #35338

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
marek-safar merged 2 commits into from
Apr 23, 2020
+7 −5
Merged

[mono] Enable LLVM for iOS by default for AppleAppBuilder #35338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3403bfa
Enable LLVM for iOS by default
EgorBo Apr 23, 2020
fe2b4e0
Update Makefile
EgorBo Apr 23, 2020
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
2 changes: 2 additions & 0 deletions eng/testing/tests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@
GenerateXcodeProject="True"
BuildAppBundle="True"
Optimized="True"
UseLlvm="$(MonoEnableLLVM)"
LlvmPath="$(RuntimePackDir)\native\cross"
DevTeamProvisioning="$(DevTeamProvisioning)"
OutputDirectory="$(BundleDir)"
AppDir="$(BundleDir)">
Expand Down
3 changes: 1 addition & 2 deletions src/mono/msbuild/AppleAppBuilder/AotCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ private static void PrecompileLibrary(
// TODO: enable direct-pinvokes (to get rid of -force_loads)
//.Append("direct-pinvoke,")
.Append("full,")
.Append("mattr=+crc,") // enable System.Runtime.Intrinsics.Arm
.Append("mattr=+base,"); // (Crc32 and ArmBase for now)
.Append("mattr=+crc,"); // enable System.Runtime.Intrinsics.Arm (Crc32 and ArmBase for now)

if (useLlvm)
{
Expand Down
2 changes: 1 addition & 1 deletion src/mono/msbuild/AppleAppBuilder/AppleAppBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public override bool Execute()
throw new ArgumentException($"ProjectName='{ProjectName}' should not contain spaces");
}

if (UseLlvm && !string.IsNullOrEmpty(LlvmPath))
if (UseLlvm && string.IsNullOrEmpty(LlvmPath))
{
// otherwise we might accidentally use some random llc/opt from PATH (installed with clang)
throw new ArgumentException($"LlvmPath shoun't be empty when UseLlvm is set");
Expand Down
3 changes: 2 additions & 1 deletion src/mono/netcore/sample/iOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MONO_CONFIG=Debug
MONO_ARCH=arm64
DOTNET := ../../../../.././dotnet.sh
USE_LLVM=True

# usage example:
# 'make all MONO_ARCH=x64 MONO_CONFIG=Release' to build the app for simulator
Expand All @@ -11,7 +12,7 @@ program:

bundle: clean program
$(DOTNET) msbuild /t:BuildAppBundle /p:Configuration=$(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH) \
/p:UseLlvm=$(UseLlvm) /p:LlvmPath=$(LlvmPath)
/p:UseLlvm=$(USE_LLVM)

deploy-sim:
$(DOTNET) msbuild /t:IosDeployToSimulator /p:Configuration=$(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH)
Expand Down
2 changes: 1 addition & 1 deletion src/mono/netcore/sample/iOS/Program.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
DevTeamProvisioning="$(DevTeamProvisioning)"
OutputDirectory="$(BundleDir)"
UseLlvm="$(UseLlvm)"
LlvmPath="$(LlvmPath)"
LlvmPath="$(RuntimePackDir)\native\cross"
Optimized="False"
AppDir="$(BundleDir)">
<Output TaskParameter="AppBundlePath" PropertyName="AppBundlePath" />
Expand Down