From 90488ec07aa1ffb8b8c101e0e869363f18a0f8c6 Mon Sep 17 00:00:00 2001
From: Kunal Pathak <Kunal.Pathak@microsoft.com>
Date: Sun, 26 Mar 2023 11:43:25 -0700
Subject: [PATCH 1/3] remove _IncludeArm64HWIntrinsicTests restriction

---
 src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj | 5 -----
 .../JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj      | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
index 4e87ff605efc7d..c07a838fec5f3f 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
@@ -4,8 +4,6 @@
     <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>
@@ -16,9 +14,6 @@
 
     <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'" />
diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
index 25f6749739539b..8108b2787305ab 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
@@ -4,8 +4,6 @@
     <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>
@@ -17,9 +15,6 @@
 
     <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'" />

From dbec5e5af9171238aaedc206b0c4eec5b96fa4b6 Mon Sep 17 00:00:00 2001
From: Kunal Pathak <Kunal.Pathak@microsoft.com>
Date: Mon, 27 Mar 2023 10:50:47 -0700
Subject: [PATCH 2/3] Remove _IncludeXarchHWIntrinsicTests

---
 .../JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj   | 9 ---------
 .../JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj  | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
index c07a838fec5f3f..16654d40944b8e 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
@@ -3,9 +3,6 @@
     <NumberOfStripesToUseInStress>20</NumberOfStripesToUseInStress>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
-
-    <_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 -->
@@ -14,12 +11,6 @@
 
     <MergedWrapperProjectReference Include="*/**/*.csproj" Exclude="**/*_ro.csproj" />
 
-    <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" />
diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
index 8108b2787305ab..cfab3f7913a597 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
@@ -3,9 +3,6 @@
     <NumberOfStripesToUseInStress>20</NumberOfStripesToUseInStress>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
-
-    <_IncludeXarchHWIntrinsicTests>false</_IncludeXarchHWIntrinsicTests>
-    <_IncludeXarchHWIntrinsicTests Condition="'$(CLRTestPriorityToBuild)' &gt;= '1' OR '$(TargetArchitecture)' == 'x64' OR ('$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true')">true</_IncludeXarchHWIntrinsicTests>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,12 +11,6 @@
     <!-- 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="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" />

From 090f611afb35c8a53bae923bf2862c5fd03b0b9e Mon Sep 17 00:00:00 2001
From: Kunal Pathak <Kunal.Pathak@microsoft.com>
Date: Mon, 27 Mar 2023 19:02:11 -0700
Subject: [PATCH 3/3] Remove comments

---
 src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj | 5 -----
 .../JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj      | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
index 16654d40944b8e..2c8f90272ce3d4 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
@@ -5,12 +5,7 @@
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
   </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" />
-
   </ItemGroup>
 
   <Import Project="$(TestSourceDir)MergedTestRunner.targets" />
diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
index cfab3f7913a597..e10ee544a203e3 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
@@ -6,10 +6,6 @@
   </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" />
   </ItemGroup>