Skip to content

Commit

Permalink
Merge pull request #1 from xianyi/develop
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
maamountki authored Feb 5, 2019
2 parents 8212472 + 729e925 commit a38aa56
Show file tree
Hide file tree
Showing 27 changed files with 3,307 additions and 82 deletions.
1 change: 1 addition & 0 deletions TargetList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,4 @@ THUNDERX2T99
9.System Z:
ZARCH_GENERIC
Z13
Z14
7 changes: 7 additions & 0 deletions cpuid_zarch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
10 changes: 10 additions & 0 deletions getarch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions kernel/Makefile.L3
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ ifeq ($(ARCH), zarch)
USE_TRMM = 1
endif

ifeq ($(CORE), Z14)
USE_TRMM = 1
endif




Expand Down
8 changes: 4 additions & 4 deletions kernel/power/KERNEL.POWER8
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ CSWAPKERNEL = cswap.c
ZSWAPKERNEL = zswap.c
#

#SGEMVNKERNEL = ../arm/gemv_n.c
SGEMVNKERNEL = sgemv_n.c
DGEMVNKERNEL = dgemv_n.c
#CGEMVNKERNEL = ../arm/zgemv_n.c
CGEMVNKERNEL = cgemv_n.c
ZGEMVNKERNEL = zgemv_n_4.c
#
#SGEMVTKERNEL = ../arm/gemv_t.c
SGEMVTKERNEL = sgemv_t.c
DGEMVTKERNEL = dgemv_t.c
#CGEMVTKERNEL = ../arm/zgemv_t.c
CGEMVTKERNEL = cgemv_t.c
ZGEMVTKERNEL = zgemv_t_4.c


Expand Down
Loading

0 comments on commit a38aa56

Please sign in to comment.