Merge branch 'hotfix-0.1alpha2.3'

OpenMathLib · Sep 8, 2011 · e27b761 · e27b761
2 parents 12d77de + b1fe26c
commit e27b761
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 58 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,4 +1,12 @@
 OpenBLAS ChangeLog
+====================================================================
+Version 0.1 alpha2.3
+5-Sep-2011
+
+x86/x86_64:
+	*  Added DTB_ENTRIES into dynamic arch setting parameters. Now, 
+	   it can read DTB_ENTRIES on runtime. (Refs issue #55 on github)
+
 ====================================================================
 Version 0.1 alpha2.2
 14-Jul-2011

diff --git a/Makefile.rule b/Makefile.rule
@@ -3,7 +3,7 @@
 #
 
 # This library's version
-VERSION = 0.1alpha2.2
+VERSION = 0.1alpha2.3
 
 # You can specify the target architecture, otherwise it's
 # automatically detected.

diff --git a/common_param.h b/common_param.h
@@ -44,6 +44,7 @@
 #ifdef DYNAMIC_ARCH
 
 typedef struct {
+  int dtb_entries;
   int offsetA, offsetB, align;
 
   int sgemm_p, sgemm_q, sgemm_r;
@@ -813,6 +814,7 @@ BLASLONG (*ixamin_k)(BLASLONG, xdouble *, BLASLONG);
 
 extern gotoblas_t *gotoblas;
 
+#define DTB_ENTRIES  gotoblas -> dtb_entries
 #define GEMM_OFFSET_A	gotoblas -> offsetA
 #define GEMM_OFFSET_B	gotoblas -> offsetB
 #define GEMM_ALIGN	gotoblas -> align
@@ -863,6 +865,8 @@ extern gotoblas_t *gotoblas;
 
 #else
 
+#define DTB_ENTRIES  DTB_DEFAULT_ENTRIES 
+
 #define GEMM_OFFSET_A	GEMM_DEFAULT_OFFSET_A
 #define GEMM_OFFSET_B	GEMM_DEFAULT_OFFSET_B
 #define GEMM_ALIGN	GEMM_DEFAULT_ALIGN
@@ -997,14 +1001,14 @@ extern gotoblas_t *gotoblas;
 #endif
 
 #ifdef XDOUBLE
-#define GEMM3M_UNROLL_M	QGEMM_DEFAULT_UNROLL_M
-#define GEMM3M_UNROLL_N	QGEMM_DEFAULT_UNROLL_N
+#define GEMM3M_UNROLL_M	QGEMM_UNROLL_M
+#define GEMM3M_UNROLL_N	QGEMM_UNROLL_N
 #elif defined(DOUBLE)
-#define GEMM3M_UNROLL_M	DGEMM_DEFAULT_UNROLL_M
-#define GEMM3M_UNROLL_N	DGEMM_DEFAULT_UNROLL_N
+#define GEMM3M_UNROLL_M	DGEMM_UNROLL_M
+#define GEMM3M_UNROLL_N	DGEMM_UNROLL_N
 #else
-#define GEMM3M_UNROLL_M	SGEMM_DEFAULT_UNROLL_M
-#define GEMM3M_UNROLL_N	SGEMM_DEFAULT_UNROLL_N
+#define GEMM3M_UNROLL_M	SGEMM_UNROLL_M
+#define GEMM3M_UNROLL_N	SGEMM_UNROLL_N
 #endif
 
 

diff --git a/cpuid_alpha.c b/cpuid_alpha.c
@@ -72,7 +72,7 @@ void get_cpuconfig(void){
     printf("#define L1_DATA_LINESIZE 32\n");
     printf("#define L2_SIZE 2097152\n");
     printf("#define L2_LINESIZE 32\n");
-    printf("#define DTB_ENTRIES 32\n");
+    printf("#define DTB_DEFAULT_ENTRIES 32\n");
     printf("#define DTB_SIZE 8192\n");
     break;
 
@@ -81,7 +81,7 @@ void get_cpuconfig(void){
     printf("#define L1_DATA_LINESIZE 32\n");
     printf("#define L2_SIZE 2097152\n");
     printf("#define L2_LINESIZE 64\n");
-    printf("#define DTB_ENTRIES 64\n");
+    printf("#define DTB_DEFAULT_ENTRIES 64\n");
     printf("#define DTB_SIZE 8192\n");
     break;
 
@@ -90,7 +90,7 @@ void get_cpuconfig(void){
     printf("#define L1_DATA_LINESIZE 64\n");
     printf("#define L2_SIZE 4194304\n");
     printf("#define L2_LINESIZE 64\n");
-    printf("#define DTB_ENTRIES 64\n");
+    printf("#define DTB_DEFAULT_ENTRIES 64\n");
     printf("#define DTB_SIZE 8192\n");
     break;
   }

diff --git a/cpuid_ia64.c b/cpuid_ia64.c
@@ -133,6 +133,6 @@ void get_cpuconfig(void){
   printf("#define L2_SIZE 1572864\n");
   printf("#define L2_LINESIZE 128\n");
   printf("#define DTB_SIZE 16384\n");
-  printf("#define DTB_ENTRIES 128\n");
+  printf("#define DTB_DEFAULT_ENTRIES 128\n");
 }
 
diff --git a/cpuid_mips.c b/cpuid_mips.c
@@ -146,7 +146,7 @@ void get_cpuconfig(void){
     printf("#define L1_DATA_LINESIZE 32\n");
     printf("#define L2_SIZE 512488\n");
     printf("#define L2_LINESIZE 32\n");
-    printf("#define DTB_ENTRIES 64\n");
+    printf("#define DTB_DEFAULT_ENTRIES 64\n");
     printf("#define DTB_SIZE 4096\n");
     printf("#define L2_ASSOCIATIVE 4\n");
   }else{
@@ -155,7 +155,7 @@ void get_cpuconfig(void){
     printf("#define L1_DATA_LINESIZE 32\n");
     printf("#define L2_SIZE 512488\n");
     printf("#define L2_LINESIZE 32\n");
-    printf("#define DTB_ENTRIES 32\n");
+    printf("#define DTB_DEFAULT_ENTRIES 32\n");
     printf("#define DTB_SIZE 4096\n");
     printf("#define L2_ASSOCIATIVE 8\n");
   }

diff --git a/cpuid_power.c b/cpuid_power.c
@@ -165,7 +165,7 @@ void get_cpuconfig(void){
   printf("#define L1_DATA_LINESIZE 128\n");
   printf("#define L2_SIZE 524288\n");
   printf("#define L2_LINESIZE 128 \n");
-  printf("#define DTB_ENTRIES 128\n");
+  printf("#define DTB_DEFAULT_ENTRIES 128\n");
   printf("#define DTB_SIZE 4096\n");
   printf("#define L2_ASSOCIATIVE 8\n");
 

diff --git a/cpuid_sparc.c b/cpuid_sparc.c
@@ -50,7 +50,7 @@ void get_subdirname(void){
 
 void get_cpuconfig(void){
   printf("#define V9\n");
-  printf("#define DTB_ENTRIES 32\n");
+  printf("#define DTB_DEFAULT_ENTRIES 32\n");
 }
 
 void get_libname(void){

diff --git a/cpuid_x86.c b/cpuid_x86.c
@@ -1393,7 +1393,7 @@ void get_cpuconfig(void){
     if (info.size > 0) {
       printf("#define DTB_SIZE %d\n", info.size * 1024);
       printf("#define DTB_ASSOCIATIVE %d\n", info.associative);
-      printf("#define DTB_ENTRIES %d\n", info.linesize);
+      printf("#define DTB_DEFAULT_ENTRIES %d\n", info.linesize);
     }
 
     features = get_cputype(GET_FEATURE);
@@ -1422,7 +1422,7 @@ void get_cpuconfig(void){
     features = get_coretype();
     if (features > 0) printf("#define CORE_%s\n", corename[features]);
   } else {
-    printf("#define DTB_ENTRIES 16\n");
+    printf("#define DTB_DEFAULT_ENTRIES 16\n");
     printf("#define L1_CODE_SIZE 8192\n");
     printf("#define L1_DATA_SIZE 8192\n");
     printf("#define L2_SIZE 0\n");