Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge JIT/Methodical tests into the merged runners #101317

Merged
merged 16 commits into from May 8, 2024

Conversation

jkoritzinsky
Copy link
Member

@jkoritzinsky jkoritzinsky commented Apr 19, 2024

This PR merges many of the tests in the JIT/Methodical tree into their respective merged runners. This was done using the following process:

  • Mechanically convert <CLRTestPriority>1</CLRTestPriority> to [Outerloop].
  • Mechanically convert <GCStressIncompatible>true</GCStressIncompatible> to [SkipOnCoreClr(RuntimeTestMode.AnyGCStress)]
  • Mechanically convert <JitOptimizationSensitive>true</JitOptimizationSensitive> to [SkipOnCoreClr(RuntimeTestMode.AnyJitStress)]
  • Mechanically convert <HeapVerifyIncompatible>true</HeapVerifyIncompatible> to [SkipOnCoreClr(RuntimeTestMode.HeapVerify)]
  • Remove any <RequiresProcessIsolation>true</RequiresProcessIsolation> that was only there to support the above properties.
  • Move any <Compile /> entries for tests that are not <RequiresProcessIsolation>true</RequiresProcessIsolation> into the corresponding merged runner.
  • Delete any now-unused .csproj projects.

A few tests were left with their csproj files intact as they include the same test source with different type definitions to reuse test code and merging them into the same assembly causes significant test size increase (ie. 30k line delta, +15k lines)

With this change, we remove ~1100 csproj files from the test tree (of 6982 csproj files today).

Copy link
Contributor

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

@jkoritzinsky

This comment was marked as outdated.

This comment was marked as outdated.

@jkoritzinsky jkoritzinsky marked this pull request as ready for review May 3, 2024 23:43
@jkoritzinsky jkoritzinsky requested review from a team, ivdiazsa and agocke May 3, 2024 23:44
@jkoritzinsky
Copy link
Member Author

This cuts about a minute off of the managed test builds.

@jkoritzinsky

This comment was marked as outdated.

This comment was marked as outdated.

@jkoritzinsky
Copy link
Member Author

Removing the extra test group used for building in Pri1, this now saves 4 minutes in a Pri1 build (comparing the run in the PR and a run against main).

@@ -670,7 +670,8 @@ private static int f109(int x, int y)


[Fact]
public static int TestEntryPoint()
[OuterLoop]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation got a bit messed up here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah some of these tests had really weird indentation to start with. I'll see if I can normalize it.

@ivdiazsa
Copy link
Member

ivdiazsa commented May 6, 2024

From what I'm seeing here, plus that the pipelines came back clean, it looks good to me! I think we should write a doc explaining how the new tags you added like [Outerloop] work, and whatnot. To make the process of adding new tests in the future easier 🙂

@jkoritzinsky
Copy link
Member Author

/ba-g timeouts unrelated (the mono interpreter leg timed out before any tests even started to run)

@jkoritzinsky jkoritzinsky merged commit a0eb5f2 into dotnet:main May 8, 2024
64 of 70 checks passed
@jkoritzinsky jkoritzinsky deleted the methodical-merge-csproj branch May 8, 2024 06:50
michaelgsharp pushed a commit to michaelgsharp/runtime that referenced this pull request May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants