Skip to content

[mono] Make iOS sample simulator friendly #33740

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
EgorBo merged 1 commit into from
Mar 19, 2020
Merged

[mono] Make iOS sample simulator friendly #33740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/mono/netcore/sample/iOS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
${DLLS}
)

# add the executable
add_executable(
HelloiOS
main.m
Expand All @@ -19,6 +17,10 @@ add_executable(
${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down
57 changes: 34 additions & 23 deletions src/mono/netcore/sample/iOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o
# should be added to xcodeproj
# once a new library is added here it should also be
# added in mono_ios_register_modules() (runtime.m)
all: prepare
make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
make aot-lib LIB=bin/Program.dll
make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All @@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All @@ -56,10 +62,15 @@ aot-lib:
xcode: all
cmake -S. -BXcode -GXcode \
-DCMAKE_SYSTEM_NAME=iOS \
-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
-DCMAKE_IOS_INSTALL_COMBINED=YES \
-DMONO_CONFIG=$(MONO_CONFIG) \
-DMONO_ARCH=arm64
-DMONO_ARCH=$(MONO_ARCH)

clean:
rm -rf *.dll
rm -rf *.dll.o
rm -rf Xcode
4 changes: 0 additions & 4 deletions src/mono/netcore/sample/iOS/Plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
</dict>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
Copy link
Member

@akoeplinger akoeplinger Mar 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you check whether it still works on device? I remember there was some issue when this key was removed

Copy link
Member Author

@EgorBo EgorBo Mar 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.

<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
8 changes: 8 additions & 0 deletions src/mono/netcore/sample/iOS/runtime.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand Down Expand Up @@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All @@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

register_dllmap ();

#if DEVICE
// register modules
mono_ios_register_modules ();
mono_ios_setup_execution_mode ();
#endif

mono_debug_init (MONO_DEBUG_FORMAT_MONO);
mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All @@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
mono_jit_parse_options (1, options);
}
mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
// device runtimes are configured to use lazy gc thread creation
mono_gc_init_finalizer_thread ();
#endif

MonoAssembly *assembly = load_assembly (executable, NULL);
assert (assembly);
Expand Down