Skip to content

Commit e826357

Browse files
kotlarmilosCopilot
kotlarmilos
and
Copilot
authored
[mobile] .NET 11 mobile runtime configuration updates (#5240)
* Update mobile performance pipeline configuration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update .NET 11 SDK to preview 6 (build 20260610.6) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Use validation package feed for SDK packages Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * [mobile] Remove Mono mobile perf jobs from runtime-perf and performance pipelines Remove the MAUI Mono scenario jobs from sdk-perf-jobs.yml and the Android Mono JIT/AOT job groups and their parameters from runtime-perf-jobs.yml. CoreCLR and NativeAOT mobile jobs and the desktop Mono microbenchmarks are kept. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * [mobile] Update iOS scenarios comment to reflect CoreCLR and NativeAOT coverage Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Revert validation feed and version pins to main Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Milos Kotlar <kotlarmilos@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 92ff3cd commit e826357

5 files changed

Lines changed: 2 additions & 262 deletions

File tree

‎eng/pipelines/runtime-ios-scenarios-perf-jobs.yml‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,10 @@ parameters:
66
jobs:
77
- template: /eng/pipelines/performance/templates/perf-ios-scenarios-build-jobs.yml@${{ parameters.runtimeRepoAlias }}
88
parameters:
9-
mono: true
9+
mono: false
1010
coreclr: true
1111
nativeAot: true
1212

13-
# run iOS scenarios - Mono FullAOT (no LLVM)
14-
- template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }}
15-
parameters:
16-
jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }}
17-
buildConfig: release
18-
runtimeFlavor: mono
19-
platforms:
20-
- osx_x64
21-
jobParameters:
22-
runtimeType: iOSMono
23-
codeGenType: FullAOT
24-
projectFile: $(Build.SourcesDirectory)/eng/testing/performance/ios_scenarios.proj
25-
runKind: ios_scenarios
26-
isScenario: true
27-
logicalMachine: 'perfiphone17'
28-
iOSLlvmBuild: False
29-
iOSStripSymbols: True
30-
additionalJobIdentifier: iOSStripSymbols
31-
runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }}
32-
performanceRepoAlias: ${{ parameters.performanceRepoAlias }}
33-
${{ each parameter in parameters.jobParameters }}:
34-
${{ parameter.key }}: ${{ parameter.value }}
35-
36-
# run iOS scenarios - Mono FullAOT (with LLVM)
37-
- template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }}
38-
parameters:
39-
jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }}
40-
buildConfig: release
41-
runtimeFlavor: mono
42-
platforms:
43-
- osx_x64
44-
jobParameters:
45-
runtimeType: iOSMono
46-
codeGenType: FullAOT
47-
projectFile: $(Build.SourcesDirectory)/eng/testing/performance/ios_scenarios.proj
48-
runKind: ios_scenarios
49-
isScenario: true
50-
logicalMachine: 'perfiphone17'
51-
iOSLlvmBuild: True
52-
iOSStripSymbols: True
53-
additionalJobIdentifier: iOSLlvmBuild iOSStripSymbols
54-
runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }}
55-
performanceRepoAlias: ${{ parameters.performanceRepoAlias }}
56-
${{ each parameter in parameters.jobParameters }}:
57-
${{ parameter.key }}: ${{ parameter.value }}
58-
5913
# run iOS scenarios - CoreCLR NativeAOT
6014
- template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }}
6115
parameters:

‎eng/pipelines/runtime-perf-build-jobs.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,6 @@ jobs:
5858
parameters:
5959
mono_arm64: true
6060

61-
- ${{ if containsValue(parameters.buildType, 'mono_arm64_android') }}:
62-
- template: /eng/pipelines/performance/templates/perf-mono-build-jobs.yml@${{ parameters.runtimeRepoAlias }}
63-
parameters:
64-
monoAndroid: true
65-
66-
- ${{ if containsValue(parameters.buildType, 'mono_arm64_ios') }}:
67-
- template: /eng/pipelines/performance/templates/perf-ios-scenarios-build-jobs.yml@${{ parameters.runtimeRepoAlias }}
68-
parameters:
69-
mono: true
70-
71-
- ${{ if containsValue(parameters.buildType, 'monoBDN_arm64_android') }}:
72-
- template: /eng/pipelines/performance/templates/perf-bdn-build-jobs.yml@${{ parameters.runtimeRepoAlias }}
73-
parameters:
74-
mauiFramework: ${{ parameters.mauiFramework }}
75-
7661
- ${{ if containsValue(parameters.buildType, 'nativeAot_arm64_ios') }}:
7762
- template: /eng/pipelines/performance/templates/perf-ios-scenarios-build-jobs.yml@${{ parameters.runtimeRepoAlias }}
7863
parameters:

