Skip to content

Commit 4c637b8

Browse files
grisuthedragongrisuthedragon
committed
Fix the test of xGEMMTR
- make the SRNAME in XERBLA more robust against strings passed from C (e.g. OpenBLAS) - adjust the maximum length of a function name from 6 to 7 characters - add a missing parameter in the error output for z/cgemmtr.
1 parent a005310 commit 4c637b8

File tree

4 files changed

+123
-109
lines changed

4 files changed

+123
-109
lines changed

‎BLAS/TESTING/cblat3.f‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*>
2121
*> The program must be driven by a short data file. The first 14 records
2222
*> of the file are read using list-directed input, the last 10 records
23-
*> are read using the format ( A6, L2 ). An annotated example of a data
23+
*> are read using the format ( A7, L2 ). An annotated example of a data
2424
*> file can be obtained by deleting the first 3 characters from the
2525
*> following 23 lines:
2626
*> 'cblat3.out' NAME OF SUMMARY OUTPUT FILE
@@ -389,7 +389,7 @@ PROGRAM CBLAT3
389389
$ 7( '(', F4.1, ',', F4.1, ') ', : ) )
390390
9991 FORMAT( ' AMEND DATA FILE OR INCREASE ARRAY SIZES IN PROGRAM',
391391
$ /' ******* TESTS ABANDONED *******' )
392-
9990 FORMAT( ' SUBPROGRAM NAME ', A6, ' NOT RECOGNIZED', /' ******* T',
392+
9990 FORMAT( ' SUBPROGRAM NAME ', A7, ' NOT RECOGNIZED', /' ******* T',
393393
$ 'ESTS ABANDONED *******' )
394394
9989 FORMAT( ' ERROR IN CMMCH - IN-LINE DOT PRODUCTS ARE BEING EVALU',
395395
$ 'ATED WRONGLY.', /' CMMCH WAS CALLED WITH TRANSA = ', A1,
@@ -674,15 +674,15 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
674674
130 CONTINUE
675675
RETURN
676676
*
677-
9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
677+
9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
678678
$ 'S)' )
679679
9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
680680
$ 'ANGED INCORRECTLY *******' )
681-
9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
681+
9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
682682
$ 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
683683
$ ' - SUSPECT *******' )
684-
9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
685-
9995 FORMAT( 1X, I6, ': ', A6, '(''', A1, ''',''', A1, ''',',
684+
9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
685+
9995 FORMAT( 1X, I6, ': ', A7, '(''', A1, ''',''', A1, ''',',
686686
$ 3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
687687
$ ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
688688
9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -953,15 +953,15 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
953953
120 CONTINUE
954954
RETURN
955955
*
956-
9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
956+
9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
957957
$ 'S)' )
958958
9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
959959
$ 'ANGED INCORRECTLY *******' )
960-
9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
960+
9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
961961
$ 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
962962
$ ' - SUSPECT *******' )
963-
9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
964-
9995 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
963+
9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
964+
9995 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
965965
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
966966
$ ',', F4.1, '), C,', I3, ') .' )
967967
9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1263,15 +1263,15 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
12631263
160 CONTINUE
12641264
RETURN
12651265
*
1266-
9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
1266+
9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
12671267
$ 'S)' )
12681268
9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
12691269
$ 'ANGED INCORRECTLY *******' )
1270-
9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
1270+
9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
12711271
$ 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
12721272
$ ' - SUSPECT *******' )
1273-
9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
1274-
9995 FORMAT( 1X, I6, ': ', A6, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
1273+
9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
1274+
9995 FORMAT( 1X, I6, ': ', A7, '(', 4( '''', A1, ''',' ), 2( I3, ',' ),
12751275
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ') ',
12761276
$ ' .' )
12771277
9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1591,19 +1591,19 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
15911591
130 CONTINUE
15921592
RETURN
15931593
*
1594-
9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
1594+
9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
15951595
$ 'S)' )
15961596
9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
15971597
$ 'ANGED INCORRECTLY *******' )
1598-
9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
1598+
9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
15991599
$ 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
16001600
$ ' - SUSPECT *******' )
1601-
9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
1601+
9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
16021602
9995 FORMAT( ' THESE ARE THE RESULTS FOR COLUMN ', I3 )
1603-
9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1603+
9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
16041604
$ F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ') ',
16051605
$ ' .' )
1606-
9993 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1606+
9993 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
16071607
$ '(', F4.1, ',', F4.1, ') , A,', I3, ',(', F4.1, ',', F4.1,
16081608
$ '), C,', I3, ') .' )
16091609
9992 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -1964,19 +1964,19 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
19641964
160 CONTINUE
19651965
RETURN
19661966
*
1967-
9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
1967+
9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
19681968
$ 'S)' )
19691969
9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
19701970
$ 'ANGED INCORRECTLY *******' )
1971-
9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
1971+
9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
19721972
$ 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
19731973
$ ' - SUSPECT *******' )
1974-
9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
1974+
9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
19751975
9995 FORMAT( ' THESE ARE THE RESULTS FOR COLUMN ', I3 )
1976-
9994 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1976+
9994 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
19771977
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',', F4.1,
19781978
$ ', C,', I3, ') .' )
1979-
9993 FORMAT( 1X, I6, ': ', A6, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1979+
9993 FORMAT( 1X, I6, ': ', A7, '(', 2( '''', A1, ''',' ), 2( I3, ',' ),
19801980
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
19811981
$ ',', F4.1, '), C,', I3, ') .' )
19821982
9992 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
@@ -2019,7 +2019,7 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
20192019
COMPLEX A( 2, 1 ), B( 2, 1 ), C( 2, 1 )
20202020
* .. External Subroutines ..
20212021
EXTERNAL CGEMM, CHEMM, CHER2K, CHERK, CHKXER, CSYMM,
2022-
$ CSYR2K, CSYRK, CTRMM, CTRSM
2022+
$ CSYR2K, CSYRK, CTRMM, CTRSM, CGEMMTR
20232023
* .. Common blocks ..
20242024
COMMON /INFOC/INFOT, NOUTC, OK, LERR
20252025
* .. Executable Statements ..
@@ -3115,8 +3115,8 @@ SUBROUTINE CCHKE( ISNUM, SRNAMT, NOUT )
31153115
END IF
31163116
RETURN
31173117
*
3118-
9999 FORMAT( ' ', A6, ' PASSED THE TESTS OF ERROR-EXITS' )
3119-
9998 FORMAT( ' ******* ', A6, ' FAILED THE TESTS OF ERROR-EXITS *****',
3118+
9999 FORMAT( ' ', A7, ' PASSED THE TESTS OF ERROR-EXITS' )
3119+
9998 FORMAT( ' ******* ', A7, ' FAILED THE TESTS OF ERROR-EXITS *****',
31203120
$ '**' )
31213121
*
31223122
* End of CCHKE
@@ -3629,7 +3629,7 @@ SUBROUTINE CHKXER( SRNAMT, INFOT, NOUT, LERR, OK )
36293629
RETURN
36303630
*
36313631
9999 FORMAT( ' ***** ILLEGAL VALUE OF PARAMETER NUMBER ', I2, ' NOT D',
3632-
$ 'ETECTED BY ', A6, ' *****' )
3632+
$ 'ETECTED BY ', A7, ' *****' )
36333633
*
36343634
* End of CHKXER
36353635
*
@@ -3663,6 +3663,8 @@ SUBROUTINE XERBLA( SRNAME, INFO )
36633663
* .. Common blocks ..
36643664
COMMON /INFOC/INFOT, NOUT, OK, LERR
36653665
COMMON /SRNAMC/SRNAMT
3666+
* .. Locals ..
3667+
INTEGER SRLEN
36663668
* .. Executable Statements ..
36673669
LERR = .TRUE.
36683670
IF( INFO.NE.INFOT )THEN
@@ -3673,16 +3675,17 @@ SUBROUTINE XERBLA( SRNAME, INFO )
36733675
END IF
36743676
OK = .FALSE.
36753677
END IF
3676-
IF( SRNAME.NE.SRNAMT )THEN
3678+
SRLEN = MIN(LEN_TRIM(SRNAME), LEN_TRIM(SRNAMT))
3679+
IF( SRNAME(1:SRLEN).NE.SRNAMT(1:SRLEN) )THEN
36773680
WRITE( NOUT, FMT = 9998 )SRNAME, SRNAMT
36783681
OK = .FALSE.
36793682
END IF
36803683
RETURN
36813684
*
36823685
9999 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6, ' INSTEAD',
36833686
$ ' OF ', I2, ' *******' )
3684-
9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A6, ' INSTE',
3685-
$ 'AD OF ', A6, ' *******' )
3687+
9998 FORMAT( ' ******* XERBLA WAS CALLED WITH SRNAME = ', A7, ' INSTE',
3688+
$ 'AD OF ', A7, ' *******' )
36863689
9997 FORMAT( ' ******* XERBLA WAS CALLED WITH INFO = ', I6,
36873690
$ ' *******' )
36883691
*
@@ -3738,7 +3741,7 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
37383741
LOGICAL LCE, LCERES
37393742
EXTERNAL LCE, LCERES
37403743
* .. External Subroutines ..
3741-
EXTERNAL CGEMM, CMAKE, CMMCH
3744+
EXTERNAL CGEMMTR, CMAKE, CMMTCH
37423745
* .. Intrinsic Functions ..
37433746
INTRINSIC MAX
37443747
* .. Scalars in Common ..
@@ -3956,21 +3959,21 @@ SUBROUTINE CCHK6( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
39563959
*
39573960
120 CONTINUE
39583961
WRITE( NOUT, FMT = 9996 )SNAME
3959-
WRITE( NOUT, FMT = 9995 )NC, SNAME, TRANSA, TRANSB, N, K,
3962+
WRITE( NOUT, FMT = 9995 )NC, SNAME, UPLO, TRANSA, TRANSB, N, K,
39603963
$ ALPHA, LDA, LDB, BETA, LDC
39613964
*
39623965
130 CONTINUE
39633966
RETURN
39643967
*
3965-
9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
3968+
9999 FORMAT( ' ', A7, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL',
39663969
$ 'S)' )
39673970
9998 FORMAT( ' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
39683971
$ 'ANGED INCORRECTLY *******' )
3969-
9997 FORMAT( ' ', A6, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
3972+
9997 FORMAT( ' ', A7, ' COMPLETED THE COMPUTATIONAL TESTS (', I6, ' C',
39703973
$ 'ALLS)', /' ******* BUT WITH MAXIMUM TEST RATIO', F8.2,
39713974
$ ' - SUSPECT *******' )
3972-
9996 FORMAT( ' ******* ', A6, ' FAILED ON CALL NUMBER:' )
3973-
9995 FORMAT( 1X, I6, ': ', A6, '(''',A1, ''',''',A1, ''',''', A1,''',',
3975+
9996 FORMAT( ' ******* ', A7, ' FAILED ON CALL NUMBER:' )
3976+
9995 FORMAT( 1X, I6, ': ', A7, '(''',A1, ''',''',A1, ''',''', A1,''',',
39743977
$ 2( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
39753978
$ ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
39763979
9994 FORMAT( ' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',

0 commit comments

Comments
 (0)