Removing 64 bit flags + correcting check.

dotnet · Feb 24, 2023 · 8bc9b34 · 8bc9b34
1 parent b0be82d
commit 8bc9b34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/coreclr/jit/compiler.cpp b/src/coreclr/jit/compiler.cpp
@@ -2298,6 +2298,16 @@ void Compiler::compSetProcessor()
             instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512DQ_VL);
             instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512CD);
             instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
+#ifdef TARGET_AMD64
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512F_X64);
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512F_VL_X64);
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512BW_X64);
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512BW_VL_X64);
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512CD_X64);
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512CD_VL_X64);
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512DQ_X64);
+            instructionSetFlags.RemoveInstructionSet(InstructionSet_AVX512DQ_VL_X64);
+#endif // TARGET_AMD64
         }
         else
         {

diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -8325,7 +8325,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     SIMDLevel getSIMDSupportLevel()
     {
 #if defined(TARGET_XARCH)
-        if (compOpportunisticallyDependsOn(InstructionSet_Vector256))
+        if (compOpportunisticallyDependsOn(InstructionSet_AVX2))
         {
             if (compOpportunisticallyDependsOn(InstructionSet_Vector512))
             {