Skip to content

Commit 450af57

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #5675 from martin-frbg/fixctestc
Fix function signatures and minor compiler warnings in the CBLAS tests
2 parents b95729f + 86ccbe8 commit 450af57

File tree

13 files changed

+231
-356
lines changed

13 files changed

+231
-356
lines changed

‎ctest/c_cblat1c.c‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,10 @@ typedef struct { real r, i; } complex;
2323
typedef struct { doublereal r, i; } doublecomplex;
2424
#ifdef _MSC_VER
2525
static inline _Fcomplex Cf(complex *z) {_Fcomplex zz={z->r , z->i}; return zz;}
26-
static inline _Dcomplex Cd(doublecomplex *z) {_Dcomplex zz={z->r , z->i};return zz;}
2726
static inline _Fcomplex * _pCf(complex *z) {return (_Fcomplex*)z;}
28-
static inline _Dcomplex * _pCd(doublecomplex *z) {return (_Dcomplex*)z;}
2927
#else
3028
static inline _Complex float Cf(complex *z) {return z->r + z->i*_Complex_I;}
31-
static inline _Complex double Cd(doublecomplex *z) {return z->r + z->i*_Complex_I;}
32-
static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
33-
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
3429
#endif
35-
#define pCf(z) (*_pCf(z))
36-
#define pCd(z) (*_pCd(z))
3730
typedef int logical;
3831
typedef short int shortlogical;
3932
typedef char logical1;
@@ -440,12 +433,12 @@ static real c_b43 = (float)1.;
440433
extern /* Subroutine */ int ctest_(integer*, complex*, complex*, complex*, real*);
441434
static complex mwpcs[5], mwpct[5];
442435
extern /* Subroutine */ int itest1_(integer*, integer*), stest1_(real*,real*,real*,real*);
443-
extern /* Subroutine */ int cscaltest_(integer*, complex*, complex*, integer*);
436+
extern /* Subroutine */ void cscaltest_(integer*, complex*, complex*, integer*);
444437
static complex cx[8];
445438
extern real scnrm2test_(integer*, complex*, integer*);
446439
static integer np1;
447440
extern integer icamaxtest_(integer*, complex*, integer*);
448-
extern /* Subroutine */ int csscaltest_(integer*, real*, complex*, integer*);
441+
extern /* Subroutine */ void csscaltest_(integer*, real*, complex*, integer*);
449442
extern real scasumtest_(integer*, complex*, integer*);
450443
static integer len;
451444

