more cleanup

ctest/c_cblat3c.c

@@ -1087,9 +1087,6 @@ L230:
 /*                          Check if error-exit was taken incorrectly. */
 
 				if (! infoc_1.ok) {
-//				    io___128.ciunit = *nout;
-//				    s_wsfe(&io___128);
-//				    e_wsfe();
 				    printf(" *** FATAL ERROR - ERROR-CALL MYEXIT TAKEN ON VALID CALL\n");
 				    *fatal = TRUE_;
 				    goto L120;
@@ -3973,26 +3970,6 @@ real sdiff_(real *x, real *y)
     static char ich[3] = "NTC";
     static char ishape[2] = "UL";
 
-    /* Format strings */
-//    static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
-//	    "TAKEN ON VALID CALL *******\002)";
-//    static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
-//	    " \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
-//    static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
-//	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-//    static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR    C"
-//	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-//    static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
-//	    "R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-//	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-//	    "ECT *******\002)";
-//    static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR  "
-//	    "  COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-//	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-//	    "ECT *******\002)";
-//    static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
-//	    "BER:\002)";
-
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2, 
 	    i__3, i__4, i__5, i__6, i__7;
@@ -4349,13 +4326,6 @@ L130:
 	k, complex *alpha, integer *lda, integer *ldb, complex *beta, integer 
 	*ldc)
 {
-    /* Format strings */
-    static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
-	    "a14,\002,\002,a14,\002,\002,a14,\002,\002)";
-    static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 (\002,f4.1,\002,\002"
-	    ",f4.1,\002) , A,\002,i3,\002, B,\002,i3,\002, (\002,f4.1,\002"
-	    ",\002,f4.1,\002) , C,\002,i3,\002).\002)";
-
     /* Local variables */
     char crc[14], cta[14], ctb[14], cuplo[14];
 
@@ -4384,7 +4354,7 @@ L130:
 	s_copy(crc, " CblasColMajor", (ftnlen)14, (ftnlen)14);
     }
     printf("%6d: %s %s %s %s %s\n",*nc,sname,crc,cuplo,cta,ctb);
-    printf("%d %d (%4.1f,%4.1f) A, %d, B, %d, (%4.1f,%4.1f), C, %d.\n",*n,*k,*alpha,*lda,*ldb,*beta,*ldc);
+    printf("%d %d (%4.1f,%4.1f) A, %d, B, %d, (%4.1f,%4.1f), C, %d.\n",*n,*k,alpha->r,alpha->i,*lda,*ldb,beta->r,beta->i,*ldc);
     return 0;
 } /* cprcn8_ */
 
