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

Refs #118. Detect AMD Bulldozer as Barcelona.

This commit is contained in:
Xianyi Zhang 2012-06-25 17:28:49 +08:00
parent 037d995c4d
commit 0a958b6a02
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpuid.h
View File

@ -105,6 +105,7 @@
#define CORE_NANO 19 #define CORE_NANO 19
#define CORE_SANDYBRIDGE 20 #define CORE_SANDYBRIDGE 20
#define CORE_BOBCAT 21 #define CORE_BOBCAT 21
#define CORE_BULLDOZER 22
#define HAVE_SSE (1 << 0) #define HAVE_SSE (1 << 0)
#define HAVE_SSE2 (1 << 1) #define HAVE_SSE2 (1 << 1)
@ -193,4 +194,5 @@ typedef struct {
#define CPUTYPE_NANO 43 #define CPUTYPE_NANO 43
#define CPUTYPE_SANDYBRIDGE 44 #define CPUTYPE_SANDYBRIDGE 44
#define CPUTYPE_BOBCAT 45 #define CPUTYPE_BOBCAT 45
#define CPUTYPE_BULLDOZER 46
#endif #endif

6
cpuid_x86.c
View File

@ -1027,6 +1027,7 @@ int get_cpuname(void){
return CPUTYPE_OPTERON; return CPUTYPE_OPTERON;
case 1: case 1:
case 10: case 10:
case 6: //AMD Bulldozer Opteron 6200 / Opteron 4200 / AMD FX-Series
return CPUTYPE_BARCELONA; return CPUTYPE_BARCELONA;
case 5: case 5:
return CPUTYPE_BOBCAT; return CPUTYPE_BOBCAT;
@ -1151,6 +1152,7 @@ static char *cpuname[] = {
"NANO", "NANO",
"SANDYBRIDGE", "SANDYBRIDGE",
"BOBCAT", "BOBCAT",
"BULLDOZER",
}; };
static char *lowercpuname[] = { static char *lowercpuname[] = {
@ -1199,6 +1201,7 @@ static char *lowercpuname[] = {
"nano", "nano",
"sandybridge", "sandybridge",
"bobcat", "bobcat",
"bulldozer",
}; };
static char *corename[] = { static char *corename[] = {
@ -1224,6 +1227,7 @@ static char *corename[] = {
"NANO", "NANO",
"SANDYBRIDGE", "SANDYBRIDGE",
"BOBCAT", "BOBCAT",
"BULLDOZER",
}; };
static char *corename_lower[] = { static char *corename_lower[] = {
@ -1249,6 +1253,7 @@ static char *corename_lower[] = {
"nano", "nano",
"sandybridge", "sandybridge",
"bobcat", "bobcat",
"bulldozer",
}; };
@ -1359,6 +1364,7 @@ int get_coretype(void){
if (family == 0xf){ if (family == 0xf){
if ((exfamily == 0) || (exfamily == 2)) return CORE_OPTERON; if ((exfamily == 0) || (exfamily == 2)) return CORE_OPTERON;
else if (exfamily == 5) return CORE_BOBCAT; else if (exfamily == 5) return CORE_BOBCAT;
else if (exfamily == 6) return CORE_BARCELONA; //AMD Bulldozer Opteron 6200 / Opteron 4200 / AMD FX-Series
else return CORE_BARCELONA; else return CORE_BARCELONA;
} }
} }

7
getarch.c
View File

@ -102,6 +102,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* #define FORCE_BARCELONA */ /* #define FORCE_BARCELONA */
/* #define FORCE_SHANGHAI */ /* #define FORCE_SHANGHAI */
/* #define FORCE_ISTANBUL */ /* #define FORCE_ISTANBUL */
/* #define FORCE_BULLDOZER */
/* #define FORCE_BOBCAT */ /* #define FORCE_BOBCAT */
/* #define FORCE_SSE_GENERIC */ /* #define FORCE_SSE_GENERIC */
/* #define FORCE_VIAC3 */ /* #define FORCE_VIAC3 */
@ -349,7 +350,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define CORENAME "OPTERON" #define CORENAME "OPTERON"
#endif #endif
#if defined(FORCE_BARCELONA) || defined(FORCE_SHANGHAI) || defined(FORCE_ISTANBUL) #if defined(FORCE_BARCELONA) || defined(FORCE_SHANGHAI) || defined(FORCE_ISTANBUL) || defined (FORCE_BULLDOZER)
#define FORCE #define FORCE
#define FORCE_INTEL #define FORCE_INTEL
#define ARCHITECTURE "X86" #define ARCHITECTURE "X86"
@ -357,8 +358,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ARCHCONFIG "-DBARCELONA " \ #define ARCHCONFIG "-DBARCELONA " \
"-DL1_DATA_SIZE=65536 -DL1_DATA_LINESIZE=64 " \ "-DL1_DATA_SIZE=65536 -DL1_DATA_LINESIZE=64 " \
"-DL2_SIZE=524288 -DL2_LINESIZE=64 -DL3_SIZE=2097152 " \ "-DL2_SIZE=524288 -DL2_LINESIZE=64 -DL3_SIZE=2097152 " \
"-DDTB_DEFAULT_ENTRIES=48 -DDTB_SIZE=4096 -DHAVE_3DNOW " \ "-DDTB_DEFAULT_ENTRIES=48 -DDTB_SIZE=4096 " \
"-DHAVE_3DNOWEX -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 " \ "-DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 " \
"-DHAVE_SSE4A -DHAVE_MISALIGNSSE -DHAVE_128BITFPU -DHAVE_FASTMOVU" "-DHAVE_SSE4A -DHAVE_MISALIGNSSE -DHAVE_128BITFPU -DHAVE_FASTMOVU"
#define LIBNAME "barcelona" #define LIBNAME "barcelona"
#define CORENAME "BARCELONA" #define CORENAME "BARCELONA"