From 57e9204da87febf1115233b8eb40ef81d2d3b034 Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Sat, 30 Jun 2018 11:28:47 -0700
Subject: [PATCH] Removing unnecessary `try/catch` blocks from the
 ExtractScalar and InsertScalar HWIntrinsic test templates

Commit migrated from https://github.com/dotnet/coreclr/commit/1613245a1e5d844825ed67dc73698ffe2e3129fa
---
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.1.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.20.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.52.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.1.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.22.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.6.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.1.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.19.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.3.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.11.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.27.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.22.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.6.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.19.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.3.cs    | 11 ++---------
 .../tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.1.cs | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.20.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.52.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.1.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.11.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.27.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.1.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.22.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.6.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.1.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.19.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.3.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.1.cs      | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.20.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.52.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.1.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.11.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.27.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.1.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.22.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.6.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.1.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.19.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.3.cs     | 11 ++---------
 .../HardwareIntrinsics/X86/Shared/ExtractScalarTest.template  | 11 ++---------
 .../HardwareIntrinsics/X86/Shared/InsertScalarTest.template   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.1.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.129.cs | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.1.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.129.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.129.cs  | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.129.cs  | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.1.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.129.cs | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.1.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.129.cs | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.1.cs  | 11 ++---------
 .../JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.129.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.1.cs  | 11 ++---------
 .../JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.129.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.1.cs  | 11 ++---------
 .../JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.129.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.1.cs     | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.129.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.129.cs  | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.129.cs  | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.1.cs    | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.129.cs  | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.1.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.129.cs | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.1.cs   | 11 ++---------
 .../src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.129.cs | 11 ++---------
 74 files changed, 148 insertions(+), 666 deletions(-)

diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.1.cs
index 2c59dfd..ecaae0d 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractByte1()
         {
             var test = new SimpleUnaryOpTest__ExtractByte1();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.20.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.20.cs
index 068e812..cd8805e 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.20.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.20.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractByte20()
         {
             var test = new SimpleUnaryOpTest__ExtractByte20();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.52.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.52.cs
index 4f39a52..203f5fd 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.52.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Byte.52.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractByte52()
         {
             var test = new SimpleUnaryOpTest__ExtractByte52();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.1.cs
index 133d65a..ea140da 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt321()
         {
             var test = new SimpleUnaryOpTest__ExtractInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.22.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.22.cs
index bd79d92..0706206 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.22.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.22.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt3222()
         {
             var test = new SimpleUnaryOpTest__ExtractInt3222();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.6.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.6.cs
index 0e42ec7..be6f8a8 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.6.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int32.6.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt326()
         {
             var test = new SimpleUnaryOpTest__ExtractInt326();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.1.cs
index 2213721..8f7518a 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt641()
         {
             var test = new SimpleUnaryOpTest__ExtractInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.19.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.19.cs
index 24e7207..5566bec 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.19.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.19.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt6419()
         {
             var test = new SimpleUnaryOpTest__ExtractInt6419();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.3.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.3.cs
index fb89cd0..e0cdece 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.3.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.Int64.3.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt643()
         {
             var test = new SimpleUnaryOpTest__ExtractInt643();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.1.cs
index 717749c..aa2b92f 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt161()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt161();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.11.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.11.cs
index b68ab35..8b09d37 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.11.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.11.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt1611()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt1611();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.27.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.27.cs
index 9ece246..af88227 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.27.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt16.27.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt1627()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt1627();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.1.cs
index 846efb1..5d7a360 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt321()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.22.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.22.cs
index 7251ef7..5199c95 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.22.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.22.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt3222()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt3222();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.6.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.6.cs
index 6546a7e..0a9cf39 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.6.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt32.6.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt326()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt326();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.1.cs
index 9f6315a..8f36015 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt641()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.19.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.19.cs
index d3d90d8..817b73f 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.19.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.19.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt6419()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt6419();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.3.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.3.cs
index 8b3f3cf..21480f04 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.3.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Extract.UInt64.3.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt643()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt643();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.1.cs
index d596cfc..dc24dd4 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertByte1()
         {
             var test = new SimpleUnaryOpTest__InsertByte1();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.20.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.20.cs
index 73ccb9d..9676713 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.20.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.20.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertByte20()
         {
             var test = new SimpleUnaryOpTest__InsertByte20();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.52.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.52.cs
index 218f984..16b7cb3 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.52.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Byte.52.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertByte52()
         {
             var test = new SimpleUnaryOpTest__InsertByte52();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.1.cs
index 1899ec7..6db867f 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt161()
         {
             var test = new SimpleUnaryOpTest__InsertInt161();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int16, Int16>(_data, new Int16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int16) != typeof(long)) && (typeof(Int16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.11.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.11.cs
index 7e3049b..e64b977 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.11.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.11.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt1611()
         {
             var test = new SimpleUnaryOpTest__InsertInt1611();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int16, Int16>(_data, new Int16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int16) != typeof(long)) && (typeof(Int16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.27.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.27.cs
index 373db0f..30f76ac 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.27.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int16.27.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt1627()
         {
             var test = new SimpleUnaryOpTest__InsertInt1627();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int16, Int16>(_data, new Int16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int16) != typeof(long)) && (typeof(Int16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.1.cs
index 0e2d1eb..fd4c149 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt321()
         {
             var test = new SimpleUnaryOpTest__InsertInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.22.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.22.cs
index 9740754..a988031 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.22.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.22.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt3222()
         {
             var test = new SimpleUnaryOpTest__InsertInt3222();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.6.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.6.cs
index 2b1da87..d37cf36 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.6.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int32.6.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt326()
         {
             var test = new SimpleUnaryOpTest__InsertInt326();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.1.cs
index f17ff1f..a94f30b 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt641()
         {
             var test = new SimpleUnaryOpTest__InsertInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.19.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.19.cs
index 012f964..501ebd5 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.19.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.19.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt6419()
         {
             var test = new SimpleUnaryOpTest__InsertInt6419();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.3.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.3.cs
index 2447132..3b842c4 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.3.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.Int64.3.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt643()
         {
             var test = new SimpleUnaryOpTest__InsertInt643();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.1.cs
index ca6d9f5..e9f9f4b 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertSByte1()
         {
             var test = new SimpleUnaryOpTest__InsertSByte1();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<SByte, SByte>(_data, new SByte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(SByte) != typeof(long)) && (typeof(SByte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.20.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.20.cs
index 917aba5..d95d63f 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.20.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.20.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertSByte20()
         {
             var test = new SimpleUnaryOpTest__InsertSByte20();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<SByte, SByte>(_data, new SByte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(SByte) != typeof(long)) && (typeof(SByte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.52.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.52.cs
index cbbaa73..bdbea54 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.52.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.SByte.52.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertSByte52()
         {
             var test = new SimpleUnaryOpTest__InsertSByte52();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<SByte, SByte>(_data, new SByte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(SByte) != typeof(long)) && (typeof(SByte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.1.cs
index b17dbdc..bd2cfe2 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt161()
         {
             var test = new SimpleUnaryOpTest__InsertUInt161();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.11.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.11.cs
index 43f4a5a..8bbea9b 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.11.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.11.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt1611()
         {
             var test = new SimpleUnaryOpTest__InsertUInt1611();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.27.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.27.cs
index cff1f45..50a583e 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.27.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt16.27.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt1627()
         {
             var test = new SimpleUnaryOpTest__InsertUInt1627();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.1.cs
index 608bede..391a2fb 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt321()
         {
             var test = new SimpleUnaryOpTest__InsertUInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.22.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.22.cs
index e3609e8..878c462 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.22.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.22.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt3222()
         {
             var test = new SimpleUnaryOpTest__InsertUInt3222();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.6.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.6.cs
index ffd0035..2c3947b 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.6.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt32.6.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt326()
         {
             var test = new SimpleUnaryOpTest__InsertUInt326();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.1.cs
index 8ec1dd8..efc9265 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt641()
         {
             var test = new SimpleUnaryOpTest__InsertUInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.19.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.19.cs
index f60e347..2601ae0 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.19.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.19.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt6419()
         {
             var test = new SimpleUnaryOpTest__InsertUInt6419();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.3.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.3.cs
index fd815ca..122c687 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.3.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Avx/Insert.UInt64.3.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt643()
         {
             var test = new SimpleUnaryOpTest__InsertUInt643();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Avx.IsSupported;
+        public bool IsSupported => Avx.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template
index 0ac2b50..e1876a1 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/ExtractScalarTest.template
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void {Method}{RetBaseType}{Imm}()
         {
             var test = new SimpleUnaryOpTest__{Method}{RetBaseType}{Imm}();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}>(_data, new {RetBaseType}[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => {Isa}.IsSupported;
+        public bool IsSupported => {Isa}.IsSupported && (Environment.Is64BitProcess || ((typeof({RetBaseType}) != typeof(long)) && (typeof({RetBaseType}) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template
index cc330e7..c08700f 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Shared/InsertScalarTest.template
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void {Method}{RetBaseType}{Imm}()
         {
             var test = new SimpleUnaryOpTest__{Method}{RetBaseType}{Imm}();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<{RetBaseType}, {Op1BaseType}>(_data, new {RetBaseType}[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => {Isa}.IsSupported;
+        public bool IsSupported => {Isa}.IsSupported && (Environment.Is64BitProcess || ((typeof({RetBaseType}) != typeof(long)) && (typeof({RetBaseType}) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.1.cs
index 4683cb8..f3bea8f 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt161()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt161();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse2.IsSupported;
+        public bool IsSupported => Sse2.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.129.cs
index ce9513a..fe45a56 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Extract.UInt16.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt16129()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt16129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse2.IsSupported;
+        public bool IsSupported => Sse2.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.1.cs
index 0f2f4e6..7523812 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt161()
         {
             var test = new SimpleUnaryOpTest__InsertInt161();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int16, Int16>(_data, new Int16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse2.IsSupported;
+        public bool IsSupported => Sse2.IsSupported && (Environment.Is64BitProcess || ((typeof(Int16) != typeof(long)) && (typeof(Int16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.129.cs
index 619d918..2c9d92c 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.Int16.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt16129()
         {
             var test = new SimpleUnaryOpTest__InsertInt16129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int16, Int16>(_data, new Int16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse2.IsSupported;
+        public bool IsSupported => Sse2.IsSupported && (Environment.Is64BitProcess || ((typeof(Int16) != typeof(long)) && (typeof(Int16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.1.cs
index 70b29d1..b46b3ab 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt161()
         {
             var test = new SimpleUnaryOpTest__InsertUInt161();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse2.IsSupported;
+        public bool IsSupported => Sse2.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.129.cs
index 2c16bc8..719ef7c 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse2/Insert.UInt16.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt16129()
         {
             var test = new SimpleUnaryOpTest__InsertUInt16129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt16, UInt16>(_data, new UInt16[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse2.IsSupported;
+        public bool IsSupported => Sse2.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt16) != typeof(long)) && (typeof(UInt16) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.1.cs
index da59ecd..d7e9847 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractByte1()
         {
             var test = new SimpleUnaryOpTest__ExtractByte1();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.129.cs
index 8cc0b1c..4f6a93b 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Byte.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractByte129()
         {
             var test = new SimpleUnaryOpTest__ExtractByte129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.1.cs
index 3e78afd..05bb4f0 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt321()
         {
             var test = new SimpleUnaryOpTest__ExtractInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.129.cs
index d8c9565..1b63c5d 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int32.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt32129()
         {
             var test = new SimpleUnaryOpTest__ExtractInt32129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.1.cs
index 1e6f97b..48276ba 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt641()
         {
             var test = new SimpleUnaryOpTest__ExtractInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.129.cs
index 948c09a..ad06c85 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Int64.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractInt64129()
         {
             var test = new SimpleUnaryOpTest__ExtractInt64129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.1.cs
index d82cd42..49a44cb 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractSingle1()
         {
             var test = new SimpleUnaryOpTest__ExtractSingle1();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Single, Single>(_data, new Single[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Single) != typeof(long)) && (typeof(Single) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.129.cs
index f9d6e7b..a325e9e 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.Single.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractSingle129()
         {
             var test = new SimpleUnaryOpTest__ExtractSingle129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Single, Single>(_data, new Single[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Single) != typeof(long)) && (typeof(Single) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.1.cs
index 0e9cf68..69f423c 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt321()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.129.cs
index 95182b0..ca6fadd 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt32.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt32129()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt32129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.1.cs
index c67da3d..399ba96 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt641()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.129.cs
index 0a8598a..c3c896d 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Extract.UInt64.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void ExtractUInt64129()
         {
             var test = new SimpleUnaryOpTest__ExtractUInt64129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.1.cs
index de94118..f12125b 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertByte1()
         {
             var test = new SimpleUnaryOpTest__InsertByte1();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.129.cs
index 6c4f2d5..a6a020d 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Byte.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertByte129()
         {
             var test = new SimpleUnaryOpTest__InsertByte129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Byte, Byte>(_data, new Byte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Byte) != typeof(long)) && (typeof(Byte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.1.cs
index a896266..02ba67c 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt321()
         {
             var test = new SimpleUnaryOpTest__InsertInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.129.cs
index c257663..5e0b41e 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int32.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt32129()
         {
             var test = new SimpleUnaryOpTest__InsertInt32129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int32, Int32>(_data, new Int32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int32) != typeof(long)) && (typeof(Int32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.1.cs
index c673ce6..03110fa 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt641()
         {
             var test = new SimpleUnaryOpTest__InsertInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.129.cs
index 6cd83ad..e344759 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.Int64.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertInt64129()
         {
             var test = new SimpleUnaryOpTest__InsertInt64129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<Int64, Int64>(_data, new Int64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(Int64) != typeof(long)) && (typeof(Int64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.1.cs
index f0a4dcf..2b7af44 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertSByte1()
         {
             var test = new SimpleUnaryOpTest__InsertSByte1();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<SByte, SByte>(_data, new SByte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(SByte) != typeof(long)) && (typeof(SByte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.129.cs
index 7bad860..4c164ab 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.SByte.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertSByte129()
         {
             var test = new SimpleUnaryOpTest__InsertSByte129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<SByte, SByte>(_data, new SByte[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(SByte) != typeof(long)) && (typeof(SByte) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.1.cs
index ab82f5f..efe68f6 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt321()
         {
             var test = new SimpleUnaryOpTest__InsertUInt321();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.129.cs
index 27177f6..32ef922 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt32.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt32129()
         {
             var test = new SimpleUnaryOpTest__InsertUInt32129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt32, UInt32>(_data, new UInt32[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt32) != typeof(long)) && (typeof(UInt32) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.1.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.1.cs
index d4d9f99..a735dd5 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.1.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.1.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt641()
         {
             var test = new SimpleUnaryOpTest__InsertUInt641();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.129.cs b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.129.cs
index 62ce511..d8b339d 100644
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.129.cs
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/X86/Sse41/Insert.UInt64.129.cs
@@ -22,9 +22,7 @@ namespace JIT.HardwareIntrinsics.X86
         private static void InsertUInt64129()
         {
             var test = new SimpleUnaryOpTest__InsertUInt64129();
-            
-            try
-            {
+
             if (test.IsSupported)
             {
                 // Validates basic functionality works, using Unsafe.Read
@@ -77,11 +75,6 @@ namespace JIT.HardwareIntrinsics.X86
                 // Validates we throw on unsupported hardware
                 test.RunUnsupportedScenario();
             }
-            }
-            catch (PlatformNotSupportedException)
-            {
-                test.Succeeded = true;
-            }
 
             if (!test.Succeeded)
             {
@@ -126,7 +119,7 @@ namespace JIT.HardwareIntrinsics.X86
             _dataTable = new SimpleUnaryOpTest__DataTable<UInt64, UInt64>(_data, new UInt64[RetElementCount], LargestVectorSize);
         }
 
-        public bool IsSupported => Sse41.IsSupported;
+        public bool IsSupported => Sse41.IsSupported && (Environment.Is64BitProcess || ((typeof(UInt64) != typeof(long)) && (typeof(UInt64) != typeof(ulong))));
 
         public bool Succeeded { get; set; }
 
-- 
2.7.4