small rollback for now

Author: czurnieden

demo/test.c

@@ -1628,7 +1628,6 @@ static int test_mp_next_small_prime(void)
 #else
    const char *primesum_32 = "202259606268580";
 #endif
-
    mp_sieve_init(&sieve);
 
    test_size = (int)(sizeof(to_test)/sizeof(mp_sieve_prime));
@@ -1665,7 +1664,7 @@ static int test_mp_next_small_prime(void)
    for (p = 4293918720lu; ret < (mp_sieve_prime)MP_SIEVE_BIGGEST_PRIME;) {
 #endif
       DO(mp_next_small_prime(p, &ret, &sieve));
-      p = ret + 1;
+      p = ret + 1u;
 #ifdef MP_64BIT
       mp_set_u64(&t, ret);
 #else
@@ -1680,7 +1679,7 @@ static int test_mp_next_small_prime(void)
    DO(mp_fwrite(&primesum, 10, stdout));
    print_timer(", computed in \n",startgt, stopgt);
 #endif
-
+   printf("Primesum computed: ");DO(mp_fwrite(&primesum, 10, stdout));puts("");
    DO(mp_read_radix(&t, primesum_32, 10));
    EXPECT(mp_cmp(&primesum, &t) == MP_EQ);
 

mp_is_small_prime.c

@@ -294,7 +294,7 @@ mp_err mp_is_small_prime(mp_sieve_prime n, mp_sieve_prime *result, mp_sieve *sie
    }
 
    /* neither of 2^16-x, 2^32-x, or 2^64-x are prime for 0<=x<=4 */
-   if (n >= (mp_sieve_prime)(MP_SIEVE_PRIME_MAX - 3)) {
+   if (n >= (mp_sieve_prime)(MP_SIEVE_PRIME_MAX - 3u)) {
       *result = 0uL;
       return e;
    }

tommath_private.h

@@ -107,44 +107,15 @@ extern void MP_FREE(void *mem, size_t size);
 /* Size of the base sieve of mp_sieve*/
 
 #define MP_SIEVE_PRIME_MAX          0xFFFFFFFFlu
-#ifndef MP_SIEVE_PRIME_MAX_SQRT
 #define MP_SIEVE_PRIME_MAX_SQRT     0xFFFFlu
-#endif
 #ifdef MP_64BIT
 #define MP_SIEVE_FILL               0xFFFFFFFFFFFFFFFFllu
 #else
 #define MP_SIEVE_FILL               0xFFFFFFFFlu
 #endif
 
-
-/*
-   It is faster for random access to set it to a very small number but that qill
-   cost quite significantly in sequential access and vice versa.
-   (NB: L1d cache on the author's machine is 16k bytes (0x20000 bits) large)
-
-   Building a base sieve with size 0xFFFF needs about 60 usec, random access in a
-   segment about 100 ns.
-
-      MP_SIEVE_RANGE_A_B              Random Access          Full Primesum
-             0x7f                         70 usec                 90 min(!)
-           0x1000                        100 usec                  2 min 33 sec
-           0x4000                        150 usec                  1 min 18 sec
-           0xFFFF                        350 usec                  0 min 57 sec
-          0x20000                        600 usec                  0 min 55 sec
-       0xFFFFFFFF (base sieve only)      300 usec                  0 min 35 sec
-
-
-   The default is optimized for random access but adding all primes would also work
-   in a reasonable time.
- */
 /* Size is in bits! */
-#ifndef MP_SIEVE_RANGE_A_B
-#ifdef MP_64BIT
-#define MP_SIEVE_RANGE_A_B 0x1000
-#else
-#define MP_SIEVE_RANGE_A_B 0x1000
-#endif
-#endif
+#define MP_SIEVE_RANGE_A_B MP_SIEVE_PRIME_MAX_SQRT
 
 #define MP_SIEVE_BASE_SIEVE_SIZE  ((mp_sieve_prime)MP_SIEVE_PRIME_MAX_SQRT)