resolve errors

khushal1996 · khushal1996 · commit 81e14877d4ca · 2024-06-06T15:25:10.000-07:00
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))
     {

Original file line number	Diff line number	Diff line change
`@@ -1424,7 +1424,7 @@ void EEJitManager::SetCpuInfo()`
`1424`	`1424`	`CPUCompileFlags.Set(InstructionSet_X86Serialize);`
`1425`	`1425`	`}`
`1426`	`1426`
`1427`		`- if (((cpuFeatures & XArchIntrinsicConstants_Evex) != 0))`
	`1427`	`+ if (((cpuFeatures & XArchIntrinsicConstants_Evex) != 0) && (CPUCompileFlags.IsSet(InstructionSet_AVX512F) \|\| CPUCompileFlags.IsSet(InstructionSet_AVX10v1)))`
`1428`	`1428`	`{`
`1429`	`1429`	`CPUCompileFlags.Set(InstructionSet_EVEX);`
`1430`	`1430`	`}`
`@@ -1541,11 +1541,6 @@ void EEJitManager::SetCpuInfo()`
`1541`	`1541`
`1542`	`1542`	`#if defined(TARGET_X86) \|\| defined(TARGET_AMD64)`
`1543`	`1543`
`1544`		`- // Set Evex ISA based on instruction set present`
`1545`		`- if (CPUCompileFlags.IsSet(InstructionSet_AVX10v1) \|\| CPUCompileFlags.IsSet(InstructionSet_AVX512F))`
`1546`		`- {`
`1547`		`- CPUCompileFlags.Set(InstructionSet_EVEX);`
`1548`		`- }`
`1549`	`1544`	`// Clean up mutually exclusive ISAs`
`1550`	`1545`	`if (CPUCompileFlags.IsSet(InstructionSet_VectorT512))`
`1551`	`1546`	`{`