diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index d6c8f71f4792ef..084bf83ab1df8c 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -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')) }}: diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index e7550889d02e9b..32fa4e486c22ad 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -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 @@ -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 diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index 0272bf2a7acb6a..209314a136702f 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -51,7 +51,6 @@ extends: - linux_x64 - osx_arm64 - osx_x64 - - windows_arm - windows_arm64 jobParameters: testGroup: outerloop @@ -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 diff --git a/eng/pipelines/coreclr/pgo.yml b/eng/pipelines/coreclr/pgo.yml index d5c3efba0d9b5b..1ed140014a6104 100644 --- a/eng/pipelines/coreclr/pgo.yml +++ b/eng/pipelines/coreclr/pgo.yml @@ -24,7 +24,6 @@ extends: - linux_arm64 - linux_x64 - osx_arm64 - - windows_arm - windows_arm64 - windows_x64 - windows_x86 @@ -50,7 +49,6 @@ extends: - linux_arm64 - linux_x64 - osx_arm64 - - windows_arm - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/pgostress.yml b/eng/pipelines/coreclr/pgostress.yml index 3d0a8beef0b96b..d1e9d833eb38f4 100644 --- a/eng/pipelines/coreclr/pgostress.yml +++ b/eng/pipelines/coreclr/pgostress.yml @@ -24,7 +24,6 @@ extends: - linux_arm64 - linux_x64 - osx_arm64 - - windows_arm - windows_arm64 - windows_x64 - windows_x86 @@ -50,7 +49,6 @@ extends: - linux_arm64 - linux_x64 - osx_arm64 - - windows_arm - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index ea4a7f99b5b9eb..e881234a956f32 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -24,7 +24,6 @@ extends: - linux_arm64 - linux_x64 - osx_arm64 - - windows_arm - windows_arm64 - windows_x64 - windows_x86 @@ -50,7 +49,6 @@ extends: - linux_arm64 - linux_x64 - osx_arm64 - - windows_arm - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index ea400d3e52e8e5..7679cca27fa54b 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -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' @@ -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) - - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 31751f32ed47b3..8fee96ad8d4a60 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -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') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index ac9304e1d692ec..355ca33e31c17d 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -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 diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index 0654ce7629aaf3..4fe91d22a9312f 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -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 }}: diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 323f7784fed557..3718c536dde9da 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -71,7 +71,6 @@ extends: - linux_musl_arm64 - windows_x86 - windows_x64 - - windows_arm - windows_arm64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} @@ -95,7 +94,6 @@ extends: - linux_musl_arm - linux_musl_arm64 - windows_x64 - - windows_arm - windows_arm64 # @@ -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) @@ -348,7 +345,6 @@ extends: # - linux_musl_arm64 # - windows_x64 # - windows_x86 - # - windows_arm # - windows_arm64 jobTemplates: # LLVMJIT @@ -396,7 +392,6 @@ extends: - linux_musl_arm64 - windows_x86 - windows_x64 - - windows_arm - windows_arm64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} @@ -459,7 +454,6 @@ extends: - linux_musl_arm64 - windows_x86 - windows_x64 - - windows_arm - windows_arm64 # diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 36c91077c0b714..025997aadde2c2 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -82,7 +82,6 @@ extends: - tizen_armel - windows_x86 - windows_x64 - - windows_arm - windows_arm64 jobParameters: testGroup: innerloop @@ -151,7 +150,6 @@ extends: - linux_musl_arm64 - windows_x64 - windows_x86 - - windows_arm - windows_arm64 - freebsd_x64 jobParameters: @@ -710,7 +708,6 @@ extends: # - linux_musl_arm64 - windows_x64 - windows_x86 - # - windows_arm # - windows_arm64 jobParameters: condition: >- @@ -733,7 +730,6 @@ extends: # - linux_musl_arm64 - windows_x64 # - windows_x86 - # - windows_arm # - windows_arm64 jobParameters: runtimeVariant: crossaot @@ -810,7 +806,6 @@ extends: # - linux_musl_arm64 - windows_x64 - windows_x86 - # - windows_arm # - windows_arm64 jobParameters: condition: >- @@ -873,7 +868,6 @@ extends: - linux_arm - linux_musl_arm - linux_musl_arm64 - - windows_arm - windows_arm64 - windows_x86 jobParameters: @@ -986,7 +980,6 @@ extends: - linux_musl_arm - linux_musl_arm64 - windows_x86 - - windows_arm - windows_arm64 - linux_arm jobParameters: