diff --git a/src/tests/Common/testgrouping.proj b/src/tests/Common/testgrouping.proj
index bd6da5968c054..6c32c7f7e6195 100644
--- a/src/tests/Common/testgrouping.proj
+++ b/src/tests/Common/testgrouping.proj
@@ -25,18 +25,158 @@
$(TestBinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll
-
- JIT.HardwareIntrinsics.Arm
+
+ JIT.HardwareIntrinsics.Arm.AdvSimd
$(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
-
- JIT.HardwareIntrinsics.General
+
+ JIT.HardwareIntrinsics.Arm.Aes
$(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
-
- JIT.HardwareIntrinsics.X86
+
+ JIT.HardwareIntrinsics.Arm.ArmBase
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.Arm.Crc32
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.Arm.Dp
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.Arm.Rdm
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.Arm.Sha1
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.Arm.Sha256
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.General.NotSupported
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.General.Vector64
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.General.Vector128
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.General.Vector256
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Aes
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Avx1
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Avx2
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.AvxVnni
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Bmi1
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Bmi2
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Fma
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.General
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Lzcnt
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Pclmulqdq
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Popcnt
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Regression
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Sse1
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Sse2
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Sse3
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Sse41
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Sse42
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.Ssse3
+ $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
+
+
+
+ JIT.HardwareIntrinsics.X86.X86Base
$(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Add.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Add.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Add.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Add.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Add.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Add.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Add.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Add.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/AddSubtract.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/AddSubtract.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/AddSubtract.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/AddSubtract.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/AddSubtract.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/AddSubtract.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/AddSubtract.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/AddSubtract.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/And.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/And.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/And.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/And.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/And.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/And.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/And.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/And.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/AndNot.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/AndNot.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/AndNot.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/AndNot.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/AndNot.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/AndNot.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/AndNot.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/AndNot.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Avx_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Avx_r.csproj
similarity index 99%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Avx_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Avx_r.csproj
index 4e5e4f001a692..e3787a57523ed 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Avx_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Avx_r.csproj
@@ -156,7 +156,7 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Avx_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Avx_ro.csproj
similarity index 99%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Avx_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Avx_ro.csproj
index c00588835b6c0..f232c1c7fc691 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Avx_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Avx_ro.csproj
@@ -154,7 +154,7 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Blend.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Blend.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Blend.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Blend.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/BlendVariable.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/BlendVariable.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/BlendVariable.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/BlendVariable.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/BlendVariable.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/BlendVariable.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/BlendVariable.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/BlendVariable.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Blend_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Blend_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Blend_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Blend_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Blend_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Blend_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Blend_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Blend_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastScalarToVector128.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastScalarToVector128.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastScalarToVector128.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastScalarToVector128.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastScalarToVector256.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastScalarToVector256.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastScalarToVector256.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastScalarToVector256.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastScalarToVector256.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastScalarToVector256.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastScalarToVector256.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastScalarToVector256.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastVector128ToVector256.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastVector128ToVector256.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastVector128ToVector256.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastVector128ToVector256.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastVector128ToVector256.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastVector128ToVector256.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/BroadcastVector128ToVector256.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/BroadcastVector128ToVector256.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Ceiling.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Ceiling.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Ceiling.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Ceiling.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Ceiling.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Ceiling.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Ceiling.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Ceiling.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Compare.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Compare.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Compare.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Compare.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareEqual.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareEqual.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareEqual.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareEqual.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThan.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThan.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThan.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThan.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThanOrEqual.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThanOrEqual.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThanOrEqual.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThanOrEqual.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareGreaterThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareGreaterThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThan.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThan.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThan.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThan.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThanOrEqual.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThanOrEqual.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThanOrEqual.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThanOrEqual.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareLessThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareLessThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotEqual.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotEqual.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotEqual.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotEqual.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThan.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThan.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThan.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThan.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThanOrEqual.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThanOrEqual.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThanOrEqual.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThanOrEqual.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotGreaterThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotGreaterThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThan.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThan.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThan.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThan.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThanOrEqual.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThanOrEqual.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThanOrEqual.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThanOrEqual.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareNotLessThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareNotLessThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareOrdered.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareOrdered.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareOrdered.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareOrdered.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareOrdered.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareOrdered.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareOrdered.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareOrdered.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareScalar.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareScalar.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareScalar.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareScalar.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareScalar_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareScalar_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareScalar_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareScalar_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareScalar_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareScalar_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareScalar_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareScalar_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareUnordered.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareUnordered.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareUnordered.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareUnordered.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareUnordered.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareUnordered.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/CompareUnordered.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/CompareUnordered.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Compare_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Compare_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Compare_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Compare_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Compare_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Compare_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Compare_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Compare_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector128Int32.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector128Int32.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector128Int32.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector128Int32.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector128Int32WithTruncation.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector128Int32WithTruncation.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector128Int32WithTruncation.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector128Int32WithTruncation.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector128Single.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector128Single.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector128Single.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector128Single.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Double.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Double.Int32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Double.Int32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Double.Int32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Double.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Double.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Double.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Double.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Int32.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Int32.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Int32.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Int32.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Int32WithTruncation.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Int32WithTruncation.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Int32WithTruncation.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Int32WithTruncation.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Single.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Single.Int32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector256Single.Int32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector256Single.Int32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ConvertToVector_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ConvertToVector_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Divide.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Divide.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Divide.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Divide.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Divide.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Divide.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Divide.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Divide.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/DotProduct.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/DotProduct.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/DotProduct.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/DotProduct.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/DotProduct_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/DotProduct_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/DotProduct_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/DotProduct_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/DotProduct_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/DotProduct_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/DotProduct_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/DotProduct_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/DuplicateEvenIndexed.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/DuplicateEvenIndexed.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/DuplicateEvenIndexed.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/DuplicateEvenIndexed.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/DuplicateEvenIndexed.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/DuplicateEvenIndexed.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/DuplicateEvenIndexed.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/DuplicateEvenIndexed.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/DuplicateOddIndexed.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/DuplicateOddIndexed.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/DuplicateOddIndexed.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/DuplicateOddIndexed.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Byte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Byte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Byte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Byte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Int16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Int16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Int16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Int16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Int32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Int32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Int32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Int64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Int64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Int64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Int64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.SByte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.SByte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.SByte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.SByte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.UInt16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.UInt16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.UInt16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.UInt16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.UInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.UInt32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.UInt32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.UInt32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.UInt64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.UInt64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtendToVector256.UInt64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtendToVector256.UInt64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Byte.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Byte.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Byte.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Byte.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Double.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Double.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Double.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Double.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Int16.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Int16.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Int16.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Int16.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Int32.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Int32.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Int32.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Int32.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Int64.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Int64.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Int64.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Int64.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.SByte.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.SByte.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.SByte.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.SByte.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Single.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Single.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.Single.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.Single.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.UInt16.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.UInt16.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.UInt16.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.UInt16.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.UInt32.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.UInt32.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.UInt32.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.UInt32.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.UInt64.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.UInt64.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/ExtractVector128.UInt64.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/ExtractVector128.UInt64.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Floor.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Floor.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Floor.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Floor.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Floor.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Floor.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Floor.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Floor.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalAdd.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalAdd.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalAdd.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalAdd.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalAdd_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalAdd_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalAdd_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalAdd_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalAdd_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalAdd_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalAdd_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalAdd_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalSubtract.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalSubtract.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalSubtract.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalSubtract.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalSubtract_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalSubtract_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalSubtract_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalSubtract_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalSubtract_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalSubtract_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/HorizontalSubtract_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/HorizontalSubtract_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Byte.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Byte.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Byte.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Byte.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Double.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Double.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Double.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Double.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Int16.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Int16.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Int16.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Int16.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Int32.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Int32.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Int32.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Int32.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Int64.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Int64.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Int64.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Int64.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.SByte.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.SByte.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.SByte.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.SByte.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Single.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Single.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.Single.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.Single.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.UInt16.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.UInt16.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.UInt16.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.UInt16.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.UInt32.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.UInt32.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.UInt32.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.UInt32.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.UInt64.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.UInt64.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/InsertVector128.UInt64.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/InsertVector128.UInt64.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadAlignedVector256.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadAlignedVector256.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadAlignedVector256.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadAlignedVector256.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadAlignedVector256_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadAlignedVector256_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadAlignedVector256_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadAlignedVector256_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadAlignedVector256_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadAlignedVector256_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadAlignedVector256_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadAlignedVector256_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadDquVector256.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadDquVector256.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadDquVector256.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadDquVector256.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadDquVector256_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadDquVector256_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadDquVector256_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadDquVector256_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadDquVector256_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadDquVector256_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadDquVector256_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadDquVector256_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Byte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Byte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Byte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Byte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Int16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Int16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Int16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Int16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Int32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Int32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Int32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Int64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Int64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Int64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Int64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.SByte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.SByte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.SByte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.SByte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.UInt16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.UInt16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.UInt16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.UInt16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.UInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.UInt32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.UInt32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.UInt32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.UInt64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.UInt64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/LoadVector256.UInt64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/LoadVector256.UInt64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskLoad.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskLoad.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskLoad.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskLoad.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskLoad.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskLoad.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskLoad.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskLoad.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskStore.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskStore.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskStore.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskStore.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskStore.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskStore.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/MaskStore.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/MaskStore.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Max.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Max.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Max.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Max.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Max.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Max.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Max.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Max.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Min.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Min.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Min.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Min.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Min.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Min.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Min.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Min.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/MoveMask.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/MoveMask.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/MoveMask.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/MoveMask.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/MoveMask_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/MoveMask_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/MoveMask_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/MoveMask_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/MoveMask_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/MoveMask_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/MoveMask_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/MoveMask_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Multiply.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Multiply.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Multiply.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Multiply.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Multiply.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Multiply.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Multiply.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Multiply.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Or.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Or.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Or.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Or.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Or.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Or.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Or.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Or.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Double.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Double.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Double.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Double.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Double.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Double.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Double.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Double.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Single.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Single.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Single.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Single.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Single.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Single.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute.Single.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute.Single.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Byte.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Byte.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Byte.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Byte.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Double.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Double.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Double.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Double.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Int16.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Int16.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Int16.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Int16.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Int32.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Int32.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Int32.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Int32.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Int64.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Int64.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Int64.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Int64.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.SByte.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.SByte.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.SByte.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.SByte.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Single.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Single.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.Single.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.Single.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.UInt16.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.UInt16.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.UInt16.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.UInt16.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.UInt32.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.UInt32.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.UInt32.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.UInt32.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.UInt64.2.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.UInt64.2.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Permute2x128.UInt64.2.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Permute2x128.UInt64.2.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/PermuteVar.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/PermuteVar.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/PermuteVar.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/PermuteVar.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/PermuteVar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/PermuteVar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/PermuteVar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/PermuteVar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Program.Avx.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Program.Avx1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Program.Avx.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Program.Avx1.cs
index 6c81d17b93d2a..1a02a937542d1 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Program.Avx.cs
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Program.Avx1.cs
@@ -26,6 +26,8 @@ static Program()
["BroadcastScalarToVector256.Double"] = BroadcastScalarToVector256Double,
["BroadcastVector128ToVector256.Single"] = BroadcastVector128ToVector256Single,
["BroadcastVector128ToVector256.Double"] = BroadcastVector128ToVector256Double,
+ ["Ceiling.Double"] = CeilingDouble,
+ ["Ceiling.Single"] = CeilingSingle,
["CompareEqual.Single"] = CompareEqualSingle,
["CompareEqual.Double"] = CompareEqualDouble,
["CompareGreaterThan.Single"] = CompareGreaterThanSingle,
@@ -50,8 +52,6 @@ static Program()
["CompareOrdered.Double"] = CompareOrderedDouble,
["CompareUnordered.Single"] = CompareUnorderedSingle,
["CompareUnordered.Double"] = CompareUnorderedDouble,
- ["Ceiling.Double"] = CeilingDouble,
- ["Ceiling.Single"] = CeilingSingle,
["Divide.Double"] = DivideDouble,
["Divide.Single"] = DivideSingle,
["DuplicateEvenIndexed.Double"] = DuplicateEvenIndexedDouble,
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Program.ConvertToVector.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Program.ConvertToVector.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Program.ConvertToVector.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Program.ConvertToVector.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundCurrentDirection.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundCurrentDirection.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundCurrentDirection.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundCurrentDirection.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundCurrentDirection.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundCurrentDirection.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundCurrentDirection.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundCurrentDirection.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNearestInteger.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNearestInteger.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNearestInteger.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNearestInteger.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNearestInteger.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNearestInteger.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNearestInteger.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNearestInteger.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNegativeInfinity.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNegativeInfinity.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNegativeInfinity.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNegativeInfinity.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNegativeInfinity.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNegativeInfinity.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToNegativeInfinity.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToNegativeInfinity.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToPositiveInfinity.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToPositiveInfinity.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToPositiveInfinity.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToPositiveInfinity.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToPositiveInfinity.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToPositiveInfinity.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToPositiveInfinity.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToPositiveInfinity.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToZero.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToZero.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToZero.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToZero.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToZero.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToZero.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/RoundToZero.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/RoundToZero.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Shuffle.Double.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Shuffle.Double.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Shuffle.Double.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Shuffle.Double.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Shuffle.Single.1.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Shuffle.Single.1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Shuffle.Single.1.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Shuffle.Single.1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Sqrt.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Sqrt.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Sqrt.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Sqrt.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Sqrt_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Sqrt_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Sqrt_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Sqrt_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Sqrt_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Sqrt_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Sqrt_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Sqrt_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Store.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Store.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Store.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Store.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAligned.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAligned.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAligned.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAligned.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAlignedNonTemporal.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAlignedNonTemporal.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAlignedNonTemporal.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAlignedNonTemporal.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAlignedNonTemporal_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAlignedNonTemporal_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAlignedNonTemporal_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAlignedNonTemporal_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAlignedNonTemporal_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAlignedNonTemporal_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAlignedNonTemporal_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAlignedNonTemporal_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAligned_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAligned_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAligned_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAligned_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAligned_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAligned_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/StoreAligned_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/StoreAligned_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Store_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Store_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Store_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Store_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Store_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Store_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Store_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Store_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Subtract.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Subtract.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Subtract.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Subtract.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Subtract.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Subtract.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Subtract.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Subtract.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Byte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Byte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Byte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Byte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Int16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Int16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Int16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Int16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Int32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Int32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Int32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Int64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Int64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.Int64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.Int64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.SByte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.SByte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.SByte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.SByte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.UInt16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.UInt16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.UInt16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.UInt16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.UInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.UInt32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.UInt32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.UInt32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.UInt64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.UInt64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestC.UInt64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestC.UInt64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Byte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Byte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Byte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Byte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Int16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Int16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Int16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Int16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Int32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Int32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Int32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Int64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Int64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.Int64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.Int64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.SByte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.SByte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.SByte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.SByte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.UInt16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.UInt16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.UInt16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.UInt16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.UInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.UInt32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.UInt32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.UInt32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.UInt64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.UInt64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestNotZAndNotC.UInt64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestNotZAndNotC.UInt64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Byte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Byte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Byte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Byte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Int16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Int16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Int16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Int16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Int32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Int32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Int32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Int32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Int64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Int64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.Int64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.Int64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.SByte.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.SByte.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.SByte.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.SByte.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.UInt16.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.UInt16.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.UInt16.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.UInt16.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.UInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.UInt32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.UInt32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.UInt32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.UInt64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.UInt64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/TestZ.UInt64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/TestZ.UInt64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackHigh.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackHigh.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackHigh.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackHigh.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackHigh_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackHigh_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackHigh_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackHigh_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackHigh_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackHigh_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackHigh_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackHigh_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackLow.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackLow.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackLow.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackLow.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackLow_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackLow_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackLow_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackLow_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackLow_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackLow_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/UnpackLow_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/UnpackLow_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Xor.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Xor.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Xor.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Xor.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx/Xor.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1/Xor.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx/Xor.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1/Xor.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Avx_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Avx_r.csproj
similarity index 92%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Avx_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Avx_r.csproj
index b47ea55de19b6..93a4e46d49efa 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Avx_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Avx_r.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Avx_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Avx_ro.csproj
similarity index 92%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Avx_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Avx_ro.csproj
index d086be6f5756c..16f2381c33013 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Avx_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Avx_ro.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskLoad.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskLoad.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskLoad.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskLoad.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskLoad.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskLoad.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskLoad.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskLoad.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskStore.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskStore.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskStore.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskStore.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskStore.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskStore.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/MaskStore.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/MaskStore.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/PermuteVar.Double.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/PermuteVar.Double.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/PermuteVar.Double.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/PermuteVar.Double.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/PermuteVar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/PermuteVar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/PermuteVar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/PermuteVar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Program.Avx_Vector128.cs b/src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Program.Avx1_Vector128.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Avx_Vector128/Program.Avx_Vector128.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Avx1_Vector128/Program.Avx1_Vector128.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenerateTests.csx b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenerateTests.csx
index d5be9e1c667e4..50b7e0b0cdbe2 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenerateTests.csx
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Shared/GenerateTests.csx
@@ -116,7 +116,7 @@ private static readonly (string templateFileName, string outputTemplateName, Dic
("_UnaryOpTestTemplate.template", "SimpleUnOpTest.template", new Dictionary { ["TemplateName"] = "Simple", ["TemplateValidationLogic"] = SimpleOpTest_ValidationLogic }),
};
-private static readonly (string templateFileName, Dictionary templateData)[] SseInputs = new []
+private static readonly (string templateFileName, Dictionary templateData)[] Sse1Inputs = new []
{
("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Sse", ["LoadIsa"] = "Sse", ["Method"] = "Add", ["RetVectorType"] = "Vector128", ["RetBaseType"] = "Single", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Single", ["Op2VectorType"] = "Vector128", ["Op2BaseType"] = "Single", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["NextValueOp2"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "BitConverter.SingleToInt32Bits(left[0] + right[0]) != BitConverter.SingleToInt32Bits(result[0])", ["ValidateRemainingResults"] = "BitConverter.SingleToInt32Bits(left[i] + right[i]) != BitConverter.SingleToInt32Bits(result[i])"}),
("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Sse", ["LoadIsa"] = "Sse", ["Method"] = "AddScalar", ["RetVectorType"] = "Vector128", ["RetBaseType"] = "Single", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Single", ["Op2VectorType"] = "Vector128", ["Op2BaseType"] = "Single", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["NextValueOp2"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "BitConverter.SingleToInt32Bits(left[0] + right[0]) != BitConverter.SingleToInt32Bits(result[0])", ["ValidateRemainingResults"] = "BitConverter.SingleToInt32Bits(left[i]) != BitConverter.SingleToInt32Bits(result[i])"}),
@@ -175,7 +175,7 @@ private static readonly (string templateFileName, Dictionary tem
("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Sse", ["LoadIsa"] = "Sse", ["Method"] = "Xor", ["RetVectorType"] = "Vector128", ["RetBaseType"] = "Single", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Single", ["Op2VectorType"] = "Vector128", ["Op2BaseType"] = "Single", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["NextValueOp2"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "(BitConverter.SingleToInt32Bits(left[0]) ^ BitConverter.SingleToInt32Bits(right[0])) != BitConverter.SingleToInt32Bits(result[0])", ["ValidateRemainingResults"] = "(BitConverter.SingleToInt32Bits(left[0]) ^ BitConverter.SingleToInt32Bits(right[0])) != BitConverter.SingleToInt32Bits(result[0])"}),
};
-private static readonly (string templateFileName, Dictionary templateData)[] SseX64Inputs = new []
+private static readonly (string templateFileName, Dictionary templateData)[] Sse1X64Inputs = new []
{
("SimdScalarUnOpConvTest.template", new Dictionary { ["Isa"] = "Sse.X64", ["LoadIsa"] = "Sse", ["Method"] = "ConvertToInt64", ["RetBaseType"] = "Int64", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Single", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "(long)Math.Round(firstOp[0]) != result"}),
("SimdScalarUnOpConvTest.template", new Dictionary { ["Isa"] = "Sse.X64", ["LoadIsa"] = "Sse", ["Method"] = "ConvertToInt64WithTruncation", ["RetBaseType"] = "Int64", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Single", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "(long) firstOp[0] != result"}),
@@ -628,7 +628,7 @@ private static readonly (string templateFileName, Dictionary tem
("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Sse42", ["LoadIsa"] = "Sse2", ["Method"] = "CompareGreaterThan", ["RetVectorType"] = "Vector128", ["RetBaseType"] = "Int64", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Int64", ["Op2VectorType"] = "Vector128", ["Op2BaseType"] = "Int64", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetInt64()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt64()", ["ValidateFirstResult"] = "result[0] != ((left[0] > right[0]) ? unchecked((long)(-1)) : 0)", ["ValidateRemainingResults"] = "result[i] != ((left[i] > right[i]) ? unchecked((long)(-1)) : 0)"}),
};
-private static readonly (string templateFileName, Dictionary templateData)[] AvxInputs = new []
+private static readonly (string templateFileName, Dictionary templateData)[] Avx1Inputs = new []
{
("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Avx", ["LoadIsa"] = "Avx", ["Method"] = "Add", ["RetVectorType"] = "Vector256", ["RetBaseType"] = "Double", ["Op1VectorType"] = "Vector256", ["Op1BaseType"] = "Double", ["Op2VectorType"] = "Vector256", ["Op2BaseType"] = "Double", ["LargestVectorSize"] = "32", ["NextValueOp1"] = "TestLibrary.Generator.GetDouble()", ["NextValueOp2"] = "TestLibrary.Generator.GetDouble()", ["ValidateFirstResult"] = "BitConverter.DoubleToInt64Bits(left[0] + right[0]) != BitConverter.DoubleToInt64Bits(result[0])", ["ValidateRemainingResults"] = "BitConverter.DoubleToInt64Bits(left[i] + right[i]) != BitConverter.DoubleToInt64Bits(result[i])"}),
("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Avx", ["LoadIsa"] = "Avx", ["Method"] = "Add", ["RetVectorType"] = "Vector256", ["RetBaseType"] = "Single", ["Op1VectorType"] = "Vector256", ["Op1BaseType"] = "Single", ["Op2VectorType"] = "Vector256", ["Op2BaseType"] = "Single", ["LargestVectorSize"] = "32", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["NextValueOp2"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "BitConverter.SingleToInt32Bits(left[0] + right[0]) != BitConverter.SingleToInt32Bits(result[0])", ["ValidateRemainingResults"] = "BitConverter.SingleToInt32Bits(left[i] + right[i]) != BitConverter.SingleToInt32Bits(result[i])"}),
@@ -778,7 +778,7 @@ private static readonly (string templateFileName, Dictionary tem
("SimpleBinOpTest.template", new Dictionary { ["Isa"] = "Avx", ["LoadIsa"] = "Avx", ["Method"] = "Xor", ["RetVectorType"] = "Vector256", ["RetBaseType"] = "Double", ["Op1VectorType"] = "Vector256", ["Op1BaseType"] = "Double", ["Op2VectorType"] = "Vector256", ["Op2BaseType"] = "Double", ["LargestVectorSize"] = "32", ["NextValueOp1"] = "TestLibrary.Generator.GetDouble()", ["NextValueOp2"] = "TestLibrary.Generator.GetDouble()", ["ValidateFirstResult"] = "(BitConverter.DoubleToInt64Bits(left[0]) ^ BitConverter.DoubleToInt64Bits(right[0])) != BitConverter.DoubleToInt64Bits(result[0])", ["ValidateRemainingResults"] = "(BitConverter.DoubleToInt64Bits(left[i]) ^ BitConverter.DoubleToInt64Bits(right[i])) != BitConverter.DoubleToInt64Bits(result[i])"}),
};
-private static readonly (string templateFileName, Dictionary templateData)[] Avx_Vector128Inputs = new []
+private static readonly (string templateFileName, Dictionary templateData)[] Avx1_Vector128Inputs = new []
{
("LoadBinOpTest.template", new Dictionary { ["Isa"] = "Avx", ["LoadIsa"] = "Avx", ["Method"] = "MaskLoad", ["RetVectorType"] = "Vector128", ["RetBaseType"] = "Double", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Double", ["Op2VectorType"] = "Vector128", ["Op2BaseType"] = "Double", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetDouble()", ["NextValueOp2"] = "TestLibrary.Generator.GetDouble()", ["ValidateFirstResult"] = "BitConverter.DoubleToInt64Bits(result[0]) != BitConverter.DoubleToInt64Bits((BitConverter.DoubleToInt64Bits(right[0]) < 0) ? left[0] : 0)", ["ValidateRemainingResults"] = "BitConverter.DoubleToInt64Bits(result[i]) != BitConverter.DoubleToInt64Bits((BitConverter.DoubleToInt64Bits(right[i]) < 0) ? left[i] : 0)"}),
("LoadBinOpTest.template", new Dictionary { ["Isa"] = "Avx", ["LoadIsa"] = "Avx", ["Method"] = "MaskLoad", ["RetVectorType"] = "Vector128", ["RetBaseType"] = "Single", ["Op1VectorType"] = "Vector128", ["Op1BaseType"] = "Single", ["Op2VectorType"] = "Vector128", ["Op2BaseType"] = "Single", ["LargestVectorSize"] = "16", ["NextValueOp1"] = "TestLibrary.Generator.GetSingle()", ["NextValueOp2"] = "TestLibrary.Generator.GetSingle()", ["ValidateFirstResult"] = "BitConverter.SingleToInt32Bits(result[0]) != BitConverter.SingleToInt32Bits((BitConverter.SingleToInt32Bits(right[0]) < 0) ? left[0] : 0)", ["ValidateRemainingResults"] = "BitConverter.SingleToInt32Bits(result[i]) != BitConverter.SingleToInt32Bits((BitConverter.SingleToInt32Bits(right[i]) < 0) ? left[i] : 0)"}),
@@ -1378,8 +1378,8 @@ private static void ProcessInput(StreamWriter testListFile, string groupName, (s
File.WriteAllText(testFileName, template);
}
-ProcessInputs("Sse", SseInputs);
-ProcessInputs("Sse.X64", SseX64Inputs);
+ProcessInputs("Sse1", Sse1Inputs);
+ProcessInputs("Sse1.X64", Sse1X64Inputs);
ProcessInputs("Sse2", Sse2Inputs);
ProcessInputs("Sse2.X64", Sse2X64Inputs);
ProcessInputs("Sse3", Sse3Inputs);
@@ -1388,8 +1388,8 @@ ProcessInputs("Sse41", Sse41Inputs);
ProcessInputs("Sse41_Overloaded", Sse41_OverloadedInputs);
ProcessInputs("Sse41.X64", Sse41X64Inputs);
ProcessInputs("Sse42", Sse42Inputs);
-ProcessInputs("Avx", AvxInputs);
-ProcessInputs("Avx_Vector128", Avx_Vector128Inputs);
+ProcessInputs("Avx1", Avx1Inputs);
+ProcessInputs("Avx1_Vector128", Avx1_Vector128Inputs);
ProcessInputs("Avx2", Avx2Inputs);
ProcessInputs("Avx2_Vector128", Avx2_Vector128Inputs);
ProcessInputs("Fma_Vector128", Fma_Vector128Inputs);
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/ConvertScalarToVector128Single.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/ConvertScalarToVector128Single.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/ConvertScalarToVector128Single.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/ConvertScalarToVector128Single.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/ConvertToInt64.Vector128Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/ConvertToInt64.Vector128Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/ConvertToInt64.Vector128Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/ConvertToInt64.Vector128Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/ConvertToInt64WithTruncation.Vector128Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/ConvertToInt64WithTruncation.Vector128Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/ConvertToInt64WithTruncation.Vector128Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/ConvertToInt64WithTruncation.Vector128Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Program.Sse.X64.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Program.Sse1.X64.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Program.Sse.X64.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Program.Sse1.X64.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Sse.X64_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Sse.X64_r.csproj
similarity index 93%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Sse.X64_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Sse.X64_r.csproj
index 4109f20cc11b4..80aa8507e10ad 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Sse.X64_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Sse.X64_r.csproj
@@ -14,6 +14,6 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Sse.X64_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Sse.X64_ro.csproj
similarity index 93%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Sse.X64_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Sse.X64_ro.csproj
index 06ec6d184787c..cd7ea7ea55bfb 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Sse.X64/Sse.X64_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Sse1.X64/Sse.X64_ro.csproj
@@ -14,6 +14,6 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Add.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Add.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Add.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Add.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/AddScalar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/AddScalar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/AddScalar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/AddScalar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/And.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/And.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/And.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/And.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/AndNot.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/AndNot.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/AndNot.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/AndNot.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareGreaterThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareGreaterThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareGreaterThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareGreaterThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareGreaterThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareGreaterThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareGreaterThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareGreaterThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareLessThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareLessThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareLessThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareLessThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareLessThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareLessThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareLessThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareLessThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotGreaterThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotGreaterThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotGreaterThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotGreaterThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotGreaterThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotGreaterThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotGreaterThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotGreaterThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotLessThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotLessThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotLessThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotLessThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotLessThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotLessThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareNotLessThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareNotLessThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareOrdered.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareOrdered.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareOrdered.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareOrdered.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarGreaterThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarGreaterThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarGreaterThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarGreaterThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarGreaterThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarGreaterThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarGreaterThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarGreaterThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarLessThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarLessThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarLessThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarLessThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarLessThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarLessThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarLessThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarLessThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotGreaterThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotGreaterThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotGreaterThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotGreaterThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotGreaterThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotGreaterThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotGreaterThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotGreaterThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotLessThan.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotLessThan.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotLessThan.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotLessThan.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotLessThanOrEqual.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotLessThanOrEqual.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarNotLessThanOrEqual.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarNotLessThanOrEqual.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrdered.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrdered.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrdered.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrdered.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedGreaterThan.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedGreaterThan.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedGreaterThan.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedGreaterThan.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedGreaterThanOrEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedGreaterThanOrEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedGreaterThanOrEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedGreaterThanOrEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedLessThan.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedLessThan.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedLessThan.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedLessThan.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedLessThanOrEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedLessThanOrEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedLessThanOrEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedLessThanOrEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedNotEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedNotEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarOrderedNotEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarOrderedNotEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnordered.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnordered.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnordered.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnordered.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedGreaterThan.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedGreaterThan.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedGreaterThan.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedGreaterThan.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedGreaterThanOrEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedGreaterThanOrEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedGreaterThanOrEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedGreaterThanOrEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedLessThan.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedLessThan.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedLessThan.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedLessThan.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedLessThanOrEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedLessThanOrEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedLessThanOrEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedLessThanOrEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedNotEqual.Boolean.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedNotEqual.Boolean.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareScalarUnorderedNotEqual.Boolean.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareScalarUnorderedNotEqual.Boolean.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareUnordered.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareUnordered.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/CompareUnordered.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/CompareUnordered.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertScalarToVector128Single.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertScalarToVector128Single.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertScalarToVector128Single.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertScalarToVector128Single.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32WithTruncation.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32WithTruncation.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32WithTruncation.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32WithTruncation.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32WithTruncation_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32WithTruncation_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32WithTruncation_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32WithTruncation_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32WithTruncation_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32WithTruncation_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32WithTruncation_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32WithTruncation_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ConvertToInt32_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ConvertToInt32_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Divide.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Divide.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Divide.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Divide.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/DivideScalar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/DivideScalar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/DivideScalar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/DivideScalar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadAlignedVector128.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadAlignedVector128.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadAlignedVector128.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadAlignedVector128.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadAlignedVector128_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadAlignedVector128_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadAlignedVector128_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadAlignedVector128_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadAlignedVector128_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadAlignedVector128_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadAlignedVector128_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadAlignedVector128_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadHigh.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadHigh.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadHigh.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadHigh.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadHigh_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadHigh_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadHigh_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadHigh_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadHigh_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadHigh_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadHigh_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadHigh_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadLow.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadLow.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadLow.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadLow.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadLow_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadLow_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadLow_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadLow_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadLow_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadLow_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadLow_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadLow_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadScalarVector128.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadScalarVector128.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadScalarVector128.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadScalarVector128.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadVector128.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadVector128.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/LoadVector128.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/LoadVector128.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Max.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Max.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Max.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Max.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MaxScalar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MaxScalar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MaxScalar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MaxScalar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Min.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Min.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Min.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Min.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MinScalar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MinScalar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MinScalar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MinScalar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveHighToLow.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveHighToLow.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveHighToLow.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveHighToLow.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveHighToLow_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveHighToLow_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveHighToLow_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveHighToLow_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveHighToLow_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveHighToLow_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveHighToLow_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveHighToLow_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveLowToHigh.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveLowToHigh.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveLowToHigh.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveLowToHigh.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveLowToHigh_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveLowToHigh_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveLowToHigh_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveLowToHigh_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveLowToHigh_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveLowToHigh_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveLowToHigh_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveLowToHigh_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveMask.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveMask.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveMask.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveMask.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveMask_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveMask_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveMask_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveMask_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveMask_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveMask_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveMask_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveMask_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveScalar.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveScalar.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveScalar.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveScalar.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveScalar_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveScalar_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveScalar_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveScalar_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveScalar_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveScalar_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MoveScalar_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MoveScalar_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Multiply.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Multiply.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Multiply.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Multiply.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/MultiplyScalar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/MultiplyScalar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/MultiplyScalar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/MultiplyScalar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Or.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Or.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Or.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Or.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Prefetch.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Prefetch.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Prefetch.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Prefetch.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Prefetch_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Prefetch_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Prefetch_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Prefetch_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Prefetch_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Prefetch_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Prefetch_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Prefetch_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Program.Sse.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Program.Sse1.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Program.Sse.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Program.Sse1.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Reciprocal.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Reciprocal.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Reciprocal.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Reciprocal.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalScalar.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalScalar.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalScalar.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalScalar.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalScalar_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalScalar_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalScalar_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalScalar_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalScalar_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalScalar_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalScalar_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalScalar_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrt.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrt.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrt.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrt.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrtScalar.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrtScalar.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrtScalar.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrtScalar.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrtScalar_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrtScalar_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrtScalar_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrtScalar_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrtScalar_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrtScalar_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrtScalar_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrtScalar_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrt_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrt_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrt_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrt_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrt_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrt_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/ReciprocalSqrt_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/ReciprocalSqrt_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Reciprocal_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Reciprocal_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Reciprocal_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Reciprocal_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Reciprocal_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Reciprocal_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Reciprocal_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Reciprocal_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Shuffle.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Shuffle.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Shuffle.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Shuffle.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Shuffle_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Shuffle_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Shuffle_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Shuffle_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Shuffle_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Shuffle_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Shuffle_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Shuffle_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Sqrt.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sqrt.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Sqrt.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sqrt.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/SqrtScalar.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/SqrtScalar.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/SqrtScalar.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/SqrtScalar.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/SqrtScalar_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/SqrtScalar_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/SqrtScalar_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/SqrtScalar_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/SqrtScalar_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/SqrtScalar_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/SqrtScalar_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/SqrtScalar_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Sqrt_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sqrt_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Sqrt_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sqrt_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Sqrt_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sqrt_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Sqrt_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sqrt_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Sse_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sse_r.csproj
similarity index 98%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Sse_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sse_r.csproj
index 111c837d1270c..3681840cefdc4 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Sse_r.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sse_r.csproj
@@ -63,7 +63,7 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Sse_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sse_ro.csproj
similarity index 98%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Sse_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sse_ro.csproj
index cb08f53e3b831..3a8cb1a5d23f6 100644
--- a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Sse_ro.csproj
+++ b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Sse_ro.csproj
@@ -63,7 +63,7 @@
-
+
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Store.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Store.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Store.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Store.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAligned.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAligned.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAligned.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAligned.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAlignedNonTemporal.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAlignedNonTemporal.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAlignedNonTemporal.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAlignedNonTemporal.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAlignedNonTemporal_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAlignedNonTemporal_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAlignedNonTemporal_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAlignedNonTemporal_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAlignedNonTemporal_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAlignedNonTemporal_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAlignedNonTemporal_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAlignedNonTemporal_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAligned_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAligned_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAligned_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAligned_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAligned_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAligned_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreAligned_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreAligned_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreFence.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreFence.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreFence.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreFence.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreFence_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreFence_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreFence_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreFence_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreFence_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreFence_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreFence_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreFence_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreHigh.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreHigh.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreHigh.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreHigh.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreHigh_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreHigh_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreHigh_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreHigh_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreHigh_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreHigh_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreHigh_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreHigh_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreLow.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreLow.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreLow.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreLow.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreLow_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreLow_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreLow_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreLow_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreLow_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreLow_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreLow_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreLow_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreScalar.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreScalar.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreScalar.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreScalar.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreScalar_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreScalar_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreScalar_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreScalar_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreScalar_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreScalar_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/StoreScalar_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/StoreScalar_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Store_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Store_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Store_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Store_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Store_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Store_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Store_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Store_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Subtract.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Subtract.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Subtract.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Subtract.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/SubtractScalar.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/SubtractScalar.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/SubtractScalar.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/SubtractScalar.Single.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackHigh.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackHigh.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackHigh.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackHigh.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackHigh_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackHigh_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackHigh_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackHigh_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackHigh_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackHigh_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackHigh_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackHigh_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackLow.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackLow.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackLow.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackLow.cs
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackLow_r.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackLow_r.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackLow_r.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackLow_r.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackLow_ro.csproj b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackLow_ro.csproj
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/UnpackLow_ro.csproj
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/UnpackLow_ro.csproj
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/Sse/Xor.Single.cs b/src/tests/JIT/HardwareIntrinsics/X86/Sse1/Xor.Single.cs
similarity index 100%
rename from src/tests/JIT/HardwareIntrinsics/X86/Sse/Xor.Single.cs
rename to src/tests/JIT/HardwareIntrinsics/X86/Sse1/Xor.Single.cs