Don't allow avxvnni to be "optimistic" since that brings in avx2

tannergooding · tannergooding · commit 9eeefd7270b3 · 2023-05-20T10:01:34.000-07:00
diff --git a/src/coreclr/tools/Common/InstructionSetHelpers.cs b/src/coreclr/tools/Common/InstructionSetHelpers.cs
@@ -103,10 +103,13 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru
                 Debug.Assert(InstructionSet.X64_AVX == InstructionSet.X86_AVX);
                 if (supportedInstructionSet.HasInstructionSet(InstructionSet.X64_AVX))
                 {
+                    // TODO: Enable optimistic usage of AVX2 once we validate it doesn't break Vector<T> usage
+                    // optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avx2");
+                    // optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxvnni");
+
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("fma");
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("bmi");
                     optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("bmi2");
-                    optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxvnni");
                 }
             }
             else if (targetArchitecture == TargetArchitecture.ARM64)

Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,13 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru`
`103`	`103`	`Debug.Assert(InstructionSet.X64_AVX == InstructionSet.X86_AVX);`
`104`	`104`	`if (supportedInstructionSet.HasInstructionSet(InstructionSet.X64_AVX))`
`105`	`105`	`{`
	`106`	`+ // TODO: Enable optimistic usage of AVX2 once we validate it doesn't break Vector<T> usage`
	`107`	`+ // optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avx2");`
	`108`	`+ // optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxvnni");`
	`109`	`+`
`106`	`110`	`optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("fma");`
`107`	`111`	`optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("bmi");`
`108`	`112`	`optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("bmi2");`
`109`		`- optimisticInstructionSetSupportBuilder.AddSupportedInstructionSet("avxvnni");`
`110`	`113`	`}`
`111`	`114`	`}`
`112`	`115`	`else if (targetArchitecture == TargetArchitecture.ARM64)`