From ab3adc7292521b3c0266190db202c14e909bcf4a Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Mon, 17 Apr 2023 12:27:08 -0700
Subject: [PATCH 1/3] Increase the number of stripes to use in stress for
 HardwareIntrinsics tests

---
 src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj  | 3 ++-
 src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
index 2c8f90272ce3d4..a44c0bfb5145dd 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <NumberOfStripesToUseInStress>20</NumberOfStripesToUseInStress>
+    <NumberOfStripesToUseInStress>32</NumberOfStripesToUseInStress>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
   </PropertyGroup>
+
   <ItemGroup>
     <MergedWrapperProjectReference Include="*/**/*.csproj" Exclude="**/*_ro.csproj" />
   </ItemGroup>
diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
index e10ee544a203e3..44c6f2f9f679f5 100644
--- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <NumberOfStripesToUseInStress>20</NumberOfStripesToUseInStress>
+    <NumberOfStripesToUseInStress>32</NumberOfStripesToUseInStress>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm'">true</GCStressIncompatible>
   </PropertyGroup>

From b9577e95ed308e621cb49d3e8392e9335f032352 Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Mon, 17 Apr 2023 13:01:37 -0700
Subject: [PATCH 2/3] Reconfigure the HWIntrinsic tests to run more selectively

---
 .../Arm/Directory.Build.props                 | 10 ++++++++++
 .../Arm/Directory.Build.targets               |  6 ------
 .../HardwareIntrinsics/Directory.Build.props  |  1 +
 .../Directory.Build.targets                   | 20 +++++++++++++++++++
 .../General/Vector256/Vector256_r.csproj      |  7 +------
 .../General/Vector256/Vector256_ro.csproj     |  9 ++-------
 .../General/Vector256_1/Vector256_1_r.csproj  |  8 +-------
 .../General/Vector256_1/Vector256_1_ro.csproj |  8 +-------
 .../General/Vector512/Vector512_r.csproj      |  6 +-----
 .../General/Vector512/Vector512_ro.csproj     |  8 ++------
 .../General/Vector512_1/Vector512_1_r.csproj  |  6 +-----
 .../General/Vector512_1/Vector512_1_ro.csproj |  8 ++------
 .../General/Vector64/Vector64_r.csproj        |  6 +-----
 .../General/Vector64/Vector64_ro.csproj       |  6 +-----
 .../General/Vector64_1/Vector64_1_r.csproj    |  6 +-----
 .../General/Vector64_1/Vector64_1_ro.csproj   |  6 +-----
 .../X86/Directory.Build.props                 | 10 ++++++++++
 .../X86/Directory.Build.targets               |  7 -------
 18 files changed, 56 insertions(+), 82 deletions(-)
 create mode 100644 src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.props
 create mode 100644 src/tests/JIT/HardwareIntrinsics/Directory.Build.targets
 create mode 100644 src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.props

diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.props b/src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.props
new file mode 100644
index 00000000000000..23625a46fc4cec
--- /dev/null
+++ b/src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <HWITestsArm64Only>true</HWITestsArm64Only>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.targets b/src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.targets
index d72d49174ce0d0..eca47c9c796adc 100644
--- a/src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.targets
+++ b/src/tests/JIT/HardwareIntrinsics/Arm/Directory.Build.targets
@@ -3,12 +3,6 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
 
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'arm64'">0</CLRTestPriority>
-  </PropertyGroup>
-
   <PropertyGroup>
     <GeneratedHWIntrinsicTestDirectory Condition="'$(GeneratedHWIntrinsicTestDirectory)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName)/gen/</GeneratedHWIntrinsicTestDirectory>
     <GeneratedHWIntrinsicTestListFile Condition="'$(GeneratedHWIntrinsicTestListFile)' == ''">$(GeneratedHWIntrinsicTestDirectory)GeneratedHWIntrinsicTestList.txt</GeneratedHWIntrinsicTestListFile>
diff --git a/src/tests/JIT/HardwareIntrinsics/Directory.Build.props b/src/tests/JIT/HardwareIntrinsics/Directory.Build.props
index 81ddb5af5a309e..8df9869fb86991 100644
--- a/src/tests/JIT/HardwareIntrinsics/Directory.Build.props
+++ b/src/tests/JIT/HardwareIntrinsics/Directory.Build.props
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="..\..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
diff --git a/src/tests/JIT/HardwareIntrinsics/Directory.Build.targets b/src/tests/JIT/HardwareIntrinsics/Directory.Build.targets
new file mode 100644
index 00000000000000..e10bfde46063a7
--- /dev/null
+++ b/src/tests/JIT/HardwareIntrinsics/Directory.Build.targets
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup Condition="'$(HWITestsArm64Only)' == 'true'">
+    <!-- Various platforms will always throw, so we don't want to spend cycles running tests unnecessarily -->
+    <!-- We don't need to worry about coverage as we have a number of stress tests that can disable intrinsics per ISA and run on the normally supported platforms -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm64'">true</CLRTestTargetUnsupported>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(HWITestsXarchOnly)' == 'true'">
+    <!-- Various platforms will always throw, so we don't want to spend cycles running tests unnecessarily -->
+    <!-- We don't need to worry about coverage as we have a number of stress tests that can disable intrinsics per ISA and run on the normally supported platforms -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64' AND '$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
+    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' == 'true' AND $(MSBuildProjectName.StartsWith('Avx512'))">true</CLRTestTargetUnsupported>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_r.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_r.csproj
index 09b38909db7125..b525dacf167c49 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_r.csproj
@@ -1,17 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
     <Optimize />
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x64'">0</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true'">0</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector256.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj
index b76e7ea9ee3b37..b525dacf167c49 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj
@@ -1,16 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x64'">0</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true'">0</CLRTestPriority>
+    <Optimize />
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector256.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj
index 688c23b52914f1..24486d9d9555c7 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
     <!-- https://github.com/dotnet/runtime/issues/57352 -->
     <MonoAotIncompatible>true</MonoAotIncompatible>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
