Skip to content
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.

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

Initial new-style iOS/tvOS cross compiler #47184

Merged
31 commits merged into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
50f4abb
Allow no EMSDK for cross-compiler
directhex Jan 14, 2021
a3bce8d
Don't try to include file not made during AOT on Browser
directhex Jan 14, 2021
e40b96f
Move BuildMonoCrossAOT from a bool to a Subset-esque string
directhex Jan 14, 2021
d3a3c7d
Generate wasm offsets
directhex Jan 14, 2021
aed7f58
Add new offset generation to non-official builds too. Oops
directhex Jan 14, 2021
d289447
Deal with default case when generating offsets only
directhex Jan 14, 2021
3f3c926
We override the OS, so can't switch on it
directhex Jan 15, 2021
e97f7d4
Merge remote-tracking branch 'origin/master' into wasm-cross
directhex Jan 15, 2021
00de7a9
We're being skipped again
directhex Jan 15, 2021
5351a01
Grr
directhex Jan 15, 2021
e1d2e12
Try another time. Merges passing in the night.
directhex Jan 15, 2021
2fb0e48
Merge remote-tracking branch 'origin/master' into wasm-cross
directhex Jan 15, 2021
7b24cc2
Merge remote-tracking branch 'origin/master' into wasm-cross
directhex Jan 19, 2021
8bcc13e
Try and make the yaml consume both offsets
directhex Jan 19, 2021
8600305
Clean up last commit, which went surprisingly well
directhex Jan 19, 2021
89331d1
Actually consume all offsets from parameter
directhex Jan 19, 2021
0a73e3f
Yaml 🤷‍♂️
directhex Jan 19, 2021
1683134
It's not crossandroid any more, is it?
directhex Jan 19, 2021
aaf7aba
Official version
directhex Jan 19, 2021
5539e7a
Fix typo
directhex Jan 19, 2021
e263c2c
Fix typo in typo
directhex Jan 19, 2021
c12e193
Cleanups
directhex Jan 19, 2021
7e07232
Variable rename suggestion from Alex
directhex Jan 19, 2021
20b1ef7
More better variable names from Alex
directhex Jan 19, 2021
984ff3d
Initial new-style AOT for iOS. Need to disable Linux builds selective…
directhex Jan 19, 2021
b08bdb0
Merge remote-tracking branch 'origin/master' into ios-cross
directhex Jan 19, 2021
4d965ea
Split Linux & Mac AOT
directhex Jan 19, 2021
b2af065
Merge branch 'master' into ios-cross
directhex Jan 20, 2021
d3b4999
fix error in official builds
directhex Jan 20, 2021
b545f7e
Merge branch 'ios-cross' of github.com:directhex/runtime into ios-cross
directhex Jan 20, 2021
e74102c
Merge remote-tracking branch 'origin/master' into ios-cross
directhex Jan 20, 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
30 changes: 29 additions & 1 deletion eng/pipelines/runtime-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ stages:
platforms:
- Android_x64
- Browser_wasm
- tvOS_x64
- iOS_x64

#
# Build Mono release AOT cross-compilers
Expand All @@ -143,7 +145,6 @@ stages:
runtimeFlavor: mono
buildConfig: release
platforms:
- OSX_x64
- Linux_x64
jobParameters:
buildArgs: -s mono+packs -c $(_BuildConfig)
Expand All @@ -161,6 +162,33 @@ stages:
extraStepsParameters:
name: MonoRuntimePacks

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
- OSX_x64
jobParameters:
buildArgs: -s mono+packs -c $(_BuildConfig)
/p:MonoCrossAOTTargetOS=Android+Browser+tvOS+iOS /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
nameSuffix: CrossAOT_Mono
runtimeVariant: crossaot
dependsOn:
- mono_android_offsets
- mono_browser_offsets
- mono_tvos_offsets
- mono_ios_offsets
monoCrossAOTTargetOS:
- Android
- Browser
- tvOS
- iOS
isOfficialBuild: ${{ variables.isOfficialBuild }}
extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
extraStepsParameters:
name: MonoRuntimePacks

#
# Build Mono LLVM runtime packs
#
Expand Down
30 changes: 28 additions & 2 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ jobs:
platforms:
- Android_x64
- Browser_wasm
- tvOS_x64
- iOS_x64
jobParameters:
condition: >-
or(
Expand Down Expand Up @@ -477,7 +479,7 @@ jobs:
eq(variables['isFullMatrix'], true))

#
# Build Mono release Android AOT cross-compiler
# Build Mono release AOT cross-compilers
# Only when mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
Expand All @@ -486,7 +488,6 @@ jobs:
runtimeFlavor: mono
buildConfig: release
platforms:
- OSX_x64
- Linux_x64
# - Linux_arm64
# - Linux_musl_arm64
Expand All @@ -508,6 +509,31 @@ jobs:
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
eq(variables['isFullMatrix'], true))

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
- OSX_x64
jobParameters:
runtimeVariant: crossaot
dependsOn:
- mono_android_offsets
- mono_browser_offsets
- mono_tvos_offsets
- mono_ios_offsets
monoCrossAOTTargetOS:
- Android
- Browser
- tvOS
- iOS
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono release
# Only when libraries or mono changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<_MonoCrossAOTTargetOS Condition="'$(MonoCrossAOTTargetOS)' != ''">+$(MonoCrossAOTTargetOS.ToLowerInvariant())+</_MonoCrossAOTTargetOS>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+android+'))">$(MonoAotTargets);android-x64;android-arm64;android-x86;android-arm</MonoAotTargets>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+browser+'))">$(MonoAotTargets);browser-wasm</MonoAotTargets>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+tvos+'))">$(MonoAotTargets);tvos-x64;tvos-arm64</MonoAotTargets>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+ios+'))">$(MonoAotTargets);ios-x64;ios-arm64;ios-x86;ios-arm</MonoAotTargets>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/mono/monoaotcross.proj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
<_MonoGenerateOffsetsOSGroups Condition="'$(MonoGenerateOffsetsOSGroups)' != ''">+$(MonoGenerateOffsetsOSGroups.ToLowerInvariant())+</_MonoGenerateOffsetsOSGroups>
<_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+android+'))">$(_MonoCrossAOTTargetOS)+android+</_MonoCrossAOTTargetOS>
<_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+browser+'))">$(_MonoCrossAOTTargetOS)+browser+</_MonoCrossAOTTargetOS>
<_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+tvos+'))">$(_MonoCrossAOTTargetOS)+tvos+</_MonoCrossAOTTargetOS>
<_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+ios+'))">$(_MonoCrossAOTTargetOS)+ios+</_MonoCrossAOTTargetOS>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+android+'))">$(MonoAotTargets);Android-x64;Android-arm64;Android-x86;Android-arm</MonoAotTargets>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+browser+'))">$(MonoAotTargets);Browser-wasm</MonoAotTargets>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+tvos+'))">$(MonoAotTargets);tvOS-x64;tvOS-arm64</MonoAotTargets>
<MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+ios+'))">$(MonoAotTargets);iOS-x64;iOS-arm64;iOS-x86;iOS-arm</MonoAotTargets>
</PropertyGroup>

<ItemGroup>
Expand Down