Fix GCStress timeouts in JIT/jit64#85040

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.

Sign up for GitHub

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

Merged
markples merged 13 commits into from
May 18, 2023
Merged

Fix GCStress timeouts in JIT/jit64 #85040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cb75c0b
Add GCStress striping to jit64_do
markples Apr 19, 2023
741d10a
Move a number of tests out-of-proc for GCStress
markples Apr 20, 2023
adc6e98
WaitForPendingFinalizers
markples Apr 20, 2023
35e18e6
Another RPI
markples Apr 21, 2023
0f14826
Trying something else
markples Apr 21, 2023
69132b6
another rpi
markples Apr 21, 2023
507a79e
Merge remote-tracking branch 'dotnet/main' into jit64_do
markples May 4, 2023
36fd808
Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…
markples May 5, 2023
fb640fd
fix staticness
markples May 5, 2023
2aa6584
Merge remote-tracking branch 'dotnet/main' into jit64_do
markples May 12, 2023
0992368
stripe gcstresse JIT.opt.csproj
markples May 16, 2023
a18841c
Revert "stripe gcstresse JIT.opt.csproj"
markples May 17, 2023
81c1981
Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…
markples May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 88 additions & 49 deletions src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
CodeBuilder builder = new();
AppendAliasMap(builder, aliasMap);

builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
builder.AppendLine();

builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
builder.AppendLine("void Initialize()");
using (builder.NewBracesScope())
{
builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
}
builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
using (builder.NewBracesScope())
{
builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
builder.AppendLine();

builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
using (builder.NewBracesScope())
{
builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
}
builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
using (builder.NewBracesScope())
{
builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
}
builder.AppendLine();

builder.AppendLine("filter = new (args, testExclusionList);");
builder.AppendLine("summary = new();");
builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
builder.AppendLine("outputRecorder = new(System.Console.Out);");
builder.AppendLine("System.Console.SetOut(outputRecorder);");
}
builder.AppendLine();

builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
builder.AppendLine("System.Console.SetOut(outputRecorder);");
builder.AppendLine();
builder.AppendLine("Initialize();");

// Open the stream writer for the temp log.
builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
CodeBuilder testExecutorBuilder = new();
int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

if (testInfos.Length > 0)
{
// Break tests into groups of 50 so that we don't create an unreasonably large main method
// Excessively large methods are known to take a long time to compile, and use excessive stack
// leading to test failures.
// This code breaks the tests into groups called by helper methods.
//
// Reasonably large methods are known to take a long time to compile, and use excessive stack
// leading to test failures. Groups of 50 were sufficient to avoid this problem.
//
// However, large methods also appear to causes problems when the tests are run in gcstress
// modes. Groups of 1 appear to help with this. It hasn't been directly measured but
// experimentally has improved gcstress testing.
foreach (ITestInfo test in testInfos)
{
if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
}

currentTestExecutor++;
testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
+ "System.IO.StreamWriter tempLogSw, "
+ "System.IO.StreamWriter statsCsvSw)");
testExecutorBuilder.AppendLine("{");
testExecutorBuilder.PushIndent();

builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
}
else
{
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
testExecutorBuilder.AppendLine();
}

testExecutorBuilder.AppendLine("}");
builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
}
builder.AppendLine();

builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
builder.AppendLine($@"if (workitemUploadRoot != null)");
builder.AppendLine("void Finish()");
using (builder.NewBracesScope())
{
builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
builder.AppendLine($@"if (workitemUploadRoot != null)");
using (builder.NewBracesScope())
{
builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
}
builder.AppendLine();

builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
}
builder.AppendLine();

builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
builder.AppendLine();
builder.AppendLine("Finish();");
builder.AppendLine("return 100;");
builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
CodeBuilder builder = new();
AppendAliasMap(builder, aliasMap);

builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
builder.AppendLine();

builder.AppendLine("try");
using (builder.NewBracesScope())
{
builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
}
builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
}
builder.AppendLine();

builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
builder.AppendLine("void Initialize()");
using (builder.NewBracesScope())
{
builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
builder.AppendLine("System.Console.SetOut(outputRecorder);");
builder.AppendLine();

builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
using (builder.NewBracesScope())
{
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
}
builder.AppendLine();

ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
builder.AppendLine("summary = new();");
builder.AppendLine("stopwatch = new();");
builder.AppendLine("outputRecorder = new(System.Console.Out);");
builder.AppendLine("System.Console.SetOut(outputRecorder);");
}
builder.AppendLine();

CodeBuilder testExecutorBuilder = new();
int testsLeftInCurrentTestExecutor = 0;
int currentTestExecutor = 0;
builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
using (builder.NewBracesScope())
{
builder.AppendLine("Initialize();");

// Open the stream writer for the temp log.
builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
CodeBuilder testExecutorBuilder = new();

using (builder.NewBracesScope())
{
builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

ITestReporterWrapper reporter =
new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

int testsLeftInCurrentTestExecutor = 0;
int currentTestExecutor = 0;

if (testInfos.Length > 0)
{
// Break tests into groups of 50 so that we don't create an unreasonably large main method
// Excessively large methods are known to take a long time to compile, and use excessive stack
// leading to test failures.
// This code breaks the tests into groups called by helper methods.
//
// Reasonably large methods are known to take a long time to compile, and use excessive stack
// leading to test failures. Groups of 50 were sufficient to avoid this problem.
//
// However, large methods also appear to causes problems when the tests are run in gcstress
// modes. Groups of 1 appear to help with this. It hasn't been directly measured but
// experimentally has improved gcstress testing.
foreach (ITestInfo test in testInfos)
{
if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
}

currentTestExecutor++;
testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
+ "XUnitWrapperLibrary.TestSummary summary, "
testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
+ "XUnitWrapperLibrary.TestFilter filter, "
+ "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
+ "System.Diagnostics.Stopwatch stopwatch, "
+ "System.IO.StreamWriter tempLogSw, "
+ "System.IO.StreamWriter statsCsvSw)");
testExecutorBuilder.AppendLine("{");
testExecutorBuilder.PushIndent();

builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
}
else
{
Expand Down
5 changes: 5 additions & 0 deletions src/tests/Common/XUnitWrapperLibrary/TestSummary.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
+ $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
}

public void WriteFooterToTempLog(StreamWriter tempLogSw)
{
tempLogSw.WriteLine("</assembly>");
}

public void ReportPassedTest(string name,
string containingTypeName,
string methodName,
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>Full</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>None</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>Full</DebugType>
<Optimize>False</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>Full</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>None</DebugType>
<Optimize>False</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>None</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>Full</DebugType>
<Optimize>False</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>Full</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>None</DebugType>
<Optimize>False</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>None</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>Full</DebugType>
<Optimize>False</Optimize>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/regress/ddb/113574/113574.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Needed for GC.WaitForPendingFinalizers -->
<!-- See https://github.com/dotnet/runtime/issues/68529 -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<!-- Needed for GC.WaitForPendingFinalizers -->
<!-- See https://github.com/dotnet/runtime/issues/68529 -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Only needed to run GCStress out-of-proc -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<DebugType>Full</DebugType>
<Optimize>False</Optimize>
</PropertyGroup>
Expand Down
5 changes: 5 additions & 0 deletions src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Needed for GCStressIncompatible -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<!-- Test simply runs for too long under GCStress -->
<GCStressIncompatible>true</GCStressIncompatible>

<DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
</PropertyGroup>
<PropertyGroup>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix GCStress timeouts in JIT/jit64#85040

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.

 Sign up for GitHub

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

 Merged

markples
merged 13 commits into

from

May 18, 2023
 Merged


Fix GCStress timeouts in JIT/jit64
#85040
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
cb75c0b

Add GCStress striping to jit64_do


markples Apr 19, 2023
741d10a

Move a number of tests out-of-proc for GCStress


markples Apr 20, 2023
adc6e98

WaitForPendingFinalizers


markples Apr 20, 2023
35e18e6

Another RPI


markples Apr 21, 2023
0f14826

Trying something else


markples Apr 21, 2023
69132b6

another rpi


markples Apr 21, 2023
507a79e

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 4, 2023
36fd808

Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…


markples May 5, 2023
fb640fd

fix staticness


markples May 5, 2023
2aa6584

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 12, 2023
0992368

stripe gcstresse JIT.opt.csproj


markples May 16, 2023
a18841c

Revert "stripe gcstresse JIT.opt.csproj"


markples May 17, 2023
81c1981

Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…


markples May 17, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 88 additions & 49 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 }
 builder.AppendLine();

 builder.AppendLine("filter = new (args, testExclusionList);");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();
 int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 testExecutorBuilder.AppendLine();
 }

 testExecutorBuilder.AppendLine("}");
 builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
 builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
 }
 builder.AppendLine();

 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 builder.AppendLine("void Finish()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 builder.AppendLine();
 builder.AppendLine("Finish();");
 builder.AppendLine("return 100;");
 builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine("try");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
 }
 builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = new();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 CodeBuilder testExecutorBuilder = new();
 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;
 builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();

 using (builder.NewBracesScope())
 {
 builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

 ITestReporterWrapper reporter =
 new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestSummary summary, "
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestFilter filter, "
 + "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
 + "System.Diagnostics.Stopwatch stopwatch, "
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/Common/XUnitWrapperLibrary/TestSummary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
 + $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
 }

 public void WriteFooterToTempLog(StreamWriter tempLogSw)
 {
 tempLogSw.WriteLine("</assembly>");
 }

 public void ReportPassedTest(string name,
 string containingTypeName,
 string methodName,
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/ddb/113574/113574.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GCStressIncompatible -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <!-- Test simply runs for too long under GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>

 <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix GCStress timeouts in JIT/jit64#85040

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.

 Sign up for GitHub

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

 Merged

markples
merged 13 commits into

from

May 18, 2023
 Merged


Fix GCStress timeouts in JIT/jit64
#85040
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
cb75c0b

Add GCStress striping to jit64_do


markples Apr 19, 2023
741d10a

Move a number of tests out-of-proc for GCStress


markples Apr 20, 2023
adc6e98

WaitForPendingFinalizers


markples Apr 20, 2023
35e18e6

Another RPI


markples Apr 21, 2023
0f14826

Trying something else


markples Apr 21, 2023
69132b6

another rpi


markples Apr 21, 2023
507a79e

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 4, 2023
36fd808

Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…


markples May 5, 2023
fb640fd

fix staticness


markples May 5, 2023
2aa6584

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 12, 2023
0992368

stripe gcstresse JIT.opt.csproj


markples May 16, 2023
a18841c

Revert "stripe gcstresse JIT.opt.csproj"


markples May 17, 2023
81c1981

Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…


markples May 17, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 88 additions & 49 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 }
 builder.AppendLine();

 builder.AppendLine("filter = new (args, testExclusionList);");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();
 int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 testExecutorBuilder.AppendLine();
 }

 testExecutorBuilder.AppendLine("}");
 builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
 builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
 }
 builder.AppendLine();

 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 builder.AppendLine("void Finish()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 builder.AppendLine();
 builder.AppendLine("Finish();");
 builder.AppendLine("return 100;");
 builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine("try");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
 }
 builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = new();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 CodeBuilder testExecutorBuilder = new();
 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;
 builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();

 using (builder.NewBracesScope())
 {
 builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

 ITestReporterWrapper reporter =
 new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestSummary summary, "
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestFilter filter, "
 + "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
 + "System.Diagnostics.Stopwatch stopwatch, "
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/Common/XUnitWrapperLibrary/TestSummary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
 + $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
 }

 public void WriteFooterToTempLog(StreamWriter tempLogSw)
 {
 tempLogSw.WriteLine("</assembly>");
 }

 public void ReportPassedTest(string name,
 string containingTypeName,
 string methodName,
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/ddb/113574/113574.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GCStressIncompatible -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <!-- Test simply runs for too long under GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>

 <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix GCStress timeouts in JIT/jit64#85040

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.

 Sign up for GitHub

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

 Merged

markples
merged 13 commits into

from

May 18, 2023
 Merged


Fix GCStress timeouts in JIT/jit64
#85040
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
cb75c0b

Add GCStress striping to jit64_do


markples Apr 19, 2023
741d10a

Move a number of tests out-of-proc for GCStress


markples Apr 20, 2023
adc6e98

WaitForPendingFinalizers


markples Apr 20, 2023
35e18e6

Another RPI


markples Apr 21, 2023
0f14826

Trying something else


markples Apr 21, 2023
69132b6

another rpi


markples Apr 21, 2023
507a79e

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 4, 2023
36fd808

Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…


markples May 5, 2023
fb640fd

fix staticness


markples May 5, 2023
2aa6584

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 12, 2023
0992368

stripe gcstresse JIT.opt.csproj


markples May 16, 2023
a18841c

Revert "stripe gcstresse JIT.opt.csproj"


markples May 17, 2023
81c1981

Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…


markples May 17, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 88 additions & 49 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 }
 builder.AppendLine();

 builder.AppendLine("filter = new (args, testExclusionList);");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();
 int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 testExecutorBuilder.AppendLine();
 }

 testExecutorBuilder.AppendLine("}");
 builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
 builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
 }
 builder.AppendLine();

 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 builder.AppendLine("void Finish()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 builder.AppendLine();
 builder.AppendLine("Finish();");
 builder.AppendLine("return 100;");
 builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine("try");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
 }
 builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = new();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 CodeBuilder testExecutorBuilder = new();
 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;
 builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();

 using (builder.NewBracesScope())
 {
 builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

 ITestReporterWrapper reporter =
 new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestSummary summary, "
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestFilter filter, "
 + "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
 + "System.Diagnostics.Stopwatch stopwatch, "
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/Common/XUnitWrapperLibrary/TestSummary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
 + $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
 }

 public void WriteFooterToTempLog(StreamWriter tempLogSw)
 {
 tempLogSw.WriteLine("</assembly>");
 }

 public void ReportPassedTest(string name,
 string containingTypeName,
 string methodName,
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/ddb/113574/113574.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GCStressIncompatible -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <!-- Test simply runs for too long under GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>

 <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix GCStress timeouts in JIT/jit64#85040

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.

 Sign up for GitHub

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

 Merged

markples
merged 13 commits into

from

May 18, 2023
 Merged


Fix GCStress timeouts in JIT/jit64
#85040
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
cb75c0b

Add GCStress striping to jit64_do


markples Apr 19, 2023
741d10a

Move a number of tests out-of-proc for GCStress


markples Apr 20, 2023
adc6e98

WaitForPendingFinalizers


markples Apr 20, 2023
35e18e6

Another RPI


markples Apr 21, 2023
0f14826

Trying something else


markples Apr 21, 2023
69132b6

another rpi


markples Apr 21, 2023
507a79e

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 4, 2023
36fd808

Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…


markples May 5, 2023
fb640fd

fix staticness


markples May 5, 2023
2aa6584

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 12, 2023
0992368

stripe gcstresse JIT.opt.csproj


markples May 16, 2023
a18841c

Revert "stripe gcstresse JIT.opt.csproj"


markples May 17, 2023
81c1981

Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…


markples May 17, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 88 additions & 49 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 }
 builder.AppendLine();

 builder.AppendLine("filter = new (args, testExclusionList);");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();
 int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 testExecutorBuilder.AppendLine();
 }

 testExecutorBuilder.AppendLine("}");
 builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
 builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
 }
 builder.AppendLine();

 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 builder.AppendLine("void Finish()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 builder.AppendLine();
 builder.AppendLine("Finish();");
 builder.AppendLine("return 100;");
 builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine("try");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
 }
 builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = new();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 CodeBuilder testExecutorBuilder = new();
 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;
 builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();

 using (builder.NewBracesScope())
 {
 builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

 ITestReporterWrapper reporter =
 new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestSummary summary, "
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestFilter filter, "
 + "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
 + "System.Diagnostics.Stopwatch stopwatch, "
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/Common/XUnitWrapperLibrary/TestSummary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
 + $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
 }

 public void WriteFooterToTempLog(StreamWriter tempLogSw)
 {
 tempLogSw.WriteLine("</assembly>");
 }

 public void ReportPassedTest(string name,
 string containingTypeName,
 string methodName,
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/ddb/113574/113574.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GCStressIncompatible -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <!-- Test simply runs for too long under GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>

 <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix GCStress timeouts in JIT/jit64#85040

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.

 Sign up for GitHub

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

 Merged

markples
merged 13 commits into

from

May 18, 2023
 Merged


Fix GCStress timeouts in JIT/jit64
#85040
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
cb75c0b

Add GCStress striping to jit64_do


markples Apr 19, 2023
741d10a

Move a number of tests out-of-proc for GCStress


markples Apr 20, 2023
adc6e98

WaitForPendingFinalizers


markples Apr 20, 2023
35e18e6

Another RPI


markples Apr 21, 2023
0f14826

Trying something else


markples Apr 21, 2023
69132b6

another rpi


markples Apr 21, 2023
507a79e

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 4, 2023
36fd808

Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…


markples May 5, 2023
fb640fd

fix staticness


markples May 5, 2023
2aa6584

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 12, 2023
0992368

stripe gcstresse JIT.opt.csproj


markples May 16, 2023
a18841c

Revert "stripe gcstresse JIT.opt.csproj"


markples May 17, 2023
81c1981

Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…


markples May 17, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 88 additions & 49 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 }
 builder.AppendLine();

 builder.AppendLine("filter = new (args, testExclusionList);");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();
 int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 testExecutorBuilder.AppendLine();
 }

 testExecutorBuilder.AppendLine("}");
 builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
 builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
 }
 builder.AppendLine();

 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 builder.AppendLine("void Finish()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 builder.AppendLine();
 builder.AppendLine("Finish();");
 builder.AppendLine("return 100;");
 builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine("try");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
 }
 builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = new();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 CodeBuilder testExecutorBuilder = new();
 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;
 builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();

 using (builder.NewBracesScope())
 {
 builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

 ITestReporterWrapper reporter =
 new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestSummary summary, "
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestFilter filter, "
 + "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
 + "System.Diagnostics.Stopwatch stopwatch, "
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/Common/XUnitWrapperLibrary/TestSummary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
 + $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
 }

 public void WriteFooterToTempLog(StreamWriter tempLogSw)
 {
 tempLogSw.WriteLine("</assembly>");
 }

 public void ReportPassedTest(string name,
 string containingTypeName,
 string methodName,
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/ddb/113574/113574.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GCStressIncompatible -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <!-- Test simply runs for too long under GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>

 <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix GCStress timeouts in JIT/jit64#85040

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.

 Sign up for GitHub

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

 Merged

markples
merged 13 commits into

from

May 18, 2023
 Merged


Fix GCStress timeouts in JIT/jit64
#85040
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
cb75c0b

Add GCStress striping to jit64_do


markples Apr 19, 2023
741d10a

Move a number of tests out-of-proc for GCStress


markples Apr 20, 2023
adc6e98

WaitForPendingFinalizers


markples Apr 20, 2023
35e18e6

Another RPI


markples Apr 21, 2023
0f14826

Trying something else


markples Apr 21, 2023
69132b6

another rpi


markples Apr 21, 2023
507a79e

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 4, 2023
36fd808

Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…


markples May 5, 2023
fb640fd

fix staticness


markples May 5, 2023
2aa6584

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 12, 2023
0992368

stripe gcstresse JIT.opt.csproj


markples May 16, 2023
a18841c

Revert "stripe gcstresse JIT.opt.csproj"


markples May 17, 2023
81c1981

Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…


markples May 17, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 88 additions & 49 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 }
 builder.AppendLine();

 builder.AppendLine("filter = new (args, testExclusionList);");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();
 int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 testExecutorBuilder.AppendLine();
 }

 testExecutorBuilder.AppendLine("}");
 builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
 builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
 }
 builder.AppendLine();

 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 builder.AppendLine("void Finish()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 builder.AppendLine();
 builder.AppendLine("Finish();");
 builder.AppendLine("return 100;");
 builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine("try");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
 }
 builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = new();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 CodeBuilder testExecutorBuilder = new();
 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;
 builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();

 using (builder.NewBracesScope())
 {
 builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

 ITestReporterWrapper reporter =
 new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestSummary summary, "
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestFilter filter, "
 + "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
 + "System.Diagnostics.Stopwatch stopwatch, "
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/Common/XUnitWrapperLibrary/TestSummary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
 + $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
 }

 public void WriteFooterToTempLog(StreamWriter tempLogSw)
 {
 tempLogSw.WriteLine("</assembly>");
 }

 public void ReportPassedTest(string name,
 string containingTypeName,
 string methodName,
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/ddb/113574/113574.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GCStressIncompatible -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <!-- Test simply runs for too long under GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>

 <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix GCStress timeouts in JIT/jit64#85040

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.

 Sign up for GitHub

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

 Merged

markples
merged 13 commits into

from

May 18, 2023
 Merged


Fix GCStress timeouts in JIT/jit64
#85040
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
cb75c0b

Add GCStress striping to jit64_do


markples Apr 19, 2023
741d10a

Move a number of tests out-of-proc for GCStress


markples Apr 20, 2023
adc6e98

WaitForPendingFinalizers


markples Apr 20, 2023
35e18e6

Another RPI


markples Apr 21, 2023
0f14826

Trying something else


markples Apr 21, 2023
69132b6

another rpi


markples Apr 21, 2023
507a79e

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 4, 2023
36fd808

Also change XHarnessTestRunner executors to size 1. Make Full/XHarnes…


markples May 5, 2023
fb640fd

fix staticness


markples May 5, 2023
2aa6584

Merge remote-tracking branch 'dotnet/main' into jit64_do


markples May 12, 2023
0992368

stripe gcstresse JIT.opt.csproj


markples May 16, 2023
a18841c

Revert "stripe gcstresse JIT.opt.csproj"


markples May 17, 2023
81c1981

Disable gcstress testing of JIT/opt/Regressions/Regression2_Regressio…


markples May 17, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


137 changes: 88 additions & 49 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,30 +166,43 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter;");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
 }
 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
 }
 builder.AppendLine();

 builder.AppendLine("filter = new (args, testExclusionList);");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 builder.AppendLine("XUnitWrapperLibrary.TestFilter filter = new (args, testExclusionList);");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = System.Diagnostics.Stopwatch.StartNew();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.tempLog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv"")){{");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();
 int totalTestsEmitted = 0;

Expand All@@ -209,9 +222,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -224,12 +242,14 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}(System.IO.StreamWriter tempLogSw, System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand All@@ -246,21 +266,27 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
 testExecutorBuilder.AppendLine();
 }

 testExecutorBuilder.AppendLine("}");
 builder.AppendLine("tempLogSw.WriteLine(\"</assembly>\");");
 builder.AppendLine("summary.WriteFooterToTempLog(tempLogSw);");
 }
 builder.AppendLine();

 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 builder.AppendLine("void Finish()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 builder.AppendLine($@"string testResults = summary.GetTestResultOutput(""{assemblyName}"");");
 builder.AppendLine($@"string workitemUploadRoot = System.Environment.GetEnvironmentVariable(""HELIX_WORKITEM_UPLOAD_ROOT"");");
 builder.AppendLine($@"if (workitemUploadRoot != null)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine($@"System.IO.File.WriteAllText(System.IO.Path.Combine(workitemUploadRoot, ""{assemblyName}.testResults.xml.txt""), testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 }
 builder.AppendLine();

 builder.AppendLine($@"System.IO.File.WriteAllText(""{assemblyName}.testResults.xml"", testResults);");
 builder.AppendLine();
 builder.AppendLine("Finish();");
 builder.AppendLine("return 100;");
 builder.AppendLine();

Expand All@@ -275,12 +301,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 CodeBuilder builder = new();
 AppendAliasMap(builder, aliasMap);

 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
 builder.AppendLine();

 builder.AppendLine("try");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("System.Collections.Generic.HashSet<string> testExclusionList = XUnitWrapperLibrary.TestFilter.LoadTestExclusionList();");
 builder.AppendLine($@"return await XHarnessRunnerLibrary.RunnerEntryPoint.RunTests(RunTests, ""{assemblyName}"", args.Length != 0 ? args[0] : null, testExclusionList);");
 }
 builder.AppendLine("catch(System.Exception ex)");
Expand All@@ -291,15 +320,9 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 builder.AppendLine("static XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 builder.AppendLine("void Initialize()");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("XUnitWrapperLibrary.TestSummary summary = new();");
 builder.AppendLine("System.Diagnostics.Stopwatch stopwatch = new();");
 builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 builder.AppendLine();

 builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
 using (builder.NewBracesScope())
 {
Expand All@@ -312,24 +335,43 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }
 builder.AppendLine();

 ITestReporterWrapper reporter = new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");
 builder.AppendLine("summary = new();");
 builder.AppendLine("stopwatch = new();");
 builder.AppendLine("outputRecorder = new(System.Console.Out);");
 builder.AppendLine("System.Console.SetOut(outputRecorder);");
 }
 builder.AppendLine();

 CodeBuilder testExecutorBuilder = new();
 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;
 builder.AppendLine("XUnitWrapperLibrary.TestSummary RunTests(XUnitWrapperLibrary.TestFilter filter)");
 using (builder.NewBracesScope())
 {
 builder.AppendLine("Initialize();");

 // Open the stream writer for the temp log.
 builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
 builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
 CodeBuilder testExecutorBuilder = new();

 using (builder.NewBracesScope())
 {
 builder.AppendLine($"statsCsvSw.WriteLine(\"{testInfos.Length},0,0,0\");");

 ITestReporterWrapper reporter =
 new WrapperLibraryTestSummaryReporting("summary", "filter", "outputRecorder");

 int testsLeftInCurrentTestExecutor = 0;
 int currentTestExecutor = 0;

 if (testInfos.Length > 0)
 {
 // Break tests into groups of 50 so that we don't create an unreasonably large main method
 // Excessively large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures.
 // This code breaks the tests into groups called by helper methods.
 //
 // Reasonably large methods are known to take a long time to compile, and use excessive stack
 // leading to test failures. Groups of 50 were sufficient to avoid this problem.
 //
 // However, large methods also appear to causes problems when the tests are run in gcstress
 // modes. Groups of 1 appear to help with this. It hasn't been directly measured but
 // experimentally has improved gcstress testing.
 foreach (ITestInfo test in testInfos)
 {
 if (testsLeftInCurrentTestExecutor == 0)
Expand All@@ -342,18 +384,15 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 }

 currentTestExecutor++;
 testExecutorBuilder.AppendLine($"static void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestSummary summary, "
 testExecutorBuilder.AppendLine($"void TestExecutor{currentTestExecutor}("
 + "XUnitWrapperLibrary.TestFilter filter, "
 + "XUnitWrapperLibrary.TestOutputRecorder outputRecorder, "
 + "System.Diagnostics.Stopwatch stopwatch, "
 + "System.IO.StreamWriter tempLogSw, "
 + "System.IO.StreamWriter statsCsvSw)");
 testExecutorBuilder.AppendLine("{");
 testExecutorBuilder.PushIndent();

 builder.AppendLine($"TestExecutor{currentTestExecutor}(summary, filter, outputRecorder, stopwatch, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 50; // Break test executors into groups of 50, which empirically seems to work well
 builder.AppendLine($"TestExecutor{currentTestExecutor}(filter, tempLogSw, statsCsvSw);");
 testsLeftInCurrentTestExecutor = 1; // Break test executors into groups of 1, which empirically seems to work well
 }
 else
 {
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/Common/XUnitWrapperLibrary/TestSummary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@ public void WriteHeaderToTempLog(string assemblyName, StreamWriter tempLogSw)
 + $" run-date-time=\"{_testRunStart.ToString("yyyy-MM-dd HH:mm:ss")}\">");
 }

 public void WriteFooterToTempLog(StreamWriter tempLogSw)
 {
 tempLogSw.WriteLine("</assembly>");
 }

 public void ReportPassedTest(string name,
 string containingTypeName,
 string methodName,
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>None</DebugType>
 <Optimize>True</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/opt/rngchk/RngchkStress3.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/ddb/113574/113574.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

4 changes: 4 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/102974/test_102974.ilproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
 <PropertyGroup>
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <!-- See https://github.com/dotnet/runtime/issues/68529 -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <CLRTestPriority>1</CLRTestPriority>
 </PropertyGroup>
 <PropertyGroup>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/jit64/regress/vsw/539509/test1_539509.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Only needed to run GCStress out-of-proc -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <DebugType>Full</DebugType>
 <Optimize>False</Optimize>
 </PropertyGroup>
Expand Down

5 changes: 5 additions & 0 deletions
src/tests/JIT/opt/Regressions/Regression2_Regressions.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <!-- Needed for GCStressIncompatible -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <!-- Test simply runs for too long under GCStress -->
 <GCStressIncompatible>true</GCStressIncompatible>

 <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</DisableProjectBuild>
 </PropertyGroup>
 <PropertyGroup>
Expand Down