Fixing up tests to match the adjusted implications

Author: tannergooding

src/coreclr/tools/Common/InstructionSetHelpers.cs

@@ -210,7 +210,6 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("fma");
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxifma");
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxvnni");
-                    optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("vpclmul");
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("gfni_v256");
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("vaes");
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("vpclmul");

src/coreclr/tools/Common/JitInterface/ThunkGenerator/InstructionSetDesc.txt

@@ -164,14 +164,18 @@ implication        ,X86   ,SSE41                ,SSSE3
 implication        ,X86   ,SSE42                ,SSE41
 implication        ,X86   ,POPCNT               ,SSE42
 
-implication        ,X86   ,AVX                  ,SSE42
-
-implication        ,X86   ,AVX2                 ,AVX
-implication        ,X86   ,BMI1                 ,AVX2
-implication        ,X86   ,BMI2                 ,AVX2
-implication        ,X86   ,FMA                  ,AVX2
-implication        ,X86   ,LZCNT                ,SSE42
-implication        ,X86   ,MOVBE                ,SSE42
+implication        ,X86   ,AVX                  ,POPCNT
+
+implication        ,X86   ,LZCNT                ,POPCNT
+implication        ,X86   ,MOVBE                ,POPCNT
+implication        ,X86   ,BMI1                 ,AVX
+implication        ,X86   ,BMI2                 ,AVX
+implication        ,X86   ,FMA                  ,AVX
+implication        ,X86   ,AVX2                 ,LZCNT
+implication        ,X86   ,AVX2                 ,MOVBE
+implication        ,X86   ,AVX2                 ,BMI1
+implication        ,X86   ,AVX2                 ,BMI2
+implication        ,X86   ,AVX2                 ,FMA
 
 implication        ,X86   ,AVX512               ,AVX2
 implication        ,X86   ,AVX512               ,BMI1

src/native/minipal/cpufeatures.c

@@ -301,7 +301,7 @@ int minipal_getcpufeatures(void)
             if (((cpuidInfo[CPUID_EBX] & (1 << 5)) != 0) &&                                                     // AVX2
                 ((cpuidInfo[CPUID_EBX] & (1 << 3)) != 0) &&                                                     // BMI1
                 ((cpuidInfo[CPUID_EBX] & (1 << 8)) != 0) &&                                                     // BMI2
-                hasAvx2Dependencies)                                                                           // F16C, FMA, LZCNT, MOVBE
+                hasAvx2Dependencies)                                                                            // F16C, FMA, LZCNT, MOVBE
             {
                 result |= XArchIntrinsicConstants_Avx2;
 
@@ -346,11 +346,6 @@ int minipal_getcpufeatures(void)
                 hasAvx2Dependencies = false;
             }
 
-            if ((cpuidInfo[CPUID_ECX] & (1 << 8)) != 0)                                                         // GFNI
-            {
-                result |= XArchIntrinsicConstants_Gfni;
-            }
-
             if ((result & XArchIntrinsicConstants_Aes) != 0)
             {
                 if (((cpuidInfo[CPUID_ECX] & (1 << 9)) != 0) &&                                                 // VAES
@@ -361,6 +356,11 @@ int minipal_getcpufeatures(void)
             }
         }
 
+        if ((cpuidInfo[CPUID_ECX] & (1 << 8)) != 0)                                                             // GFNI
+        {
+            result |= XArchIntrinsicConstants_Gfni;
+        }
+
         if ((cpuidInfo[CPUID_EBX] & (1 << 29)) != 0)                                                            // SHA
         {
             result |= XArchIntrinsicConstants_Sha;