Skip to content

Commit c4e32db

Browse files
matouskozakmatouskozak
authored
[mono][infra] Remove Mono LLVMJIT builds (#104552)
* update tracking issue for disabled AOTLLVM arm64 * Remove LLVMJIT jobs from runtime-llvm.yml * remove LLVM JIT jobs from runtime-official.yml * Move mono LLVMJIT full product build to regular * remove -lc build flag (only Release)
1 parent 66ae898 commit c4e32db

File tree

3 files changed

+7
-103
lines changed

3 files changed

+7
-103
lines changed

‎eng/pipelines/runtime-llvm.yml

+4-46
Original file line numberDiff line numberDiff line change
@@ -43,48 +43,6 @@ extends:
4343

4444
- stage: Build
4545
jobs:
46-
#
47-
# Build Mono and Installer on LLVMJIT mode
48-
#
49-
- template: /eng/pipelines/common/platform-matrix.yml
50-
parameters:
51-
jobTemplate: /eng/pipelines/common/global-build-job.yml
52-
buildConfig: Release
53-
runtimeFlavor: mono
54-
platforms:
55-
- osx_x64
56-
jobParameters:
57-
testGroup: innerloop
58-
nameSuffix: AllSubsets_Mono_LLVMJIT
59-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
60-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
61-
condition: >-
62-
or(
63-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
64-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
65-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
66-
eq(variables['isRollingBuild'], true))
67-
68-
- template: /eng/pipelines/common/platform-matrix.yml
69-
parameters:
70-
jobTemplate: /eng/pipelines/common/global-build-job.yml
71-
buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
72-
runtimeFlavor: mono
73-
platforms:
74-
- linux_x64
75-
- linux_arm64
76-
jobParameters:
77-
testGroup: innerloop
78-
nameSuffix: AllSubsets_Mono_LLVMJIT
79-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
80-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
81-
condition: >-
82-
or(
83-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
84-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
85-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
86-
eq(variables['isRollingBuild'], true))
87-
8846
#
8947
# Build Mono and Installer on LLVMAOT mode
9048
#
@@ -133,7 +91,7 @@ extends:
13391
runtimeFlavor: mono
13492
platforms:
13593
- linux_x64
136-
# Disabled pending outcome of https://github.com/dotnet/runtime/issues/60234 investigation
94+
# Tracking issue: https://github.com/dotnet/runtime/issues/90427
13795
#- linux_arm64
13896
variables:
13997
- name: timeoutPerTestInMinutes
@@ -144,7 +102,7 @@ extends:
144102
testGroup: innerloop
145103
nameSuffix: AllSubsets_Mono_LLVMAOT_RuntimeTests
146104
runtimeVariant: llvmaot
147-
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) -lc ${{ variables.debugOnPrReleaseOnRolling }} /p:MonoEnableLLVM=true
105+
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) /p:MonoEnableLLVM=true
148106
timeoutInMinutes: 360
149107
condition: >-
150108
or(
@@ -185,7 +143,7 @@ extends:
185143
testGroup: innerloop
186144
nameSuffix: AllSubsets_Mono_LLVMFULLAOT_RuntimeTests
187145
runtimeVariant: llvmfullaot
188-
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) -lc ${{ variables.debugOnPrReleaseOnRolling }} /p:MonoEnableLLVM=true
146+
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) /p:MonoEnableLLVM=true
189147
timeoutInMinutes: 360
190148
condition: >-
191149
or(
@@ -232,7 +190,7 @@ extends:
232190
testGroup: innerloop
233191
nameSuffix: AllSubsets_Mono_LLVMFULLAOT_RuntimeIntrinsicsTests
234192
runtimeVariant: llvmfullaot
235-
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) -lc ${{ variables.debugOnPrReleaseOnRolling }} /p:MonoEnableLLVM=true
193+
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) /p:MonoEnableLLVM=true
236194
timeoutInMinutes: 360
237195
condition: >-
238196
or(

‎eng/pipelines/runtime-official.yml

-15
Original file line numberDiff line numberDiff line change
@@ -532,21 +532,6 @@ extends:
532532
# - windows_x86
533533
# - windows_arm64
534534
jobTemplates:
535-
# LLVMJIT
536-
- jobTemplate: /eng/pipelines/common/global-build-job.yml
537-
buildConfig: release
538-
runtimeFlavor: mono
539-
jobParameters:
540-
templatePath: 'templates-official'
541-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
542-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
543-
nameSuffix: Mono_LLVMJIT
544-
runtimeVariant: LLVMJIT
545-
isOfficialBuild: ${{ variables.isOfficialBuild }}
546-
postBuildSteps:
547-
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
548-
parameters:
549-
name: MonoRuntimePacks
550535
#LLVMAOT
551536
- jobTemplate: /eng/pipelines/common/global-build-job.yml
552537
buildConfig: release

‎eng/pipelines/runtime.yml

+3-42
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,9 @@ extends:
779779
runtimeFlavor: mono
780780
platforms:
781781
- tvossimulator_x64
782+
- linux_x64
782783
- linux_arm
784+
- linux_arm64
783785
jobParameters:
784786
testGroup: innerloop
785787
nameSuffix: AllSubsets_Mono
@@ -799,6 +801,7 @@ extends:
799801
platforms:
800802
- linux_musl_x64
801803
- linux_riscv64
804+
- osx_x64
802805
jobParameters:
803806
testGroup: innerloop
804807
nameSuffix: AllSubsets_Mono
@@ -1116,48 +1119,6 @@ extends:
11161119
eq(variables['monoContainsChange'], true),
11171120
eq(variables['isRollingBuild'], true))
11181121
1119-
#
1120-
# Build Mono and Installer on LLVMJIT mode
1121-
#
1122-
- template: /eng/pipelines/common/platform-matrix.yml
1123-
parameters:
1124-
jobTemplate: /eng/pipelines/common/global-build-job.yml
1125-
buildConfig: Release
1126-
runtimeFlavor: mono
1127-
platforms:
1128-
- osx_x64
1129-
jobParameters:
1130-
testGroup: innerloop
1131-
nameSuffix: AllSubsets_Mono_LLVMJIT
1132-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
1133-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
1134-
condition: >-
1135-
or(
1136-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
1137-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
1138-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
1139-
eq(variables['isRollingBuild'], true))
1140-
1141-
- template: /eng/pipelines/common/platform-matrix.yml
1142-
parameters:
1143-
jobTemplate: /eng/pipelines/common/global-build-job.yml
1144-
buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
1145-
runtimeFlavor: mono
1146-
platforms:
1147-
- linux_x64
1148-
- linux_arm64
1149-
jobParameters:
1150-
testGroup: innerloop
1151-
nameSuffix: AllSubsets_Mono_LLVMJIT
1152-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
1153-
/p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
1154-
condition: >-
1155-
or(
1156-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
1157-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
1158-
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
1159-
eq(variables['isRollingBuild'], true))
1160-
11611122
#
11621123
# Build Mono and Installer on LLVMAOT mode
11631124
#

0 commit comments

Comments
 (0)