Added printing benchmark lists and graphs

Author: czurnieden

etc/get_limbsize.c

@@ -0,0 +1,11 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "tommath.h"
+
+int main(void)
+{
+   printf("%d",MP_DIGIT_BIT);
+
+   exit(EXIT_SUCCESS);
+}

etc/makefile

@@ -6,7 +6,7 @@ LTM_TUNE_CFLAGS = $(CFLAGS) $(LTM_CFLAGS) -Wall -W -Wextra -Wshadow -O3 -I../
 # libname when you can't install the lib with install
 LIBNAME=../libtommath.a
 
-all: pprime tune test_standalone mersenne drprime 2kprime mont
+all: pprime tune test_standalone mersenne drprime 2kprime mont getlimbsize graph
 
 #provable primes
 pprime: pprime.o
@@ -36,10 +36,17 @@ drprime: drprime.o
 mont: mont.o
 	$(CC) $(LTM_TUNE_CFLAGS) mont.o $(LIBNAME) -o mont
 
+getlimbsize: get_limbsize.o
+	$(CC) $(LTM_TUNE_CFLAGS) get_limbsize.o $(LIBNAME) -o get_limbsize
+
+# Make pretty pictures (500 is the maximum number of limbs)
+graphs: tune get_limbsize
+	./tune -p -M 500
+	gnuplot -c plot_graphs.gp `./get_limbsize`
 
 clean:
 	rm -f *.log *.o *.obj *.exe pprime tune mersenne drprime mont 2kprime pprime.dat \
-        tuning_list multiplying squaring test *.da *.dyn *.dpi *~
+        tuning_list multiplying squaring readradix writeradix test get_limbsize *png *.da *.dyn *.dpi *~
 	rm -rf .libs
 
 .PHONY: tune

etc/plot_graphs.gp

@@ -0,0 +1,29 @@
+set term pngcairo size 720,540
+# Good for most colorblinds
+set colorsequence podo
+
+set key top left;
+
+set ylabel "Time"
+set xlabel "Operand size (limbs)"
+
+set output "multiplying.png";
+set title "Comparing fast and slow multiplying [".ARG1." bits limbsize]";
+plot "multiplying" using 1:2 w lines t "slow", "multiplying" using 1:3 w lines t "fast"
+
+set output "squaring.png";
+set title "Comparing fast and slow squaring [".ARG1." bits limbsize]";
+plot "squaring" using 1:2 w lines t "slow", "squaring" using 1:3 w lines t "fast"
+
+set xlabel "Operand size (bits)"
+set output "readradix.png";
+set title "Comparing fast and slow radix conversion (reading) [".ARG1." bits limbsize]";
+plot "readradix" using 1:2 w lines t "slow", "readradix" using 1:3 w lines t "fast"
+
+set output "writeradix.png";
+set title "Comparing fast and slow radix conversion (writing) [".ARG1." bits limbsize]";
+plot "writeradix" using 1:2 w lines t "slow", "writeradix" using 1:3 w lines t "fast"
+
+
+
+

etc/tune.c

@@ -386,8 +386,8 @@ static void s_usage(char *s)
    fprintf(stderr,"          -T testmode, for use with testme.sh\n");
    fprintf(stderr,"          -v verbose, print all timings\n");
    fprintf(stderr,"          -c check results\n");
-   fprintf(stderr,"          -p print benchmark of final cutoffs in files \"multiplying\"\n");
-   fprintf(stderr,"             and \"squaring\"\n");
+   fprintf(stderr,"          -p print benchmark of final cutoffs in files \"multiplying\",\n");
+   fprintf(stderr,"             \"squaring\", \"readradix\", and  \"writeradix\" \n");
    fprintf(stderr,"          -G [string] suffix for the filenames listed above\n");
    fprintf(stderr,"             Implies '-p'\n");
    fprintf(stderr,"          -b print benchmark of bncore.c\n");
@@ -457,9 +457,11 @@ int main(int argc, char **argv)
    int opt;
    struct cutoffs orig, updated;
 
-   FILE *squaring, *multiplying;
+   FILE *squaring, *multiplying, *readradix, *writeradix;
    char mullog[256] = "multiplying";
    char sqrlog[256] = "squaring";
+   char rcreadlog[256] = "readradix";
+   char rcwritelog[256] = "writeradix";
    s_number_of_test_loops = 64;
    s_stabilization_extra = 3;
 
@@ -525,6 +527,31 @@ int main(int argc, char **argv)
                   break;
                }
             }
+
+            for (i = 0; i < 255; i++) {
+               if (rcreadlog[i] == '\0') {
+                  break;
+               }
+            }
+            for (j = 0; i < 255; j++, i++) {
+               rcreadlog[i] = argv[opt][j];
+               if (argv[opt][j] == '\0') {
+                  break;
+               }
+            }
+
+            for (i = 0; i < 255; i++) {
+               if (rcwritelog[i] == '\0') {
+                  break;
+               }
+            }
+            for (j = 0; i < 255; j++, i++) {
+               rcwritelog[i] = argv[opt][j];
+               if (argv[opt][j] == '\0') {
+                  break;
+               }
+            }
+
             break;
          case 'b':
             args.bncore = 1;
