Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix lto type mismatch #1027

Merged
merged 6 commits into from
Jun 20, 2024
Merged

Fix lto type mismatch #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50a943d
Fixed external 64bit api CBLAS example. CBLAS_API64 needs to be defin…
ACSimon33 Jun 19, 2024
a926c93
Fixed wrong F77 C declarations for complex BLAS routines. Some comple…
ACSimon33 Jun 19, 2024
f47a870
Added missing FORTRAN_STRLEN arguments in CBLAS testting framework
ACSimon33 Jun 19, 2024
4f504e0
Fixed use of F77_xerbla in CBLAS testing framework
ACSimon33 Jun 19, 2024
51219d2
Fixed use of F77_xerbla in CBLAS testing framework
ACSimon33 Jun 19, 2024
ed17a25
Removed spurious char lenght arguments in LSAME declaration
ACSimon33 Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CBLAS/examples/cblas_example2_64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* cblas_example2.c */

#define CBLAS_API64
#define F77_INT int64_t

#include <stdio.h>
#include <stdlib.h>
#include "cblas_64.h"
#define CBLAS_API64
#define F77_INT int64_t
#include "cblas_f77.h"

#define INVALID -1
Expand Down
40 changes: 20 additions & 20 deletions CBLAS/include/cblas_f77.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ void F77_chpr_base(FCHAR, FINT, const float *, const void *, FINT, void *
, FORTRAN_STRLEN
#endif
);
void F77_chpr2_base(FCHAR, FINT, const float *, const void *, FINT, const void *, FINT, void *
void F77_chpr2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN
#endif
Expand Down Expand Up @@ -964,7 +964,7 @@ void F77_zhpr_base(FCHAR, FINT, const double *, const void *, FINT, void *
, FORTRAN_STRLEN
#endif
);
void F77_zhpr2_base(FCHAR, FINT, const double *, const void *, FINT, const void *, FINT, void *
void F77_zhpr2_base(FCHAR, FINT, const void *, const void *, FINT, const void *, FINT, void *
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN
#endif
Expand Down Expand Up @@ -1042,95 +1042,95 @@ void F77_dtrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, cons

/* Single Complex Precision */

void F77_cgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
void F77_cgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_csymm_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
void F77_csymm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_chemm_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
void F77_chemm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_csyrk_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT
void F77_csyrk_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_cherk_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, float *, FINT
void F77_cherk_base(FCHAR, FCHAR, FINT, FINT, const float *, const void *, FINT, const float *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_csyr2k_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
void F77_csyr2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_cher2k_base(FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
void F77_cher2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const float *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_ctrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
void F77_ctrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_ctrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, float *, FINT
void F77_ctrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);

/* Double Complex Precision */

void F77_zgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
void F77_zgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_zsymm_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
void F77_zsymm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_zhemm_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
void F77_zhemm_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_zsyrk_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT
void F77_zsyrk_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_zherk_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, double *, FINT
void F77_zherk_base(FCHAR, FCHAR, FINT, FINT, const double *, const void *, FINT, const double *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_zsyr2k_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
void F77_zsyr2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const void *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_zher2k_base(FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
void F77_zher2k_base(FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, const void *, FINT, const double *, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_ztrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
void F77_ztrmm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
);
void F77_ztrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, double *, FINT
void F77_ztrsm_base(FCHAR, FCHAR, FCHAR, FCHAR, FINT, FINT, const void *, const void *, FINT, void *, FINT
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
#endif
Expand Down
9 changes: 9 additions & 0 deletions CBLAS/include/cblas_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
#include "cblas.h"
#include "cblas_mangling.h"

/* It seems all current Fortran compilers put strlen at end.
* Some historical compilers put strlen after the str argument
* or make the str argument into a struct. */
#define BLAS_FORTRAN_STRLEN_END

#ifndef FORTRAN_STRLEN
#define FORTRAN_STRLEN size_t
#endif

#define TRUE 1
#define PASSED 1
#define TEST_ROW_MJR 1
Expand Down
16 changes: 12 additions & 4 deletions CBLAS/testing/c_c2chke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
char *cblas_rout;

#ifdef F77_Char
void F77_xerbla(F77_Char F77_srname, void *vinfo);
void F77_xerbla(F77_Char F77_srname, void *vinfo
#else
void F77_xerbla(char *srname, void *vinfo);
void F77_xerbla(char *srname, void *vinfo
#endif
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN
#endif
);

void chkxer(void) {
extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
Expand All @@ -24,7 +28,11 @@ void chkxer(void) {
cblas_lerr = 1 ;
}

void F77_c2chke(char *rout) {
void F77_c2chke(char *rout
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN
#endif
) {
char *sf = ( rout ) ;
float A[2] = {0.0,0.0},
X[2] = {0.0,0.0},
Expand All @@ -40,7 +48,7 @@ void F77_c2chke(char *rout) {
if (link_xerbla) /* call these first to link */
{
cblas_xerbla(cblas_info,cblas_rout,"");
F77_xerbla(cblas_rout,&cblas_info);
F77_xerbla(cblas_rout,&cblas_info, 1);
}
#endif

Expand Down
16 changes: 12 additions & 4 deletions CBLAS/testing/c_c3chke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
char *cblas_rout;

#ifdef F77_Char
void F77_xerbla(F77_Char F77_srname, void *vinfo);
void F77_xerbla(F77_Char F77_srname, void *vinfo
#else
void F77_xerbla(char *srname, void *vinfo);
void F77_xerbla(char *srname, void *vinfo
#endif
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN
#endif
);

void chkxer(void) {
extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
Expand All @@ -24,7 +28,11 @@ void chkxer(void) {
cblas_lerr = 1 ;
}

void F77_c3chke(char * rout) {
void F77_c3chke(char * rout
#ifdef BLAS_FORTRAN_STRLEN_END
, FORTRAN_STRLEN
#endif
) {
char *sf = ( rout ) ;
float A[4] = {0.0,0.0,0.0,0.0},
B[4] = {0.0,0.0,0.0,0.0},
Expand All @@ -43,7 +51,7 @@ void F77_c3chke(char * rout) {
if (link_xerbla) /* call these first to link */
{
cblas_xerbla(cblas_info,cblas_rout,"");
F77_xerbla(cblas_rout,&cblas_info);
F77_xerbla(cblas_rout,&cblas_info, 1);
}
#endif

Expand Down
Loading
Loading