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

s390x: gate dynamic arch detection on gcc version and add generic 

When building OpenBLAS with DYNAMIC_ARCH=1 on s390x (aka zarch), make
sure to include support for systems without the facilities introduced
with z13 (i.e., zarch_generic). Adjust runtime detection to fallback to
that generic code when running on a unknown platform other than Z13
through Z15.

When detecting a Z13 or newer system, add a check for gcc support for
the architecture-specific features before selecting the respective
kernel. Fallback to Z13 or generic code, in case.

Signed-off-by: Marius Hillenbrand <mhillen@linux.ibm.com>
This commit is contained in:
Marius Hillenbrand 2020-05-11 12:37:21 +02:00
parent f94c53ec0a
commit 8c338616f9
2 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.system
View File

@ -563,7 +563,8 @@ DYNAMIC_CORE += EMAG8180
endif endif
ifeq ($(ARCH), zarch) ifeq ($(ARCH), zarch)
DYNAMIC_CORE = Z13 DYNAMIC_CORE = ZARCH_GENERIC
DYNAMIC_CORE += Z13
DYNAMIC_CORE += Z14 DYNAMIC_CORE += Z14
endif endif

70
driver/others/dynamic_zarch.c
View File

@ -1,12 +1,25 @@
#include "common.h" #include "common.h"
#include <stdbool.h>
// Gate kernels for z13 and z14 on gcc version
#if (__GNUC__ == 5 && __GNUC_MINOR__ >= 2) || __GNUC__ >= 6 || \
/* RHEL 7 since 7.3: */ \
(__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ == 5 && \
__GNUC_RH_RELEASE__ >= 11)
#define HAVE_Z13_SUPPORT
#endif
#if __GNUC__ >= 7
#define HAVE_Z14_SUPPORT
#endif
extern gotoblas_t gotoblas_ZARCH_GENERIC;
#ifdef HAVE_Z13_SUPPORT
extern gotoblas_t gotoblas_Z13; extern gotoblas_t gotoblas_Z13;
#endif
#ifdef HAVE_Z14_SUPPORT
extern gotoblas_t gotoblas_Z14; extern gotoblas_t gotoblas_Z14;
//extern gotoblas_t gotoblas_Z15; #endif
//#if (!defined C_GCC) || (GCC_VERSION >= 60000)
//extern gotoblas_t gotoblas_Z14;
//#endif
#define NUM_CORETYPES 4 #define NUM_CORETYPES 4
@ -16,18 +29,19 @@ static char* corename[] = {
"unknown", "unknown",
"Z13", "Z13",
"Z14", "Z14",
// "Z15",
"ZARCH_GENERIC", "ZARCH_GENERIC",
}; };
char* gotoblas_corename(void) { char* gotoblas_corename(void) {
#ifdef HAVE_Z13_SUPPORT
if (gotoblas == &gotoblas_Z13) return corename[1]; if (gotoblas == &gotoblas_Z13) return corename[1];
#endif
#ifdef HAVE_Z14_SUPPORT
if (gotoblas == &gotoblas_Z14) return corename[2]; if (gotoblas == &gotoblas_Z14) return corename[2];
// if (gotoblas == &gotoblas_Z15) return corename[3]; #endif
//#if (!defined C_GCC) || (GCC_VERSION >= 60000) if (gotoblas == &gotoblas_ZARCH_GENERIC) return corename[3];
// if (gotoblas == &gotoblas_POWER9) return corename[3];
//#endif return corename[0];
return corename[0]; // try generic?
} }
// __builtin_cpu_is is not supported by zarch // __builtin_cpu_is is not supported by zarch
@ -49,14 +63,21 @@ static gotoblas_t* get_coretype(void) {
fclose(infile); fclose(infile);
if (strstr(p, "2964")) return &gotoblas_Z13; #ifdef HAVE_Z13_SUPPORT
if (strstr(p, "2965")) return &gotoblas_Z13; if (strstr(p, "2964") || strstr(p, "2965")) return &gotoblas_Z13;
if (strstr(p, "3906")) return &gotoblas_Z14; #endif
if (strstr(p, "3907")) return &gotoblas_Z14;
if (strstr(p, "8561")) return &gotoblas_Z14; // fallback z15 to z14
if (strstr(p, "8562")) return &gotoblas_Z14; // fallback z15 to z14
return NULL; // should be ZARCH_GENERIC // Z14 and Z15 systems
if (strstr(p, "3906") || strstr(p, "3907") || strstr(p, "8561") ||
strstr(p, "8562"))
#ifdef HAVE_Z14_SUPPORT
return &gotoblas_Z14;
#else
return &gotoblas_Z13;
#endif
// unknown system or compiler too old? use generic code for z architecture
return &gotoblas_ZARCH_GENERIC;
} }
static gotoblas_t* force_coretype(char* coretype) { static gotoblas_t* force_coretype(char* coretype) {
@ -76,12 +97,13 @@ static gotoblas_t* force_coretype(char* coretype) {
switch (found) switch (found)
{ {
#ifdef HAVE_Z13_SUPPORT
case 1: return (&gotoblas_Z13); case 1: return (&gotoblas_Z13);
#endif
#ifdef HAVE_Z14_SUPPORT
case 2: return (&gotoblas_Z14); case 2: return (&gotoblas_Z14);
// case 3: return (&gotoblas_Z15); #endif
//#if (!defined C_GCC) || (GCC_VERSION >= 60000) case 3: return (&gotoblas_ZARCH_GENERIC);
// case 3: return (&gotoblas_POWER9);
//#endif
default: return NULL; default: return NULL;
} }
snprintf(message, 128, "Core not found: %s\n", coretype); snprintf(message, 128, "Core not found: %s\n", coretype);
@ -109,9 +131,9 @@ void gotoblas_dynamic_init(void) {
if (gotoblas == NULL) if (gotoblas == NULL)
{ {
snprintf(coremsg, 128, "Falling back to Z14 core\n"); snprintf(coremsg, 128, "Failed to detect system, falling back to generic z support.\n");
openblas_warning(1, coremsg); openblas_warning(1, coremsg);
gotoblas = &gotoblas_Z14; gotoblas = &gotoblas_ZARCH_GENERIC;
} }
if (gotoblas && gotoblas->init) { if (gotoblas && gotoblas->init) {