@@ -468,7 +461,7 @@ static real c_b43 = (float)1.;
468461
i__1 = len;
469462
for (i__ = 1; i__ <= i__1; ++i__) {
470463
i__2 = i__ - 1;
471-
i__3 = i__ + (np1 + combla_1.incx * 5 << 3) - 49;
464+
i__3 = i__ + ((np1 + combla_1.incx * 5) << 3) - 49;
472465
cx[i__2].r = cv[i__3].r, cx[i__2].i = cv[i__3].i;
473466
/* L20: */
474467
}
@@ -483,13 +476,13 @@ static real c_b43 = (float)1.;
483476
} else if (combla_1.icase == 8) {
484477
/* .. CSCAL .. */
485478
cscaltest_(&combla_1.n, &ca, cx, &combla_1.incx);
486-
ctest_(&len, cx, &ctrue5[(np1 + combla_1.incx * 5 << 3) - 48],
487-
&ctrue5[(np1 + combla_1.incx * 5 << 3) - 48], sfac);
479+
ctest_(&len, cx, &ctrue5[((np1 + combla_1.incx * 5) << 3) - 48],
480+
&ctrue5[((np1 + combla_1.incx * 5) << 3) - 48], sfac);
488481
} else if (combla_1.icase == 9) {
489482
/* .. CSSCALTEST .. */
490483
csscaltest_(&combla_1.n, &sa, cx, &combla_1.incx);
491-
ctest_(&len, cx, &ctrue6[(np1 + combla_1.incx * 5 << 3) - 48],
492-
&ctrue6[(np1 + combla_1.incx * 5 << 3) - 48], sfac);
484+
ctest_(&len, cx, &ctrue6[((np1 + combla_1.incx * 5) << 3) - 48],
485+
&ctrue6[((np1 + combla_1.incx * 5) << 3) - 48], sfac);
493486
} else if (combla_1.icase == 10) {
494487
/* .. ICAMAXTEST .. */
495488
i__1 = icamaxtest_(&combla_1.n, cx, &combla_1.incx);
@@ -737,7 +730,7 @@ static real c_b43 = (float)1.;
737730
static complex ctemp;
738731
extern /* Subroutine */ int ctest_(integer*, complex*, complex*, complex*, real*);
739732
static integer ksize;
740-
extern /* Subroutine */ int cdotctest_(integer*, complex*, integer*, complex*, integer*,complex*), ccopytest_(integer*, complex*, integer*, complex*, integer*), cdotutest_(integer*, complex*, integer*, complex*, integer*, complex*),
733+
extern /* Subroutine */ void cdotctest_(integer*, complex*, integer*, complex*, integer*,complex*), ccopytest_(integer*, complex*, integer*, complex*, integer*), cdotutest_(integer*, complex*, integer*, complex*, integer*, complex*),
741734
cswaptest_(integer*, complex*, integer*, complex*, integer*), caxpytest_(integer*, complex*, complex*, integer*, complex*, integer*);
742735
static integer ki, kn;
743736
static complex cx[7], cy[7];

‎ctest/c_cblat2c.c‎

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,12 @@ typedef struct { real r, i; } complex;
2323
typedef struct { doublereal r, i; } doublecomplex;
2424
#ifdef _MSC_VER
2525
static inline _Fcomplex Cf(complex *z) {_Fcomplex zz={z->r , z->i}; return zz;}
26-
static inline _Dcomplex Cd(doublecomplex *z) {_Dcomplex zz={z->r , z->i};return zz;}
2726
static inline _Fcomplex * _pCf(complex *z) {return (_Fcomplex*)z;}
28-
static inline _Dcomplex * _pCd(doublecomplex *z) {return (_Dcomplex*)z;}
2927
#else
3028
static inline _Complex float Cf(complex *z) {return z->r + z->i*_Complex_I;}
31-
static inline _Complex double Cd(doublecomplex *z) {return z->r + z->i*_Complex_I;}
3229
static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
33-
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
3430
#endif
3531
#define pCf(z) (*_pCf(z))
36-
#define pCd(z) (*_pCd(z))
3732
typedef int logical;
3833
typedef short int shortlogical;
3934
typedef char logical1;
@@ -319,7 +314,7 @@ static logical c_false = FALSE_;
319314
static char snamet[12];
320315
static real thresh;
321316
static logical rorder;
322-
extern /* Subroutine */ void cc2chke_(char*, ftnlen);
317+
extern /* Subroutine */ void cc2chke_(char*);
323318
static integer layout;
324319
static logical ltestt, tsterr;
325320
static complex alf[7];
@@ -712,7 +707,7 @@ static logical c_false = FALSE_;
712707
ftnlen)12);
713708
/* Test error exits. */
714709
if (tsterr) {
715-
cc2chke_(snames[isnum - 1], (ftnlen)12);
710+
cc2chke_(snames[isnum - 1]);
716711
}
717712
/* Test computations. */
718713
infoc_1.infot = 0;
@@ -892,8 +887,8 @@ static logical c_false = FALSE_;
892887
static integer ia, ib, ic;
893888
static logical banded;
894889
static integer nc, nd, im, in, kl, ml, nk, nl, ku, ix, iy, ms, lx, ly, ns;
895-
extern /* Subroutine */ int ccgbmv_(integer*, char*, integer*, integer*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*, ftnlen);
896-
extern /* Subroutine */ void ccgemv_(integer*, char*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*, ftnlen);
890+
extern /* Subroutine */ void ccgbmv_(integer*, char*, integer*, integer*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*);
891+
extern /* Subroutine */ void ccgemv_(integer*, char*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*);
897892
extern logical lceres_(char*, char*, integer*, integer*, complex*, complex*, integer*, ftnlen, ftnlen);
898893
static char ctrans[14];
899894
static real errmax;
@@ -1142,8 +1137,7 @@ static logical c_false = FALSE_;
11421137
}
11431138
ccgemv_(iorder, trans, &m, &n, &alpha,
11441139
&aa[1], &lda, &xx[1], &incx,
1145-
&beta, &yy[1], &incy, (ftnlen)
1146-
1);
1140+
&beta, &yy[1], &incy);
11471141
} else if (banded) {
11481142
if (*trace) {
11491143
/*
@@ -1158,8 +1152,7 @@ static logical c_false = FALSE_;
11581152
}
11591153
ccgbmv_(iorder, trans, &m, &n, &kl, &
11601154
ku, &alpha, &aa[1], &lda, &xx[
1161-
1], &incx, &beta, &yy[1], &
1162-
incy, (ftnlen)1);
1155+
1], &incx, &beta, &yy[1], &incy);
11631156
}
11641157

11651158
/* Check if error-exit was taken incorrectly. */
@@ -1347,10 +1340,10 @@ static logical c_false = FALSE_;
13471340
static integer nc, ik, in;
13481341
static logical packed;
13491342
static integer nk, ks, ix, iy, ns, lx, ly;
1350-
extern /* Subroutine */ void cchbmv_(integer*, char*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*, ftnlen);
1351-
extern /* Subroutine */ void cchemv_(integer*, char*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*, ftnlen);
1343+
extern /* Subroutine */ void cchbmv_(integer*, char*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*);
1344+
extern /* Subroutine */ void cchemv_(integer*, char*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*);
13521345
extern logical lceres_(char*, char*, integer*, integer*, complex*, complex*, integer*, ftnlen, ftnlen);
1353-
extern /* Subroutine */ void cchpmv_(integer*, char*, integer*, complex*, complex*, complex*, integer*, complex*, complex*, integer*, ftnlen);
1346+
extern /* Subroutine */ void cchpmv_(integer*, char*, integer*, complex*, complex*, complex*, integer*, complex*, complex*, integer*);
13541347
static real errmax;
13551348
static complex transl;
13561349
static integer laa, lda;
@@ -1566,7 +1559,7 @@ static logical c_false = FALSE_;
15661559
}
15671560
cchemv_(iorder, uplo, &n, &alpha, &aa[1],
15681561
&lda, &xx[1], &incx, &beta, &yy[1]
1569-
, &incy, (ftnlen)1);
1562+
, &incy);
15701563
} else if (banded) {
15711564
if (*trace) {
15721565
/*
@@ -1581,7 +1574,7 @@ static logical c_false = FALSE_;
15811574
}
15821575
cchbmv_(iorder, uplo, &n, &k, &alpha, &aa[
15831576
1], &lda, &xx[1], &incx, &beta, &
1584-
yy[1], &incy, (ftnlen)1);
1577+
yy[1], &incy);
15851578
} else if (packed) {
15861579
if (*trace) {
15871580
/*
@@ -1596,7 +1589,7 @@ static logical c_false = FALSE_;
15961589
}
15971590
cchpmv_(iorder, uplo, &n, &alpha, &aa[1],
15981591
&xx[1], &incx, &beta, &yy[1], &
1599-
incy, (ftnlen)1);
1592+
incy);
16001593
}
16011594

16021595
/* Check if error-exit was taken incorrectly. */
@@ -1792,15 +1785,15 @@ static logical c_false = FALSE_;
17921785
static logical packed;
17931786
static integer nk, ks, ix, ns, lx;
17941787
extern logical lceres_(char*, char*, integer*, integer*, complex*, complex*, integer*, ftnlen, ftnlen);
1795-
extern /* Subroutine */ void cctbmv_(integer*, char*, char*, char*, integer*, integer*, complex*, integer*, complex*, integer*, ftnlen, ftnlen, ftnlen);
1796-
extern /* Subroutine */ void cctbsv_(integer*, char*, char*, char*, integer*, integer*, complex*, integer*, complex*, integer*, ftnlen, ftnlen, ftnlen);
1788+
extern /* Subroutine */ void cctbmv_(integer*, char*, char*, char*, integer*, integer*, complex*, integer*, complex*, integer*);
1789+
extern /* Subroutine */ void cctbsv_(integer*, char*, char*, char*, integer*, integer*, complex*, integer*, complex*, integer*);
17971790
static char ctrans[14];
1798-
extern /* Subroutine */ void cctpmv_(integer*, char*, char*, char*, integer*, complex*, complex*, integer*, ftnlen, ftnlen, ftnlen);
1791+
extern /* Subroutine */ void cctpmv_(integer*, char*, char*, char*, integer*, complex*, complex*, integer*);
17991792
static real errmax;
1800-
extern /* Subroutine */ void cctrmv_(integer*, char*, char*, char*, integer*, complex*, integer*, complex*, integer*, ftnlen, ftnlen, ftnlen);
1801-
extern /* Subroutine */ void cctpsv_(integer*, char*, char*, char*, integer*, complex*, complex*, integer*, ftnlen, ftnlen, ftnlen);
1793+
extern /* Subroutine */ void cctrmv_(integer*, char*, char*, char*, integer*, complex*, integer*, complex*, integer*);
1794+
extern /* Subroutine */ void cctpsv_(integer*, char*, char*, char*, integer*, complex*, complex*, integer*);
18021795
static complex transl;
1803-
extern /* Subroutine */ void cctrsv_(integer*, char*, char*, char*, integer*, complex*, integer*, complex*, integer*, ftnlen, ftnlen, ftnlen);
1796+
extern /* Subroutine */ void cctrsv_(integer*, char*, char*, char*, integer*, complex*, integer*, complex*, integer*);
18041797
static char transs[1];
18051798
static integer laa, icd, lda;
18061799
extern logical lce_(complex*, complex*, integer*);
@@ -2010,8 +2003,7 @@ static logical c_false = FALSE_;
20102003
f_rew(&al__1);*/
20112004
}
20122005
cctrmv_(iorder, uplo, trans, diag, &n, &
2013-
aa[1], &lda, &xx[1], &incx, (
2014-
ftnlen)1, (ftnlen)1, (ftnlen)1);
2006+
aa[1], &lda, &xx[1], &incx);
20152007
} else if (banded) {
20162008
if (*trace) {
20172009
/*
@@ -2025,8 +2017,7 @@ static logical c_false = FALSE_;
20252017
f_rew(&al__1);*/
20262018
}
20272019
cctbmv_(iorder, uplo, trans, diag, &n, &k,
2028-
&aa[1], &lda, &xx[1], &incx, (
2029-
ftnlen)1, (ftnlen)1, (ftnlen)1);
2020+
&aa[1], &lda, &xx[1], &incx);
20302021
} else if (packed) {
20312022
if (*trace) {
20322023
/*
@@ -2040,8 +2031,7 @@ static logical c_false = FALSE_;
20402031
f_rew(&al__1);*/
20412032
}
20422033
cctpmv_(iorder, uplo, trans, diag, &n, &
2043-
aa[1], &xx[1], &incx, (ftnlen)1, (
2044-
ftnlen)1, (ftnlen)1);
2034+
aa[1], &xx[1], &incx);
20452035
}
20462036
} else if (s_cmp(sname + 9, "sv", (ftnlen)2, (
20472037
ftnlen)2) == 0) {
@@ -2058,8 +2048,7 @@ static logical c_false = FALSE_;
20582048
f_rew(&al__1);*/
20592049
}
20602050
cctrsv_(iorder, uplo, trans, diag, &n, &
2061-
aa[1], &lda, &xx[1], &incx, (
2062-
ftnlen)1, (ftnlen)1, (ftnlen)1);
2051+
aa[1], &lda, &xx[1], &incx);
20632052
} else if (banded) {
20642053
if (*trace) {
20652054
/*
@@ -2073,8 +2062,7 @@ static logical c_false = FALSE_;
20732062
f_rew(&al__1);*/
20742063
}
20752064
cctbsv_(iorder, uplo, trans, diag, &n, &k,
2076-
&aa[1], &lda, &xx[1], &incx, (
2077-
ftnlen)1, (ftnlen)1, (ftnlen)1);
2065+
&aa[1], &lda, &xx[1], &incx);
20782066
} else if (packed) {
20792067
if (*trace) {
20802068
/*
@@ -2088,8 +2076,7 @@ static logical c_false = FALSE_;
20882076
f_rew(&al__1);*/
20892077
}
20902078
cctpsv_(iorder, uplo, trans, diag, &n, &
2091-
aa[1], &xx[1], &incx, (ftnlen)1, (
2092-
ftnlen)1, (ftnlen)1);
2079+
aa[1], &xx[1], &incx);
20932080
}
20942081
}
20952082

