forked from dotnet/runtime
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NativeAOT ARM64 libraries testing (dotnet#64373)
Enable ARM64 libraries testing for NativeAOT. * Copy the crosstargeting build approach from crossgen2. We'll now build two ILC compilers when targeting ARM64 from x64: an arm64-hosted one that is useless on the build machine, and a x64-hosted one, that will work on the build machine. The `ILCompiler.csproj/props/_crossarch.csproj` projects mirror crossgen's approach. * Limit the number of libraries tests to one. Hopefully it avoids the build races that we'd see until we can update the repo build to .NET 7 Preview 1. * Create an ARM64 NativeAOT CI leg that sends the libraries tests to Helix to run.
- Loading branch information
1 parent
8ee59f4
commit b11469f
Showing
10 changed files
with
192 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,7 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <AssemblyName>ilc</AssemblyName> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> | ||
| <NoWarn>8002,NU1701</NoWarn> | ||
| <Platforms>x64;x86</Platforms> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> | ||
| <AppendTargetFrameworkToOutputPath Condition="'$(BuildingInsideVisualStudio)' == 'true'">true</AppendTargetFrameworkToOutputPath> | ||
| <OutputPath>$(RuntimeBinDir)ilc</OutputPath> | ||
| <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> | ||
| <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems> | ||
| <Configurations>Debug;Release;Checked</Configurations> | ||
| <UseAppHost>true</UseAppHost> | ||
| <ServerGarbageCollection>true</ServerGarbageCollection> | ||
| <TieredCompilation>false</TieredCompilation> | ||
| <OutputPath>$(RuntimeBinDir)ilc/</OutputPath> | ||
| <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <SelfContained>true</SelfContained> | ||
| <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> | ||
| <RuntimeIdentifier>$(ToolsRID)</RuntimeIdentifier> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ObjWriterRid Condition="'$(ObjWriterRid)' == '' and '$(RuntimeIdentifier)' == 'osx-x64'">osx.10.12-x64</ObjWriterRid> | ||
| <ObjWriterRid Condition="'$(ObjWriterRid)' == '' and '$(RuntimeIdentifier)' == 'osx-arm64'">osx.11.0-arm64</ObjWriterRid> | ||
| <ObjWriterRid Condition="'$(ObjWriterRid)' == ''">$(RuntimeIdentifier)</ObjWriterRid> | ||
|
|
||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'linux-arm64'">$(runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'linux-x64'">$(runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">$(runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'linux-musl-x64'">$(runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'win-arm64'">$(runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'win-x64'">$(runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'osx-arm64'">$(runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
| <ObjWriterVersion Condition="'$(ObjWriterVersion)' == '' and '$(RuntimeIdentifier)' == 'osx-x64'">$(runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion)</ObjWriterVersion> | ||
|
|
||
| <!-- CoreDisTools are used in debugging visualizers. --> | ||
| <IncludeCoreDisTools Condition="'$(Configuration)' != 'Release'">true</IncludeCoreDisTools> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(RepositoryEngineeringDir)coredistools.targets" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(IncludeCoreDisTools)' == 'true'" /> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="runtime.$(ObjWriterRid).Microsoft.NETCore.Runtime.ObjWriter"> | ||
| <Version>$(ObjWriterVersion)</Version> | ||
| </PackageReference> | ||
|
|
||
| <Content Include="$(NuGetPackageRoot)runtime.$(ObjWriterRid).microsoft.netcore.runtime.objwriter\$(ObjWriterVersion)\runtimes\$(ObjWriterRid)\native\$(LibPrefix)objwriter$(LibSuffix)"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <Visible>false</Visible> | ||
| <Pack>false</Pack> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="$(RuntimeBinDir)$(LibPrefix)jitinterface_$(TargetArchitecture)$(LibSuffix)"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <Visible>false</Visible> | ||
| <Pack>false</Pack> | ||
| </Content> | ||
|
|
||
| <Content Include="$(RuntimeBinDir)$(LibPrefix)clrjit_*_$(TargetArchitecture)$(LibSuffix)"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <Visible>false</Visible> | ||
| <Pack>false</Pack> | ||
| </Content> | ||
|
|
||
| <Content Include="$(CoreDisToolsLibrary)" Condition="Exists('$(CoreDisToolsLibrary)') and '$(IncludeCoreDisTools)' == 'true'"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\ILCompiler.DependencyAnalysisFramework\ILCompiler.DependencyAnalysisFramework.csproj" /> | ||
| <ProjectReference Include="..\ILCompiler.MetadataTransform\ILCompiler.MetadataTransform.csproj" /> | ||
| <ProjectReference Include="..\ILCompiler.RyuJit\ILCompiler.RyuJit.csproj" /> | ||
| <ProjectReference Include="..\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj" /> | ||
| <ProjectReference Include="..\ILCompiler.Compiler\ILCompiler.Compiler.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="..\..\Common\CommandLine\Argument.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\Argument_1.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentCommand.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentCommand_1.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentLexer.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentList_1.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentParser.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentSyntax.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentSyntax_Definers.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentSyntaxException.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\ArgumentToken.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\CommandLineException.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\CommandLineHelpers.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\Enumerable.cs" /> | ||
| <Compile Include="..\..\Common\CommandLine\HelpTextGenerator.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Include="..\..\Common\CommandLine\Resources\Strings.resx"> | ||
| <GenerateSource>true</GenerateSource> | ||
| <ClassName>Internal.CommandLine.Strings</ClassName> | ||
| </EmbeddedResource> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Remove="repro\*" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetOSComponent>unix</TargetOSComponent> | ||
| <TargetOSComponent Condition="'$(TargetsWindows)' == 'true'">win</TargetOSComponent> | ||
| <TargetSpec>$(TargetOSComponent)_$(TargetArchitecture)_$(TargetArchitecture)</TargetSpec> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- On Windows we can re-use PGO-optimized clrjit.dll produced by the build for AOT compilation. | ||
| On Linux renaming the library makes it difficult to debug it. --> | ||
| <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> | ||
| <Content Remove="$(RuntimeBinDir)$(LibPrefix)clrjit_$(TargetSpec)$(LibSuffix)" /> | ||
| <Content Include="$(RuntimeBinDir)$(LibPrefix)clrjit$(LibSuffix)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Link="$(LibPrefix)clrjit_$(TargetSpec)$(LibSuffix)" /> | ||
| </ItemGroup> | ||
| <Import Project="ILCompiler.props" /> | ||
| </Project> |
Oops, something went wrong.