@@ -4394,16 +4364,6 @@ L130:
 	real *g, complex *cc, integer *ldcc, real *eps, real *err, logical *
 	fatal, integer *nout, logical *mv)
 {
-    /* Format strings */
-    static char fmt_9999[] = "(\002 ******* FATAL ERROR - COMPUTED RESULT IS"
-	    " LESS THAN HAL\002,\002F ACCURATE *******\002,/\002             "
-	    "          EXPECTED RE\002,\002SULT                    COMPUTED R"
-	    "ESULT\002)";
-    static char fmt_9998[] = "(1x,i7,2(\002  (\002,g15.6,\002,\002,g15.6,"
-	    "\002)\002))";
-    static char fmt_9997[] = "(\002      THESE ARE THE RESULTS FOR COLUMN"
-	    " \002,i3)";
-
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, cc_dim1, 
 	    cc_offset, i__1, i__2, i__3, i__4, i__5, i__6, i__7;

ctest/c_cblat3c_3m.c

@@ -275,7 +275,7 @@ int /* Main program */ main(void)
 {
     /* Initialized data */
 
-    static char snames[9][13] = {"cblas_cgemm3m ", "cblas_chemm ", "cblas_csymm ", 
+    static char snames[9][13] = {"cblas_cgemm3m", "cblas_chemm ", "cblas_csymm ", 
 	    "cblas_ctrmm ", "cblas_ctrsm ", "cblas_cherk ", "cblas_csyrk ", 
 	    "cblas_cher2k", "cblas_csyr2k"};
 

ctest/c_dblat3c.c

@@ -3280,30 +3280,9 @@ doublereal ddiff_(doublereal* x, doublereal* y)
     static char ich[3] = "NTC";
     static char ishape[2] = "UL";
 
-    /* Format strings */
-    static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
-	    "TAKEN ON VALID CALL *******\002)";
-    static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
-	    " \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
-    static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
-	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-    static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR    C"
-	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-    static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
-	    "R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-	    "ECT *******\002)";
-    static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR  "
-	    "  COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-	    "ECT *******\002)";
-    static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
-	    "BER:\002)";
-
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2, 
 	    i__3, i__4, i__5;
-    alist al__1;
 
     /* Local variables */
     extern /* Subroutine */ int cdgemmtr_(integer *, char *, char *, char *, 
@@ -3326,7 +3305,8 @@ doublereal ddiff_(doublereal* x, doublereal* y)
     char uplos[1];
     extern /* Subroutine */ void dprcn8_(integer *, integer *, char *, integer 
 	    *, char *, char *, char *, integer *, integer *, doublereal *, 
-	    integer *, integer *, doublereal *, integer *), dmmtch_(char *, char *, char *, integer *, 
+	    integer *, integer *, doublereal *, integer *);
+    extern int dmmtch_(char *, char *, char *, integer *, 
 	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
 	    integer *, doublereal *, doublereal *, integer *, doublereal *, 
 	    doublereal *, doublereal *, integer *, doublereal *, doublereal *,
@@ -3643,19 +3623,9 @@ L130:
 	k, doublereal *alpha, integer *lda, integer *ldb, doublereal *beta, 
 	integer *ldc)
 {
-    /* Format strings */
-    static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
-	    "a14,\002,\002,a14,\002,\002,a14,\002,\002)";
-    static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 \002,f4.1,\002 , A"
-	    ",\002,i3,\002, B,\002,i3,\002, \002,f4.1,\002 , C,\002,i3,\002)"
-	    ".\002)";
-
     /* Local variables */
     char crc[14], cta[14], ctb[14], cuplo[14];
 
-    /* Fortran I/O blocks */
-    static cilist io___455 = { 0, 0, 0, fmt_9995, 0 };
-    static cilist io___456 = { 0, 0, 0, fmt_9994, 0 };
 
 
     if (*(unsigned char *)uplo == 'U') {
@@ -3686,7 +3656,7 @@ L130:
     printf("%d %d %4.1f A, %d, B, %d, %4.1f, C, %d.\n",*n,*k,*alpha,*lda,*ldb,*beta,*ldc);
 } /* dprcn8_ */
 
-/* Subroutine */ void dmmtch_(char *uplo, char *transa, char *transb, integer *
+/* Subroutine */ int dmmtch_(char *uplo, char *transa, char *transb, integer *
 	n, integer *kk, doublereal *alpha, doublereal *a, integer *lda, 
 	doublereal *b, integer *ldb, doublereal *beta, doublereal *c__, 
 	integer *ldc, doublereal *ct, doublereal *g, doublereal *cc, integer *

ctest/c_sblat3c.c

@@ -3252,30 +3252,9 @@ real sdiff_(real *x, real *y)
     static char ich[3] = "NTC";
     static char ishape[2] = "UL";
 
-    /* Format strings */
-    static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
-	    "TAKEN ON VALID CALL *******\002)";
-    static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
-	    " \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
-    static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
-	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-    static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR    C"
-	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-    static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
-	    "R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-	    "ECT *******\002)";
-    static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR  "
-	    "  COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-	    "ECT *******\002)";
-    static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
-	    "BER:\002)";
-
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2, 
 	    i__3, i__4, i__5;
-    alist al__1;
 
     /* Local variables */
     extern /* Subroutine */ int csgemmtr_(integer *, char *, char *, char *, 
@@ -3618,13 +3597,6 @@ L130:
 	*iorder, char *uplo, char *transa, char *transb, integer *n, integer *
 	k, real *alpha, integer *lda, integer *ldb, real *beta, integer *ldc)
 {
-    /* Format strings */
-    static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
-	    "a14,\002,\002,a14,\002,\002,a14,\002,\002)";
-    static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 \002,f4.1,\002 , A"
-	    ",\002,i3,\002, B,\002,i3,\002, \002,f4.1,\002 , C,\002,i3,\002)"
-	    ".\002)";
-
     /* Local variables */
     char crc[14], cta[14], ctb[14], cuplo[14];
 
@@ -3662,11 +3634,6 @@ L130:
 	 integer *ldcc, real *eps, real *err, logical *fatal, integer *nout, 
 	logical *mv)
 {
-    /* Format strings */
-    static char fmt_9998[] = "(1x,i7,2g18.6)";
-    static char fmt_9997[] = "(\002      THESE ARE THE RESULTS FOR COLUMN"
-	    " \002,i3)";
-
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, cc_dim1, 
 	    cc_offset, i__1, i__2, i__3;

ctest/c_zblat3c.c

@@ -3853,30 +3853,9 @@ doublereal ddiff_(doublereal* x, doublereal* y)
     static char ich[3] = "NTC";
     static char ishape[2] = "UL";
 
-    /* Format strings */
-    static char fmt_9994[] = "(\002 ******* FATAL ERROR - ERROR-CALL MYEXIT "
-	    "TAKEN ON VALID CALL *******\002)";
-    static char fmt_9998[] = "(\002 ******* FATAL ERROR - PARAMETER NUMBER"
-	    " \002,i2,\002 WAS CH\002,\002ANGED INCORRECTLY *******\002)";
-    static char fmt_10000[] = "(\002 \002,a13,\002 PASSED THE COLUMN-MAJOR C"
-	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-    static char fmt_10001[] = "(\002 \002,a13,\002 PASSED THE ROW-MAJOR    C"
-	    "OMPUTATIONAL TESTS\002,\002 (\002,i6,\002 CALL\002,\002S)\002)";
-    static char fmt_10002[] = "(\002 \002,a13,\002 COMPLETED THE COLUMN-MAJO"
-	    "R COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-	    "ECT *******\002)";
-    static char fmt_10003[] = "(\002 \002,a13,\002 COMPLETED THE ROW-MAJOR  "
-	    "  COMPUTATIONAL \002,\002TESTS (\002,i6,\002 CALLS)\002,/\002 **"
-	    "***** BUT WITH MAXIMUM TEST \002,\002RATIO \002,f8.2,\002 - SUSP"
-	    "ECT *******\002)";
-    static char fmt_9996[] = "(\002 ******* \002,a13,\002 FAILED ON CALL NUM"
-	    "BER:\002)";
-
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, i__1, i__2, 
 	    i__3, i__4, i__5, i__6, i__7;
-    alist al__1;
 
     /* Local variables */
     extern /* Subroutine */ int czgemmtr_(integer *, char *, char *, char *, 
@@ -3914,17 +3893,6 @@ doublereal ddiff_(doublereal* x, doublereal* y)
     extern logical lzeres_(char *, char *, integer *, integer *, 
 	    doublecomplex *, doublecomplex *, integer *);
 
-    /* Fortran I/O blocks */
-    static cilist io___468 = { 0, 0, 0, fmt_9994, 0 };
-    static cilist io___471 = { 0, 0, 0, fmt_9998, 0 };
-    static cilist io___473 = { 0, 0, 0, fmt_10000, 0 };
-    static cilist io___474 = { 0, 0, 0, fmt_10001, 0 };
-    static cilist io___475 = { 0, 0, 0, fmt_10002, 0 };
-    static cilist io___476 = { 0, 0, 0, fmt_10003, 0 };
-    static cilist io___477 = { 0, 0, 0, fmt_9996, 0 };
-
-
-
 /*  Tests CGEMMTR. */
 
 /*  Auxiliary routine for test program for Level 3 Blas. */
@@ -4249,21 +4217,9 @@ L130:
 	k, doublecomplex *alpha, integer *lda, integer *ldb, doublecomplex *
 	beta, integer *ldc)
 {
-    /* Format strings */
-    static char fmt_9995[] = "(1x,i6,\002: \002,a13,\002(\002,a14,\002,\002,"
-	    "a14,\002,\002,a14,\002,\002,a14,\002,\002)";
-    static char fmt_9994[] = "(10x,2(i3,\002,\002),\002 (\002,f4.1,\002,\002"
-	    ",f4.1,\002) , A,\002,i3,\002, B,\002,i3,\002, (\002,f4.1,\002"
-	    ",\002,f4.1,\002) , C,\002,i3,\002).\002)";
-
     /* Local variables */
     char crc[14], cta[14], ctb[14], cuplo[14];
 
-    /* Fortran I/O blocks */
-    static cilist io___482 = { 0, 0, 0, fmt_9995, 0 };
-    static cilist io___483 = { 0, 0, 0, fmt_9994, 0 };
-
-
     if (*(unsigned char *)uplo == 'U') {
 	s_copy(cuplo, "CblasUpper", (ftnlen)14, (ftnlen)10);
     } else {
@@ -4300,16 +4256,6 @@ L130:
 	cc, integer *ldcc, doublereal *eps, doublereal *err, logical *fatal, 
 	integer *nout, logical *mv)
 {
-    /* Format strings */
-    static char fmt_9999[] = "(\002 ******* FATAL ERROR - COMPUTED RESULT IS"
-	    " LESS THAN HAL\002,\002F ACCURATE *******\002,/\002             "
-	    "          EXPECTED RE\002,\002SULT                    COMPUTED R"
-	    "ESULT\002)";
-    static char fmt_9998[] = "(1x,i7,2(\002  (\002,g15.6,\002,\002,g15.6,"
-	    "\002)\002))";
-    static char fmt_9997[] = "(\002      THESE ARE THE RESULTS FOR COLUMN"
-	    " \002,i3)";
-
     /* System generated locals */
     integer a_dim1, a_offset, b_dim1, b_offset, c_dim1, c_offset, cc_dim1, 
 	    cc_offset, i__1, i__2, i__3, i__4, i__5, i__6, i__7;

ctest/c_zblat3c_3m.c

@@ -272,7 +272,7 @@ static logical c_false = FALSE_;
 {
     /* Initialized data */
 
-    static char snames[9][13] = { "cblas_zgemm3m ", "cblas_zhemm ", "cblas_zsymm ", "cblas_ztrmm ",
+    static char snames[9][13] = { "cblas_zgemm3m", "cblas_zhemm ", "cblas_zsymm ", "cblas_ztrmm ",
      "cblas_ztrsm ", "cblas_zherk ", "cblas_zsyrk ", "cblas_zher2k", "cblas_zsyr2k"};
 
     /* System generated locals */