Merge branch 'develop'

Author: xianyi

Makefile

@@ -247,10 +247,16 @@ ifndef NOFORTRAN
 	-@echo "SUFFIX      = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "PSUFFIX     = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "CEXTRALIB   = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifeq ($(F_COMPILER), GFORTRAN)
+ifeq ($(FC), GFORTRAN)
 	-@echo "TIMER       = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
+ifdef SMP
+	-@echo "LOADER      = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
+else
+	-@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
+endif
 else
 	-@echo "TIMER       = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
 endif
 	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
 endif

Makefile.rule

@@ -3,7 +3,7 @@
 #
 
 # This library's version
-VERSION = 0.2.10.rc1
+VERSION = 0.2.10.rc2
 
 # If you set the suffix, the library name will be libopenblas_$(LIBNAMESUFFIX).a
 # and libopenblas_$(LIBNAMESUFFIX).so. Meanwhile, the soname in shared library

cblas.h

@@ -16,6 +16,9 @@ void goto_set_num_threads(int num_threads);
 /*Get the build configure on runtime.*/
 char* openblas_get_config(void);
 
+/*Get the CPU corename on runtime.*/
+char* openblas_get_corename(void);
+
 /* Get the parallelization type which is used by OpenBLAS */
 int openblas_get_parallel(void);
 /* OpenBLAS is compiled for sequential use  */

driver/level3/Makefile

@@ -1,12 +1,14 @@
 TOPDIR	= ../..
 include ../../Makefile.system
 
+USE_GEMM3M = 0
+
 ifeq ($(ARCH), x86)
-USE_GEMM3M = 1
+USE_GEMM3M = 0
 endif
 
 ifeq ($(ARCH), x86_64)
-USE_GEMM3M = 1
+USE_GEMM3M = 0
 endif
 
 ifeq ($(ARCH), ia64)
@@ -168,7 +170,7 @@ XBLASOBJS	+= \
 	xher2k_kernel_UN.$(SUFFIX) xher2k_kernel_UC.$(SUFFIX) \
 	xher2k_kernel_LN.$(SUFFIX) xher2k_kernel_LC.$(SUFFIX)
 
-ifdef USE_GEMM3M
+ifeq ($(USE_GEMM3M), 1)
 
 CBLASOBJS   +=  \
 	cgemm3m_nn.$(SUFFIX) cgemm3m_cn.$(SUFFIX) cgemm3m_tn.$(SUFFIX) cgemm3m_nc.$(SUFFIX) \
@@ -239,7 +241,7 @@ CBLASOBJS    += cherk_thread_UN.$(SUFFIX) cherk_thread_UC.$(SUFFIX) cherk_thread
 ZBLASOBJS    += zherk_thread_UN.$(SUFFIX) zherk_thread_UC.$(SUFFIX) zherk_thread_LN.$(SUFFIX) zherk_thread_LC.$(SUFFIX)
 XBLASOBJS    += xherk_thread_UN.$(SUFFIX) xherk_thread_UC.$(SUFFIX) xherk_thread_LN.$(SUFFIX) xherk_thread_LC.$(SUFFIX)
 
-ifdef USE_GEMM3M
+ifeq ($(USE_GEMM3M), 1)
 
 CBLASOBJS    += cgemm3m_thread_nn.$(SUFFIX) cgemm3m_thread_nt.$(SUFFIX) cgemm3m_thread_nr.$(SUFFIX) cgemm3m_thread_nc.$(SUFFIX)
 CBLASOBJS    += cgemm3m_thread_tn.$(SUFFIX) cgemm3m_thread_tt.$(SUFFIX) cgemm3m_thread_tr.$(SUFFIX) cgemm3m_thread_tc.$(SUFFIX)

driver/others/openblas_get_config.c

@@ -32,6 +32,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "common.h"
 
+#include <string.h>
+
 static char* openblas_config_str=""
 #ifdef USE64BITINT
   "USE64BITINT "
@@ -50,10 +52,33 @@ static char* openblas_config_str=""
 #endif
 #ifdef NO_AFFINITY
   "NO_AFFINITY "
+#endif
+#ifndef DYNAMIC_ARCH
+  CHAR_CORENAME
 #endif
   ;
 
+#ifdef DYNAMIC_ARCH
+char *gotoblas_corename();
+static char tmp_config_str[256];
+#endif
+
+
 char* CNAME() {
+#ifndef DYNAMIC_ARCH
   return openblas_config_str;
+#else
+  strcpy(tmp_config_str, openblas_config_str);
+  strcat(tmp_config_str, gotoblas_corename());
+  return tmp_config_str;
+#endif
 }
 
+
+char* openblas_get_corename() {
+#ifndef DYNAMIC_ARCH 
+  return CHAR_CORENAME;
+#else
+  return gotoblas_corename();
+#endif
+}

driver/others/parameter.c

@@ -165,7 +165,8 @@ int get_L2_size(void){
 
 #if defined(ATHLON) || defined(OPTERON) || defined(BARCELONA) || defined(BOBCAT) || defined(BULLDOZER) || \
     defined(CORE_PRESCOTT) || defined(CORE_CORE2) || defined(PENRYN) || defined(DUNNINGTON) || \
-  defined(CORE_NEHALEM) || defined(CORE_SANDYBRIDGE) || defined(ATOM) || defined(GENERIC)
+    defined(CORE_NEHALEM) || defined(CORE_SANDYBRIDGE) || defined(ATOM) || defined(GENERIC) || \
+    defined(PILEDRIVER) || defined(HASWELL)
 
   cpuid(0x80000006, &eax, &ebx, &ecx, &edx);
 

exports/gensymbol

@@ -73,7 +73,7 @@
 	       );
 
 @gemm3mobjs = (
-	       zgemm3m, cgemm3m, zsymm3m, csymm3m, zhemm3m, chemm3m,
+	       
 	       );
 
 
@@ -85,6 +85,7 @@
 @misc_no_underscore_objs = (
                             goto_set_num_threads,
                             openblas_get_config,
+                            openblas_get_corename,
                            );
 
 @misc_underscore_objs = (

getarch.c

@@ -952,6 +952,15 @@ int main(int argc, char *argv[]){
 #else
     get_cpuconfig();
 #endif
+
+#ifdef FORCE
+    printf("#define CHAR_CORENAME \"%s\"\n", CORENAME);
+#else
+#if defined(__i386__) || defined(__x86_64__) || defined(POWER) || defined(__mips__) || defined(__arm__)
+    printf("#define CHAR_CORENAME \"%s\"\n", get_corename());
+#endif
+#endif
+
  break;
 
   case '2' : /* SMP */

interface/Makefile

@@ -1,6 +1,8 @@
 TOPDIR	= ..
 include $(TOPDIR)/Makefile.system
 
+SUPPORT_GEMM3M = 0
+
 ifeq ($(ARCH), x86)
 SUPPORT_GEMM3M = 0
 endif
@@ -124,7 +126,7 @@ ZBLAS3OBJS    = \
 	       	zhemm.$(SUFFIX) zherk.$(SUFFIX) zher2k.$(SUFFIX) \
 		zomatcopy.$(SUFFIX) zimatcopy.$(SUFFIX)
 
-ifdef SUPPORT_GEMM3M
+ifeq ($(SUPPORT_GEMM3M), 1)
 
 CBLAS3OBJS   +=  cgemm3m.$(SUFFIX) csymm3m.$(SUFFIX) chemm3m.$(SUFFIX)
 
@@ -182,7 +184,7 @@ XBLAS3OBJS    = \
 		xtrsm.$(SUFFIX) xsyrk.$(SUFFIX) xsyr2k.$(SUFFIX) \
 		xhemm.$(SUFFIX) xherk.$(SUFFIX) xher2k.$(SUFFIX)
 
-ifdef SUPPORT_GEMM3M
+ifeq ($(SUPPORT_GEMM3M), 1)
 
 XBLAS3OBJS   +=  xgemm3m.$(SUFFIX) xsymm3m.$(SUFFIX) xhemm3m.$(SUFFIX)
 
@@ -238,7 +240,7 @@ XBLAS3OBJS    = \
 		xtrsm.$(SUFFIX) xsyrk.$(SUFFIX) xsyr2k.$(SUFFIX) \
 		xhemm.$(SUFFIX) xherk.$(SUFFIX) xher2k.$(SUFFIX)
 
-ifdef SUPPORT_GEMM3M
+ifeq ($(SUPPORT_GEMM3M), 1)
 
 XBLAS3OBJS   +=  xgemm3m.$(SUFFIX) xsymm3m.$(SUFFIX) xhemm3m.$(SUFFIX)
 

interface/ger.c

@@ -42,6 +42,12 @@
 #include "functable.h"
 #endif
 
+#ifdef SMP
+#ifdef __64BIT__
+#define SMPTEST 1
+#endif
+#endif
+
 #ifdef XDOUBLE
 #define ERROR_NAME "QGER  "
 #elif defined DOUBLE
@@ -75,7 +81,7 @@ void NAME(blasint *M, blasint *N, FLOAT *Alpha,
   blasint    incy  = *INCY;
   blasint    lda   = *LDA;
   FLOAT *buffer;
-#ifdef SMPBUG
+#ifdef SMPTEST
   int nthreads;
 #endif
 
@@ -107,7 +113,7 @@ void CNAME(enum CBLAS_ORDER order,
 
   FLOAT *buffer;
   blasint info, t;
-#ifdef SMPBUG
+#ifdef SMPTEST
   int nthreads;
 #endif
 
@@ -167,7 +173,7 @@ void CNAME(enum CBLAS_ORDER order,
 
   buffer = (FLOAT *)blas_memory_alloc(1);
 
-#ifdef SMPBUG
+#ifdef SMPTEST
   nthreads = num_cpu_avail(2);
 
 
@@ -176,7 +182,7 @@ void CNAME(enum CBLAS_ORDER order,
 
     GER(m, n, 0, alpha, x, incx, y, incy, a, lda, buffer);
 
-#ifdef SMPBUG
+#ifdef SMPTEST
   } else {
 
     GER_THREAD(m, n, alpha, x, incx, y, incy, a, lda, buffer, nthreads);