Skip to content

Commit 8c83139

Browse files
martin-frbgmartin-frbg
authored
Fix compiler warnings in ctest
Various fixes for const correctness, stray tab characters and unused labels
1 parent bede1c4 commit 8c83139

17 files changed

+184
-184
lines changed

‎ctest/c_cblas1.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "common.h"
1010
#include "cblas_test.h"
1111

12-
void F77_caxpy(const int *N, const void *alpha, void *X,
12+
void F77_caxpy(const int *N, OPENBLAS_CONST void *alpha, void *X,
1313
const int *incX, void *Y, const int *incY)
1414
{
1515
cblas_caxpy(*N, alpha, X, *incX, Y, *incY);
@@ -58,13 +58,13 @@ void F77_cswap( const int *N, void *X, const int *incX,
5858
return;
5959
}
6060

61-
int F77_icamax(const int *N, const void *X, const int *incX)
61+
int F77_icamax(const int *N, OPENBLAS_CONST void *X, const int *incX)
6262
{
6363
if (*N < 1 || *incX < 1) return(0);
6464
return (cblas_icamax(*N, X, *incX)+1);
6565
}
6666

67-
float F77_scnrm2(const int *N, const void *X, const int *incX)
67+
float F77_scnrm2(const int *N, OPENBLAS_CONST void *X, const int *incX)
6868
{
6969
return cblas_scnrm2(*N, X, *incX);
7070
}

‎ctest/c_cblas2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#include "cblas_test.h"
1010

1111
void F77_cgemv(int *order, char *transp, int *m, int *n,
12-
const void *alpha,
13-
CBLAS_TEST_COMPLEX *a, int *lda, const void *x, int *incx,
14-
const void *beta, void *y, int *incy) {
12+
OPENBLAS_CONST void *alpha,
13+
CBLAS_TEST_COMPLEX *a, int *lda, OPENBLAS_CONST void *x, int *incx,
14+
OPENBLAS_CONST void *beta, void *y, int *incy) {
1515

1616
CBLAS_TEST_COMPLEX *A;
1717
int i,j,LDA;

‎ctest/c_cblat2.f

+3-3
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,13 @@ PROGRAM CBLAT2
349349
CALL CCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
350350
$ REWI, FATAL, NIDIM, IDIM, NKB, KB, NINC, INC,
351351
$ NMAX, INCMAX, A, AA, AS, Y, YY, YS, YT, G, Z,
352-
$ 0 )
352+
$ 0 )
353353
END IF
354354
IF (RORDER) THEN
355355
CALL CCHK3( SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
356356
$ REWI, FATAL, NIDIM, IDIM, NKB, KB, NINC, INC,
357357
$ NMAX, INCMAX, A, AA, AS, Y, YY, YS, YT, G, Z,
358-
$ 1 )
358+
$ 1 )
359359
END IF
360360
GO TO 200
361361
* Test CGERC, 12, CGERU, 13.
@@ -2660,7 +2660,7 @@ LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
26602660
50 CONTINUE
26612661
END IF
26622662
*
2663-
60 CONTINUE
2663+
C 60 CONTINUE
26642664
LCERES = .TRUE.
26652665
GO TO 80
26662666
70 CONTINUE

‎ctest/c_cblat3.f

