From 24f6bddcd6639108ebcb28b5bf78a9f2bff9a147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 14 Jan 2025 06:58:06 +0100 Subject: [PATCH 01/10] Start regular pri-1 tests runs with native AOT --- eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml | 10 +++++----- src/tests/Common/helixpublishwitharcade.proj | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml b/eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml index c39c6d81a45b90..e83192e6f9b18c 100644 --- a/eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml +++ b/eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml @@ -155,7 +155,7 @@ extends: testRunNamePrefixSuffix: NativeAOT_Checked_SpeedOpt_$(_BuildConfig) # - # CoreCLR NativeAOT checked build and Pri0 tests + # CoreCLR NativeAOT checked build and Pri1 tests # - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -173,8 +173,8 @@ extends: - name: timeoutPerTestCollectionInMinutes value: 180 jobParameters: - timeoutInMinutes: 300 # doesn't normally take this long, but we have had Helix queues backed up for over an hour - nameSuffix: NativeAOT_Pri0 + timeoutInMinutes: 480 + nameSuffix: NativeAOT_Pri1 buildArgs: -s clr.aot+libs -rc $(_BuildConfig) -lc Release /p:RunAnalyzers=false postBuildSteps: - template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml @@ -182,11 +182,11 @@ extends: creator: dotnet-bot testBuildArgs: 'nativeaot /p:IlcUseServerGc=false' liveLibrariesBuildConfig: Release - testRunNamePrefixSuffix: NativeAOT_Pri0_$(_BuildConfig) + testRunNamePrefixSuffix: NativeAOT_Pri1_$(_BuildConfig) extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml parameters: - testGroup: innerloop + testGroup: outerloop liveLibrariesBuildConfig: Release # diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index 5a44eaeb794639..a47d3e00f56148 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -448,7 +448,7 @@ - + From 0a3fd5c11d75bb4d8be7b41694e0e2c4980ed8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Wed, 15 Jan 2025 09:23:14 +0100 Subject: [PATCH 02/10] Debug --- .../common/templates/runtimes/send-to-helix-inner-step.yml | 4 ++-- .../common/templates/runtimes/send-to-helix-step.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 12e3f68baafb94..63e8b684a52023 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -8,14 +8,14 @@ parameters: steps: - ${{ if eq(parameters.osGroup, 'windows') }}: - - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 --restore -ci -warnaserror 0 ${{ parameters.sendParams }} + - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 --restore -ci -warnaserror 0 -verbosity diagnostic ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Windows) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }}) env: ${{ parameters.environment }} continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }} - ${{ if ne(parameters.osGroup, 'windows') }}: - - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --restore --ci --warnaserror false ${{ parameters.sendParams }} + - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --restore --ci --warnaserror false --verbosity diagnostic ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Unix) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }}) env: ${{ parameters.environment }} diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml index a45c3817d13b53..a312780047676a 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml @@ -56,6 +56,7 @@ steps: _TieringTest: ${{ parameters.tieringTest }} _HotColdSplitting: ${{ parameters.hotColdSplitting }} _NativeAotTest: ${{ parameters.nativeAotTest }} + DOTNET_ThreadPool_ForceMaxWorkerThreads: 1 _LongRunningGcTests: ${{ parameters.longRunningGcTests }} _GcSimulatorTests: ${{ parameters.gcSimulatorTests }} _Scenarios: ${{ join(',', parameters.scenarios) }} From 6f98f65a1d2f4fd5f3b96368b0cbf97254fbad7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Wed, 15 Jan 2025 05:56:04 -0800 Subject: [PATCH 03/10] Change verbosity to normal in msbuild scripts --- .../common/templates/runtimes/send-to-helix-inner-step.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 63e8b684a52023..aa47f952695d45 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -8,14 +8,14 @@ parameters: steps: - ${{ if eq(parameters.osGroup, 'windows') }}: - - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 --restore -ci -warnaserror 0 -verbosity diagnostic ${{ parameters.sendParams }} + - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 --restore -ci -warnaserror 0 -verbosity normal ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Windows) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }}) env: ${{ parameters.environment }} continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }} - ${{ if ne(parameters.osGroup, 'windows') }}: - - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --restore --ci --warnaserror false --verbosity diagnostic ${{ parameters.sendParams }} + - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --restore --ci --warnaserror false --verbosity normal ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Unix) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }}) env: ${{ parameters.environment }} From f6ce627ec5ec978b647e171acc56526c9d5a9533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Fri, 31 Jan 2025 10:29:22 +0100 Subject: [PATCH 04/10] Comment out DOTNET_ThreadPool_ForceMaxWorkerThreads --- eng/pipelines/common/templates/runtimes/send-to-helix-step.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml index a312780047676a..fab44817527283 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml @@ -56,7 +56,7 @@ steps: _TieringTest: ${{ parameters.tieringTest }} _HotColdSplitting: ${{ parameters.hotColdSplitting }} _NativeAotTest: ${{ parameters.nativeAotTest }} - DOTNET_ThreadPool_ForceMaxWorkerThreads: 1 + # DOTNET_ThreadPool_ForceMaxWorkerThreads: 1 _LongRunningGcTests: ${{ parameters.longRunningGcTests }} _GcSimulatorTests: ${{ parameters.gcSimulatorTests }} _Scenarios: ${{ join(',', parameters.scenarios) }} From 492e6e9200754658941189002282d606bc05e854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 6 Feb 2025 07:13:37 +0100 Subject: [PATCH 05/10] Undo debug --- .../common/templates/runtimes/send-to-helix-inner-step.yml | 4 ++-- .../common/templates/runtimes/send-to-helix-step.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index aa47f952695d45..12e3f68baafb94 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -8,14 +8,14 @@ parameters: steps: - ${{ if eq(parameters.osGroup, 'windows') }}: - - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 --restore -ci -warnaserror 0 -verbosity normal ${{ parameters.sendParams }} + - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 --restore -ci -warnaserror 0 ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Windows) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }}) env: ${{ parameters.environment }} continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }} - ${{ if ne(parameters.osGroup, 'windows') }}: - - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --restore --ci --warnaserror false --verbosity normal ${{ parameters.sendParams }} + - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --restore --ci --warnaserror false ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Unix) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }}) env: ${{ parameters.environment }} diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml index f3093db8a1751d..989ccdc9319a92 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml @@ -57,7 +57,6 @@ steps: _TieringTest: ${{ parameters.tieringTest }} _HotColdSplitting: ${{ parameters.hotColdSplitting }} _NativeAotTest: ${{ parameters.nativeAotTest }} - # DOTNET_ThreadPool_ForceMaxWorkerThreads: 1 _LongRunningGcTests: ${{ parameters.longRunningGcTests }} _GcSimulatorTests: ${{ parameters.gcSimulatorTests }} _Scenarios: ${{ join(',', parameters.scenarios) }} From dc8b16406b6477bfad5541853cac62cdc31d9fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 6 Feb 2025 07:16:22 +0100 Subject: [PATCH 06/10] Exclude failing x86 test --- src/tests/issues.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 6bd846800fce0c..e9bebed2893789 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1152,6 +1152,9 @@ https://github.com/dotnet/runtime/issues/101363 + + https://github.com/dotnet/runtime/issues/112228 + From bc35582ff82524cbeb8171c2e0f739488110cd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 6 Feb 2025 23:29:15 +0100 Subject: [PATCH 07/10] Disable another test --- src/tests/issues.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index e9bebed2893789..2a096e52099657 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1155,6 +1155,9 @@ https://github.com/dotnet/runtime/issues/112228 + + https://github.com/dotnet/runtime/issues/112251 + From 76c37e73d91a6fb07e4a742d26934d70e225bfbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 6 Feb 2025 23:29:23 +0100 Subject: [PATCH 08/10] Hm --- .../DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs index b531ea2a02ac2e..85a507d6a1dd90 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMReadyToRunHelperNode.cs @@ -127,9 +127,6 @@ protected override void EmitCode(NodeFactory factory, ref ARMEmitter encoder, bo MethodDesc targetMethod = (MethodDesc)Target; if (targetMethod.OwningType.IsInterface) { - // Not tested - encoder.EmitDebugBreak(); - encoder.EmitMOV(encoder.TargetRegister.Arg1, factory.InterfaceDispatchCell(targetMethod)); encoder.EmitJMP(factory.ExternSymbol("RhpResolveInterfaceMethod")); } From b5b2ae7aa0e42f18e3222b211afbe45dd1dbaecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Fri, 7 Feb 2025 08:49:52 +0100 Subject: [PATCH 09/10] Update issues.targets --- src/tests/issues.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 2a096e52099657..ea4356546edf31 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1051,6 +1051,7 @@ + From 41322489921d9771ef8cd86f7c9770c5bee8a3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Sat, 8 Feb 2025 07:36:49 +0900 Subject: [PATCH 10/10] Remove outdated exclude list entries --- src/tests/issues.targets | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index ea4356546edf31..73f392cc50a517 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1153,12 +1153,6 @@ https://github.com/dotnet/runtime/issues/101363 - - https://github.com/dotnet/runtime/issues/112228 - - - https://github.com/dotnet/runtime/issues/112251 -