From 8f758eeff9a659534f7655376ec3e013763a6b2e Mon Sep 17 00:00:00 2001 From: Zhang Xianyi Date: Sat, 5 Mar 2016 08:32:03 +0800 Subject: [PATCH] Refs #786. avoid old assembly c/zgemv kernels. --- ctest/cin2 | 2 +- ctest/cin3 | 2 +- ctest/cin3_3m | 2 +- ctest/din2 | 2 +- ctest/din3 | 2 +- ctest/sin2 | 2 +- ctest/sin3 | 2 +- ctest/zin2 | 2 +- ctest/zin3 | 2 +- ctest/zin3_3m | 2 +- kernel/x86_64/KERNEL | 8 ++++---- kernel/x86_64/KERNEL.BARCELONA | 3 --- kernel/x86_64/KERNEL.BULLDOZER | 2 +- 13 files changed, 15 insertions(+), 18 deletions(-) diff --git a/ctest/cin2 b/ctest/cin2 index 032fcbb39..b2e1e4a0e 100644 --- a/ctest/cin2 +++ b/ctest/cin2 @@ -1,7 +1,7 @@ 'CBLAT2.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 LOGICAL FLAG, T TO TEST ROW-MAJOR (IF FALSE COLUMN-MAJOR IS TESTED) 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/cin3 b/ctest/cin3 index 223d165db..fbdb57857 100644 --- a/ctest/cin3 +++ b/ctest/cin3 @@ -1,7 +1,7 @@ 'CBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/cin3_3m b/ctest/cin3_3m index 34014143e..5a797291a 100644 --- a/ctest/cin3_3m +++ b/ctest/cin3_3m @@ -1,7 +1,7 @@ 'CBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/din2 b/ctest/din2 index 6f42b2792..df8f7b6ae 100644 --- a/ctest/din2 +++ b/ctest/din2 @@ -1,7 +1,7 @@ 'DBLAT2.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/din3 b/ctest/din3 index cbbcc22ab..23fedfe32 100644 --- a/ctest/din3 +++ b/ctest/din3 @@ -1,7 +1,7 @@ 'DBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/sin2 b/ctest/sin2 index 3eee5c2f9..0e1ecd9d6 100644 --- a/ctest/sin2 +++ b/ctest/sin2 @@ -1,7 +1,7 @@ 'SBLAT2.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 LOGICAL FLAG, T TO TEST ROW-MAJOR (IF FALSE COLUMN-MAJOR IS TESTED) 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/sin3 b/ctest/sin3 index 01e32d6ee..644083f22 100644 --- a/ctest/sin3 +++ b/ctest/sin3 @@ -1,7 +1,7 @@ 'SBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/zin2 b/ctest/zin2 index 4c0affe92..217697191 100644 --- a/ctest/zin2 +++ b/ctest/zin2 @@ -1,7 +1,7 @@ 'ZBLAT2.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 LOGICAL FLAG, T TO TEST ROW-MAJOR (IF FALSE COLUMN-MAJOR IS TESTED) 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/zin3 b/ctest/zin3 index 70050b693..ee269e8d5 100644 --- a/ctest/zin3 +++ b/ctest/zin3 @@ -1,7 +1,7 @@ 'ZBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/ctest/zin3_3m b/ctest/zin3_3m index 33bf08353..a0d4fde0a 100644 --- a/ctest/zin3_3m +++ b/ctest/zin3_3m @@ -1,7 +1,7 @@ 'ZBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0) F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD. -F LOGICAL FLAG, T TO STOP ON FAILURES. +T LOGICAL FLAG, T TO STOP ON FAILURES. T LOGICAL FLAG, T TO TEST ERROR EXITS. 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH 16.0 THRESHOLD VALUE OF TEST RATIO diff --git a/kernel/x86_64/KERNEL b/kernel/x86_64/KERNEL index 56850f791..4874711bb 100644 --- a/kernel/x86_64/KERNEL +++ b/kernel/x86_64/KERNEL @@ -389,19 +389,19 @@ DGEMVTKERNEL = dgemv_t.S endif ifndef CGEMVNKERNEL -CGEMVNKERNEL = cgemv_n.S +CGEMVNKERNEL = cgemv_n_4.c endif ifndef CGEMVTKERNEL -CGEMVTKERNEL = ../arm/zgemv_t.c +CGEMVTKERNEL = cgemv_t_4.c endif ifndef ZGEMVNKERNEL -ZGEMVNKERNEL = zgemv_n.S +ZGEMVNKERNEL = zgemv_n_4.c endif ifndef ZGEMVTKERNEL -ZGEMVTKERNEL = zgemv_t.S +ZGEMVTKERNEL = zgemv_t_4.c endif ifndef QGEMVNKERNEL diff --git a/kernel/x86_64/KERNEL.BARCELONA b/kernel/x86_64/KERNEL.BARCELONA index 313c62d7c..70f3d6058 100644 --- a/kernel/x86_64/KERNEL.BARCELONA +++ b/kernel/x86_64/KERNEL.BARCELONA @@ -1,6 +1,3 @@ -ZGEMVNKERNEL = zgemv_n_dup.S -ZGEMVTKERNEL = zgemv_t.S - SGEMMKERNEL = gemm_kernel_8x4_barcelona.S SGEMMINCOPY = ../generic/gemm_ncopy_8.c SGEMMITCOPY = ../generic/gemm_tcopy_8.c diff --git a/kernel/x86_64/KERNEL.BULLDOZER b/kernel/x86_64/KERNEL.BULLDOZER index c8ccae1ea..90834d9ca 100644 --- a/kernel/x86_64/KERNEL.BULLDOZER +++ b/kernel/x86_64/KERNEL.BULLDOZER @@ -18,7 +18,7 @@ SSYMV_L_KERNEL = ssymv_L.c SGEMVNKERNEL = sgemv_n_4.c SGEMVTKERNEL = sgemv_t_4.c -ZGEMVNKERNEL = zgemv_n_dup.S +ZGEMVNKERNEL = zgemv_n_4.c ZGEMVTKERNEL = zgemv_t_4.c DGEMVNKERNEL = dgemv_n_bulldozer.S