+26-26
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,13 @@ PROGRAM CBLAT3
329329
CALL CCHK3(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
330330
$ REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
331331
$ AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
332-
$ 0 )
332+
$ 0 )
333333
END IF
334334
IF (RORDER) THEN
335335
CALL CCHK3(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
336336
$ REWI, FATAL, NIDIM, IDIM, NALF, ALF, NMAX, AB,
337337
$ AA, AS, AB( 1, NMAX + 1 ), BB, BS, CT, G, C,
338-
$ 1 )
338+
$ 1 )
339339
END IF
340340
GO TO 190
341341
* Test CHERK, 06, CSYRK, 07.
@@ -357,13 +357,13 @@ PROGRAM CBLAT3
357357
CALL CCHK5(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
358358
$ REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
359359
$ NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
360-
$ 0 )
360+
$ 0 )
361361
END IF
362362
IF (RORDER) THEN
363363
CALL CCHK5(SNAMES( ISNUM ), EPS, THRESH, NOUT, NTRA, TRACE,
364364
$ REWI, FATAL, NIDIM, IDIM, NALF, ALF, NBET, BET,
365365
$ NMAX, AB, AA, AS, BB, BS, C, CC, CS, CT, G, W,
366-
$ 1 )
366+
$ 1 )
367367
END IF
368368
GO TO 190
369369
*
@@ -707,9 +707,9 @@ SUBROUTINE CCHK1( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
707707
9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
708708
$ 'ANGED INCORRECTLY *******' )
709709
9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
710-
9995 FORMAT( 1X, I6, ': ', A12,'(''', A1, ''',''', A1, ''',',
711-
$ 3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
712-
$ ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
710+
C 9995 FORMAT( 1X, I6, ': ', A12,'(''', A1, ''',''', A1, ''',',
711+
C $ 3( I3, ',' ), '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3,
712+
C $ ',(', F4.1, ',', F4.1, '), C,', I3, ').' )
713713
9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
714714
$ '******' )
715715
*
@@ -1033,9 +1033,9 @@ SUBROUTINE CCHK2( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
10331033
9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
10341034
$ 'ANGED INCORRECTLY *******' )
10351035
9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
1036-
9995 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1037-
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
1038-
$ ',', F4.1, '), C,', I3, ') .' )
1036+
C 9995 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1037+
C $ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
1038+
C $ ',', F4.1, '), C,', I3, ') .' )
10391039
9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
10401040
$ '******' )
10411041
*
@@ -1385,9 +1385,9 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
13851385
9998 FORMAT(' ******* FATAL ERROR - PARAMETER NUMBER ', I2, ' WAS CH',
13861386
$ 'ANGED INCORRECTLY *******' )
13871387
9996 FORMAT(' ******* ', A12,' FAILED ON CALL NUMBER:' )
1388-
9995 FORMAT(1X, I6, ': ', A12,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
1389-
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ') ',
1390-
$ ' .' )
1388+
C 9995 FORMAT(1X, I6, ': ', A12,'(', 4( '''', A1, ''',' ), 2( I3, ',' ),
1389+
C $ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ') ',
1390+
C $ ' .' )
13911391
9994 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
13921392
$ '******' )
13931393
*
@@ -1768,12 +1768,12 @@ SUBROUTINE CCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
17681768
$ 'ANGED INCORRECTLY *******' )
17691769
9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
17701770
9995 FORMAT( ' THESE ARE THE RESULTS FOR COLUMN ', I3 )
1771-
9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1772-
$ F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ') ',
1773-
$ ' .' )
1774-
9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1775-
$ '(', F4.1, ',', F4.1, ') , A,', I3, ',(', F4.1, ',', F4.1,
1776-
$ '), C,', I3, ') .' )
1771+
C 9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1772+
C $ F4.1, ', A,', I3, ',', F4.1, ', C,', I3, ') ',
1773+
C $ ' .' )
1774+
C 9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
1775+
C $ '(', F4.1, ',', F4.1, ') , A,', I3, ',(', F4.1, ',', F4.1,
1776+
C $ '), C,', I3, ') .' )
17771777
9992 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
17781778
$ '******' )
17791779
*
@@ -2221,12 +2221,12 @@ SUBROUTINE CCHK5( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
22212221
$ 'ANGED INCORRECTLY *******' )
22222222
9996 FORMAT( ' ******* ', A12,' FAILED ON CALL NUMBER:' )
22232223
9995 FORMAT( ' THESE ARE THE RESULTS FOR COLUMN ', I3 )
2224-
9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
2225-
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',', F4.1,
2226-
$ ', C,', I3, ') .' )
2227-
9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
2228-
$ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
2229-
$ ',', F4.1, '), C,', I3, ') .' )
2224+
C 9994 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
2225+
C $ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',', F4.1,
2226+
C $ ', C,', I3, ') .' )
2227+
C 9993 FORMAT(1X, I6, ': ', A12,'(', 2( '''', A1, ''',' ), 2( I3, ',' ),
2228+
C $ '(', F4.1, ',', F4.1, '), A,', I3, ', B,', I3, ',(', F4.1,
2229+
C $ ',', F4.1, '), C,', I3, ') .' )
22302230
9992 FORMAT(' ******* FATAL ERROR - ERROR-EXIT TAKEN ON VALID CALL *',
22312231
$ '******' )
22322232
*
@@ -2702,7 +2702,7 @@ LOGICAL FUNCTION LCERES( TYPE, UPLO, M, N, AA, AS, LDA )
27022702
50 CONTINUE
27032703
END IF
27042704
*
2705-
60 CONTINUE
2705+
C 60 CONTINUE
27062706
LCERES = .TRUE.
27072707
GO TO 80
27082708
70 CONTINUE

‎ctest/c_dblas1.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ double F77_dasum(const int *N, double *X, const int *incX)
1414
return cblas_dasum(*N, X, *incX);
1515
}
1616

