Move rms binary to rms_bench.c.

src/Makefile.am

@@ -1,4 +1,6 @@
-bin_PROGRAMS = rms ddlog_bench exp_bench mul_bench
+BENCHMARKS = rms_bench ddlog_bench exp_bench mul_bench
+
+bin_PROGRAMS = $(BENCHMARKS)
 check_PROGRAMS = group_test
 
 DDLOG = ddlog.c ddlog.h
@@ -6,13 +8,17 @@ ELGAMAL = elgamal.c elgamal.h
 ENTROPY = entropy.c entropy.h
 FBASE = fbase.c fbase.h
 GROUP = group.c group.h
-HSS = hss.c hss.h
+HSS = hss.c rms.c hss.h
 TIMEIT = timeit.h
 TESTS = $(check_PROGRAMS)
 
-group_test_SOURCES = group_test.c $(GROUP) $(ENTROPY)
-
-rms_SOURCES = rms.c $(DDLOG) $(ELGAMAL) $(ENTROPY) $(GROUP) $(FBASE) $(HSS) $(TIMEIT)
-ddlog_bench_SOURCES = ddlog_bench.c $(DDLOG) $(ENTROPY) $(GROUP) $(TIMEIT)
-exp_bench_SOURCES = exp_bench.c $(ENTROPY) $(GROUP) $(FBASE) $(TIMEIT)
-mul_bench_SOURCES = mul_bench.c $(ENTROPY) $(GROUP)
+group_test_SOURCES = group_test.c \
+	$(GROUP) $(ENTROPY)
+rms_bench_SOURCES = rms_bench.c \
+	$(DDLOG) $(ELGAMAL) $(ENTROPY) $(GROUP) $(FBASE) $(HSS) $(TIMEIT)
+ddlog_bench_SOURCES = ddlog_bench.c \
+	$(DDLOG) $(ENTROPY) $(GROUP) $(TIMEIT)
+exp_bench_SOURCES = exp_bench.c \
+	$(ENTROPY) $(GROUP) $(FBASE) $(TIMEIT)
+mul_bench_SOURCES = mul_bench.c \
+	$(ENTROPY) $(GROUP)

src/hss.h

@@ -40,3 +40,6 @@ void ssl2_init(ssl2_t s);
 void ssl2_clear(ssl2_t s);
 void ssl2_share(ssl2_t s1, ssl2_t s2, const mpz_t v, const mpz_t sk);
 void ssl2_open(mpz_t rop, const ssl2_t s1, const ssl2_t s2);
+
+
+void hss_mul(ssl2_t rop, const ssl1_t sl1, const ssl2_t sl2);

src/rms.c

@@ -14,9 +14,6 @@
 #include "hss.h"
 #include "timeit.h"
 