@@ -693,7 +720,7 @@ int main(int argc, char **argv)
    }
    /* TODO: add graphs for radix conversion, too? */
    if (args.print == 1) {
-      printf("Printing data for graphing to \"%s\" and \"%s\"\n",mullog, sqrlog);
+      printf("Printing data for graphing to \"%s\", \"%s\", \"%s\", and \"%s\"\n",mullog, sqrlog, rcreadlog, rcwritelog);
 
       multiplying = fopen(mullog, "w+");
       if (multiplying == NULL) {
@@ -707,6 +734,19 @@ int main(int argc, char **argv)
          exit(EXIT_FAILURE);
       }
 
+      readradix = fopen(rcreadlog, "w+");
+      if (readradix == NULL) {
+         fprintf(stderr, "Opening file \"%s\" failed\n",rcreadlog);
+         exit(EXIT_FAILURE);
+      }
+
+      writeradix = fopen(rcwritelog, "w+");
+      if (readradix == NULL) {
+         fprintf(stderr, "Opening file \"%s\" failed\n",rcwritelog);
+         exit(EXIT_FAILURE);
+      }
+
+
       for (x = 8; x < args.upper_limit_print; x += args.increment_print) {
          set_cutoffs(&max_cutoffs);
          t1 = s_time_mul(x);
@@ -728,23 +768,54 @@ int main(int argc, char **argv)
             printf("SQR %d: %9" PRIu64 " %9" PRIu64 ", %9" PRIi64 "\n", x, t1, t2, (int64_t)t2 - (int64_t)t1);
             fflush(stdout);
          }
+
+
+         set_cutoffs(&max_cutoffs);
+         t1 = s_time_radix_conversion_read(x);
+         set_cutoffs(&orig);
+         t2 = s_time_radix_conversion_read(x);
+         fprintf(readradix,"%d: %9" PRIu64 " %9" PRIu64 ", %9" PRIi64 "\n", x * MP_DIGIT_BIT, t1, t2, (int64_t)t2 - (int64_t)t1);
+         fflush(readradix);
+         if (args.verbose == 1) {
+            printf("RCR %d: %9" PRIu64 " %9" PRIu64 ", %9" PRIi64 "\n", x * MP_DIGIT_BIT, t1, t2, (int64_t)t2 - (int64_t)t1);
+            fflush(stdout);
+         }
+
+         set_cutoffs(&max_cutoffs);
+         t1 = s_time_radix_conversion_write(x);
+         set_cutoffs(&orig);
+         t2 = s_time_radix_conversion_write(x);
+         fprintf(writeradix,"%d: %9" PRIu64 " %9" PRIu64 ", %9" PRIi64 "\n", x * MP_DIGIT_BIT, t1, t2,
+                 (int64_t)t2 - (int64_t)t1);
+         fflush(writeradix);
+         if (args.verbose == 1) {
+            printf("RCW %d: %9" PRIu64 " %9" PRIu64 ", %9" PRIi64 "\n", x * MP_DIGIT_BIT, t1, t2, (int64_t)t2 - (int64_t)t1);
+            fflush(stdout);
+         }
+
       }
-      printf("Finished. Data for graphing in \"%s\" and \"%s\"\n",mullog, sqrlog);
+      printf("Finished. Data for graphing in \"%s\", \"%s\", \"%s\", and \"%s\"\n",mullog, sqrlog, rcreadlog, rcwritelog);
       if (args.verbose == 1) {
          set_cutoffs(&orig);
          if (args.terse == 1) {
-            printf("%d %d %d %d\n",
+            printf("%d %d %d %d %d %d\n",
                    MP_MUL_KARATSUBA_CUTOFF,
                    MP_SQR_KARATSUBA_CUTOFF,
                    MP_MUL_TOOM_CUTOFF,
-                   MP_SQR_TOOM_CUTOFF);
+                   MP_SQR_TOOM_CUTOFF,
+                   MP_RADIX_READ_CUTOFF,
+                   MP_RADIX_WRITE_CUTOFF);
          } else {
             printf("MUL_KARATSUBA_CUTOFF = %d\n", MP_MUL_KARATSUBA_CUTOFF);
             printf("SQR_KARATSUBA_CUTOFF = %d\n", MP_SQR_KARATSUBA_CUTOFF);
             printf("MUL_TOOM_CUTOFF = %d\n", MP_MUL_TOOM_CUTOFF);
             printf("SQR_TOOM_CUTOFF = %d\n", MP_SQR_TOOM_CUTOFF);
+            printf("MP_RADIX_READ_CUTOFF = %d\n", MP_RADIX_READ_CUTOFF);
+            printf("MP_RADIX_WRITE_CUTOFF = %d\n", MP_RADIX_WRITE_CUTOFF);
          }
       }
+      fclose(readradix);
+      fclose(writeradix);
    }
    exit(EXIT_SUCCESS);
 }

mp_read_radix.c

@@ -86,9 +86,8 @@ mp_err mp_read_radix(mp_int *a, const char *str, int radix)
    slen_2 = slen * (size_t)(s_mp_log2_radix[radix] + 1);
 
    mp_zero(a);
-
    /* Try faster version first */
-   if (MP_HAS(S_MP_FASTER_READ_RADIX) && (slen_2 < (size_t)MP_RADIX_READ_CUTOFF)) {
+   if (MP_HAS(S_MP_FASTER_READ_RADIX) && (slen_2 > (size_t)MP_RADIX_READ_CUTOFF)) {
       if ((err = s_mp_faster_read_radix(a, str, 0, slen, radix)) != MP_OKAY)                             goto LTM_ERR;
    } else if (MP_HAS(S_MP_SLOWER_READ_RADIX)) {
       if ((err = s_mp_slower_read_radix(a, str, 0, slen, radix)) != MP_OKAY)                             goto LTM_ERR;