summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXianyi Zhang <xianyi@iscas.ac.cn>2011-05-03 17:19:36 +0800
committerXianyi Zhang <xianyi@iscas.ac.cn>2011-05-03 17:19:36 +0800
commit1acf5ace29601e272670313568c630f858122015 (patch)
tree3bfb69617ad0f86a2b7ea5610a314bca7ed09645
parentfcf9b82f14310915052218f850bd60454b3be989 (diff)
downloadopenblas-1acf5ace29601e272670313568c630f858122015.tar.gz
openblas-1acf5ace29601e272670313568c630f858122015.tar.bz2
openblas-1acf5ace29601e272670313568c630f858122015.zip
Fixed a bug when detecting Intel CPU.
-rw-r--r--cpuid_x86.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/cpuid_x86.c b/cpuid_x86.c
index 0d091b37c..6e3e74f82 100644
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@@ -1302,24 +1302,25 @@ int get_coretype(void){
case 13:
return CORE_DUNNINGTON;
}
- break;
- case 2:
- switch (model) {
- case 5:
- //Intel Core (Clarkdale) / Core (Arrandale)
- // Pentium (Clarkdale) / Pentium Mobile (Arrandale)
- // Xeon (Clarkdale), 32nm
- return CORE_NEHALEM;
- case 12:
- //Xeon Processor 5600 (Westmere-EP)
- return CORE_NEHALEM;
- }
- break;
-
+ break;
+ case 2:
+ switch (model) {
+ case 5:
+ //Intel Core (Clarkdale) / Core (Arrandale)
+ // Pentium (Clarkdale) / Pentium Mobile (Arrandale)
+ // Xeon (Clarkdale), 32nm
+ return CORE_NEHALEM;
+ case 12:
+ //Xeon Processor 5600 (Westmere-EP)
+ return CORE_NEHALEM;
+ }
+ break;
}
+ break;
+
case 15:
- if (model <= 0x2) return CORE_NORTHWOOD;
- return CORE_PRESCOTT;
+ if (model <= 0x2) return CORE_NORTHWOOD;
+ else return CORE_PRESCOTT;
}
}