Skip to content

Commit 13ba592

Browse files
tannergoodingtannergooding
committed
Fixing up tests to match the adjusted implications
1 parent 176e795 commit 13ba592

File tree

7 files changed

+621
-373
lines changed

7 files changed

+621
-373
lines changed

‎src/coreclr/inc/corinfoinstructionset.h

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -561,20 +561,28 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
561561
resultflags.RemoveInstructionSet(InstructionSet_SSE42);
562562
if (resultflags.HasInstructionSet(InstructionSet_POPCNT) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
563563
resultflags.RemoveInstructionSet(InstructionSet_POPCNT);
564-
if (resultflags.HasInstructionSet(InstructionSet_AVX) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
564+
if (resultflags.HasInstructionSet(InstructionSet_AVX) && !resultflags.HasInstructionSet(InstructionSet_POPCNT))
565565
resultflags.RemoveInstructionSet(InstructionSet_AVX);
566-
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_AVX))
567-
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
568-
if (resultflags.HasInstructionSet(InstructionSet_BMI1) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
566+
if (resultflags.HasInstructionSet(InstructionSet_LZCNT) && !resultflags.HasInstructionSet(InstructionSet_POPCNT))
567+
resultflags.RemoveInstructionSet(InstructionSet_LZCNT);
568+
if (resultflags.HasInstructionSet(InstructionSet_MOVBE) && !resultflags.HasInstructionSet(InstructionSet_POPCNT))
569+
resultflags.RemoveInstructionSet(InstructionSet_MOVBE);
570+
if (resultflags.HasInstructionSet(InstructionSet_BMI1) && !resultflags.HasInstructionSet(InstructionSet_AVX))
569571
resultflags.RemoveInstructionSet(InstructionSet_BMI1);
570-
if (resultflags.HasInstructionSet(InstructionSet_BMI2) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
572+
if (resultflags.HasInstructionSet(InstructionSet_BMI2) && !resultflags.HasInstructionSet(InstructionSet_AVX))
571573
resultflags.RemoveInstructionSet(InstructionSet_BMI2);
572-
if (resultflags.HasInstructionSet(InstructionSet_FMA) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
574+
if (resultflags.HasInstructionSet(InstructionSet_FMA) && !resultflags.HasInstructionSet(InstructionSet_AVX))
573575
resultflags.RemoveInstructionSet(InstructionSet_FMA);
574-
if (resultflags.HasInstructionSet(InstructionSet_LZCNT) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
575-
resultflags.RemoveInstructionSet(InstructionSet_LZCNT);
576-
if (resultflags.HasInstructionSet(InstructionSet_MOVBE) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
577-
resultflags.RemoveInstructionSet(InstructionSet_MOVBE);
576+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_LZCNT))
577+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
578+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_MOVBE))
579+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
580+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_BMI1))
581+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
582+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_BMI2))
583+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
584+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_FMA))
585+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
578586
if (resultflags.HasInstructionSet(InstructionSet_AVX512) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
579587
resultflags.RemoveInstructionSet(InstructionSet_AVX512);
580588
if (resultflags.HasInstructionSet(InstructionSet_AVX512) && !resultflags.HasInstructionSet(InstructionSet_BMI1))
@@ -661,20 +669,28 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
661669
resultflags.RemoveInstructionSet(InstructionSet_SSE42);
662670
if (resultflags.HasInstructionSet(InstructionSet_POPCNT) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
663671
resultflags.RemoveInstructionSet(InstructionSet_POPCNT);
664-
if (resultflags.HasInstructionSet(InstructionSet_AVX) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
672+
if (resultflags.HasInstructionSet(InstructionSet_AVX) && !resultflags.HasInstructionSet(InstructionSet_POPCNT))
665673
resultflags.RemoveInstructionSet(InstructionSet_AVX);
666-
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_AVX))
667-
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
668-
if (resultflags.HasInstructionSet(InstructionSet_BMI1) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
674+
if (resultflags.HasInstructionSet(InstructionSet_LZCNT) && !resultflags.HasInstructionSet(InstructionSet_POPCNT))
675+
resultflags.RemoveInstructionSet(InstructionSet_LZCNT);
676+
if (resultflags.HasInstructionSet(InstructionSet_MOVBE) && !resultflags.HasInstructionSet(InstructionSet_POPCNT))
677+
resultflags.RemoveInstructionSet(InstructionSet_MOVBE);
678+
if (resultflags.HasInstructionSet(InstructionSet_BMI1) && !resultflags.HasInstructionSet(InstructionSet_AVX))
669679
resultflags.RemoveInstructionSet(InstructionSet_BMI1);
670-
if (resultflags.HasInstructionSet(InstructionSet_BMI2) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
680+
if (resultflags.HasInstructionSet(InstructionSet_BMI2) && !resultflags.HasInstructionSet(InstructionSet_AVX))
671681
resultflags.RemoveInstructionSet(InstructionSet_BMI2);
672-
if (resultflags.HasInstructionSet(InstructionSet_FMA) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
682+
if (resultflags.HasInstructionSet(InstructionSet_FMA) && !resultflags.HasInstructionSet(InstructionSet_AVX))
673683
resultflags.RemoveInstructionSet(InstructionSet_FMA);
674-
if (resultflags.HasInstructionSet(InstructionSet_LZCNT) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
675-
resultflags.RemoveInstructionSet(InstructionSet_LZCNT);
676-
if (resultflags.HasInstructionSet(InstructionSet_MOVBE) && !resultflags.HasInstructionSet(InstructionSet_SSE42))
677-
resultflags.RemoveInstructionSet(InstructionSet_MOVBE);
684+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_LZCNT))
685+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
686+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_MOVBE))
687+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
688+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_BMI1))
689+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
690+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_BMI2))
691+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
692+
if (resultflags.HasInstructionSet(InstructionSet_AVX2) && !resultflags.HasInstructionSet(InstructionSet_FMA))
693+
resultflags.RemoveInstructionSet(InstructionSet_AVX2);
678694
if (resultflags.HasInstructionSet(InstructionSet_AVX512) && !resultflags.HasInstructionSet(InstructionSet_AVX2))
679695
resultflags.RemoveInstructionSet(InstructionSet_AVX512);
680696
if (resultflags.HasInstructionSet(InstructionSet_AVX512) && !resultflags.HasInstructionSet(InstructionSet_BMI1))

‎src/coreclr/tools/Common/InstructionSetHelpers.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru
210210
optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("fma");
211211
optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxifma");
212212
optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxvnni");
213-
optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("vpclmul");
214213
optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("gfni_v256");
215214
optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("vaes");
216215
optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("vpclmul");

0 commit comments

Comments
 (0)