17-
void F77_daxpy(const int *N, const double *alpha, const double *X,
17+
void F77_daxpy(const int *N, const double *alpha, OPENBLAS_CONST double *X,
1818
const int *incX, double *Y, const int *incY)
1919
{
2020
cblas_daxpy(*N, *alpha, X, *incX, Y, *incY);
@@ -28,13 +28,13 @@ void F77_dcopy(const int *N, double *X, const int *incX,
2828
return;
2929
}
3030

31-
double F77_ddot(const int *N, const double *X, const int *incX,
32-
const double *Y, const int *incY)
31+
double F77_ddot(const int *N, OPENBLAS_CONST double *X, const int *incX,
32+
OPENBLAS_CONST double *Y, const int *incY)
3333
{
3434
return cblas_ddot(*N, X, *incX, Y, *incY);
3535
}
3636

37-
double F77_dnrm2(const int *N, const double *X, const int *incX)
37+
double F77_dnrm2(const int *N, OPENBLAS_CONST double *X, const int *incX)
3838
{
3939
return cblas_dnrm2(*N, X, *incX);
4040
}
@@ -72,12 +72,12 @@ double F77_dzasum(const int *N, void *X, const int *incX)
7272
return cblas_dzasum(*N, X, *incX);
7373
}
7474

75-
double F77_dznrm2(const int *N, const void *X, const int *incX)
75+
double F77_dznrm2(const int *N, OPENBLAS_CONST void *X, const int *incX)
7676
{
7777
return cblas_dznrm2(*N, X, *incX);
7878
}
7979

80-
int F77_idamax(const int *N, const double *X, const int *incX)
80+
int F77_idamax(const int *N, OPENBLAS_CONST double *X, const int *incX)
8181
{
8282
if (*N < 1 || *incX < 1) return(0);
8383
return (cblas_idamax(*N, X, *incX)+1);

‎ctest/c_dblat1.f

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ SUBROUTINE CHECK1(SFAC)
211211
IF (ICASE.EQ.7) THEN
212212
* .. DNRM2TEST ..
213213
STEMP(1) = DTRUE1(NP1)
214-
CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP,STEMP,SFAC)
214+
CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
215215
ELSE IF (ICASE.EQ.8) THEN
216216
* .. DASUMTEST ..
217217
STEMP(1) = DTRUE3(NP1)
218-
CALL STEST1(DASUMTEST(N,SX,INCX),STEMP,STEMP,SFAC)
218+
CALL STEST1(DASUMTEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
219219
ELSE IF (ICASE.EQ.9) THEN
220220
* .. DSCALTEST ..
221221
CALL DSCALTEST(N,SA((INCX-1)*5+NP1),SX,INCX)

0 commit comments

Comments
 (0)