-INIT_TIMEIT(CLOCK_PROCESS_CPUTIME_ID);
-
-
 static inline
 uint32_t mul_single(const elgamal_cipher_t c,
                     const uint32_t x,
@@ -25,7 +22,6 @@ uint32_t mul_single(const elgamal_cipher_t c,
   mpz_t op1, op2;
   mpz_inits(op1, op2, NULL);
 
-  START_TIMEIT();
   /* c1: first block */
   fb_powmp_ui(op1, c->fb_c1, cx->_mp_d[0]);
   /* c1: second block */
@@ -37,7 +33,6 @@ uint32_t mul_single(const elgamal_cipher_t c,
   /* c2 */
   fb_powmp_ui(op2, c->fb_c2, x);
   mpz_mul_modp(op2, op2, op1);
-  END_TIMEIT();
 
   const uint32_t converted = convert(PTR(op2));
 
@@ -57,90 +52,3 @@ void hss_mul(ssl2_t rop, const ssl1_t sl1, const ssl2_t sl2)
     mpz_add_ui(rop->cx, rop->cx, converted);
   }
 }
-
-int main()
-{
-  group_init();
-  mpz_entropy_init();
-  dlog_precompute();
-
-  mpz_t test;
-  mpz_init(test);
-
-  mpz_t x, y, xy;
-  mpz_inits(x, y, xy, NULL);
-
-  elgamal_key_t key;
-  ELGAMAL_KEY(init, key);
-  elgamal_keygen(key);
-
-
-  mpz_t expected_mod, base;
-  mpz_inits(expected_mod, base, NULL);
-  mpz_urandomm(base, _rstate, p);
-  mpz_powm_ui(expected_mod, base, 2, p);
-  mpz_pow_ui(test, base, 2);
-  remp(test);
-  // gmp_printf("%Zx\n%Zx\n", test, expected_mod);
-  assert(!mpz_cmp(test, expected_mod));
-  mpz_clear(expected_mod);
-
-  ssl1_t r1, r2;
-  ssl2_t s1, s2;
-  ssl2_t t1, t2;
-
-  ssl1_init(r1);
-  ssl1_init(r2);
-  ssl2_init(s1);
-  ssl2_init(s2);
-  ssl2_init(t1);
-  ssl2_init(t2);
-
-  mpz_urandomb(y, _rstate, 1);
-  mpz_urandomb(x, _rstate, 1);
-  /* mpz_set_ui(x, 1); */
-  /* mpz_set_ui(y, 1); */
-
-  ssl2_share(s1, s2, x, key->sk);
-  ssl2_open(test, s1, s2);
-  assert(!mpz_cmp(test, x));
-
-  ssl1_share(r1, r2, y, key);
-
-  ssl1_open(test, r1, r2, key);
-  assert(!mpz_cmp_ui(test, mpz_cmp_ui(y, 0) ? 2 : 1));
-
-
-
-  for (int i = 0; i <  (int) 1e2; i++) {
-    hss_mul(t1, r1, s1);
-    hss_mul(t2, r2, s2);
-
-#ifndef NDEBUG
-    gmp_printf("%Zx %Zx\n", x, y);
-    gmp_printf("%d %d\n", s1->x, s2->x);
-#endif
-
-    mpz_mul(xy, x, y);
-    ssl2_open(test, t2, t1);
-    assert(!mpz_cmp(test, xy));
-
-    mpz_sub(test, t2->cx, t1->cx);
-    mpz_abs(test, test);
-    assert(((!mpz_cmp_ui(xy, 1) && !mpz_cmp(test, key->sk))) ||
-           ((!mpz_cmp_ui(xy, 0)) && !mpz_cmp_ui(test, 0)));
-  }
-
-  printf(TIMEIT_FORMAT "\n", GET_TIMEIT());
-  ssl2_clear(s1);
-  ssl2_clear(s2);
-  ssl1_clear(r1);
-  ssl1_clear(r2);
-  ssl2_clear(t1);
-  ssl2_clear(t2);
-
-  mpz_clears(x, y, NULL);
-  ELGAMAL_KEY(clear, key);
-  group_clear();
-  return 0;
-}

src/rms_bench.c

@@ -0,0 +1,102 @@
+#include "config.h"
+
+#include <assert.h>
+#include <stdio.h>
+
+#include <gmp.h>
+
+#include "ddlog.h"
+#include "hss.h"
+#include "timeit.h"
+
+INIT_TIMEIT(CLOCK_PROCESS_CPUTIME_ID);
+
+
+int main()
+{
+  group_init();
+  mpz_entropy_init();
+  dlog_precompute();
+
+  mpz_t test;
+  mpz_init(test);
+
+  mpz_t x, y, xy;
+  mpz_inits(x, y, xy, NULL);
+
+  elgamal_key_t key;
+  ELGAMAL_KEY(init, key);
+  elgamal_keygen(key);
+
+
+  mpz_t expected_mod, base;
+  mpz_inits(expected_mod, base, NULL);
+  mpz_urandomm(base, _rstate, p);
+  mpz_powm_ui(expected_mod, base, 2, p);
+  mpz_pow_ui(test, base, 2);
+  remp(test);
+  // gmp_printf("%Zx\n%Zx\n", test, expected_mod);
+  assert(!mpz_cmp(test, expected_mod));
+  mpz_clear(expected_mod);
+
+  ssl1_t r1, r2;
+  ssl2_t s1, s2;
+  ssl2_t t1, t2;
+
+  ssl1_init(r1);
+  ssl1_init(r2);
+  ssl2_init(s1);
+  ssl2_init(s2);
+  ssl2_init(t1);
+  ssl2_init(t2);
+
+  mpz_urandomb(y, _rstate, 1);
+  mpz_urandomb(x, _rstate, 1);
+  /* mpz_set_ui(x, 1); */
+  /* mpz_set_ui(y, 1); */
+
+  ssl2_share(s1, s2, x, key->sk);
+  ssl2_open(test, s1, s2);
+  assert(!mpz_cmp(test, x));
+
+  ssl1_share(r1, r2, y, key);
+
+  ssl1_open(test, r1, r2, key);
+  assert(!mpz_cmp_ui(test, mpz_cmp_ui(y, 0) ? 2 : 1));
+
+
+
+  for (int i = 0; i <  (int) 1e2; i++) {
+    START_TIMEIT();
+    hss_mul(t1, r1, s1);
+    END_TIMEIT();
+    hss_mul(t2, r2, s2);
+
+#ifndef NDEBUG
+    gmp_printf("%Zx %Zx\n", x, y);
+    gmp_printf("%d %d\n", s1->x, s2->x);
+#endif
+
+    mpz_mul(xy, x, y);
+    ssl2_open(test, t2, t1);
+    assert(!mpz_cmp(test, xy));
+
+    mpz_sub(test, t2->cx, t1->cx);
+    mpz_abs(test, test);
+    assert(((!mpz_cmp_ui(xy, 1) && !mpz_cmp(test, key->sk))) ||
+           ((!mpz_cmp_ui(xy, 0)) && !mpz_cmp_ui(test, 0)));
+  }
+
+  printf(TIMEIT_FORMAT "\n", GET_TIMEIT());
+  ssl2_clear(s1);
+  ssl2_clear(s2);
+  ssl1_clear(r1);
+  ssl1_clear(r2);
+  ssl2_clear(t1);
+  ssl2_clear(t2);
+
+  mpz_clears(x, y, NULL);
+  ELGAMAL_KEY(clear, key);
+  group_clear();
+  return 0;
+}