resolve errors

dotnet · Jun 6, 2024 · 81e1487 · 81e1487
1 parent cd54804
commit 81e1487
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/coreclr/vm/codeman.cpp b/src/coreclr/vm/codeman.cpp
@@ -1424,7 +1424,7 @@ void EEJitManager::SetCpuInfo()
  CPUCompileFlags.Set(InstructionSet_X86Serialize);
  }
 
- if (((cpuFeatures & XArchIntrinsicConstants_Evex) != 0))
+ if (((cpuFeatures & XArchIntrinsicConstants_Evex) != 0) && (CPUCompileFlags.IsSet(InstructionSet_AVX512F) || CPUCompileFlags.IsSet(InstructionSet_AVX10v1)))
  {
  CPUCompileFlags.Set(InstructionSet_EVEX);
  }
@@ -1541,11 +1541,6 @@ void EEJitManager::SetCpuInfo()
 
 #if defined(TARGET_X86) || defined(TARGET_AMD64)
 
- // Set Evex ISA based on instruction set present
- if (CPUCompileFlags.IsSet(InstructionSet_AVX10v1) || CPUCompileFlags.IsSet(InstructionSet_AVX512F))
- {
- CPUCompileFlags.Set(InstructionSet_EVEX);
- }
  // Clean up mutually exclusive ISAs
  if (CPUCompileFlags.IsSet(InstructionSet_VectorT512))
  {