diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 4171b5bcc33e57..88ad3e36cda0bc 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -190,7 +190,7 @@ jobs: timeoutInMinutes: 390 ${{ if in(parameters.testGroup, 'gcstress-extra', 'r2r-extra', 'pgo', 'pgostress', 'jit-experimental') }}: timeoutInMinutes: 510 - ${{ if in(parameters.testGroup, 'jitstress-isas-x86', 'jitstress-isas-avx512', 'jitstress-isas-sve') }}: + ${{ if in(parameters.testGroup, 'jitstress-isas-x86', 'jitstress-isas-avx512') }}: timeoutInMinutes: 960 steps: @@ -430,9 +430,6 @@ jobs: - jitstress_isas_x86_evex - jitstress_isas_x86_noavx512 - jitstressregs0x2000 - ${{ if in(parameters.testGroup, 'jitstress-isas-sve') }}: - scenarios: - - jitstress_isas_arm64_sve ${{ if in(parameters.testGroup, 'jitstressregs-x86') }}: scenarios: - jitstressregs1_x86_noavx diff --git a/eng/pipelines/common/templates/runtimes/test-variables.yml b/eng/pipelines/common/templates/runtimes/test-variables.yml index b9a5e92dcf2c75..7903626a4905b9 100644 --- a/eng/pipelines/common/templates/runtimes/test-variables.yml +++ b/eng/pipelines/common/templates/runtimes/test-variables.yml @@ -50,7 +50,7 @@ variables: # gc reliability may take up to 2 hours to shutdown. Some scenarios have very long iteration times. - name: timeoutPerTestInMinutes value: 240 - - ${{ if in(parameters.testGroup, 'jitstress', 'jitstress-random', 'jitstress-isas-arm', 'jitstress-isas-x86', 'jitstress-isas-avx512', 'jitstress-isas-sve', 'jitstressregs-x86', 'jitstressregs', 'jitstress2-jitstressregs', 'jitelthookenabled' ) }}: + - ${{ if in(parameters.testGroup, 'jitstress', 'jitstress-random', 'jitstress-isas-arm', 'jitstress-isas-x86', 'jitstress-isas-avx512', 'jitstressregs-x86', 'jitstressregs', 'jitstress2-jitstressregs', 'jitelthookenabled' ) }}: - name: timeoutPerTestCollectionInMinutes value: 120 - name: timeoutPerTestInMinutes diff --git a/eng/pipelines/coreclr/jitstress-isas-sve.yml b/eng/pipelines/coreclr/jitstress-isas-sve.yml deleted file mode 100644 index c5aca49e62322f..00000000000000 --- a/eng/pipelines/coreclr/jitstress-isas-sve.yml +++ /dev/null @@ -1,39 +0,0 @@ -# This pipeline only runs on GitHub PRs, not on merges. -trigger: none - -# Only run on specific changes to the JIT directory that are likely to affect Sve. -pr: - branches: - include: - - main - paths: - include: - - src/coreclr/jit/codegenarmarch.cpp - - src/coreclr/jit/emitarm64sve.cpp - - src/coreclr/jit/emitfmtsarm64sve.h - - src/coreclr/jit/hwintrinsicarm64.cpp - - src/coreclr/jit/hwintrinsiccodegenarm64.cpp - - src/coreclr/jit/hwintrinsiclistarm64sve.h - - src/coreclr/jit/instrsarm64sve.h - - src/coreclr/jit/lowerarmarch.cpp - - src/coreclr/jit/lsraarmarch.cpp - - src/coreclr/jit/lsraarm64.cpp - -schedules: -- cron: "30 19 * * 6" - displayName: Sat at 11:30 AM (UTC-8:00) - branches: - include: - - main - always: true - -variables: - - template: /eng/pipelines/common/variables.yml - -extends: - template: /eng/pipelines/coreclr/templates/jit-outerloop-pipeline.yml - parameters: - platforms: - # just run on windows for now, because abi is universal for other platforms - - windows_x64 - testGroup: jitstress-isas-sve diff --git a/src/tests/Common/testenvironment.proj b/src/tests/Common/testenvironment.proj index 1569ec4c8ea8f6..209ca36fe2bdcf 100644 --- a/src/tests/Common/testenvironment.proj +++ b/src/tests/Common/testenvironment.proj @@ -175,7 +175,6 @@ -