@@ -2634,10 +2621,10 @@ static logical c_false = FALSE_;
26342621
static char uplo[1];
26352622
static integer i__, j, n;
26362623
extern /* Subroutine */ int cmake_(char*, char*, char*, integer*, integer*, complex*, integer*, complex*, integer*, integer*, integer*, logical*, complex*, ftnlen, ftnlen, ftnlen);
2637-
extern /* Subroutine */ void ccher_(integer*, char*, integer*, real*, complex*, integer*, complex*, integer*, ftnlen);
2624+
extern /* Subroutine */ void ccher_(integer*, char*, integer*, real*, complex*, integer*, complex*, integer*);
26382625
static complex alpha, w[1];
26392626
static logical isame[13];
2640-
extern /* Subroutine */ void cchpr_(integer*, char*, integer*, real*, complex*, integer*, complex*, ftnlen);
2627+
extern /* Subroutine */ void cchpr_(integer*, char*, integer*, real*, complex*, integer*, complex*);
26412628
extern /* Subroutine */ int cmvch_(char*, integer*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, complex*, integer*, complex*, real*, complex*, real*, real*, logical*, integer*, logical*, ftnlen);
26422629
static integer nargs;
26432630
static logical reset;
@@ -2812,7 +2799,7 @@ static logical c_false = FALSE_;
28122799
f_rew(&al__1);*/
28132800
}
28142801
ccher_(iorder, uplo, &n, &ralpha, &xx[1], &incx, &aa[
2815-
1], &lda, (ftnlen)1);
2802+
1], &lda);
28162803
} else if (packed) {
28172804
if (*trace) {
28182805
/*
@@ -2825,8 +2812,7 @@ static logical c_false = FALSE_;
28252812
al__1.aunit = *ntra;
28262813
f_rew(&al__1);*/
28272814
}
2828-
cchpr_(iorder, uplo, &n, &ralpha, &xx[1], &incx, &aa[
2829-
1], (ftnlen)1);
2815+
cchpr_(iorder, uplo, &n, &ralpha, &xx[1], &incx, &aa[1]);
28302816
}
28312817

