Skip to content

Commit 7f4b072

Browse files
BruceForstallBruceForstall
authored
Remove Windows arm32 support (#85947)
* Remove Windows arm32 support Mostly, remove the CI runs. Windows arm32 product support was removed before .NET 6. * Restore a few files Only change YML files to remove windows_arm runs. Don't build Windows arm cross components. Don't touch mono files. Changing scripts to remove builds, and remove code, can follow.
1 parent 888bac3 commit 7f4b072

12 files changed

Lines changed: 6 additions & 60 deletions

File tree

‎eng/pipelines/common/platform-matrix.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -895,24 +895,6 @@ jobs:
895895
helixQueueGroup: ${{ parameters.helixQueueGroup }}
896896
${{ insert }}: ${{ parameters.jobParameters }}
897897

898-
# Windows arm
899-
- ${{ if or(containsValue(parameters.platforms, 'windows_arm'), eq(parameters.platformGroup, 'all')) }}:
900-
- template: xplat-setup.yml
901-
parameters:
902-
jobTemplate: ${{ parameters.jobTemplate }}
903-
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
904-
variables: ${{ parameters.variables }}
905-
osGroup: windows
906-
archType: arm
907-
targetRid: win-arm
908-
platform: windows_arm
909-
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
910-
jobParameters:
911-
runtimeFlavor: ${{ parameters.runtimeFlavor }}
912-
buildConfig: ${{ parameters.buildConfig }}
913-
helixQueueGroup: ${{ parameters.helixQueueGroup }}
914-
${{ insert }}: ${{ parameters.jobParameters }}
915-
916898
# Windows arm64
917899

918900
- ${{ if or(containsValue(parameters.platforms, 'windows_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:

‎eng/pipelines/common/templates/runtimes/run-test-job.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ jobs:
537537
- defaultpgo
538538
${{ if in(parameters.testGroup, 'pgostress') }}:
539539
# We run a limited number of scenarios on the win-arm64 queues as we hit frequent timeouts on those queues otherwise.
540-
# The loss of coverage is not critical as win-arm64/win-arm32 are practically equivalent to linux-arm64/linux-arm32 to the JIT.
541-
${{ if and(eq(parameters.osGroup, 'windows'), or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))) }}:
540+
# The loss of coverage is not critical as win-arm64 is practically equivalent to linux-arm64 to the JIT.
541+
${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm64')) }}:
542542
scenarios:
543543
- fullpgo
544544
- fullpgo_random_gdv_edge
@@ -571,7 +571,7 @@ jobs:
571571
- jitelthookenabled
572572
- jitelthookenabled_tiered
573573
${{ if in(parameters.testGroup, 'jit-experimental') }}:
574-
${{ if and(eq(parameters.osGroup, 'windows'), or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))) }}:
574+
${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm64')) }}:
575575
scenarios:
576576
- jitosr_stress
577577
- jitpartialcompilation_pgo

‎eng/pipelines/coreclr/ci.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ extends:
5151
- linux_x64
5252
- osx_arm64
5353
- osx_x64
54-
- windows_arm
5554
- windows_arm64
5655
jobParameters:
5756
testGroup: outerloop
@@ -148,7 +147,6 @@ extends:
148147
- osx_x64
149148
- windows_x64
150149
- windows_x86
151-
- windows_arm
152150
- windows_arm64
153151
helixQueueGroup: ci
154152
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml

‎eng/pipelines/coreclr/pgo.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ extends:
2424
- linux_arm64
2525
- linux_x64
2626
- osx_arm64
27-
- windows_arm
2827
- windows_arm64
2928
- windows_x64
3029
- windows_x86
@@ -50,7 +49,6 @@ extends:
5049
- linux_arm64
5150
- linux_x64
5251
- osx_arm64
53-
- windows_arm
5452
- windows_arm64
5553
- windows_x64
5654
- windows_x86

‎eng/pipelines/coreclr/pgostress.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ extends:
2424
- linux_arm64
2525
- linux_x64
2626
- osx_arm64
27-
- windows_arm
2827
- windows_arm64
2928
- windows_x64
3029
- windows_x86
@@ -50,7 +49,6 @@ extends:
5049
- linux_arm64
5150
- linux_x64
5251
- osx_arm64
53-
- windows_arm
5452
- windows_arm64
5553
- windows_x64
5654
- windows_x86

‎eng/pipelines/coreclr/r2r.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ extends:
2424
- linux_arm64
2525
- linux_x64
2626
- osx_arm64
27-
- windows_arm
2827
- windows_arm64
2928
- windows_x64
3029
- windows_x86
@@ -50,7 +49,6 @@ extends:
5049
- linux_arm64
5150
- linux_x64
5251
- osx_arm64
53-
- windows_arm
5452
- windows_arm64
5553
- windows_x64
5654
- windows_x86

‎eng/pipelines/coreclr/templates/build-job.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ jobs:
104104
value: '/p:OfficialBuildId=$(Build.BuildNumber)'
105105
- name: enforcePgoArg
106106
value: ''
107-
# The EnforcePGO script is only supported on Windows and is not supported on arm or arm64.
108-
- ${{ if and(eq(parameters.buildConfig, 'Release'), and(eq(parameters.osGroup, 'windows'), not(or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm')))), ne(parameters.pgoType, 'pgo')) }}:
107+
# The EnforcePGO script is only supported on Windows and is not supported on arm64.
108+
- ${{ if and(eq(parameters.buildConfig, 'Release'), and(eq(parameters.osGroup, 'windows'), ne(parameters.archType, 'arm64')), ne(parameters.pgoType, 'pgo')) }}:
109109
- name: enforcePgoArg
110110
value: '-enforcepgo'
111111

@@ -202,10 +202,6 @@ jobs:
202202
- script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -hostarch x64 $(osArg) -ci $(compilerArg) -component crosscomponents -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" $(officialBuildIdArg) $(clrRuntimePortableBuildArg)
203203
displayName: Build CoreCLR Cross-Arch Tools (Tools that run on x64 targeting x86)
204204

205-
- ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm')) }}:
206-
- script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -hostarch x86 $(osArg) -ci $(compilerArg) -component crosscomponents -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" $(officialBuildIdArg) $(clrRuntimePortableBuildArg)
207-
displayName: Build CoreCLR Cross-Arch Tools (Tools that run on x86 targeting arm)
208-
209205
- ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}:
210206
- script: |
211207
du -sh $(Build.SourcesDirectory)/*

‎eng/pipelines/coreclr/templates/helix-queues-setup.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ jobs:
140140
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
141141
- Windows.10.Amd64.X86.Rt
142142

143-
# windows arm
144-
- ${{ if eq(parameters.platform, 'windows_arm') }}:
145-
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
146-
- Windows.11.Arm64.Open
147-
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
148-
- Windows.11.Arm64
149-
150143
# windows arm64
151144
- ${{ if eq(parameters.platform, 'windows_arm64') }}:
152145
- ${{ if eq(variables['System.TeamProject'], 'public') }}:

‎eng/pipelines/libraries/helix-queues-setup.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,6 @@ jobs:
175175
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
176176
- Windows.10.Amd64.Client.Open
177177

178-
# windows arm
179-
- ${{ if eq(parameters.platform, 'windows_arm') }}:
180-
- Windows.11.Arm64.Open
181-
182178
# windows arm64
183179
- ${{ if eq(parameters.platform, 'windows_arm64') }}:
184180
- Windows.11.Arm64.Open

‎eng/pipelines/libraries/run-test-job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
- gcstress0xc_jitstress2
190190
- gcstress0xc_jitminopts_heapverify1
191191
${{ if in(parameters.coreclrTestGroup, 'pgo') }}:
192-
${{ if and(eq(parameters.osGroup, 'windows'), or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))) }}:
192+
${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm64')) }}:
193193
scenarios:
194194
- defaultpgo
195195
${{ else }}:

0 commit comments

Comments
 (0)