Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Try to allocate 2 processors per test in helix. #24749

Closed
wants to merge 2 commits into from
Closed

Try to allocate 2 processors per test in helix. #24749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
956ce05
Try to allocate 2 processors per test in helix.
May 23, 2019
faac7fb
Reenable tests that were failing with timeouts under GCStress.
Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions tests/helixpublishwitharcade.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@
<TestRunNamePrefix Condition=" '$(Scenario)' != 'normal' ">$(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ </TestRunNamePrefix>
<TimeoutPerTestInMilliseconds Condition=" '$(TimeoutPerTestInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds)</TimeoutPerTestInMilliseconds>
<WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
<XUnitRunnerArgs>-parallel collections -nocolor -noshadow -xml testResults.xml</XUnitRunnerArgs>
</PropertyGroup>

<!-- WARNING: HelixPreCommand ItemGroup is intentionally minimal and should be kept that way. -->
Expand All @@ -186,6 +185,7 @@
<HelixPreCommand Include="set CLRCustomTestLauncher=%HELIX_CORRELATION_PAYLOAD%\runincontext.cmd" Condition=" '$(RunInUnloadableContext)' == 'true' " />
<HelixPreCommand Include="set __TestEnv=%HELIX_WORKITEM_PAYLOAD%\$(TestEnvFileName)" />
<HelixPreCommand Include="set __TestTimeout=$(TimeoutPerTestInMilliseconds)" Condition=" '$(TimeoutPerTestInMilliseconds)' != '' " />
<HelixPreCommand Include="set /a __MaxNumberOfThreads=((%NUMBER_OF_PROCESSORS%)+1)/2" />
<HelixPreCommand Include="type %__TestEnv%" />
</ItemGroup>

Expand All @@ -196,21 +196,26 @@
<HelixPreCommand Include="export CLRCustomTestLauncher=$HELIX_CORRELATION_PAYLOAD/runincontext.sh" Condition=" '$(RunInUnloadableContext)' == 'true' " />
<HelixPreCommand Include="export __TestEnv=$HELIX_WORKITEM_PAYLOAD/$(TestEnvFileName)" />
<HelixPreCommand Include="export __TestTimeout=$(TimeoutPerTestInMilliseconds)" Condition=" '$(TimeoutPerTestInMilliseconds)' != '' " />
<HelixPreCommand Include="export __NumberOfProcessors=%24(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)" />
<HelixPreCommand Include="export __MaxNumberOfThreads=%24(( %24((%24__NumberOfProcessors + 1)) / 2))" />
<HelixPreCommand Include="cat $__TestEnv" />
</ItemGroup>

<PropertyGroup>
<HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetsWindows)' == 'true' ">
<CoreRun>%CORE_ROOT%\CoreRun.exe</CoreRun>
<XUnitRunnerDll>%CORE_ROOT%\xunit.console.dll</XUnitRunnerDll>
<MaxNumberOfThreads>%__MaxNumberOfThreads%</MaxNumberOfThreads>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetsWindows)' != 'true' ">
<CoreRun>$CORE_ROOT/corerun</CoreRun>
<XUnitRunnerDll>$CORE_ROOT/xunit.console.dll</XUnitRunnerDll>
<MaxNumberOfThreads>$__MaxNumberOfThreads</MaxNumberOfThreads>
</PropertyGroup>

<PropertyGroup>
<HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
<XUnitRunnerArgs>-parallel collections -nocolor -noshadow -xml testResults.xml -maxthreads $(MaxNumberOfThreads)</XUnitRunnerArgs>
</PropertyGroup>

<ItemGroup Condition=" '$(UsesHelixSdk)' == 'true' ">
Expand Down
2 changes: 0 additions & 2 deletions tests/src/JIT/HardwareIntrinsics/X86/Avx/Avx_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- https://github.com/dotnet/coreclr/issues/23624 -->
<GCStressIncompatible>true</GCStressIncompatible>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions tests/src/JIT/HardwareIntrinsics/X86/Avx2/Avx2_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- It takes a long time to complete (on a non-AVX machine) -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
<!-- https://github.com/dotnet/coreclr/issues/23624 -->
<GCStressIncompatible>true</GCStressIncompatible>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions tests/src/JIT/HardwareIntrinsics/X86/Sse2/Sse2_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- https://github.com/dotnet/coreclr/issues/23624 -->
<GCStressIncompatible>true</GCStressIncompatible>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions tests/src/JIT/HardwareIntrinsics/X86/Sse41/Sse41_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- https://github.com/dotnet/coreclr/issues/23624 -->
<GCStressIncompatible>true</GCStressIncompatible>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
Expand Down