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.

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

Jump to bottom

[mono][infra] Fix mono-aot-cross build for linux-arm64 using biarch image #91019

Merged
merged 12 commits into from
Sep 8, 2023
Merged

[mono][infra] Fix mono-aot-cross build for linux-arm64 using biarch image #91019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
11ea53e
Test linux-x64 full AOT llvm job
kotlarmilos Aug 23, 2023
0683ef4
Test linux-x64 full AOT llvm job
kotlarmilos Aug 23, 2023
8e6989c
Test linux-x64 full AOT llvm job
kotlarmilos Aug 23, 2023
1921d45
Test osx-arm64 full AOT llvm job
kotlarmilos Aug 24, 2023
ecbaf7a
Increase timeout and test linux-arm64 job
kotlarmilos Aug 24, 2023
1f3b2b5
Increase timeout and test linux-arm64 job
kotlarmilos Aug 24, 2023
844e3ad
Merge branch 'dotnet:main' into improvement/fix-linux-fullaot-job
kotlarmilos Sep 6, 2023
3251323
Use biarch linux image
kotlarmilos Sep 6, 2023
1e53b99
Fix naming
kotlarmilos Sep 6, 2023
da22b86
Use host ROOTFS_DIR when bulding mono-aot-cross
kotlarmilos Sep 7, 2023
5bbb910
Use host rootfs when TARGET_BUILD_ARCH matches
kotlarmilos Sep 7, 2023
ea6b941
Revert disabled tests
kotlarmilos Sep 7, 2023
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
3 changes: 2 additions & 1 deletion eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ resources:
ROOTFS_DIR: /crossrootfs/armv6

- container: linux_arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-biarch-amd64-arm64
env:
ROOTFS_HOST_DIR: /crossrootfs/x64
ROOTFS_DIR: /crossrootfs/arm64

- container: linux_musl_x64
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ jobs:
runtimeFlavor: mono
platforms:
- linux_x64
fanyang-mono marked this conversation as resolved.
Show resolved Hide resolved
# - linux_arm64
- linux_arm64
variables:
- name: timeoutPerTestInMinutes
value: 60
Expand Down
12 changes: 11 additions & 1 deletion src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,16 @@
<MonoAotCrossOffsetsToolParams Condition="'$(TargetsWasi)' == 'true'" Include="--wasi-sdk=&quot;$([MSBuild]::NormalizePath('$(WASI_SDK_PATH)'))&quot;" />
</ItemGroup>

<!--
When cross-building, this PropertyGroup sets the MonoCrossDir to use the ROOTFS_HOST_DIR.
This is specifically for linux_arm64 image that has both x64 and arm64 rootfs.
The runtime is built using the 'ROOTFS_DIR' which points to '/crossrootfs/arm64'.
The 'mono-aot-cross' is built using the 'ROOTFS_HOST_DIR' which points to '/crossrootfs/x64'.
-->
<PropertyGroup Condition="'$(CrossBuild)' == 'true' and '$(ROOTFS_HOST_DIR)' != '' and $(ROOTFS_HOST_DIR.Contains('$(AotHostArchitecture)'))">
<MonoCrossDir>$(ROOTFS_HOST_DIR)</MonoCrossDir>
</PropertyGroup>

<!-- AOT compiler cross-build options -->
<ItemGroup Condition="'$(MonoCrossDir)' != ''">
<MonoAOTCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
Expand Down Expand Up @@ -859,7 +869,7 @@
<_MonoSkipInitCompiler Condition="'$(CrossBuild)' == 'true'">false</_MonoSkipInitCompiler>
<_MonoAotCrossOffsetsCommand Condition="'$(MonoUseCrossTool)' == 'true'">$(PythonCmd) $(MonoProjectRoot)mono/tools/offsets-tool/offsets-tool.py @(MonoAotCrossOffsetsToolParams, ' ')</_MonoAotCrossOffsetsCommand>
<_MonoAotCMakeConfigureCommand>cmake @(MonoAOTCMakeArgs, ' ') $(MonoCMakeExtraArgs) &quot;$(MonoProjectRoot.TrimEnd('\/'))&quot;</_MonoAotCMakeConfigureCommand>
<_MonoAotCMakeConfigureCommand Condition="'$(_MonoSkipInitCompiler)' != 'true' and '$(HostOS)' != 'windows'">sh -c 'build_arch=&quot;$(_CompilerTargetArch)&quot; compiler=&quot;$(MonoCCompiler)&quot; . &quot;$(RepositoryEngineeringCommonDir)native/init-compiler.sh&quot; &amp;&amp; @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand)'</_MonoAotCMakeConfigureCommand>
<_MonoAotCMakeConfigureCommand Condition="'$(_MonoSkipInitCompiler)' != 'true' and '$(HostOS)' != 'windows'">sh -c 'build_arch=&quot;$(_CompilerTargetArch)&quot; ROOTFS_DIR=&quot;$(MonoCrossDir)&quot; compiler=&quot;$(MonoCCompiler)&quot; . &quot;$(RepositoryEngineeringCommonDir)native/init-compiler.sh&quot; &amp;&amp; @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand)'</_MonoAotCMakeConfigureCommand>
<_MonoAotCMakeConfigureCommand Condition="'$(_MonoSkipInitCompiler)' == 'true' and '$(HostOS)' != 'windows'">$(_MonoAOTCCOption) $(_MonoAOTCXXOption) @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand)</_MonoAotCMakeConfigureCommand>
<_MonoAotCMakeConfigureCommand Condition="'$(HostOS)' == 'windows'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; $(_CompilerTargetArch) &amp;&amp; cd /D &quot;$(MonoObjCrossDir)&quot; &amp;&amp; @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand)</_MonoAotCMakeConfigureCommand>
<_MonoAotCMakeBuildCommand>cmake --build . --target install --config $(Configuration)</_MonoAotCMakeBuildCommand>
Expand Down
Loading