Merge branch 'develop' into bulldozer
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 28 Jul 2013 04:38:25 +0000 (06:38 +0200)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 28 Jul 2013 04:38:25 +0000 (06:38 +0200)
Conflicts:
kernel/x86_64/KERNEL.BULLDOZER

1  2 
driver/others/init.c
kernel/x86_64/KERNEL.BULLDOZER

Simple merge
@@@ -1,11 -1,17 +1,18 @@@
  ZGEMVNKERNEL = zgemv_n_dup.S
  ZGEMVTKERNEL = zgemv_t_dup.S
  
- SGEMMKERNEL    =  sgemm_kernel_8x4_bulldozer.S
- SGEMMINCOPY    =  ../generic/gemm_ncopy_8.c
- SGEMMITCOPY    =  ../generic/gemm_tcopy_8.c
- SGEMMONCOPY    =  gemm_ncopy_4_opteron.S
- SGEMMOTCOPY    =  gemm_tcopy_4_opteron.S
+ DGEMVNKERNEL = dgemv_n_bulldozer.S
+ DGEMVTKERNEL = dgemv_t_bulldozer.S
+ DAXPYKERNEL  = daxpy_bulldozer.S
+ DDOTKERNEL   = ddot_bulldozer.S
+ DCOPYKERNEL  = dcopy_bulldozer.S
+ SGEMMKERNEL    =  sgemm_kernel_16x2_bulldozer.S
+ SGEMMINCOPY    =  ../generic/gemm_ncopy_16.c
+ SGEMMITCOPY    =  ../generic/gemm_tcopy_16.c
+ SGEMMONCOPY    =  gemm_ncopy_2_bulldozer.S
+ SGEMMOTCOPY    =  gemm_tcopy_2_bulldozer.S
++
  SGEMMINCOPYOBJ =  sgemm_incopy$(TSUFFIX).$(SUFFIX) 
  SGEMMITCOPYOBJ =  sgemm_itcopy$(TSUFFIX).$(SUFFIX) 
  SGEMMONCOPYOBJ =  sgemm_oncopy$(TSUFFIX).$(SUFFIX)