Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Windows arm32 support #85947

Merged
merged 2 commits into from
May 10, 2023
Merged

Remove Windows arm32 support #85947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5819e9e
Remove Windows arm32 support
BruceForstall May 8, 2023
a9fc5ae
Restore a few files
BruceForstall May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions eng/pipelines/common/platform-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,24 +895,6 @@ jobs:
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Windows arm
- ${{ if or(containsValue(parameters.platforms, 'windows_arm'), eq(parameters.platformGroup, 'all')) }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
variables: ${{ parameters.variables }}
osGroup: windows
archType: arm
targetRid: win-arm
platform: windows_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Windows arm64

- ${{ if or(containsValue(parameters.platforms, 'windows_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,8 +537,8 @@ jobs:
- defaultpgo
${{ if in(parameters.testGroup, 'pgostress') }}:
# We run a limited number of scenarios on the win-arm64 queues as we hit frequent timeouts on those queues otherwise.
# The loss of coverage is not critical as win-arm64/win-arm32 are practically equivalent to linux-arm64/linux-arm32 to the JIT.
${{ if and(eq(parameters.osGroup, 'windows'), or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))) }}:
# The loss of coverage is not critical as win-arm64 is practically equivalent to linux-arm64 to the JIT.
${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm64')) }}:
scenarios:
- fullpgo
- fullpgo_random_gdv_edge
Expand Down Expand Up @@ -571,7 +571,7 @@ jobs:
- jitelthookenabled
- jitelthookenabled_tiered
${{ if in(parameters.testGroup, 'jit-experimental') }}:
${{ if and(eq(parameters.osGroup, 'windows'), or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))) }}:
${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm64')) }}:
scenarios:
- jitosr_stress
- jitpartialcompilation_pgo
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/coreclr/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ extends:
- linux_x64
- osx_arm64
- osx_x64
- windows_arm
- windows_arm64
jobParameters:
testGroup: outerloop
Expand Down Expand Up @@ -148,7 +147,6 @@ extends:
- osx_x64
- windows_x64
- windows_x86
- windows_arm
- windows_arm64
helixQueueGroup: ci
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/coreclr/pgo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ extends:
- linux_arm64
- linux_x64
- osx_arm64
- windows_arm
- windows_arm64
- windows_x64
- windows_x86
Expand All @@ -50,7 +49,6 @@ extends:
- linux_arm64
- linux_x64
- osx_arm64
- windows_arm
- windows_arm64
- windows_x64
- windows_x86
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/coreclr/pgostress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ extends:
- linux_arm64
- linux_x64
- osx_arm64
- windows_arm
- windows_arm64
- windows_x64
- windows_x86
Expand All @@ -50,7 +49,6 @@ extends:
- linux_arm64
- linux_x64
- osx_arm64
- windows_arm
- windows_arm64
- windows_x64
- windows_x86
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/coreclr/r2r.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ extends:
- linux_arm64
- linux_x64
- osx_arm64
- windows_arm
- windows_arm64
- windows_x64
- windows_x86
Expand All @@ -50,7 +49,6 @@ extends:
- linux_arm64
- linux_x64
- osx_arm64
- windows_arm
- windows_arm64
- windows_x64
- windows_x86
Expand Down
8 changes: 2 additions & 6 deletions eng/pipelines/coreclr/templates/build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ jobs:
value: '/p:OfficialBuildId=$(Build.BuildNumber)'
- name: enforcePgoArg
value: ''
# The EnforcePGO script is only supported on Windows and is not supported on arm or arm64.
- ${{ 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')) }}:
# The EnforcePGO script is only supported on Windows and is not supported on arm64.
- ${{ if and(eq(parameters.buildConfig, 'Release'), and(eq(parameters.osGroup, 'windows'), ne(parameters.archType, 'arm64')), ne(parameters.pgoType, 'pgo')) }}:
- name: enforcePgoArg
value: '-enforcepgo'

Expand Down Expand Up @@ -202,10 +202,6 @@ jobs:
- 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)
displayName: Build CoreCLR Cross-Arch Tools (Tools that run on x64 targeting x86)

- ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm')) }}:
- 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)
displayName: Build CoreCLR Cross-Arch Tools (Tools that run on x86 targeting arm)

Comment on lines -205 to -208
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a condition in eng/Subsets.props that corresponds to this condition. Do we want to remove that as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. But that will be a follow-up.

- ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}:
- script: |
du -sh $(Build.SourcesDirectory)/*
Expand Down
7 changes: 0 additions & 7 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,6 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Windows.10.Amd64.X86.Rt

# windows arm
- ${{ if eq(parameters.platform, 'windows_arm') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- Windows.11.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Windows.11.Arm64

# windows arm64
- ${{ if eq(parameters.platform, 'windows_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
Expand Down
4 changes: 0 additions & 4 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,6 @@ jobs:
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
- Windows.10.Amd64.Client.Open

# windows arm
- ${{ if eq(parameters.platform, 'windows_arm') }}:
- Windows.11.Arm64.Open

# windows arm64
- ${{ if eq(parameters.platform, 'windows_arm64') }}:
- Windows.11.Arm64.Open
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ jobs:
- gcstress0xc_jitstress2
- gcstress0xc_jitminopts_heapverify1
${{ if in(parameters.coreclrTestGroup, 'pgo') }}:
${{ if and(eq(parameters.osGroup, 'windows'), or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))) }}:
${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'arm64')) }}:
scenarios:
- defaultpgo
${{ else }}:
Expand Down
6 changes: 0 additions & 6 deletions eng/pipelines/runtime-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ extends:
- linux_musl_arm64
- windows_x86
- windows_x64
- windows_arm
- windows_arm64
jobParameters:
isOfficialBuild: ${{ variables.isOfficialBuild }}
Expand All @@ -95,7 +94,6 @@ extends:
- linux_musl_arm
- linux_musl_arm64
- windows_x64
- windows_arm
- windows_arm64

#
Expand Down Expand Up @@ -157,7 +155,6 @@ extends:
# - linux_musl_arm64
- windows_x64
- windows_x86
# - windows_arm
# - windows_arm64
jobParameters:
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
Expand Down Expand Up @@ -348,7 +345,6 @@ extends:
# - linux_musl_arm64
# - windows_x64
# - windows_x86
# - windows_arm
# - windows_arm64
jobTemplates:
# LLVMJIT
Expand Down Expand Up @@ -396,7 +392,6 @@ extends:
- linux_musl_arm64
- windows_x86
- windows_x64
- windows_arm
- windows_arm64
jobParameters:
isOfficialBuild: ${{ variables.isOfficialBuild }}
Expand Down Expand Up @@ -459,7 +454,6 @@ extends:
- linux_musl_arm64
- windows_x86
- windows_x64
- windows_arm
- windows_arm64

#
Expand Down
7 changes: 0 additions & 7 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ extends:
- tizen_armel
- windows_x86
- windows_x64
- windows_arm
- windows_arm64
jobParameters:
testGroup: innerloop
Expand Down Expand Up @@ -151,7 +150,6 @@ extends:
- linux_musl_arm64
- windows_x64
- windows_x86
- windows_arm
- windows_arm64
- freebsd_x64
jobParameters:
Expand Down Expand Up @@ -710,7 +708,6 @@ extends:
# - linux_musl_arm64
- windows_x64
- windows_x86
# - windows_arm
# - windows_arm64
jobParameters:
condition: >-
Expand All @@ -733,7 +730,6 @@ extends:
# - linux_musl_arm64
- windows_x64
# - windows_x86
# - windows_arm
# - windows_arm64
jobParameters:
runtimeVariant: crossaot
Expand Down Expand Up @@ -810,7 +806,6 @@ extends:
# - linux_musl_arm64
- windows_x64
- windows_x86
# - windows_arm
# - windows_arm64
jobParameters:
condition: >-
Expand Down Expand Up @@ -873,7 +868,6 @@ extends:
- linux_arm
- linux_musl_arm
- linux_musl_arm64
- windows_arm
- windows_arm64
- windows_x86
jobParameters:
Expand Down Expand Up @@ -986,7 +980,6 @@ extends:
- linux_musl_arm
- linux_musl_arm64
- windows_x86
- windows_arm
- windows_arm64
- linux_arm
jobParameters:
Expand Down