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

Merge pull request #69 from xianyi/develop 

rebase
This commit is contained in:
Martin Kroeker 2020-07-02 16:56:00 +02:00 committed by GitHub
parent 8dfda02e89 c3aa036e99
commit a83680b40b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpuid_x86.c
View File

@ -1409,6 +1409,7 @@ int get_cpuname(void){
} }
case 10: //family 6 exmodel 10 case 10: //family 6 exmodel 10
switch (model) { switch (model) {
case 5: // Comet Lake H and S
case 6: // Comet Lake U case 6: // Comet Lake U
if(support_avx2()) if(support_avx2())
return CPUTYPE_HASWELL; return CPUTYPE_HASWELL;
@ -1967,16 +1968,16 @@ int get_coretype(void){
break; break;
case 10: case 10:
switch (model) { switch (model) {
case 6: case 5: // Comet Lake H and S
// Comet Lake U case 6: // Comet Lake U
if(support_avx()) if(support_avx())
#ifndef NO_AVX2 #ifndef NO_AVX2
return CORE_HASWELL; return CORE_HASWELL;
#else #else
return CORE_SANDYBRIDGE; return CORE_SANDYBRIDGE;
#endif #endif
else else
return CORE_NEHALEM; return CORE_NEHALEM;
} }
case 5: case 5:
switch (model) { switch (model) {

2
driver/others/dynamic.c
View File

@ -619,7 +619,7 @@ static gotoblas_t *get_coretype(void){
} }
} }
case 10: case 10:
if (model == 6) { if (model == 5 || model == 6) {
if(support_avx2()) if(support_avx2())
return &gotoblas_HASWELL; return &gotoblas_HASWELL;
if(support_avx()) { if(support_avx()) {

4
kernel/power/cgemm_kernel_8x4_power8.S
View File

@ -424,7 +424,7 @@ L999:
lwz r16, 204(SP) lwz r16, 204(SP)
lwz r15, 208(SP) lwz r15, 208(SP)
lwz r14, 212(SP) lwz r14, 212(SP)
addi r11, 224 addi r11, SP, 224
#endif #endif
lvx v20, r11, r0 lvx v20, r11, r0
addi r11, r11, 16 addi r11, r11, 16
@ -459,4 +459,4 @@ L999:
blr blr
EPILOGUE EPILOGUE
#endif^ #endif