‎eng/pipelines/runtime-perf-jobs.yml‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,6 @@ parameters:
5050
enabled: true
5151
configs:
5252
- linux_x64
53-
- name: androidMonoJit
54-
type: object
55-
default:
56-
enabled: true
57-
- name: androidMonoAot
58-
type: object
59-
default:
60-
enabled: true
6153
- name: androidCoreclrJit
6254
type: object
6355
default:
@@ -91,55 +83,13 @@ jobs:
9183
perfBranch: ${{ parameters.perfBranch }}
9284

9385
- ${{ if not(startswith(variables['Build.SourceBranch'], 'refs/heads/release')) }}:
94-
# Build and run iOS Mono and NativeAOT scenarios
86+
# Build and run iOS CoreCLR and NativeAOT scenarios
9587
- template: /eng/pipelines/runtime-ios-scenarios-perf-jobs.yml
9688
parameters:
9789
runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }}
9890
performanceRepoAlias: ${{ parameters.performanceRepoAlias }}
9991
jobParameters: ${{ parameters.jobParameters }}
10092

101-
# Android Mono JIT — controlled by androidMonoJit toggle
102-
- ${{ if eq(parameters.androidMonoJit.enabled, true) }}:
103-
- template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }}
104-
parameters:
105-
jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }}
106-
buildConfig: release
107-
runtimeFlavor: mono
108-
platforms:
109-
- windows_x64
110-
jobParameters:
111-
runtimeType: AndroidMono
112-
codeGenType: JIT
113-
projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj
114-
runKind: android_scenarios
115-
isScenario: true
116-
logicalMachine: 'perfpixel4a'
117-
runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }}
118-
performanceRepoAlias: ${{ parameters.performanceRepoAlias }}
119-
${{ each parameter in parameters.jobParameters }}:
120-
${{ parameter.key }}: ${{ parameter.value }}
121-
122-
# Android Mono AOT — controlled by androidMonoAot toggle
123-
- ${{ if eq(parameters.androidMonoAot.enabled, true) }}:
124-
- template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }}
125-
parameters:
126-
jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }}
127-
buildConfig: release
128-
runtimeFlavor: mono
129-
platforms:
130-
- windows_x64
131-
jobParameters:
132-
runtimeType: AndroidMono
133-
codeGenType: AOT
134-
projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj
135-
runKind: android_scenarios
136-
isScenario: true
137-
logicalMachine: 'perfpixel4a'
138-
runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }}
139-
performanceRepoAlias: ${{ parameters.performanceRepoAlias }}
140-
${{ each parameter in parameters.jobParameters }}:
141-
${{ parameter.key }}: ${{ parameter.value }}
142-
14393
# Android CoreCLR JIT (includes static linking variant) — controlled by androidCoreclrJit toggle
14494
- ${{ if eq(parameters.androidCoreclrJit.enabled, true) }}:
14595
- template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }}

‎eng/pipelines/sdk-perf-jobs.yml‎

Lines changed: 0 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -407,26 +407,6 @@ jobs:
407407
${{ each parameter in parameters.jobParameters }}:
408408
${{ parameter.key }}: ${{ parameter.value }}
409409

410-
# Maui Android scenario benchmarks (Mono Default) - Release
411-
- template: /eng/pipelines/templates/build-machine-matrix.yml
412-
parameters:
413-
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
414-
buildMachines:
415-
- win-x64-android-arm64-pixel
416-
- win-x64-android-arm64-galaxy
417-
isPublic: false
418-
jobParameters:
419-
runKind: maui_scenarios_android
420-
projectFileName: maui_scenarios_android.proj
421-
channels:
422-
- main
423-
runtimeFlavor: mono
424-
codeGenType: Default
425-
buildConfig: Release
426-
additionalJobIdentifier: Mono
427-
${{ each parameter in parameters.jobParameters }}:
428-
${{ parameter.key }}: ${{ parameter.value }}
429-
430410
# Maui Android scenario benchmarks (CoreCLR Default) - Release
431411
- template: /eng/pipelines/templates/build-machine-matrix.yml
432412
parameters:
@@ -467,25 +447,6 @@ jobs:
467447
${{ each parameter in parameters.jobParameters }}:
468448
${{ parameter.key }}: ${{ parameter.value }}
469449

