Added some benchmarking (temporarily)

Author: czurnieden

demo/test.c

@@ -1571,16 +1571,39 @@ static int test_mp_is_small_prime(void)
    return EXIT_FAILURE;
 }
 
+#ifdef BENCHMARK_SIEVE
+#include <time.h>
+#include <sys/time.h>
+#define LTM_BILLION 1000000000
+static uint64_t gettime(void)
+{
+   struct timespec ts;
+   clock_gettime(CLOCK_MONOTONIC, &ts);
+   return (((uint64_t)ts.tv_sec) * LTM_BILLION + (uint64_t)ts.tv_nsec);
+}
+static void print_timer(const char *s, const uint64_t start, const uint64_t stop)
+{
+   printf("%s%"PRIu64" min %"PRIu64" sec %"PRIu64" ms %"PRIu64" usec %"PRIu64" nsec\n", s,
+          ((stop - start)/LTM_BILLION) / 60,
+          ((stop - start)/LTM_BILLION) % 60,
+          ((stop - start)/(LTM_BILLION/1000))%1000,
+          ((stop - start)/(LTM_BILLION/1000000))%1000,
+          (((stop - start)%LTM_BILLION)%1000)
+         );
+}
+#endif
+
 static int test_mp_next_small_prime(void)
 {
    mp_sieve sieve;
    mp_sieve_prime ret, p;
    mp_int primesum, t;
    int e;
    int i, test_size;
-
-   clock_t start, stop;
-
+#ifdef BENCHMARK_SIEVE
+   uint64_t startgt, stopgt;
+#endif
+   /* Jumping wildly to and fro */
    mp_sieve_prime to_test[] = {
       52, 137, 153, 179, 6, 153, 53, 132, 150, 65,
       27414, 36339, 36155, 11067, 52060, 5741,
@@ -1600,6 +1623,7 @@ static int test_mp_next_small_prime(void)
       1019879761, 72282701, 2048787577, 2058368113
    };
 
+/* TODO: No, remove 64-bit version, way too big and a bit unwieldy, too! */
 #if ( (defined MP_64BIT) && (defined MP_SIEVE_USE_LARGE_SIEVE) )
    /* primesum up to 2^64
       $ time /home/czurnieden/GITHUB/primesum/primesum 2^64
@@ -1613,8 +1637,12 @@ static int test_mp_next_small_prime(void)
    /* const char *primesum_64 = "3879578600671960388666457126750869198"; */
 
    const char *primesum_64 = "208139436659661";
+#else
+#ifdef BENCHMARK_SIEVE
+   const char *primesum_32 = "425649736193687430";
 #else
    const char *primesum_32 = "202259606268580";
+#endif
 #endif
 
    mp_sieve_init(&sieve);
@@ -1623,6 +1651,9 @@ static int test_mp_next_small_prime(void)
    test_size = (int)(sizeof(to_test)/sizeof(mp_sieve_prime));
 
    for (i = 0; i < test_size; i++) {
+#ifdef BENCHMARK_SIEVE
+      startgt = gettime();
+#endif
       if ((e = mp_next_small_prime(to_test[i], &ret, &sieve)) != MP_OKAY) {
          fprintf(stderr,"mp_next_small_prime failed with \"%s\" at index %d\n",
                  mp_error_to_string(e), i);
@@ -1633,11 +1664,17 @@ static int test_mp_next_small_prime(void)
                  (unsigned long)to_test[i], (unsigned long)ret, (unsigned long)tested[i]);
          goto LBL_ERR;
       }
+#ifdef BENCHMARK_SIEVE
+      stopgt = gettime();
+      printf("Single random access for prime: %*u: ", 10, ret);
+      print_timer("",startgt, stopgt);
+#endif
    }
 
    DOR(mp_init_multi(&primesum, &t, NULL));
-   start = clock();
-/* Define   -DMP_SIEVE_PRIME_MAX_SQRT=0x1ffffffllu to make it feasable  */
+#ifdef BENCHMARK_SIEVE
+   startgt = gettime();
+#endif
 #if ( (defined MP_64BIT) && (defined MP_SIEVE_USE_LARGE_SIEVE) )
    for (p = 4293918720lu; ret < (mp_sieve_prime)4294997297lu;) {
       DO(mp_next_small_prime(p, &ret, &sieve));
@@ -1646,18 +1683,23 @@ static int test_mp_next_small_prime(void)
       DO(mp_add(&primesum, &t, &primesum));
    }
 #else
-/* We build the whole sieve instead of just the last segment. Too slow for valgrind */
+#ifdef BENCHMARK_SIEVE
+   for (p = 0ul; ret < (mp_sieve_prime)MP_SIEVE_BIGGEST_PRIME;) {
+#else
    for (p = 4293918720lu; ret < (mp_sieve_prime)MP_SIEVE_BIGGEST_PRIME;) {
+#endif
       DO(mp_next_small_prime(p, &ret, &sieve));
       p = ret + 1;
       mp_set_u32(&t, ret);
       DO(mp_add(&primesum, &t, &primesum));
    }
 #endif
-   stop = clock();
-(void)mp_fwrite(&primesum, 10, stdout);puts("");
-   printf("Time for primesum was %.2f seconds\n",
-          (double)(stop-start)/(double)CLOCKS_PER_SEC);
+#ifdef BENCHMARK_SIEVE
+   stopgt = gettime();
+   printf("Sum of all primes between 0 and %u = ", MP_SIEVE_BIGGEST_PRIME);
+   DO(mp_fwrite(&primesum, 10, stdout));
+   print_timer(", computed in ",startgt, stopgt);
+#endif
 
 #if ( (defined MP_64BIT) && (defined MP_SIEVE_USE_LARGE_SIEVE) )
    DO(mp_read_radix(&t, primesum_64, 10));

mp_is_small_prime.c

@@ -277,6 +277,7 @@ static int s_init_single_segment_with_start(mp_sieve_prime a,
  * Worst case runtime is: building a base sieve and a segment and
  * search the segment
  */
+/* TODO: add ability to keep segments? */
 mp_err mp_is_small_prime(mp_sieve_prime n, mp_sieve_prime *result, mp_sieve *sieve)
 {
    int e = MP_OKAY;