@@ -10,12 +10,6 @@
     <DebugType>Embedded</DebugType>
     <Optimize />
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x64'">0</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true'">0</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector256_1.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_ro.csproj
index 10a0920bb91530..32ce1332e61a01 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_ro.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
     <!-- https://github.com/dotnet/runtime/issues/57352 -->
     <MonoAotIncompatible>true</MonoAotIncompatible>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
@@ -10,12 +10,6 @@
     <DebugType>Embedded</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x64'">0</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true'">0</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector256_1.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_r.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_r.csproj
index 5bd89c674d2a87..681f7971f5f5cc 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_r.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
     <Optimize />
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <!-- Unlock other types, Vector512 is only accelerated on a single small pool of machines, so it is always outerloop -->
-    <CLRTestPriority>1</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector512.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj
index 097a1aef365035..681f7971f5f5cc 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj
@@ -1,15 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <!-- Unlock other types, Vector512 is only accelerated on a single small pool of machines, so it is always outerloop -->
-    <CLRTestPriority>1</CLRTestPriority>
+    <Optimize />
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector512.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_r.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_r.csproj
index 2529fc56bf8631..ee8b16107dc8f5 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_r.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
     <Optimize />
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <!-- Unlock other types, Vector512 is only accelerated on a single small pool of machines, so it is always outerloop -->
-    <CLRTestPriority>1</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector512_1.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj
index 66c501a722e2d6..ee8b16107dc8f5 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj
@@ -1,15 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <!-- Unlock other types, Vector512 is only accelerated on a single small pool of machines, so it is always outerloop -->
-    <CLRTestPriority>1</CLRTestPriority>
+    <Optimize />
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector512_1.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_r.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_r.csproj
index bb555014d8ff33..7e05ced6512f17 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_r.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsArm64Only>true</HWITestsArm64Only>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
     <Optimize />
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'arm64'">0</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector64.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_ro.csproj
index f41eecd53c7f4a..1713e654022273 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector64/Vector64_ro.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsArm64Only>true</HWITestsArm64Only>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'arm64'">0</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector64.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_r.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_r.csproj
index 676fb4cfe89b13..aeeaf5a1738fee 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_r.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsArm64Only>true</HWITestsArm64Only>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
     <Optimize />
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'arm64'">0</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector64_1.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_ro.csproj
index dce5b934909f1d..2310470cc212fe 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector64_1/Vector64_1_ro.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <HWITestsArm64Only>true</HWITestsArm64Only>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'arm64'">0</CLRTestPriority>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector64_1.cs" />
     <Compile Include="..\Shared\Program.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.props b/src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.props
new file mode 100644
index 00000000000000..e3e1bac79c32c5
--- /dev/null
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <HWITestsXarchOnly>true</HWITestsXarchOnly>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.targets b/src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.targets
index 77fd5e210fc556..933c13be21e6a0 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.targets
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Directory.Build.targets
@@ -3,13 +3,6 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
 
-  <PropertyGroup>
-    <!-- We have a lot of tests here so run them in outerloop on platforms where they aren't accelerated -->
-    <CLRTestPriority>1</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x64'">0</CLRTestPriority>
-    <CLRTestPriority Condition="'$(TargetArchitecture)' == 'x86' AND '$(TargetsWindows)' == 'true'">0</CLRTestPriority>
-  </PropertyGroup>
-
   <PropertyGroup>
     <GeneratedHWIntrinsicTestDirectory Condition="'$(GeneratedHWIntrinsicTestDirectory)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName)/gen/</GeneratedHWIntrinsicTestDirectory>
     <GeneratedHWIntrinsicTestListFile Condition="'$(GeneratedHWIntrinsicTestListFile)' == ''">$(GeneratedHWIntrinsicTestDirectory)GeneratedHWIntrinsicTestList.txt</GeneratedHWIntrinsicTestListFile>

From f78e75998bfe184af3d4c4706c5e3a7fc6762b70 Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Mon, 17 Apr 2023 13:17:11 -0700
Subject: [PATCH 3/3] Fix a _ro.csproj

---
 .../HardwareIntrinsics/General/Vector256/Vector256_ro.csproj    | 2 +-
 .../HardwareIntrinsics/General/Vector512/Vector512_ro.csproj    | 2 +-
 .../General/Vector512_1/Vector512_1_ro.csproj                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj
index b525dacf167c49..9194d3a9763a51 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector256/Vector256_ro.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
-    <Optimize />
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector256.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj
index 681f7971f5f5cc..d458d5bf486149 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector512/Vector512_ro.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
-    <Optimize />
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector512.cs" />
diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj
index ee8b16107dc8f5..4b8799ae937abd 100644
--- a/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/General/Vector512_1/Vector512_1_ro.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>
-    <Optimize />
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.Vector512_1.cs" />