amd/blis
1
0
Fork 0
mirror of https://github.com/amd/blis.git synced 2026-05-12 01:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

JIRA: CPUPL-853: Fix for the redefinition of _unsigned int __get_cpuid_max(unsigned int, unsigned int*)_. http://ontrack-internal.amd.com/browse/CPUPL-853 https://github.com/flame/blis/issues/393

Browse Source 
Change-Id: I88c23b2fdad0beb3796d0e6acbcf215fe9daab2d
This commit is contained in:
Nallani Bhaskar
2020-04-23 17:14:24 +05:30
parent 138bc75063
commit ea3865fbf2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frame/base/bli_cpuid.c
View File

@@ -45,19 +45,21 @@
#define __arm__
#endif
#ifndef BLIS_CONFIGURETIME_CPUID
#include "blis.h"
#else
#ifdef BLIS_CONFIGURETIME_CPUID
#define BLIS_EXPORT_BLIS
#include "bli_system.h"
#include "bli_type_defs.h"
#include "bli_cpuid.h"
#else
#include "blis.h"
#endif
// -----------------------------------------------------------------------------
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
#include "cpuid.h"
arch_t bli_cpuid_query_id( void )
{
uint32_t vendor, family, model, features;

4
frame/base/bli_cpuid.h
View File

@@ -125,7 +125,9 @@ static bool_t bli_cpuid_has_features( uint32_t have, uint32_t want )
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
#include "cpuid.h"
// cpuid.h is now #included in bli_cpuid.c instead of here. See issue #393
// // for more information why this move was made.
// //#include "cpuid.h"
void get_cpu_name( char *cpu_name );
int vpu_count( void );