Benchmark cleanup

Related to #56
nakatamaho · Sep 24, 2022 · 9b93a0e · 9b93a0e
1 parent f0ee27d
commit 9b93a0e
Show file tree

Hide file tree

Showing 13 changed files with 102 additions and 42 deletions.
diff --git a/benchmark/mpblas/Makefile.am b/benchmark/mpblas/Makefile.am
@@ -1,7 +1,8 @@
 bench_PROGRAMS =
 bench_DATA = \
 Raxpy1.plt.in Raxpy2.plt.in Raxpy3.plt.in \
-Rcopy1.plt Rcopy2.plt Rcopy3.plt Rdot1.plt Rdot2.plt Rdot3.plt \
+Rcopy1.plt Rcopy2.plt Rcopy3.plt \
+Rdot1.plt.in Rdot2.plt.in Rdot3.plt.in \
 Rgemm1.plt Rgemm2.plt Rgemm3.plt \
 Rgemm_cuda.plt \
 Rgemv1.plt Rgemv2.plt Rgemv3.plt \

diff --git a/benchmark/mpblas/Raxpy.cpp b/benchmark/mpblas/Raxpy.cpp
@@ -36,7 +36,7 @@
 
 int main(int argc, char *argv[]) {
     mplapackint n;
-    mplapackint incx = 1, incy = 1, STEP = 97, N0 = 1, LOOPS = 3, TOTALSTEPS = 3000;
+    mplapackint incx = 1, incy = 1, STEP = 97, N0 = 1, LOOPS = 3, TOTALSTEPS = 3092;
     REAL alpha, dummy, *dummywork;
     double elapsedtime;
     int i, p;
@@ -88,6 +88,7 @@ int main(int argc, char *argv[]) {
         REAL *x = new REAL[n];
         REAL *y = new REAL[n];
         REAL *y_ref = new REAL[n];
+        REAL *z = new REAL[n];
         if (check_flag) {
             for (i = 0; i < n; i++) {
                 x[i] = randomnumber(dummy);
@@ -99,7 +100,10 @@ int main(int argc, char *argv[]) {
             auto t2 = Clock::now();
             elapsedtime = (double)duration_cast<nanoseconds>(t2 - t1).count() / 1.0e9;
             (*mpblas_ref)(n, alpha, x, incx, y_ref, incy);
-            diff = Rlange(&normtype, (mplapackint)n, (mplapackint)1, y_ref, 1, dummywork);
+            for (i = 0; i < n; i++) {
+                z[i] = y[i] - y_ref[i];
+            }
+            diff = Rlange(&normtype, (mplapackint)n, (mplapackint)1, z, 1, dummywork);
             diffr = cast2double(diff);
             printf("         n       MFLOPS      error\n");
             printf("%10d   %10.3f   %10.3f\n", (int)n, (2.0 * (double)n) / elapsedtime * MFLOPS, diffr);
@@ -120,6 +124,7 @@ int main(int argc, char *argv[]) {
             printf("         n       MFLOPS     LOOPS\n");
             printf("%10d   %10.3f        %d\n", (int)n, (2.0 * (double)n) / elapsedtime * MFLOPS, (int)LOOPS);
         }
+        delete[] z;
         delete[] y_ref;
         delete[] y;
         delete[] x;

diff --git a/benchmark/mpblas/Raxpy3.plt.in b/benchmark/mpblas/Raxpy3.plt.in
@@ -10,5 +10,5 @@ set terminal pdf
 
 plot "log.Raxpy.double_opt"	    using 1:2 title 'double (OpenMP)'     with lines linewidth 1, \
      "log.Raxpy.double"             using 1:2 title 'double'              with lines linewidth 1, \
-     "log.daxpy.ref"	            using 1:2 title 'double (Ref.BLAS)'  with lines linewidth 1, \
-     "log.daxpy.openblas"           using 1:2 title 'double (OpenBLAS)'   with lines linewidth 1
+     "log.daxpy.ref"	            using 1:2 title 'double (Ref.BLAS)'   with lines linewidth 1, \
+     "log.daxpy.openblas"           using 1:2 title 'double (OpenBLAS)'   with lines linewidth 1
diff --git a/benchmark/mpblas/Rdot.cpp b/benchmark/mpblas/Rdot.cpp
@@ -36,7 +36,7 @@
 
 int main(int argc, char *argv[]) {
     mplapackint n;
-    mplapackint incx = 1, incy = 1, STEP = 97, N0 = 1, LOOP = 3, TOTALSTEPS = 3000;
+    mplapackint incx = 1, incy = 1, STEP = 97, N0 = 1, LOOPS = 3, TOTALSTEPS = 3092;
     REAL dummy, ans, ans_ref;
     double elapsedtime;
     int i, p;
@@ -63,8 +63,8 @@ int main(int argc, char *argv[]) {
                 STEP = atoi(argv[++i]);
             } else if (strcmp("-NOCHECK", argv[i]) == 0) {
                 check_flag = 0;
-            } else if (strcmp("-LOOP", argv[i]) == 0) {
-                LOOP = atoi(argv[++i]);
+            } else if (strcmp("-LOOPS", argv[i]) == 0) {
+                LOOPS = atoi(argv[++i]);
             } else if (strcmp("-TOTALSTEPS", argv[i]) == 0) {
                 TOTALSTEPS = atoi(argv[++i]);
             }
@@ -107,15 +107,15 @@ int main(int argc, char *argv[]) {
                 y[i] = randomnumber(dummy);
             }
             elapsedtime = 0.0;
-            for (int j = 0; j < LOOP; j++) {
+            for (int j = 0; j < LOOPS; j++) {
                 auto t1 = Clock::now();
                 ans = Rdot(n, x, incx, y, incy);
                 auto t2 = Clock::now();
                 elapsedtime = elapsedtime + (double)duration_cast<nanoseconds>(t2 - t1).count() / 1.0e9;
             }
-            elapsedtime = elapsedtime / (double)LOOP;
-            printf("         n       MFLOPS\n");
-            printf("%10d   %10.3f\n", (int)n, (2.0 * (double)n) / elapsedtime * MFLOPS);
+            elapsedtime = elapsedtime / (double)LOOPS;
+            printf("         n       MFLOPS     LOOPS\n");
+            printf("%10d   %10.3f        %d\n", (int)n, (2.0 * (double)n) / elapsedtime * MFLOPS, (int)LOOPS);
         }
         delete[] y;
         delete[] x;

diff --git a/benchmark/mpblas/Rdot1.plt b/benchmark/mpblas/Rdot1.plt
@@ -2,10 +2,10 @@ set xlabel font "Helvetica,20"
 set ylabel font "Helvetica,20"
 set key font "Helvetica,16"
 set title font "Helvetica,20"
-set title "Rdot on %%MODELNAME%%"
+set title "Rdot on AMD Ryzen Threadripper 3970X 32-Core Processor "
 set xlabel "Dimension"
 set ylabel "MFLOPS"
-#set terminal postscript eps color enhanced
+set key above
 set terminal pdf
 
 plot \
@@ -14,6 +14,4 @@ plot \
 "log.Rdot._Float64x"       using 1:2 title '\_Float64x'             with lines linewidth 1, \
 "log.Rdot._Float64x_opt"   using 1:2 title '\_Float64x (OpenMP)'    with lines linewidth 1, \
 "log.Rdot.dd"              using 1:2 title 'double double'          with lines linewidth 1, \
-"log.Rdot.dd_opt"          using 1:2 title 'double double (OpenMP)' with lines linewidth 1, \
-"log.Rdot.double"          using 1:2 title 'double'                 with lines linewidth 1
-
+"log.Rdot.dd_opt"          using 1:2 title 'double double (OpenMP)' with lines linewidth 1
diff --git a/benchmark/mpblas/Rdot1.plt.in b/benchmark/mpblas/Rdot1.plt.in
@@ -0,0 +1,17 @@
+set xlabel font "Helvetica,20"
+set ylabel font "Helvetica,20"
+set key font "Helvetica,16"
+set title font "Helvetica,20"
+set title "Rdot on %%MODELNAME%%"
+set xlabel "Dimension"
+set ylabel "MFLOPS"
+set key above
+set terminal pdf
+
+plot \
+"log.Rdot._Float128"       using 1:2 title '\_Float128'             with lines linewidth 1, \
+"log.Rdot._Float128_opt"   using 1:2 title '\_Float128 (OpenMP)'    with lines linewidth 1, \
+"log.Rdot._Float64x"       using 1:2 title '\_Float64x'             with lines linewidth 1, \
+"log.Rdot._Float64x_opt"   using 1:2 title '\_Float64x (OpenMP)'    with lines linewidth 1, \
+"log.Rdot.dd"              using 1:2 title 'double double'          with lines linewidth 1, \
+"log.Rdot.dd_opt"          using 1:2 title 'double double (OpenMP)' with lines linewidth 1
diff --git a/benchmark/mpblas/Rdot2.plt b/benchmark/mpblas/Rdot2.plt
@@ -2,10 +2,10 @@ set xlabel font "Helvetica,20"
 set ylabel font "Helvetica,20"
 set key font "Helvetica,16"
 set title font "Helvetica,20"
-set title "Rdot on %%MODELNAME%%"
+set title "Rdot on AMD Ryzen Threadripper 3970X 32-Core Processor "
 set xlabel "Dimension"
 set ylabel "MFLOPS"
-#set terminal postscript eps color enhanced
+set key above
 set terminal pdf
 
 plot \

diff --git a/benchmark/mpblas/Rdot2.plt.in b/benchmark/mpblas/Rdot2.plt.in
@@ -0,0 +1,17 @@
+set xlabel font "Helvetica,20"
+set ylabel font "Helvetica,20"
+set key font "Helvetica,16"
+set title font "Helvetica,20"
+set title "Rdot on %%MODELNAME%%"
+set xlabel "Dimension"
+set ylabel "MFLOPS"
+set key above
+set terminal pdf
+
+plot \
+"log.Rdot.mpfr"            using 1:2 title 'MPFR 512bit'            with lines linewidth 1, \
+"log.Rdot.mpfr_opt"        using 1:2 title 'MPFR 512bit(OpenMP)'    with lines linewidth 1, \
+"log.Rdot.gmp"             using 1:2 title 'GMP  512bit'            with lines linewidth 1, \
+"log.Rdot.gmp_opt"         using 1:2 title 'GMP  512bit(OpenMP)'    with lines linewidth 1, \
+"log.Rdot.qd"              using 1:2 title 'quad-double'            with lines linewidth 1, \
+"log.Rdot.qd_opt"          using 1:2 title 'quad-double(OpenMP)'    with lines linewidth 1
diff --git a/benchmark/mpblas/Rdot3.plt b/benchmark/mpblas/Rdot3.plt
@@ -2,11 +2,14 @@ set xlabel font "Helvetica,20"
 set ylabel font "Helvetica,20"
 set key font "Helvetica,16"
 set title font "Helvetica,20"
-set title "Rdot on %%MODELNAME%%"
+set title "Rdot on AMD Ryzen Threadripper 3970X 32-Core Processor "
 set xlabel "Dimension"
 set ylabel "MFLOPS"
-#set terminal postscript eps color enhanced
+set key above
 set terminal pdf
 
-plot "log.Rdot.double_opt"	    using 1:2 title 'double (OpenMP)'     with lines linewidth 1
+plot "log.Rdot.double_opt"	    using 1:2 title 'double (OpenMP)'     with lines linewidth 1, \
+     "log.Rdot.double"              using 1:2 title 'double'              with lines linewidth 1, \
+     "log.ddot.ref"	            using 1:2 title 'double (Ref.BLAS)'   with lines linewidth 1, \
+     "log.ddot.openblas"            using 1:2 title 'double (OpenBLAS)'   with lines linewidth 1
 
diff --git a/benchmark/mpblas/Rdot3.plt.in b/benchmark/mpblas/Rdot3.plt.in
@@ -0,0 +1,15 @@
+set xlabel font "Helvetica,20"
+set ylabel font "Helvetica,20"
+set key font "Helvetica,16"
+set title font "Helvetica,20"
+set title "Rdot on %%MODELNAME%%"
+set xlabel "Dimension"
+set ylabel "MFLOPS"
+set key above
+set terminal pdf
+
+plot "log.Rdot.double_opt"	    using 1:2 title 'double (OpenMP)'     with lines linewidth 1, \
+     "log.Rdot.double"              using 1:2 title 'double'              with lines linewidth 1, \
+     "log.ddot.ref"	            using 1:2 title 'double (Ref.BLAS)'   with lines linewidth 1, \
+     "log.ddot.openblas"            using 1:2 title 'double (OpenBLAS)'   with lines linewidth 1
+
diff --git a/benchmark/mpblas/ddot.cpp b/benchmark/mpblas/ddot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2010
+ * Copyright (c) 2008-2022
  *	Nakata, Maho
  * 	All rights reserved.
  *
@@ -35,11 +35,9 @@
 #define ___DOUBLE_BENCH___
 #include <mplapack_benchmark.h>
 
-#define TOTALSTEPS 1000
-
 int main(int argc, char *argv[]) {
     int n;
-    int incx = 1, incy = 1, STEP, N0;
+    int incx = 1, incy = 1, STEP = 97, N0 = 1, LOOPS = 3, TOTALSTEPS = 3000;
     double dummy, ans, ans_ref;
     double mOne = -1;
     double elapsedtime;
@@ -51,20 +49,19 @@ int main(int argc, char *argv[]) {
     using std::chrono::nanoseconds;
 
     // initialization
-    N0 = 1;
-    STEP = 1;
     if (argc != 1) {
         for (i = 1; i < argc; i++) {
             if (strcmp("-N", argv[i]) == 0) {
                 N0 = atoi(argv[++i]);
             } else if (strcmp("-STEP", argv[i]) == 0) {
                 STEP = atoi(argv[++i]);
-            } else if (strcmp("-NOCHECK", argv[i]) == 0) {
-                check_flag = 0;
+            } else if (strcmp("-LOOPS", argv[i]) == 0) {
+                LOOPS = atoi(argv[++i]);
+            } else if (strcmp("-TOTALSTEPS", argv[i]) == 0) {
+                TOTALSTEPS = atoi(argv[++i]);
             }
         }
     }
-
     n = N0;
     for (p = 0; p < TOTALSTEPS; p++) {
         double *x = new double[n];
@@ -73,12 +70,16 @@ int main(int argc, char *argv[]) {
             x[i] = randomnumber(dummy);
             y[i] = randomnumber(dummy);
         }
-        auto t1 = Clock::now();
-        ans = ddot_f77(&n, x, &incx, y, &incy);
-        auto t2 = Clock::now();
-        elapsedtime = elapsedtime + (double)duration_cast<nanoseconds>(t2 - t1).count() / 1.0e9;
-        printf("         n       MFLOPS\n");
-        printf("%10d   %10.3f\n", (int)n, (2.0 * (double)n) / elapsedtime * MFLOPS);
+        elapsedtime = 0.0;
+        for (int j = 0; j < LOOPS; j++) {
+            auto t1 = Clock::now();
+            ans = ddot_f77(&n, x, &incx, y, &incy);
+            auto t2 = Clock::now();
+            elapsedtime = elapsedtime + (double)duration_cast<nanoseconds>(t2 - t1).count() / 1.0e9;
+        }
+        elapsedtime = elapsedtime / (double)LOOPS;
+        printf("         n       MFLOPS    loops\n");
+        printf("%10d   %10.3f       %d\n", (int)n, (2.0 * (double)n) / elapsedtime * MFLOPS, LOOPS);
         delete[] y;
         delete[] x;
         n = n + STEP;

diff --git a/benchmark/mpblas/go.Raxpy.sh b/benchmark/mpblas/go.Raxpy.sh
@@ -6,8 +6,8 @@ else
     LDPATHPREFIX="LD_LIBRARY_PATH=%%PREFIX%%/lib:$LD_LIBRARY_PATH"
 fi
 
-env $LDPATHPREFIX ./daxpy_ref      -STEP 7 -TOTALSTEPS 42000 -LOOPS 3 >& log.daxpy.ref
-env $LDPATHPREFIX ./daxpy_openblas -STEP 7 -TOTALSTEPS 42000 -LOOPS 3 >& log.daxpy.openblas
+env $LDPATHPREFIX ./daxpy_ref      -STEP 7 -TOTALSTEPS 42857 -LOOPS 3 >& log.daxpy.ref
+env $LDPATHPREFIX ./daxpy_openblas -STEP 7 -TOTALSTEPS 42857 -LOOPS 3 >& log.daxpy.openblas
 
 ####
 MPLIBS="_Float128 _Float64x dd double"

diff --git a/benchmark/mpblas/go.Rdot.sh b/benchmark/mpblas/go.Rdot.sh
@@ -6,6 +6,9 @@ else
     LDPATHPREFIX="LD_LIBRARY_PATH=%%PREFIX%%/lib:$LD_LIBRARY_PATH"
 fi
 
+env $LDPATHPREFIX ./ddot_ref      -STEP 7 -TOTALSTEPS 42857 -LOOPS 3 >& log.ddot.ref
+env $LDPATHPREFIX ./ddot_openblas -STEP 7 -TOTALSTEPS 42857 -LOOPS 3 >& log.ddot.openblas
+
 ####
 MPLIBS="_Float128 _Float64x dd double"
 
@@ -35,9 +38,9 @@ else
     MODELNAME="unknown"
 fi
 
-$SED -i -e "s/%%MODELNAME%%/$MODELNAME/g" Rdot1.plt
-$SED -i -e "s/%%MODELNAME%%/$MODELNAME/g" Rdot2.plt
-$SED -i -e "s/%%MODELNAME%%/$MODELNAME/g" Rdot3.plt
+$SED -e "s/%%MODELNAME%%/$MODELNAME/g" Rdot1.plt.in > Rdot1.plt
+$SED -e "s/%%MODELNAME%%/$MODELNAME/g" Rdot2.plt.in > Rdot2.plt
+$SED -e "s/%%MODELNAME%%/$MODELNAME/g" Rdot3.plt.in > Rdot3.plt
 ####
 
 gnuplot Rdot1.plt > Rdot1.pdf