Removed benchmarking from demo/test.c

Author: czurnieden

demo/test.c

@@ -1529,27 +1529,6 @@ static int test_mp_decr(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_is_small_prime(void)
 {
    mp_sieve sieve;
@@ -1571,25 +1550,10 @@ static int test_mp_is_small_prime(void)
    };
    bool result;
 
-#ifdef BENCHMARK_SIEVE
-   uint64_t startgt, stopgt;
-#endif
-
    mp_sieve_init(&sieve);
 
    test_size = (int)(sizeof(to_test)/sizeof(mp_sieve_prime));
 
-#ifdef BENCHMARK_SIEVE
-   startgt = gettime();
-   if ((e = mp_is_small_prime((mp_sieve_prime)(153u), &result, &sieve)) != MP_OKAY) {
-      fprintf(stderr,"mp_is_small_prime failed: \"%s\"\n",mp_error_to_string(e));
-      goto LTM_ERR;
-   }
-   stopgt = gettime();
-   printf("Building base sieve and checking once: %"MP_SIEVE_PR_UINT": ", (mp_sieve_prime)(153u));
-   print_timer("",startgt, stopgt);
-#endif
-
    for (i = 0; i < test_size; i++) {
       if ((e = mp_is_small_prime(to_test[i], &result, &sieve)) != MP_OKAY) {
          fprintf(stderr,"mp_is_small_prime failed: \"%s\"\n",mp_error_to_string(e));
@@ -1617,9 +1581,7 @@ static int test_mp_next_small_prime(void)
    mp_int primesum, t;
    mp_err e;
    int i, test_size;
-#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,
@@ -1639,20 +1601,13 @@ static int test_mp_next_small_prime(void)
       961126169, 1057886083, 1222702081, 1017450823,
       1019879761, 72282701, 2048787577, 2058368113
    };
-
-#ifdef BENCHMARK_SIEVE
-   const char *primesum_32 = "425649736193687430";
-#else
    const char *primesum_32 = "202259606268580";
-#endif
+
    mp_sieve_init(&sieve);
 
    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);
@@ -1663,23 +1618,11 @@ 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: %*"MP_SIEVE_PR_UINT": ", 10, ret);
-      print_timer("",startgt, stopgt);
-#endif
    }
 
    DOR(mp_init_multi(&primesum, &t, NULL));
-#ifdef BENCHMARK_SIEVE
-   startgt = gettime();
-#endif
 
-#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 + 1u;
 #ifdef MP_64BIT
@@ -1689,13 +1632,6 @@ static int test_mp_next_small_prime(void)
 #endif
       DO(mp_add(&primesum, &t, &primesum));
    }
-
-#ifdef BENCHMARK_SIEVE
-   stopgt = gettime();
-   printf("Sum of all primes between 0 and %"MP_SIEVE_PR_UINT" = ", (mp_sieve_prime)MP_SIEVE_BIGGEST_PRIME);
-   DO(mp_fwrite(&primesum, 10, stdout));
-   print_timer(", computed in \n",startgt, stopgt);
-#endif
    printf("Primesum computed: ");
    DO(mp_fwrite(&primesum, 10, stdout));
    puts("");