mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[VMR] light up Mono LLVM lanes (#19398)

Browse source
This commit is contained in:
Jo Shields 2024-04-15 11:52:42 -04:00 committed by GitHub
parent e1615279a1
commit ebe8dc51f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
eng/pipelines/templates/stages/vmr-build.yml
View file

@ -710,6 +710,36 @@ stages:
targetOS: linux
targetArchitecture: x64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_ShortStack_Mono_LLVMAOT
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerX64CrossContainer }}
crossRootFs: '/crossrootfs/x64'
useMonoRuntime: true
targetOS: linux
targetArchitecture: x64
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoAOTEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=true
runTests: false
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_ShortStack_Mono_LLVMJIT
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerX64CrossContainer }}
crossRootFs: '/crossrootfs/x64'
useMonoRuntime: true
targetOS: linux
targetArchitecture: x64
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=false
runTests: false
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross
@ -826,6 +856,36 @@ stages:
targetArchitecture: arm64
extraProperties: /p:TargetRID=linux-musl-arm64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_ShortStack_Mono_LLVMAOT
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArm64CrossContainer }}
crossRootFs: '/crossrootfs/arm64'
useMonoRuntime: true
targetOS: linux
targetArchitecture: arm64
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoAOTEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=true
runTests: false
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_ShortStack_Mono_LLVMJIT
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArm64CrossContainer }}
crossRootFs: '/crossrootfs/arm64'
useMonoRuntime: true
targetOS: linux
targetArchitecture: arm64
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=false
runTests: false
- template: ../jobs/vmr-build.yml
parameters:
buildName: OSX
@ -847,6 +907,19 @@ stages:
targetOS: osx
targetArchitecture: arm64
- template: ../jobs/vmr-build.yml
parameters:
buildName: OSX_ShortStack_Mono_LLVMJIT
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Mac }}
useMonoRuntime: true
targetOS: osx
targetArchitecture: x64
extraProperties: /p:DotNetBuildMonoEnableLLVM=true /p:DotNetBuildMonoBundleLLVMOptimizer=false
runTests: false
- template: ../jobs/vmr-build.yml
parameters:
buildName: OSX_ShortStack_NativeAOT

2
src/SourceBuild/content/Directory.Build.props
View file

@ -32,6 +32,8 @@
<ShortStack Condition="'$(TargetOS)' == 'linux-bionic'">true</ShortStack>
<!-- NativeAOT Mac builds are short -->
<ShortStack Condition="'$(TargetOS)' == 'osx' and '$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">true</ShortStack>
<!-- Mono LLVM builds are short -->
<ShortStack Condition="'$(MonoEnableLLVM)' == 'true' or '$(MonoAOTEnableLLVM)' == 'true'">true</ShortStack>
<!-- Short stack builds stop at runtime, not the whole SDK -->
<RootRepo Condition="'$(ShortStack)' == 'true'">runtime</RootRepo>
</PropertyGroup>

3
src/SourceBuild/content/repo-projects/runtime.proj
View file

@ -19,6 +19,9 @@
<BuildArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildRuntimeWasmEnableThreads)' == 'true'">$(BuildArgs) /p:DotNetBuildRuntimeWasmEnableThreads=true</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">$(BuildArgs) /p:DotNetBuildRuntimeNativeAOTRuntimePack=true</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildMonoEnableLLVM)' != ''">$(BuildArgs) /p:DotNetBuildMonoEnableLLVM=$(DotNetBuildMonoEnableLLVM)</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildMonoAOTEnableLLVM)' != ''">$(BuildArgs) /p:DotNetBuildMonoAOTEnableLLVM=$(DotNetBuildMonoAOTEnableLLVM)</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildMonoBundleLLVMOptimizer)' != ''">$(BuildArgs) /p:DotNetBuildMonoBundleLLVMOptimizer=$(DotNetBuildMonoBundleLLVMOptimizer)</BuildArgs>
<BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)pgoinstrument</BuildArgs>
</PropertyGroup>