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

Merge pull request #2407 from susilehtola/patch-2 

Patch out instances of Z15 in dynamic_zarch.c
This commit is contained in:
Martin Kroeker 2020-02-11 13:04:44 +01:00 committed by GitHub
parent 63994e1cdb 5a6bba3061
commit cb6ef49857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
driver/others/dynamic_zarch.c
View File

@ -3,12 +3,12 @@
extern gotoblas_t gotoblas_Z13; extern gotoblas_t gotoblas_Z13;
extern gotoblas_t gotoblas_Z14; extern gotoblas_t gotoblas_Z14;
extern gotoblas_t gotoblas_Z15; //extern gotoblas_t gotoblas_Z15;
//#if (!defined C_GCC) || (GCC_VERSION >= 60000) //#if (!defined C_GCC) || (GCC_VERSION >= 60000)
//extern gotoblas_t gotoblas_Z14; //extern gotoblas_t gotoblas_Z14;
//#endif //#endif
#define NUM_CORETYPES 5 #define NUM_CORETYPES 4
extern void openblas_warning(int verbose, const char* msg); extern void openblas_warning(int verbose, const char* msg);
@ -16,14 +16,14 @@ static char* corename[] = {
"unknown", "unknown",
"Z13", "Z13",
"Z14", "Z14",
"Z15", // "Z15",
"ZARCH_GENERIC", "ZARCH_GENERIC",
}; };
char* gotoblas_corename(void) { char* gotoblas_corename(void) {
if (gotoblas == &gotoblas_Z13) return corename[1]; if (gotoblas == &gotoblas_Z13) return corename[1];
if (gotoblas == &gotoblas_Z14) return corename[2]; if (gotoblas == &gotoblas_Z14) return corename[2];
if (gotoblas == &gotoblas_Z15) return corename[3]; // if (gotoblas == &gotoblas_Z15) return corename[3];
//#if (!defined C_GCC) || (GCC_VERSION >= 60000) //#if (!defined C_GCC) || (GCC_VERSION >= 60000)
// if (gotoblas == &gotoblas_POWER9) return corename[3]; // if (gotoblas == &gotoblas_POWER9) return corename[3];
//#endif //#endif
@ -78,7 +78,7 @@ static gotoblas_t* force_coretype(char* coretype) {
{ {
case 1: return (&gotoblas_Z13); case 1: return (&gotoblas_Z13);
case 2: return (&gotoblas_Z14); case 2: return (&gotoblas_Z14);
case 3: return (&gotoblas_Z15); // case 3: return (&gotoblas_Z15);
//#if (!defined C_GCC) || (GCC_VERSION >= 60000) //#if (!defined C_GCC) || (GCC_VERSION >= 60000)
// case 3: return (&gotoblas_POWER9); // case 3: return (&gotoblas_POWER9);
//#endif //#endif