Benchmark cleanup #56

nakatamaho · Sep 24, 2022 · 0562aba · 0562aba
1 parent c88d388
commit 0562aba
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 37 deletions.
diff --git a/benchmark/mpblas/Raxpy.cpp b/benchmark/mpblas/Raxpy.cpp
@@ -38,7 +38,7 @@ int main(int argc, char *argv[]) {
     mplapackint n = 1;
     mplapackint incx = 1, incy = 1, STEP = 97, LOOPS = 3, TOTALSTEPS = 3092;
     char normtype = 'm';
-    REAL alpha, dummy, *dummywork = new REAL[1];
+    REAL alpha, dummy, dummywork[1];
     double elapsedtime;
     int i, p;
     int check_flag = 1;

diff --git a/benchmark/mpblas/Rgemm.cpp b/benchmark/mpblas/Rgemm.cpp
@@ -49,7 +49,7 @@ double flops_gemm(mplapackint k_i, mplapackint m_i, mplapackint n_i) {
 
 int main(int argc, char *argv[]) {
     REAL alpha, beta, dummy;
-    REAL *dummywork = new REAL[1];
+    REAL dummywork[1];
     double elapsedtime;
     char transa = 'n', transb = 'n', normtype = 'm';
     int m = 1, n = 1, k = 1, STEPN = 3, STEPM = 3, STEPK = 3, LOOPS = 3, TOTALSTEPS = 333;

diff --git a/benchmark/mpblas/Rgemm_dd_cuda_kernel.cpp b/benchmark/mpblas/Rgemm_dd_cuda_kernel.cpp
@@ -84,13 +84,13 @@ void SetDevice() {
 
 int main(int argc, char *argv[]) {
     REAL alpha, beta, dummy;
-    REAL *dummywork;
+    REAL dummywork[1];
     double elapsedtime;
     double *dummyd;
-    char transa, transb, normtype;
-    int N0, M0, K0, STEPN = 7, STEPM = 7, STEPK = 7, LOOPS = 3, TOTALSTEPS = 720;
+    char transa = 'n', transb = 'n', normtype = 'm';
+    int m = 1, n = 1, k = 1, STEPN = 7, STEPM = 7, STEPK = 7, LOOPS = 3, TOTALSTEPS = 720;
     int lda, ldb, ldc;
-    int i, j, m, n, k, ka, kb, p, q;
+    int i, ka, kb, p;
     int check_flag = 1;
 
     const char mpblas_sym[] = SYMBOL_GCC_RGEMM;
@@ -107,18 +107,14 @@ int main(int argc, char *argv[]) {
     using std::chrono::nanoseconds;
 
     // initialization
-    N0 = M0 = K0 = 1;
-    STEPM = STEPN = STEPK = 1;
-    transa = transb = 'n';
-    normtype = 'm';
     if (argc != 1) {
         for (i = 1; i < argc; i++) {
             if (strcmp("-N", argv[i]) == 0) {
-                N0 = atoi(argv[++i]);
+                n = atoi(argv[++i]);
             } else if (strcmp("-M", argv[i]) == 0) {
-                M0 = atoi(argv[++i]);
+                m = atoi(argv[++i]);
             } else if (strcmp("-K", argv[i]) == 0) {
-                K0 = atoi(argv[++i]);
+                k = atoi(argv[++i]);
             } else if (strcmp("-STEPN", argv[i]) == 0) {
                 STEPN = atoi(argv[++i]);
             } else if (strcmp("-STEPM", argv[i]) == 0) {
@@ -168,9 +164,6 @@ int main(int argc, char *argv[]) {
     cudaMalloc((void **)&dummyd, 16);
     cudaFree(dummyd);
 
-    m = M0;
-    n = N0;
-    k = K0;
     for (p = 0; p < TOTALSTEPS; p++) {
         if (Mlsame(&transa, "n")) {
             ka = k;

diff --git a/benchmark/mpblas/Rgemv.cpp b/benchmark/mpblas/Rgemv.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
     mplapackint STEPN = 1, STEPM = 1, LOOPS = 3, TOTALSTEPS = 283;
     mplapackint incx = 1, incy = 1;
     char trans = 'n', normtype = 'm';
-    REAL alpha, beta, dummy, *dummywork = new REAL[1];
+    REAL alpha, beta, dummy, dummywork[1];
     REAL mOne = -1;
     double elapsedtime;
     int i, p;

diff --git a/benchmark/mpblas/Rsyrk.cpp b/benchmark/mpblas/Rsyrk.cpp
@@ -48,7 +48,7 @@ double flops_syrk(mplapackint k_i, mplapackint n_i) {
 
 int main(int argc, char *argv[]) {
     REAL alpha, beta, dummy;
-    REAL *dummywork = new REAL[1];
+    REAL dummywork[1];
     double elapsedtime;
     char uplo = 'u', trans = 'n', normtype = 'm';
     int n = 1, k = 1, STEPN = 3, STEPK = 3, LOOPS = 3, TOTALSTEPS = 340;

diff --git a/benchmark/mpblas/Rsyrk_dd_cuda_kernel.cpp b/benchmark/mpblas/Rsyrk_dd_cuda_kernel.cpp
@@ -83,13 +83,13 @@ double flops_syrk(mplapackint k_i, mplapackint n_i) {
 
 int main(int argc, char *argv[]) {
     REAL alpha, beta, dummy;
-    REAL *dummywork;
+    REAL dummywork[1];
     double elapsedtime;
     double *dummyd;
-    char uplo, trans, normtype;
-    int N0, K0, STEPN, STEPK, LOOPS = 3, TOTALSTEPS = 100;
+    char uplo = 'u', trans = 'n', normtype = 'm';
+    int STEPN = 1, STEPK = 1, LOOPS = 3, TOTALSTEPS = 100;
     int lda, ldc;
-    int i, j, n, k, ka, kb, p, q;
+    int i, n = 1, k = 1, ka, p;
     int check_flag = 1;
 
     const char mpblas_sym[] = SYMBOL_GCC_RSYRK;
@@ -106,17 +106,12 @@ int main(int argc, char *argv[]) {
     using std::chrono::nanoseconds;
 
     // initialization
-    N0 = K0 = 1;
-    STEPN = STEPK = 1;
-    uplo = 'u';
-    trans = 'n';
-    normtype = 'm';
     if (argc != 1) {
         for (i = 1; i < argc; i++) {
             if (strcmp("-N", argv[i]) == 0) {
-                N0 = atoi(argv[++i]);
+                n = atoi(argv[++i]);
             } else if (strcmp("-K", argv[i]) == 0) {
-                K0 = atoi(argv[++i]);
+                k = atoi(argv[++i]);
             } else if (strcmp("-STEPN", argv[i]) == 0) {
                 STEPN = atoi(argv[++i]);
             } else if (strcmp("-STEPK", argv[i]) == 0) {
@@ -153,7 +148,6 @@ int main(int argc, char *argv[]) {
             fprintf(stderr, "%s\n", error);
             return 1;
         }
-
         raxpy_ref = (void (*)(mplapackint, REAL, REAL *, mplapackint, REAL *, mplapackint))dlsym(handle, raxpy_sym);
         if ((error = dlerror()) != NULL) {
             fprintf(stderr, "%s\n", error);
@@ -166,8 +160,6 @@ int main(int argc, char *argv[]) {
     cudaMalloc((void **)&dummyd, 16);
     cudaFree(dummyd);
 
-    n = N0;
-    k = K0;
     for (p = 0; p < TOTALSTEPS; p++) {
         if (Mlsame(&trans, "n")) {
             ka = k;

diff --git a/benchmark/mpblas/dgemm.cpp b/benchmark/mpblas/dgemm.cpp
@@ -40,8 +40,8 @@ int main(int argc, char *argv[]) {
     double elapsedtime;
     char transa = 'n', transb = 'n';
     int STEPN = 7, STEPM = 7, STEPK = 7, LOOPS = 7, TOTALSTEPS = 428;
-    int lda, ldb, ldc;
-    int i, m = 1, n = 1, k = 1, ka, kb, p;
+    int m = 1, n = 1, k = 1, int lda, ldb, ldc;
+    int i, ka, kb, p;
 
     using Clock = std::chrono::high_resolution_clock;
     using std::chrono::duration_cast;

diff --git a/benchmark/mpblas/dgemv.cpp b/benchmark/mpblas/dgemv.cpp
@@ -48,13 +48,12 @@ double flops_gemv(int m_i, int n_i) {
 }
 
 int main(int argc, char *argv[]) {
-    int k, l, m, n;
     int STEPN = 1, STEPM = 1, LOOPS = 3, TOTALSTEPS = 283;
-    int incx = 1, incy = 1;
+    int m = 1, n = 1, incx = 1, incy = 1;
     char trans = 'n';
     double alpha, beta, dummy;
     double elapsedtime;
-    int i, p;
+    int i, k, l, p;
 
     using Clock = std::chrono::high_resolution_clock;
     using std::chrono::duration_cast;