From 6999362a97e60a9ab49b874e636bd091b58e3a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 25 Jul 2023 17:48:08 +0900 Subject: [PATCH 1/6] Pri0 test leg --- .../runtime-extra-platforms-other.yml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index 40f75bfbd7c9a..0655522eb1197 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -193,6 +193,44 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isRollingBuild'], true)) +# +# CoreCLR NativeAOT checked build and Pri0 tests +# Only when CoreCLR is changed +# +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/common/global-build-job.yml + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + buildConfig: Checked + platforms: + - windows_x64 + - linux_x64 + variables: + - name: timeoutPerTestInMinutes + value: 60 + - name: timeoutPerTestCollectionInMinutes + value: 180 + jobParameters: + timeoutInMinutes: 240 + nameSuffix: NativeAOT + buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release + extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml + extraStepsParameters: + creator: dotnet-bot + testBuildArgs: 'nativeaot' + liveLibrariesBuildConfig: Release + testRunNamePrefixSuffix: NativeAOT_Pri0_$(_BuildConfig) + extraVariablesTemplates: + - template: /eng/pipelines/common/templates/runtimes/test-variables.yml + parameters: + testGroup: innerloop + liveLibrariesBuildConfig: Release + condition: >- + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(variables['isRollingBuild'], true)) + # Run net48 tests on win-x64 - template: /eng/pipelines/common/platform-matrix.yml parameters: From af025c048145685352b70eb76894c6d6d1eca0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 25 Jul 2023 17:48:15 +0900 Subject: [PATCH 2/6] wip --- eng/pipelines/runtime-extra-platforms.yml | 49 ----------------------- eng/pipelines/runtime.yml | 1 - 2 files changed, 50 deletions(-) diff --git a/eng/pipelines/runtime-extra-platforms.yml b/eng/pipelines/runtime-extra-platforms.yml index 958eabb9d33d7..2b2a1f6ee27da 100644 --- a/eng/pipelines/runtime-extra-platforms.yml +++ b/eng/pipelines/runtime-extra-platforms.yml @@ -49,55 +49,6 @@ extends: - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: - template: /eng/pipelines/common/evaluate-default-paths.yml - # Add wasm jobs only for rolling builds - - ${{ if eq(variables.isRollingBuild, true) }}: - - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} - - # Add iOS/tvOS jobs - - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} - isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} - - # Add iOS/tvOS simulator jobs - - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} - isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} - - # Add Android jobs - - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} - isAndroidOnlyBuild: ${{ variables.isAndroidOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} - - # Add Android emulator jobs - - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} - isAndroidEmulatorOnlyBuild: ${{ variables.isAndroidEmulatorOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} - - # Add Mac Catalyst jobs - - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} - isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} - - # Add Linux Bionic jobs - - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} - isLinuxBionicOnlyBuild: ${{ variables.isLinuxBionicOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} # Any jobs that are not specific to any platform - ${{ if eq(variables.isNotSpecificPlatformOnlyBuild, true) }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 7c138e343db57..e62ae434e0522 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -31,7 +31,6 @@ schedules: pr: branches: include: - - main - release/*.* paths: include: From d121255f1c0b12ffe7b0e9dc030756fcfa3ad4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 25 Jul 2023 17:57:57 +0900 Subject: [PATCH 3/6] hm --- .../extra-platforms/runtime-extra-platforms-other.yml | 4 ++-- src/tests/build.proj | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index 0655522eb1197..ca839ab509686 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -212,12 +212,12 @@ jobs: value: 180 jobParameters: timeoutInMinutes: 240 - nameSuffix: NativeAOT + nameSuffix: NativeAOT_Pri0 buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml extraStepsParameters: creator: dotnet-bot - testBuildArgs: 'nativeaot' + testBuildArgs: 'nativeaot /p:IlcUseServerGc=false' liveLibrariesBuildConfig: Release testRunNamePrefixSuffix: NativeAOT_Pri0_$(_BuildConfig) extraVariablesTemplates: diff --git a/src/tests/build.proj b/src/tests/build.proj index cca44fe29bf88..16c97f9978d27 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -590,6 +590,7 @@ $(GroupBuildCmd) "/p:CrossBuild=true" $(GroupBuildCmd) "/p:DefaultBuildAllTarget=BuildNativeAot" $(GroupBuildCmd) "/p:IlcMultiModule=true" + $(GroupBuildCmd) "/p:IlcUseServerGc=false" $(GroupBuildCmd) "/p:BuildNativeAotFrameworkObjects=true" From 443027a70aeedbdc59ae63139792d8dddc238968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 3 Aug 2023 17:35:16 +0900 Subject: [PATCH 4/6] Update Comparer_get_Default.csproj --- src/tests/JIT/opt/Devirtualization/Comparer_get_Default.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tests/JIT/opt/Devirtualization/Comparer_get_Default.csproj b/src/tests/JIT/opt/Devirtualization/Comparer_get_Default.csproj index c6636e39772f4..ef9e4a7a6abc7 100644 --- a/src/tests/JIT/opt/Devirtualization/Comparer_get_Default.csproj +++ b/src/tests/JIT/opt/Devirtualization/Comparer_get_Default.csproj @@ -1,6 +1,9 @@ True + + + true From f824fa9d2d95b510ae6423aea80e99c6a2ac7a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 3 Aug 2023 20:35:20 +0900 Subject: [PATCH 5/6] Revert "wip" This reverts commit af025c048145685352b70eb76894c6d6d1eca0c5. --- eng/pipelines/runtime-extra-platforms.yml | 49 +++++++++++++++++++++++ eng/pipelines/runtime.yml | 1 + 2 files changed, 50 insertions(+) diff --git a/eng/pipelines/runtime-extra-platforms.yml b/eng/pipelines/runtime-extra-platforms.yml index 2b2a1f6ee27da..958eabb9d33d7 100644 --- a/eng/pipelines/runtime-extra-platforms.yml +++ b/eng/pipelines/runtime-extra-platforms.yml @@ -49,6 +49,55 @@ extends: - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: - template: /eng/pipelines/common/evaluate-default-paths.yml + # Add wasm jobs only for rolling builds + - ${{ if eq(variables.isRollingBuild, true) }}: + - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + + # Add iOS/tvOS jobs + - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + + # Add iOS/tvOS simulator jobs + - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + + # Add Android jobs + - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isAndroidOnlyBuild: ${{ variables.isAndroidOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + + # Add Android emulator jobs + - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isAndroidEmulatorOnlyBuild: ${{ variables.isAndroidEmulatorOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + + # Add Mac Catalyst jobs + - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} + + # Add Linux Bionic jobs + - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml + parameters: + isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + isLinuxBionicOnlyBuild: ${{ variables.isLinuxBionicOnlyBuild }} + isRollingBuild: ${{ variables.isRollingBuild }} # Any jobs that are not specific to any platform - ${{ if eq(variables.isNotSpecificPlatformOnlyBuild, true) }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e62ae434e0522..7c138e343db57 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -31,6 +31,7 @@ schedules: pr: branches: include: + - main - release/*.* paths: include: From 227a0f31d298d048ebba5532a700534cc2083603 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Sat, 19 Aug 2023 11:13:57 -0700 Subject: [PATCH 6/6] Add failing JIT test to issues.targets --- src/tests/issues.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index aa781d6fca828..bfa2f0d40c366 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -700,6 +700,9 @@ + + https://github.com/dotnet/runtime/issues/90848 + https://github.com/dotnet/runtime/issues/89157