excluded timing from valgrind run

Author: czurnieden

demo/test.c

@@ -4,6 +4,10 @@
 #define S_MP_RAND_JENKINS_C
 #include "s_mp_rand_jenkins.c"
 
+/* TODO: Make it an environment variable via main.yml?
+         This is for testing only, so no  to add checks to the build process. */
+#include <valgrind/valgrind.h>
+
 static long rand_long(void)
 {
    long x;
@@ -1163,7 +1167,7 @@ static int test_mp_read_radix(void)
    char buf[4096];
    size_t written, maxlen;
 
-   int bignum, i, j, k;
+   int bignum, i, j, k, limit_test;
    char *buffer, *bcpy, *startb;
    clock_t start, stop, t_slow, t_fast;
    double slow = 0.0, fast = 0.0, sum_slow = 0.0, sum_fast = 0.0;
@@ -1195,8 +1199,15 @@ static int test_mp_read_radix(void)
       printf("%s, %lu\n", buf, (unsigned long)a.dp[0] & 3uL);
    }
 
+   /* Safe a bit of testing time */
+   if (RUNNING_ON_VALGRIND != 0) {
+      limit_test = 2000;
+   } else {
+      limit_test = 6000;
+   }
+
    /* Test the fast method with a slightly larger number (about a minute on an older machine) */
-   for (k = 100; k < 6000; k += 1000) {
+   for (k = 100; k < limit_test; k += 1000) {
       bignum = k;
       buffer = (char *)malloc((size_t)(bignum + 2));
       if (buffer == NULL) {
@@ -1253,8 +1264,12 @@ static int test_mp_read_radix(void)
       fprintf(stderr,"Sums for Base %d SLOW: %.10f, FAST: %.10f\n",i, s_bases_slow[i], s_bases_fast[i]);
    }
 
-   /* Very basic check if the fast algorithms are actually faster. */
-   EXPECT(sum_slow > sum_fast);
+   /* Valgrind overhead does not allow for timings. */
+   if (RUNNING_ON_VALGRIND == 0) {
+      /* Very basic check if the fast algorithms are actually faster. */
+      EXPECT(sum_slow > sum_fast);
+   }
+
 
    mp_clear_multi(&a, &b, &c, NULL);
    return EXIT_SUCCESS;

tommath_class.h

@@ -1109,11 +1109,10 @@
 #   define MP_INIT_C
 #   define MP_INIT_I32_C
 #   define MP_INIT_MULTI_C
-#   define MP_MUL_2D_C
-#   define MP_MUL_2_C
 #   define MP_MUL_C
 #   define MP_SUB_C
 #   define MP_SUB_D_C
+#   define S_MP_COMPUTE_S_C
 #   define S_MP_SLOWER_TO_RADIX_C
 #   define S_MP_TO_RADIX_RECURSIVE_C
 #   define S_MP_ZERO_BUF_C