From 475cd04b1dfc787f2f3090488a57e9439023f05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Sat, 8 Feb 2025 11:49:39 +0100 Subject: [PATCH] Start regular pri-1 tests runs with native AOT (#111391) --- eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml | 10 +++++----- .../Target_ARM/ARMReadyToRunHelperNode.cs | 3 --- src/tests/issues.targets | 1 + 3 files changed, 6 insertions(+), 8 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/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")); } diff --git a/src/tests/issues.targets b/src/tests/issues.targets index b4f92feee7012c..8982fc0fbe7a04 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1051,6 +1051,7 @@ +