470-
# Maui iOS scenario benchmarks (Mono Default) - Release
471-
- template: /eng/pipelines/templates/build-machine-matrix.yml
472-
parameters:
473-
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
474-
buildMachines:
475-
- osx-x64-ios-arm64
476-
isPublic: false
477-
jobParameters:
478-
runKind: maui_scenarios_ios
479-
projectFileName: maui_scenarios_ios.proj
480-
channels:
481-
- main
482-
runtimeFlavor: mono
483-
codeGenType: Default
484-
buildConfig: Release
485-
additionalJobIdentifier: Mono
486-
${{ each parameter in parameters.jobParameters }}:
487-
${{ parameter.key }}: ${{ parameter.value }}
488-
489450
# Maui iOS scenario benchmarks (CoreCLR Default) - Release
490451
- template: /eng/pipelines/templates/build-machine-matrix.yml
491452
parameters:
@@ -524,26 +485,6 @@ jobs:
524485
${{ each parameter in parameters.jobParameters }}:
525486
${{ parameter.key }}: ${{ parameter.value }}
526487

527-
# Maui Android scenario benchmarks (Mono - Default) - Debug
528-
- template: /eng/pipelines/templates/build-machine-matrix.yml
529-
parameters:
530-
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
531-
buildMachines:
532-
- win-x64-android-arm64-pixel
533-
- win-x64-android-arm64-galaxy
534-
isPublic: false
535-
jobParameters:
536-
runKind: maui_scenarios_android
537-
projectFileName: maui_scenarios_android.proj
538-
channels:
539-
- main
540-
runtimeFlavor: mono
541-
codeGenType: Default
542-
buildConfig: Debug
543-
additionalJobIdentifier: Mono_Debug
544-
${{ each parameter in parameters.jobParameters }}:
545-
${{ parameter.key }}: ${{ parameter.value }}
546-
547488
# Maui Android scenario benchmarks (CoreCLR - Default) - Debug
548489
- template: /eng/pipelines/templates/build-machine-matrix.yml
549490
parameters:
@@ -564,26 +505,6 @@ jobs:
564505
${{ each parameter in parameters.jobParameters }}:
565506
${{ parameter.key }}: ${{ parameter.value }}
566507

567-
# Maui Android inner loop benchmarks on devices (Mono Default) - Debug
568-
- template: /eng/pipelines/templates/build-machine-matrix.yml
569-
parameters:
570-
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
571-
buildMachines:
572-
- win-x64-android-arm64-pixel
573-
- win-x64-android-arm64-galaxy
574-
isPublic: false
575-
jobParameters:
576-
runKind: maui_scenarios_android_innerloop
577-
projectFileName: maui_scenarios_android_innerloop.proj
578-
channels:
579-
- main
580-
runtimeFlavor: mono
581-
codeGenType: Default
582-
buildConfig: Debug
583-
additionalJobIdentifier: Mono_Debug_InnerLoop
584-
${{ each parameter in parameters.jobParameters }}:
585-
${{ parameter.key }}: ${{ parameter.value }}
586-
587508
# Maui Android inner loop benchmarks on devices (CoreCLR Default) - Debug
588509
- template: /eng/pipelines/templates/build-machine-matrix.yml
589510
parameters:
@@ -604,25 +525,6 @@ jobs:
604525
${{ each parameter in parameters.jobParameters }}:
605526
${{ parameter.key }}: ${{ parameter.value }}
606527

