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

Merge a31511dcea into a9594e8072

This commit is contained in:
Martin Köhler 2017-02-07 16:24:56 +00:00 committed by GitHub
parent a9594e8072 a31511dcea
commit 6204d8596d
2 changed files with 179 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpuid_x86.c
View File

@ -1250,6 +1250,7 @@ int get_cpuname(void){
} }
if (vendor == VENDOR_AMD){ if (vendor == VENDOR_AMD){
/* fprintf(stderr, "Family: %x exfamily: %x model: %x exmodel: %x\n", family, exfamily, model, exmodel ); */
switch (family) { switch (family) {
case 0x4: case 0x4:
return CPUTYPE_AMD5X86; return CPUTYPE_AMD5X86;
@ -1280,6 +1281,11 @@ int get_cpuname(void){
return CPUTYPE_PILEDRIVER; return CPUTYPE_PILEDRIVER;
else else
return CPUTYPE_BARCELONA; //OS don't support AVX. return CPUTYPE_BARCELONA; //OS don't support AVX.
case 5: // EXCAVATOR
if(support_avx())
return CPUTYPE_EXCAVATOR;
else
return CPUTYPE_BARCELONA; //OS don't support AVX.
case 0: case 0:
switch(exmodel){ switch(exmodel){
case 1: //AMD Trinity case 1: //AMD Trinity
@ -1786,6 +1792,11 @@ int get_coretype(void){
return CORE_PILEDRIVER; return CORE_PILEDRIVER;
else else
return CORE_BARCELONA; //OS don't support AVX. return CORE_BARCELONA; //OS don't support AVX.
case 5:
if(support_avx())
return CORE_EXCAVATOR;
else
return CORE_BARCELONA; //OS don't support AVX.
case 0: case 0:
switch(exmodel){ switch(exmodel){

8
driver/others/dynamic.c
View File

@ -354,6 +354,14 @@ static gotoblas_t *get_coretype(void){
openblas_warning(FALLBACK_VERBOSE, BARCELONA_FALLBACK); openblas_warning(FALLBACK_VERBOSE, BARCELONA_FALLBACK);
return &gotoblas_BARCELONA; //OS doesn't support AVX. Use old kernels. return &gotoblas_BARCELONA; //OS doesn't support AVX. Use old kernels.
} }
}else if(model == 5) { // EXCAVATOR
if(support_avx())
return &gotoblas_EXCAVATOR;
else{
openblas_warning(FALLBACK_VERBOSE, BARCELONA_FALLBACK);
return &gotoblas_BARCELONA; //OS doesn't support AVX. Use old kernels.
}
}else if(model == 0){ }else if(model == 0){
if (exmodel == 1) { if (exmodel == 1) {
//AMD Trinity //AMD Trinity