Merge pull request #1993 from martin-frbg/aarnes-zarch

martin-frbg · web-flow · commit 282230c30324 · 2019-01-31T21:27:00.000+01:00
Various fixes for the new Z14 target
diff --git a/TargetList.txt b/TargetList.txt
@@ -94,3 +94,4 @@ THUNDERX2T99
 9.System Z:
 ZARCH_GENERIC
 Z13
+Z14
diff --git a/cpuid_zarch.c b/cpuid_zarch.c
@@ -114,7 +114,14 @@ void get_cpuconfig(void)
 	  break;
 	case CPU_Z14:
 	  printf("#define Z14\n");
+	  printf("#define L1_DATA_SIZE 131072\n");
+	  printf("#define L1_DATA_LINESIZE 256\n");
+	  printf("#define L1_DATA_ASSOCIATIVE 8\n");
+	  printf("#define L2_SIZE 4194304\n");
+	  printf("#define L2_LINESIZE 256\n");
+	  printf("#define L2_ASSOCIATIVE 8\n");
 	  printf("#define DTB_DEFAULT_ENTRIES 64\n");
+	  printf("#define DTB_SIZE 4096\n");
 	  break;
 	}
 }
diff --git a/getarch.c b/getarch.c
@@ -1085,6 +1085,16 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define CORENAME  "Z13"
 #endif
 
+#ifdef FORCE_Z14
+#define FORCE
+#define ARCHITECTURE    "ZARCH"
+#define SUBARCHITECTURE "Z14"
+#define ARCHCONFIG   "-DZ14 " \
+       "-DDTB_DEFAULT_ENTRIES=64"
+#define LIBNAME   "z14"
+#define CORENAME  "Z14"
+#endif
+
 #ifndef FORCE
 
 #ifdef USER_TARGET
diff --git a/kernel/Makefile.L3 b/kernel/Makefile.L3
@@ -48,6 +48,10 @@ ifeq ($(ARCH), zarch)
 USE_TRMM = 1
 endif
 
+ifeq ($(CORE), Z14)
+USE_TRMM = 1
+endif
+
 
 
 
diff --git a/kernel/zarch/damax.c b/kernel/zarch/damax.c
@@ -81,7 +81,7 @@ static FLOAT damax_kernel_32(BLASLONG n, FLOAT *x)
 
         "vfmaxdb  %%v16,%%v16,%%v17,8     \n\t"
 
-        "vfmaxdb  %%v0,%%v0,%%16,8        \n\t"
+        "vfmaxdb  %%v0,%%v0,%%v16,8       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/kernel/zarch/damin.c b/kernel/zarch/damin.c
@@ -81,7 +81,7 @@ static FLOAT damin_kernel_32(BLASLONG n, FLOAT *x)
 
         "vfmindb  %%v16,%%v16,%%v17,8     \n\t"
 
-        "vfmindb  %%v0,%%v0,%%16,8        \n\t"
+        "vfmindb  %%v0,%%v0,%%v16,8       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/kernel/zarch/dmax.c b/kernel/zarch/dmax.c
@@ -74,7 +74,7 @@ static FLOAT dmax_kernel_32(BLASLONG n, FLOAT *x)
 
         "vfmaxdb  %%v16,%%v16,%%v17,0     \n\t"
 
-        "vfmaxdb  %%v0,%%v0,%%16,0        \n\t"
+        "vfmaxdb  %%v0,%%v0,%%v16,0       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/kernel/zarch/dmin.c b/kernel/zarch/dmin.c
@@ -74,7 +74,7 @@ static FLOAT dmin_kernel_32(BLASLONG n, FLOAT *x)
 
         "vfmindb  %%v16,%%v16,%%v17,0     \n\t"
 
-        "vfmindb  %%v0,%%v0,%%16,0        \n\t"
+        "vfmindb  %%v0,%%v0,%%v16,0       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/kernel/zarch/dsdot.c b/kernel/zarch/dsdot.c
@@ -132,7 +132,7 @@ double CNAME(BLASLONG n,FLOAT *x,BLASLONG inc_x,FLOAT *y,BLASLONG inc_y)
 		while(i < n)
 		{
 
-			dot += y[i] * x[i] ;
+			dot += (double) y[i] * (double) x[i] ;
 			i++ ;
 
 		}
@@ -146,7 +146,8 @@ double CNAME(BLASLONG n,FLOAT *x,BLASLONG inc_x,FLOAT *y,BLASLONG inc_y)
 	while(i < n1)
 	{
 
-		dot += y[iy] * x[ix] + y[iy+inc_y] * x[ix+inc_x];
+		dot += (double) y[iy] * (double) x[ix];
+		dot += (double) y[iy+inc_y] * (double) x[ix+inc_x];
 		ix  += inc_x*2 ;
 		iy  += inc_y*2 ;
 		i+=2 ;
@@ -156,7 +157,7 @@ double CNAME(BLASLONG n,FLOAT *x,BLASLONG inc_x,FLOAT *y,BLASLONG inc_y)
 	while(i < n)
 	{
 
-		dot += y[iy] * x[ix] ;
+		dot += (double) y[iy] * (double) x[ix] ;
 		ix  += inc_x ;
 		iy  += inc_y ;
 		i++ ;
diff --git a/kernel/zarch/samax.c b/kernel/zarch/samax.c
@@ -81,7 +81,7 @@ static FLOAT samax_kernel_64(BLASLONG n, FLOAT *x)
 
         "vfmaxsb  %%v16,%%v16,%%v17,8     \n\t"
 
-        "vfmaxsb  %%v0,%%v0,%%16,8        \n\t"
+        "vfmaxsb  %%v0,%%v0,%%v16,8       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/kernel/zarch/samin.c b/kernel/zarch/samin.c
@@ -81,7 +81,7 @@ static FLOAT samin_kernel_64(BLASLONG n, FLOAT *x)
 
         "vfminsb  %%v16,%%v16,%%v17,8     \n\t"
 
-        "vfminsb  %%v0,%%v0,%%16,8        \n\t"
+        "vfminsb  %%v0,%%v0,%%v16,8       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/kernel/zarch/smax.c b/kernel/zarch/smax.c
@@ -74,7 +74,7 @@ static FLOAT smax_kernel_64(BLASLONG n, FLOAT *x)
 
         "vfmaxsb  %%v16,%%v16,%%v17,0     \n\t"
 
-        "vfmaxsb  %%v0,%%v0,%%16,0        \n\t"
+        "vfmaxsb  %%v0,%%v0,%%v16,0       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/kernel/zarch/smin.c b/kernel/zarch/smin.c
@@ -74,7 +74,7 @@ static FLOAT smin_kernel_64(BLASLONG n, FLOAT *x)
 
         "vfminsb  %%v16,%%v16,%%v17,0     \n\t"
 
-        "vfminsb  %%v0,%%v0,%%16,0        \n\t"
+        "vfminsb  %%v0,%%v0,%%v16,0       \n\t"
 
         "agfi    %%r1, 256                \n\t"
         "brctg   %%r0, 0b                 \n\t"
diff --git a/param.h b/param.h
@@ -2915,6 +2915,46 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 
+#if defined(Z14)
+#define SNUMOPT		2
+#define DNUMOPT		2
+
+#define GEMM_DEFAULT_OFFSET_A 0
+#define GEMM_DEFAULT_OFFSET_B 0
+#define GEMM_DEFAULT_ALIGN 0x03fffUL
+
+#define SGEMM_DEFAULT_UNROLL_M  8
+#define SGEMM_DEFAULT_UNROLL_N  4
+
+#define DGEMM_DEFAULT_UNROLL_M  8
+#define DGEMM_DEFAULT_UNROLL_N  4
+
+#define CGEMM_DEFAULT_UNROLL_M  4
+#define CGEMM_DEFAULT_UNROLL_N  4
+
+#define ZGEMM_DEFAULT_UNROLL_M  4
+#define ZGEMM_DEFAULT_UNROLL_N  4
+
+#define SGEMM_DEFAULT_P	456
+#define DGEMM_DEFAULT_P	320
+#define CGEMM_DEFAULT_P 480
+#define ZGEMM_DEFAULT_P 224
+
+#define SGEMM_DEFAULT_Q 488
+#define DGEMM_DEFAULT_Q 384
+#define CGEMM_DEFAULT_Q 128
+#define ZGEMM_DEFAULT_Q 352
+
+#define SGEMM_DEFAULT_R 8192
+#define DGEMM_DEFAULT_R 4096
+#define CGEMM_DEFAULT_R 4096
+#define ZGEMM_DEFAULT_R 2048
+
+
+#define SYMV_P	16
+#endif
+
+
 
 #ifdef GENERIC
 
diff --git a/sgemv_t_4.c b/sgemv_t_4.c

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ double CNAME(BLASLONG n,FLOAT x,BLASLONG inc_x,FLOAT y,BLASLONG inc_y)`
`132`	`132`	`while(i < n)`
`133`	`133`	`{`
`134`	`134`
`135`		`- dot += y[i] * x[i] ;`
	`135`	`+ dot += (double) y[i] * (double) x[i] ;`
`136`	`136`	`i++ ;`
`137`	`137`
`138`	`138`	`}`
`@@ -146,7 +146,8 @@ double CNAME(BLASLONG n,FLOAT x,BLASLONG inc_x,FLOAT y,BLASLONG inc_y)`
`146`	`146`	`while(i < n1)`
`147`	`147`	`{`
`148`	`148`
`149`		`- dot += y[iy] * x[ix] + y[iy+inc_y] * x[ix+inc_x];`
	`149`	`+ dot += (double) y[iy] * (double) x[ix];`
	`150`	`+ dot += (double) y[iy+inc_y] * (double) x[ix+inc_x];`
`150`	`151`	`ix += inc_x*2 ;`
`151`	`152`	`iy += inc_y*2 ;`
`152`	`153`	`i+=2 ;`
`@@ -156,7 +157,7 @@ double CNAME(BLASLONG n,FLOAT x,BLASLONG inc_x,FLOAT y,BLASLONG inc_y)`
`156`	`157`	`while(i < n)`
`157`	`158`	`{`
`158`	`159`
`159`		`- dot += y[iy] * x[ix] ;`
	`160`	`+ dot += (double) y[iy] * (double) x[ix] ;`
`160`	`161`	`ix += inc_x ;`
`161`	`162`	`iy += inc_y ;`
`162`	`163`	`i++ ;`