Merge pull request #3725 from FlyGoat/alpha

Alpha build fixes
2022-08-11 20:38:07 +02:00 · 2022-08-11 20:38:07 +02:00 · 8a5ad01acd
parent 0cca127907 407af4b6aa
commit 8a5ad01acd
48 changed files with 105 additions and 75 deletions
--- a/Makefile.alpha
+++ b/Makefile.alpha
@ -1,42 +1,24 @@
-CPP	= $(CC) -E
-RANLIB  = ranlib
-
-ifeq ($(LIBSUBARCH), EV4)
-LIBNAME		= $(LIBPREFIX)_ev4.a
-LIBNAME_P	= $(LIBPREFIX)_ev4_p.a
-endif
-
-ifeq ($(LIBSUBARCH), EV5)
-LIBNAME		= $(LIBPREFIX)_ev5.a
-LIBNAME_P	= $(LIBPREFIX)_ev5_p.a
-endif
-
-ifeq ($(LIBSUBARCH), EV6)
-LIBNAME		= $(LIBPREFIX)_ev6.a
-LIBNAME_P	= $(LIBPREFIX)_ev6_p.a
-endif
-
 ifneq ($(COMPILER), NATIVE)
 # GCC User
-ifeq ($(LIBSUBARCH), EV4)
-OPTION += -DEV4 -mcpu=ev4
+ifeq ($(CORE), EV4)
+CCOMMON_OPT += -mcpu=ev4
 endif
-ifeq ($(LIBSUBARCH), EV5)
-OPTION += -DEV5 -mcpu=ev5
+ifeq ($(CORE), EV5)
+CCOMMON_OPT += -mcpu=ev5
 endif
-ifeq ($(LIBSUBARCH), EV6)
-OPTION += -DEV6 -mcpu=ev6
+ifeq ($(CORE), EV6)
+CCOMMON_OPT += -mcpu=ev6
 endif
 else
 # Compaq Compiler User
-ifeq ($(LIBSUBARCH), EV4)
-OPTION += -DEV4 -tune ev4 -arch ev4
+ifeq ($(CORE), EV4)
+CCOMMON_OPT += -tune ev4 -arch ev4
 endif
-ifeq ($(LIBSUBARCH), EV5)
-OPTION += -DEV5 -tune ev5 -arch ev5
+ifeq ($(CORE), EV5)
+CCOMMON_OPT += -tune ev5 -arch ev5
 endif
-ifeq ($(LIBSUBARCH), EV6)
-OPTION += -DEV6 -tune ev6 -arch ev6
+ifeq ($(CORE), EV6)
+CCOMMON_OPT += -tune ev6 -arch ev6
 endif
 endif

--- a/TargetList.txt
+++ b/TargetList.txt
@ -128,3 +128,7 @@ LOONGSON2K1000
 12. Elbrus E2000:
 E2K

+13. Alpha
+EV4
+EV5
+EV6
--- a/common_alpha.h
+++ b/common_alpha.h
@ -43,7 +43,7 @@

 #define MB  asm("mb")
 #define WMB asm("wmb")
-#define RMB asm("rmb")
+#define RMB asm("mb")

 static void __inline blas_lock(unsigned long *address){
 #ifndef __DECC
--- a/common_macro.h
+++ b/common_macro.h
@ -2612,7 +2612,7 @@
 #ifndef ASSEMBLER
 #if !defined(DYNAMIC_ARCH) \
  && (defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_IA64) || defined(ARCH_MIPS64) || defined(ARCH_ARM64) \
-      || defined(ARCH_LOONGARCH64) || defined(ARCH_E2K))
+      || defined(ARCH_LOONGARCH64) || defined(ARCH_E2K) || defined(ARCH_ALPHA))
 extern BLASLONG gemm_offset_a;
 extern BLASLONG gemm_offset_b;
 extern BLASLONG sbgemm_p;
--- a/cpuid_alpha.c
+++ b/cpuid_alpha.c
@ -59,6 +59,11 @@ void get_subarchitecture(void){
  printf("ev%d", implver() + 4);
 }

+
+void get_corename(void){
+  printf("EV%d", implver() + 4);
+}
+
 void get_subdirname(void){
  printf("alpha");
 }
--- a/getarch.c
+++ b/getarch.c
@ -146,6 +146,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* #define FORCE_SPARCV7	*/
 /* #define FORCE_ZARCH_GENERIC	*/
 /* #define FORCE_Z13		*/
+/* #define FORCE_EV4		*/
+/* #define FORCE_EV5		*/
+/* #define FORCE_EV6		*/
 /* #define FORCE_GENERIC	*/

 #ifdef FORCE_P2
@ -1601,6 +1604,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define CORENAME  "Z14"
 #endif

+#ifdef FORCE_EV4
+#define FORCE
+#define ARCHITECTURE    "ALPHA"
+#define SUBARCHITECTURE "ev4"
+#define ARCHCONFIG   "-DEV4 " \
+		     "-DL1_DATA_SIZE=16384 -DL1_DATA_LINESIZE=32 " \
+		     "-DL2_SIZE=2097152 -DL2_LINESIZE=32 " \
+		     "-DDTB_DEFAULT_ENTRIES=32 -DDTB_SIZE=8192 "
+#define LIBNAME   "ev4"
+#define CORENAME  "EV4"
+#endif
+
+#ifdef FORCE_EV5
+#define FORCE
+#define ARCHITECTURE    "ALPHA"
+#define SUBARCHITECTURE "ev5"
+#define ARCHCONFIG   "-DEV5 " \
+		     "-DL1_DATA_SIZE=16384 -DL1_DATA_LINESIZE=32 " \
+		     "-DL2_SIZE=2097152 -DL2_LINESIZE=64 " \
+		     "-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=8192 "
+#define LIBNAME   "ev5"
+#define CORENAME  "EV5"
+#endif
+
+#ifdef FORCE_EV6
+#define FORCE
+#define ARCHITECTURE    "ALPHA"
+#define SUBARCHITECTURE "ev6"
+#define ARCHCONFIG   "-DEV6 " \
+		     "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
+		     "-DL2_SIZE=4194304 -DL2_LINESIZE=64 " \
+		     "-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=8192 "
+#define LIBNAME   "ev6"
+#define CORENAME  "EV6"
+#endif
+
 #ifdef FORCE_C910V
 #define FORCE
 #define ARCHITECTURE    "RISCV64"
@ -1777,7 +1816,7 @@ int main(int argc, char *argv[]){
 #ifdef FORCE
    printf("CORE=%s\n", CORENAME);
 #else
-#if defined(INTEL_AMD) || defined(POWER) || defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(ZARCH) || defined(sparc) || defined(__loongarch__) || defined(__riscv)
+#if defined(INTEL_AMD) || defined(POWER) || defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(ZARCH) || defined(sparc) || defined(__loongarch__) || defined(__riscv) || defined(__alpha__)
    printf("CORE=%s\n", get_corename());
 #endif
 #endif
--- a/kernel/alpha/amax.S
+++ b/kernel/alpha/amax.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define X	$17
--- a/kernel/alpha/asum.S
+++ b/kernel/alpha/asum.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/axpy.S
+++ b/kernel/alpha/axpy.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE 40

--- a/kernel/alpha/cabs.S
+++ b/kernel/alpha/cabs.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 	.set noat
 	.set noreorder
--- a/kernel/alpha/cnrm2.S
+++ b/kernel/alpha/cnrm2.S
@ -39,7 +39,7 @@
 #define ASSEMBLER

 #include "common.h"
-#include "version.h"
+

 #define PREFETCH_SIZE 80

--- a/kernel/alpha/copy.S
+++ b/kernel/alpha/copy.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define X	$17
--- a/kernel/alpha/cscal.S
+++ b/kernel/alpha/cscal.S
@ -42,7 +42,7 @@
 #define ASSEMBLER

 #include "common.h"
-#include "version.h"
+

 	.globl NAME
 	.ent   NAME
--- a/kernel/alpha/dnrm2.S
+++ b/kernel/alpha/dnrm2.S
@ -39,7 +39,7 @@
 #define ASSEMBLER

 #include "common.h"
-#include "version.h"
+

 #define PREFETCH_SIZE 80

--- a/kernel/alpha/dot.S
+++ b/kernel/alpha/dot.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/gemm_beta.S
+++ b/kernel/alpha/gemm_beta.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 	.set noat
 	.set noreorder
--- a/kernel/alpha/gemm_kernel_4x4.S
+++ b/kernel/alpha/gemm_kernel_4x4.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."
--- a/kernel/alpha/gemv_n.S
+++ b/kernel/alpha/gemv_n.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define STACKSIZE     64
 #define PREFETCHSIZE  32
--- a/kernel/alpha/gemv_t.S
+++ b/kernel/alpha/gemv_t.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define STACKSIZE     64
 #define PREFETCHSIZE  32
--- a/kernel/alpha/iamax.S
+++ b/kernel/alpha/iamax.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define X	$17
--- a/kernel/alpha/imax.S
+++ b/kernel/alpha/imax.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define X	$17
--- a/kernel/alpha/izamax.S
+++ b/kernel/alpha/izamax.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define X	$17
--- a/kernel/alpha/lsame.S
+++ b/kernel/alpha/lsame.S
@ -36,7 +36,7 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/

-#include "version.h"
+

 	.set noat
 	.set noreorder
--- a/kernel/alpha/max.S
+++ b/kernel/alpha/max.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define X	$17
--- a/kernel/alpha/rot.S
+++ b/kernel/alpha/rot.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define	X	$17
--- a/kernel/alpha/scal.S
+++ b/kernel/alpha/scal.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/snrm2.S
+++ b/kernel/alpha/snrm2.S
@ -39,7 +39,7 @@
 #define ASSEMBLER

 #include "common.h"
-#include "version.h"
+

 #define PREFETCH_SIZE 80

--- a/kernel/alpha/sum.S
+++ b/kernel/alpha/sum.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/swap.S
+++ b/kernel/alpha/swap.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 	PROLOGUE
 	PROFCODE
--- a/kernel/alpha/trsm_kernel_4x4_LN.S
+++ b/kernel/alpha/trsm_kernel_4x4_LN.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."
--- a/kernel/alpha/trsm_kernel_4x4_LT.S
+++ b/kernel/alpha/trsm_kernel_4x4_LT.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."
--- a/kernel/alpha/trsm_kernel_4x4_RT.S
+++ b/kernel/alpha/trsm_kernel_4x4_RT.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."
--- a/kernel/alpha/zamax.S
+++ b/kernel/alpha/zamax.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define X	$17
--- a/kernel/alpha/zasum.S
+++ b/kernel/alpha/zasum.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/zaxpy.S
+++ b/kernel/alpha/zaxpy.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE 40

--- a/kernel/alpha/zdot.S
+++ b/kernel/alpha/zdot.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/zgemm_beta.S
+++ b/kernel/alpha/zgemm_beta.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 	.set noat
 	.set noreorder
--- a/kernel/alpha/zgemm_kernel_2x2.S
+++ b/kernel/alpha/zgemm_kernel_2x2.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."
--- a/kernel/alpha/zgemv_n.S
+++ b/kernel/alpha/zgemv_n.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define STACKSIZE     64
 #define PREFETCHSIZE  32
--- a/kernel/alpha/zgemv_t.S
+++ b/kernel/alpha/zgemv_t.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define STACKSIZE     64
 #define PREFETCHSIZE  32
--- a/kernel/alpha/znrm2.S
+++ b/kernel/alpha/znrm2.S
@ -39,7 +39,7 @@
 #define ASSEMBLER

 #include "common.h"
-#include "version.h"
+

 #define PREFETCH_SIZE 80

--- a/kernel/alpha/zrot.S
+++ b/kernel/alpha/zrot.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define N	$16
 #define	X	$17
--- a/kernel/alpha/zscal.S
+++ b/kernel/alpha/zscal.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/zsum.S
+++ b/kernel/alpha/zsum.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #define PREFETCHSIZE	88

--- a/kernel/alpha/zswap.S
+++ b/kernel/alpha/zswap.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 	PROLOGUE
 	PROFCODE
--- a/kernel/alpha/ztrsm_kernel_2x2_LN.S
+++ b/kernel/alpha/ztrsm_kernel_2x2_LN.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."
--- a/kernel/alpha/ztrsm_kernel_2x2_LT.S
+++ b/kernel/alpha/ztrsm_kernel_2x2_LT.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."
--- a/kernel/alpha/ztrsm_kernel_2x2_RT.S
+++ b/kernel/alpha/ztrsm_kernel_2x2_RT.S
@ -38,7 +38,7 @@

 #define ASSEMBLER
 #include "common.h"
-#include "version.h"
+

 #if !defined(EV4) && !defined(EV5) && !defined(EV6)
 #error "Architecture is not specified."