Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add autodetection for POWER7, POWER9 & POWER10 #647

Merged
merged 1 commit into from
Jul 21, 2022
Merged

Add autodetection for POWER7, POWER9 & POWER10 #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions frame/base/bli_cpuid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ bool bli_cpuid_is_bulldozer
return TRUE;
}

#elif defined(__aarch64__) || defined(__arm__) || defined(_M_ARM)
#elif defined(__aarch64__) || defined(__arm__) || defined(_M_ARM) || defined(_ARCH_PPC)

arch_t bli_cpuid_query_id( void )
{
Expand Down Expand Up @@ -530,9 +530,14 @@ arch_t bli_cpuid_query_id( void )
return BLIS_ARCH_GENERIC;
}
}
else if ( vendor == VENDOR_UNKNOWN )
else if ( vendor == VENDOR_IBM )
{
return BLIS_ARCH_GENERIC;
if ( model == MODEL_POWER7)
return BLIS_ARCH_POWER7;
else if ( model == MODEL_POWER9)
return BLIS_ARCH_POWER9;
else if ( model == MODEL_POWER10)
return BLIS_ARCH_POWER10;
}

return BLIS_ARCH_GENERIC;
Expand Down Expand Up @@ -1203,7 +1208,7 @@ uint32_t bli_cpuid_query
return VENDOR_ARM;
}

#elif defined(__arm__) || defined(_M_ARM)
#elif defined(__arm__) || defined(_M_ARM) || defined(_ARCH_PPC)

/*
I can't easily find documentation to do this as for aarch64, though
Expand Down Expand Up @@ -1240,6 +1245,20 @@ uint32_t bli_cpuid_query
char feat_str[ TEMP_BUFFER_SIZE ];
char* r_val;

#ifdef _ARCH_PPC
r_val = find_string_in( "cpu", proc_str, TEMP_BUFFER_SIZE, pci_str );
if ( r_val == NULL ) return VENDOR_IBM;

if ( strstr( proc_str, "POWER7" ) != NULL )
*model = MODEL_POWER7;
else if ( strstr( proc_str, "POWER9" ) != NULL )
*model = MODEL_POWER9;
else if ( strstr( proc_str, "POWER10" ) != NULL )
*model = MODEL_POWER10;

return VENDOR_IBM;
#endif

//printf( "bli_cpuid_query(): beginning search\n" );

// Search /proc/cpuinfo for the 'Processor' entry.
Expand Down
6 changes: 5 additions & 1 deletion frame/base/bli_cpuid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,19 +161,23 @@ enum
FEATURE_AVX512VL = 0x4000
};

#elif defined(__aarch64__) || defined(__arm__) || defined(_M_ARM)
#elif defined(__aarch64__) || defined(__arm__) || defined(_M_ARM) || defined(_ARCH_PPC)

char* find_string_in( char* target, char* buffer, size_t buf_len, char* filepath );

enum
{
VENDOR_ARM = 0,
VENDOR_IBM,
VENDOR_UNKNOWN
};
enum
{
MODEL_ARMV7 = 0,
MODEL_ARMV8,
MODEL_POWER7,
MODEL_POWER9,
MODEL_POWER10,
MODEL_UNKNOWN
};
enum
Expand Down