(wrong string) ée

From: <git_AT_suckless.org>
Date: Sun, 13 Mar 2016 00:34:21 +0100 (CET)

commit b2584fb5a9851bdf3c23036e6cea9cd301135df0
Author: Mattias Andrée <maandree_AT_kth.se>
AuthorDate: Sun Mar 13 00:27:15 2016 +0100
Commit: Mattias Andrée <maandree_AT_kth.se>
CommitDate: Sun Mar 13 00:33:43 2016 +0100

    Add possibility to compare against libgmp
    
    Signed-off-by: Mattias Andrée <maandree_AT_kth.se>

diff --git a/Makefile b/Makefile
index 19d3e1d..90351d9 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -89,6 +89,7 @@ endif
 ifdef BENCHMARK_LIB
 CPPFLAGS += -DBENCHMARK_LIB='"$(BENCHMARK_LIB).h"'
 BENCHMARK_libtommath = -ltommath
+BENCHMARK_libgmp = -lgmp
 benchmark: bench/benchmark.c bench/$(BENCHMARK_LIB).h
         $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -o $_AT_ bench/benchmark.c $(BENCHMARK_$(BENCHMARK_LIB))
 endif
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..fbc847f
--- /dev/null
+++ b/TODO
_AT_@ -0,0 +1,2 @@
+GMP has mpz_divexact(q,n,d), we should have zdiv_exact(q,n,d).
+It uses optimised division algorithm that requires that d|n.
diff --git a/bench/libgmp.h b/bench/libgmp.h
new file mode 100644
index 0000000..832bfe9
--- /dev/null
+++ b/bench/libgmp.h
_AT_@ -0,0 +1,193 @@
+#include <gmp.h>
+
+#include <stddef.h>
+#include <setjmp.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+typedef mpz_t z_t;
+
+static z_t _0, _1, _a, _b;
+static FILE *_fbuf;
+static gmp_randstate_t _randstate;
+
+static void
+zsetup(jmp_buf env)
+{
+ static char buf[1000];
+ (void) env;
+ mpz_init_set_ui(_0, 0);
+ mpz_init_set_ui(_1, 1);
+ mpz_init(_a);
+ mpz_init(_b);
+ _fbuf = fmemopen(buf, sizeof(buf), "r+");
+ gmp_randinit_mt(_randstate);
+}
+
+static void
+zunsetup(void)
+{
+ mpz_clear(_0);
+ mpz_clear(_1);
+ mpz_clear(_a);
+ mpz_clear(_b);
+ fclose(_fbuf);
+ gmp_randclear(_randstate);
+}
+
+#define FAST_RANDOM 0
+#define QUASIUNIFORM 0
+#define UNIFORM 1
+
+#define zperror(x) 0
+#define zinit mpz_init
+#define zfree mpz_clear
+
+#define zset mpz_set
+#define zneg mpz_neg
+#define zabs mpz_abs
+#define zadd_unsigned(r, a, b) (zabs(_a, a), zabs(_b, b), mpz_add(r, _a, _b))
+#define zsub_unsigned(r, a, b) (zabs(_a, a), zabs(_b, b), mpz_sub(r, _a, _b))
+#define zadd mpz_add
+#define zsub mpz_sub
+#define zand mpz_and
+#define zor mpz_ior
+#define zxor mpz_xor
+#define znot mpz_com
+#define zbtest mpz_tstbit
+#define zeven mpz_even_p /* Note, must not have side effects. */
+#define zodd mpz_odd_p /* Note, must not have side effects. */
+#define zeven_nonzero zeven
+#define zodd_nonzero zodd
+#define zzero(a) (!mpz_sgn(a))
+#define zsignum mpz_sgn
+#define zbits(a) mpz_sizeinbase(a, 2)
+#define zlsb(a) mpz_scan1(a, 0)
+#define zswap mpz_swap
+#define zlsh mpz_mul_2exp
+#define zrsh mpz_tdiv_q_2exp
+#define ztrunc mpz_tdiv_r_2exp
+#define zcmpmag mpz_cmpabs
+#define zcmp mpz_cmp
+#define zcmpi(a, b) (zseti(_b, b), zcmp(a, _b))
+#define zcmpu(a, b) (zsetu(_b, b), zcmp(a, _b))
+#define zgcd mpz_gcd
+#define zmul mpz_mul
+#define zsqr(r, a) mpz_mul(r, a, a)
+#define zmodmul(r, a, b, m) (zmul(r, a, b), zmod(r, r, m))
+#define zmodsqr(r, a, m) (zsqr(r, a), zmod(r, r, m))
+#define zpow(r, a, b) mpz_pow_ui(r, a, mpz_get_ui(b))
+#define zpowu mpz_pow_ui
+#define zmodpow mpz_powm
+#define zmodpowu mpz_powm_ui
+#define zsets(a, s) mpz_set_str(a, s, 10)
+#define zstr_length(a, b) (mpz_sizeinbase(a, 10) + (zsignum(a) < 0))
+#define zstr(a, s) mpz_get_str(s, 10, a)
+#define zptest(w, a, t) mpz_probab_prime_p(a, t) /* Note, the witness is not returned. */
+#define zdiv mpz_tdiv_q
+#define zmod mpz_tdiv_r
+#define zdivmod mpz_tdiv_qr
+
+static void
+zsetu(z_t r, unsigned long long int val)
+{
+ uint32_t high = (uint32_t)(val >> 32);
+ uint32_t low = (uint32_t)val;
+
+ if (high) {
+ mpz_set_ui(r, high);
+ mpz_set_ui(_a, low);
+ zlsh(r, r, 32);
+ zadd(r, r, _a);
+ } else {
+ mpz_set_ui(r, low);
+ }
+
+}
+
+static void
+zseti(z_t r, long long int val)
+{
+ if (val >= 0) {
+ zsetu(r, (unsigned long long int)val);
+ } else {
+ zsetu(r, (unsigned long long int)-val);
+ zneg(r, r);
+ }
+}
+
+static void
+zsplit(z_t high, z_t low, z_t a, size_t brk)
+{
+ if (low == a) {
+ zrsh(high, a, brk);
+ ztrunc(low, a, brk);
+ } else {
+ ztrunc(low, a, brk);
+ zrsh(high, a, brk);
+ }
+}
+
+static void
+zbset(z_t r, z_t a, size_t bit, int mode)
+{
+ if (r != a)
+ zset(r, a);
+ if (mode > 0)
+ mpz_setbit(r, bit);
+ else if (mode == 0)
+ mpz_clrbit(r, bit);
+ else
+ mpz_combit(r, bit);
+}
+
+static size_t
+zsave(z_t a, void *buffer)
+{
+ size_t n = mpz_out_raw(_fbuf, a);
+ (void)buffer;
+ fseek(_fbuf, -(long)n, SEEK_CUR);
+ return n;
+}
+
+static size_t
+zload(z_t a, const void *buffer)
+{
+ size_t n = mpz_inp_raw(a, _fbuf);
+ (void)buffer;
+ fseek(_fbuf, -(long)n, SEEK_CUR);
+ return n;
+}
+
+static void
+zrand(z_t r, int dev, int dist, z_t n)
+{
+ size_t bits;
+ (void) dev;
+
+ if (zzero(n)) {
+ mpz_set_ui(r, 0);
+ return;
+ }
+ if (zsignum(n) < 0) {
+ return;
+ }
+
+ switch (dist) {
+ case QUASIUNIFORM:
+ bits = zbits(n);
+ mpz_urandomb(r, _randstate, bits);
+ zadd(r, r, _1);
+ zmul(r, r, n);
+ zrsh(r, r, bits);
+ break;
+
+ case UNIFORM: /* Note, n is exclusive in this implementation. */
+ mpz_urandomm(r, _randstate, n);
+ break;
+
+ default:
+ abort();
+ }
+}
Received on Sun Mar 13 2016 - 00:34:21 CET