Merge pull request #3810 from martin-frbg/fix3800

Add fallbacks to RaptorLake entry from PR3800
2022-11-09 15:28:12 +01:00
parent 4743d80c22 1865b15240
commit f14435cb4b
1 changed files with 11 additions and 1 deletions
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@@ -1549,6 +1549,10 @@ int get_cpuname(void){
          case 7: // Raptor Lake
            if(support_avx2())
              return CPUTYPE_HASWELL;
+	    if(support_avx())
+	      return CPUTYPE_SANDYBRIDGE;
+            else
+	      return CPUTYPE_NEHALEM;
        }
        break;
      }
@@ -2344,8 +2348,14 @@ int get_coretype(void){
      case 11:
 	switch (model) {
 	  case 7: // Raptor Lake
-          if(support_avx2())
+#ifndef NO_AVX2
+	  if(support_avx2())
            return CORE_HASWELL;
+#endif
+	  if(support_avx())
+	    return CORE_SANDYBRIDGE;
+	  else
+	  return CORE_NEHALEM;
 	}
      case 15:
 	if (model <= 0x2) return CORE_NORTHWOOD;