Skip to content

Renable running Arm64 test cases in CI #83948

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
kunalspathak merged 3 commits into from
Mar 28, 2023
Merged

Renable running Arm64 test cases in CI #83948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90488ec
remove _IncludeArm64HWIntrinsicTests restriction
kunalspathak Mar 26, 2023
dbec5e5
Remove _IncludeXarchHWIntrinsicTests
kunalspathak Mar 27, 2023
090f611
Remove comments
kunalspathak Mar 28, 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
19 changes: 0 additions & 19 deletions src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,9 @@
<NumberOfStripesToUseInStress>20</NumberOfStripesToUseInStress>
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>

<_IncludeArm64HWIntrinsicTests>false</_IncludeArm64HWIntrinsicTests>
<_IncludeArm64HWIntrinsicTests Condition="'$(CLRTestPriorityToBuild)' &gt;= '1' OR '$(TargetArchitecture)' == 'arm64'">true</_IncludeArm64HWIntrinsicTests>
<_IncludeXarchHWIntrinsicTests>false</_IncludeXarchHWIntrinsicTests>
<_IncludeXarchHWIntrinsicTests Condition="'$(CLRTestPriorityToBuild)' &gt;= '1' OR '$(TargetArchitecture)' == 'x64' OR ('$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true')">true</_IncludeXarchHWIntrinsicTests>
</PropertyGroup>
<ItemGroup>
<!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
<!-- For most of these, that just involves excluding the projects when the architecture is mismatched -->
<!-- For Vector512, we only have a very small pool of machines with acceleration support, so they are always outerloop -->

<MergedWrapperProjectReference Include="*/**/*.csproj" Exclude="**/*_ro.csproj" />

<MergedWrapperProjectReference Remove="Arm/**/*.csproj" Condition="'$(_IncludeArm64HWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector64/**/*.csproj" Condition="'$(_IncludeArm64HWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector64_1/**/*.csproj" Condition="'$(_IncludeArm64HWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector256/**/*.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector256_1/**/*.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector512/**/*.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector512_1/**/*.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="X86/**/*.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />

</ItemGroup>

<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
Expand Down
18 changes: 0 additions & 18 deletions src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,10 @@
<NumberOfStripesToUseInStress>20</NumberOfStripesToUseInStress>
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>

<_IncludeArm64HWIntrinsicTests>false</_IncludeArm64HWIntrinsicTests>
<_IncludeArm64HWIntrinsicTests Condition="'$(CLRTestPriorityToBuild)' &gt;= '1' OR '$(TargetArchitecture)' == 'arm64'">true</_IncludeArm64HWIntrinsicTests>
<_IncludeXarchHWIntrinsicTests>false</_IncludeXarchHWIntrinsicTests>
<_IncludeXarchHWIntrinsicTests Condition="'$(CLRTestPriorityToBuild)' &gt;= '1' OR '$(TargetArchitecture)' == 'x64' OR ('$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true')">true</_IncludeXarchHWIntrinsicTests>
</PropertyGroup>

<ItemGroup>
<!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
<!-- For most of these, that just involves excluding the projects when the architecture is mismatched -->
<!-- For Vector512, we only have a very small pool of machines with acceleration support, so they are always outerloop -->

<MergedWrapperProjectReference Include="*/**/*_ro.csproj" />

<MergedWrapperProjectReference Remove="Arm/**/*_ro.csproj" Condition="'$(_IncludeArm64HWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector64/**/*_ro.csproj" Condition="'$(_IncludeArm64HWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector64_1/**/*_ro.csproj" Condition="'$(_IncludeArm64HWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector256/**/*_ro.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector256_1/**/*_ro.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector512/**/*_ro.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="General/Vector512_1/**/*_ro.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
<MergedWrapperProjectReference Remove="X86/**/*_ro.csproj" Condition="'$(_IncludeXarchHWIntrinsicTests)' != 'true'" />
</ItemGroup>

<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
Expand Down