28322818
/* Check if error-exit was taken incorrectly. */
@@ -3005,8 +2991,8 @@ static logical c_false = FALSE_;
30052991
static integer incxs, incys;
30062992
static logical upper;
30072993
static char uplos[1];
3008-
extern /* Subroutine */ void ccher2_(integer*, char*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, integer*, ftnlen);
3009-
extern /* Subroutine */ void cchpr2_(integer*, char*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, ftnlen);
2994+
extern /* Subroutine */ void ccher2_(integer*, char*, integer*, complex*, complex*, integer*, complex*, integer*, complex*, integer*);
2995+
extern /* Subroutine */ void cchpr2_(integer*, char*, integer*, complex*, complex*, integer*, complex*, integer*, complex*);
30102996
static integer ia, ja, ic, nc, jj, lj, in;
30112997
static logical packed;
30122998
static integer ix, iy, ns, lx, ly;
@@ -3202,7 +3188,7 @@ static logical c_false = FALSE_;
32023188
f_rew(&al__1);*/
32033189
}
32043190
ccher2_(iorder, uplo, &n, &alpha, &xx[1], &incx, &
3205-
yy[1], &incy, &aa[1], &lda, (ftnlen)1);
3191+
yy[1], &incy, &aa[1], &lda);
32063192
} else if (packed) {
32073193
if (*trace) {
32083194
/*
@@ -3216,7 +3202,7 @@ static logical c_false = FALSE_;
32163202
f_rew(&al__1);*/
32173203
}
32183204
cchpr2_(iorder, uplo, &n, &alpha, &xx[1], &incx, &
3219-
yy[1], &incy, &aa[1], (ftnlen)1);
3205+
yy[1], &incy, &aa[1]);
32203206
}
32213207

32223208
/* Check if error-exit was taken incorrectly. */

0 commit comments

Comments
 (0)