floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect other Intel Skylake cores. 

http://users.atw.hu/instlatx64/
This commit is contained in:
Zhang Xianyi 2015-09-09 10:47:17 -05:00
parent 61ae47eb99
commit cc7cab8a45
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cpuid_x86.c
View File

@ -1133,6 +1133,16 @@ int get_cpuname(void){
return CPUTYPE_HASWELL; return CPUTYPE_HASWELL;
#else #else
return CPUTYPE_SANDYBRIDGE; return CPUTYPE_SANDYBRIDGE;
#endif
else
return CPUTYPE_NEHALEM;
case 14:
//Skylake
if(support_avx())
#ifndef NO_AVX2
return CPUTYPE_HASWELL;
#else
return CPUTYPE_SANDYBRIDGE;
#endif #endif
else else
return CPUTYPE_NEHALEM; return CPUTYPE_NEHALEM;
@ -1150,6 +1160,7 @@ int get_cpuname(void){
#endif #endif
else else
return CPUTYPE_NEHALEM; return CPUTYPE_NEHALEM;
case 5:
case 14: case 14:
// Skylake // Skylake
if(support_avx()) if(support_avx())
@ -1618,6 +1629,16 @@ int get_coretype(void){
return CORE_HASWELL; return CORE_HASWELL;
#else #else
return CORE_SANDYBRIDGE; return CORE_SANDYBRIDGE;
#endif
else
return CORE_NEHALEM;
case 14:
//Skylake
if(support_avx())
#ifndef NO_AVX2
return CORE_HASWELL;
#else
return CORE_SANDYBRIDGE;
#endif #endif
else else
return CORE_NEHALEM; return CORE_NEHALEM;
@ -1635,6 +1656,7 @@ int get_coretype(void){
#endif #endif
else else
return CORE_NEHALEM; return CORE_NEHALEM;
case 5:
case 14: case 14:
// Skylake // Skylake
if(support_avx()) if(support_avx())

11
driver/others/dynamic.c
View File

@ -252,6 +252,15 @@ static gotoblas_t *get_coretype(void){
return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels. return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
} }
} }
//Intel Skylake
if (model == 14) {
if(support_avx())
return &gotoblas_HASWELL;
else{
openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
}
}
return NULL; return NULL;
case 5: case 5:
//Intel Broadwell //Intel Broadwell
@ -264,7 +273,7 @@ static gotoblas_t *get_coretype(void){
} }
} }
//Intel Skylake //Intel Skylake
if (model == 14) { if (model == 14 || model == 5) {
if(support_avx()) if(support_avx())
return &gotoblas_HASWELL; return &gotoblas_HASWELL;
else{ else{