607-
# Maui Android inner loop benchmarks on emulator (Mono Default) - Debug
608-
- template: /eng/pipelines/templates/build-machine-matrix.yml
609-
parameters:
610-
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
611-
buildMachines:
612-
- ubuntu-x64-android-emulator
613-
isPublic: false
614-
jobParameters:
615-
runKind: maui_scenarios_android_innerloop
616-
projectFileName: maui_scenarios_android_innerloop.proj
617-
channels:
618-
- main
619-
runtimeFlavor: mono
620-
codeGenType: Default
621-
buildConfig: Debug
622-
additionalJobIdentifier: Mono_Debug_InnerLoop_Emulator
623-
${{ each parameter in parameters.jobParameters }}:
624-
${{ parameter.key }}: ${{ parameter.value }}
625-
626528
# Maui Android inner loop benchmarks on emulator (CoreCLR Default) - Debug
627529
- template: /eng/pipelines/templates/build-machine-matrix.yml
628530
parameters:
@@ -642,25 +544,6 @@ jobs:
642544
${{ each parameter in parameters.jobParameters }}:
643545
${{ parameter.key }}: ${{ parameter.value }}
644546

645-
# Maui iOS scenario benchmarks (Mono - Default) - Debug
646-
- template: /eng/pipelines/templates/build-machine-matrix.yml
647-
parameters:
648-
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
649-
buildMachines:
650-
- osx-x64-ios-arm64
651-
isPublic: false
652-
jobParameters:
653-
runKind: maui_scenarios_ios
654-
projectFileName: maui_scenarios_ios.proj
655-
channels:
656-
- main
657-
runtimeFlavor: mono
658-
codeGenType: Default
659-
buildConfig: Debug
660-
additionalJobIdentifier: Mono_Debug
661-
${{ each parameter in parameters.jobParameters }}:
662-
${{ parameter.key }}: ${{ parameter.value }}
663-
664547
# Maui iOS scenario benchmarks (CoreCLR - Default) - Debug
665548
- template: /eng/pipelines/templates/build-machine-matrix.yml
666549
parameters:

‎eng/pipelines/upload-build-artifacts-jobs.yml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -119,38 +119,6 @@ jobs:
119119
- artifactName: 'BuildArtifacts_linux_arm64_Release_mono'
120120
files: [ 'BuildArtifacts_linux_arm64_Release_mono.tar.gz' ]
121121

122-
- ${{ if containsValue(parameters.buildType, 'mono_arm64_android') }}:
123-
- template: /eng/pipelines/templates/upload-build-artifacts-job.yml@${{ parameters.performanceRepoAlias }}
124-
parameters:
125-
buildType: 'mono_arm64_android'
126-
dependencyJobName: build_android_arm64_release_AndroidMono
127-
repoName: ${{ parameters.repoName }}
128-
artifacts:
129-
- artifactName: 'AndroidHelloWorldArm64Mono'
130-
files: [ 'AndroidHelloWorldArm64Mono.tar.gz' ]
131-
132-
- ${{ if containsValue(parameters.buildType, 'mono_arm64_ios') }}:
133-
- template: /eng/pipelines/templates/upload-build-artifacts-job.yml@${{ parameters.performanceRepoAlias }}
134-
parameters:
135-
buildType: 'mono_arm64_ios'
136-
dependencyJobName: build_ios_arm64_release_iOSMono
137-
repoName: ${{ parameters.repoName }}
138-
artifacts:
139-
- artifactName: 'iOSSampleAppMonoFullAOTLLVMNoSymbols'
140-
files: [ 'iOSSampleAppMonoFullAOTLLVMNoSymbols.zip' ]
141-
- artifactName: 'iOSSampleAppMonoFullAOTNoLLVMNoSymbols'
142-
files: [ 'iOSSampleAppMonoFullAOTNoLLVMNoSymbols.zip' ]
143-
144-
- ${{ if containsValue(parameters.buildType, 'monoBDN_arm64_android') }}:
145-
- template: /eng/pipelines/templates/upload-build-artifacts-job.yml@${{ parameters.performanceRepoAlias }}
146-
parameters:
147-
buildType: 'monoBDN_arm64_android'
148-
dependencyJobName: build_ios_arm64_release_PerfBDNApp #build_android_arm64_release_Mono_Packs
149-
repoName: ${{ parameters.repoName }}
150-
artifacts:
151-
- artifactName: 'AndroidBDNApk'
152-
files: [ 'AndroidBDNApk.tar.gz' ]
153-
154122
- ${{ if containsValue(parameters.buildType, 'nativeAot_arm64_ios') }}:
155123
- template: /eng/pipelines/templates/upload-build-artifacts-job.yml@${{ parameters.performanceRepoAlias }}
156124
parameters:

0 commit comments

Comments
 (0)