[she] fix format of benchmark

4 files changed, 129 insertions, 147 deletions

diff --git a/misc/she/bench4.txt b/misc/she/bench4.txt
index 985834f..6a109e2 100644
--- a/misc/she/bench4.txt
+++ b/misc/she/bench4.txt
@@ -8,58 +8,55 @@ ctest:module=add_mul_add_sub
 ctest:module=innerProduct
 ctest:module=io
 ctest:module=bench
-enc 674.383Kclk
-add   8.133Kclk
-mul   4.052Mclk
-dec   2.213Mclk
-add after mul  20.752Kclk
+enc 676.135Kclk
+add   7.946Kclk
+mul   4.053Mclk
+dec   2.210Mclk
+add after mul  20.648Kclk
 ctest:module=saveHash
 ctest:module=hashBench
-Mclk
-i= 0 dec(c2)=000fffff dec 2.22e+03
-i= 1 dec(c2)=001fffff dec 2.22e+03
-i= 2 dec(c2)=003fffff dec 2.23e+03
-i= 3 dec(c2)=007fffff dec 2.24e+03
-i= 4 dec(c2)=00ffffff dec 2.27e+03
-i= 5 dec(c2)=01ffffff dec 2.30e+03
-i= 6 dec(c2)=03ffffff dec 2.39e+03
-i= 7 dec(c2)=07ffffff dec 2.58e+03
-i= 8 dec(c2)=0fffffff dec 2.98e+03
-i= 9 dec(c2)=1fffffff dec 3.83e+03
-i=10 dec(c2)=3fffffff dec 5.45e+03
-i=11 dec(c2)=7fffffff dec 8.74e+03
 Kclk
+i= 0 dec(c2)=000fffff dec 2.25e+03
+i= 1 dec(c2)=001fffff dec 2.24e+03
+i= 2 dec(c2)=003fffff dec 2.19e+03
+i= 3 dec(c2)=007fffff dec 2.20e+03
+i= 4 dec(c2)=00ffffff dec 2.23e+03
+i= 5 dec(c2)=01ffffff dec 2.27e+03
+i= 6 dec(c2)=03ffffff dec 2.37e+03
+i= 7 dec(c2)=07ffffff dec 2.54e+03
+i= 8 dec(c2)=0fffffff dec 2.94e+03
+i= 9 dec(c2)=1fffffff dec 3.77e+03
+i=10 dec(c2)=3fffffff dec 5.38e+03
+i=11 dec(c2)=7fffffff dec 8.67e+03
 large m
-G1::add  7.47e-01
-G1::mul  1.94e+02
-G2::add  2.99e+00
-G2::mul  4.02e+02
-GT::mul  5.17e+00
-GT::pow  7.39e+02
+G1::add  7.42e-01
+G1::mul  1.86e+02
+G2::add  3.00e+00
+G2::mul  3.93e+02
+GT::mul  5.16e+00
+GT::pow  7.23e+02
 GTwindow 1.36e+02
-Mclk
-miller   6.73e+02
-finalExp 4.25e+02
-precomML 5.14e+02
-Kclk
-small m = 897426
-G1::mul  4.11e+01
-G2::mul  9.13e+01
-GT::pow  1.12e+02
-GTwindow 1.06e+01
+miller   6.71e+02
+finalExp 4.29e+02
+precomML 5.24e+02
+small m = 214346
+G1::mul  3.88e+01
+G2::mul  8.54e+01
+GT::pow  9.79e+01
+GTwindow 1.05e+01
 encG1    2.21e+02
-encG2    4.74e+02
-encGT    2.48e+03
-decG1    1.88e+02
-degGT    2.22e+03
-mul      4.09e+03
+encG2    4.77e+02
+encGT    2.45e+03
+decG1    1.84e+02
+degGT    2.19e+03
+mul      4.06e+03
 addG1    1.56e+00
-addG2    4.78e+00
-addGT    2.05e+01
-reRandG1 2.10e+02
-reRandG2 4.74e+02
-reRandGT 2.49e+03
-mulG1    8.33e+01
-mulG2    1.75e+02
-mulGT    4.47e+02
+addG2    4.72e+00
+addGT    2.04e+01
+reRandG1 2.12e+02
+reRandG2 4.76e+02
+reRandGT 2.47e+03
+mulG1    7.90e+01
+mulG2    1.65e+02
+mulGT    3.93e+02
 ctest:name=she_test, module=11, total=2809, ok=2809, ng=0, exception=0
diff --git a/misc/she/bench6.txt b/misc/she/bench6.txt
index c06ac1e..de2f269 100644
--- a/misc/she/bench6.txt
+++ b/misc/she/bench6.txt
@@ -8,58 +8,55 @@ ctest:module=add_mul_add_sub
 ctest:module=innerProduct
 ctest:module=io
 ctest:module=bench
-enc   2.092Mclk
-add  17.902Kclk
-mul  13.469Mclk
-dec   6.005Mclk
-add after mul  42.122Kclk
+enc   2.098Mclk
+add  17.896Kclk
+mul  13.425Mclk
+dec   6.041Mclk
+add after mul  41.833Kclk
 ctest:module=saveHash
 ctest:module=hashBench
-Mclk
-i= 0 dec(c2)=000fffff dec 6.18e+03
-i= 1 dec(c2)=001fffff dec 6.20e+03
-i= 2 dec(c2)=003fffff dec 6.18e+03
-i= 3 dec(c2)=007fffff dec 6.24e+03
-i= 4 dec(c2)=00ffffff dec 6.25e+03
-i= 5 dec(c2)=01ffffff dec 6.36e+03
-i= 6 dec(c2)=03ffffff dec 6.56e+03
-i= 7 dec(c2)=07ffffff dec 6.90e+03
-i= 8 dec(c2)=0fffffff dec 7.61e+03
-i= 9 dec(c2)=1fffffff dec 9.13e+03
-i=10 dec(c2)=3fffffff dec 1.21e+04
-i=11 dec(c2)=7fffffff dec 1.81e+04
 Kclk
+i= 0 dec(c2)=000fffff dec 6.00e+03
+i= 1 dec(c2)=001fffff dec 6.02e+03
+i= 2 dec(c2)=003fffff dec 6.01e+03
+i= 3 dec(c2)=007fffff dec 6.01e+03
+i= 4 dec(c2)=00ffffff dec 6.05e+03
+i= 5 dec(c2)=01ffffff dec 6.14e+03
+i= 6 dec(c2)=03ffffff dec 6.36e+03
+i= 7 dec(c2)=07ffffff dec 6.68e+03
+i= 8 dec(c2)=0fffffff dec 7.40e+03
+i= 9 dec(c2)=1fffffff dec 8.92e+03
+i=10 dec(c2)=3fffffff dec 1.20e+04
+i=11 dec(c2)=7fffffff dec 1.79e+04
 large m
-G1::add  1.46e+00
-G1::mul  5.42e+02
-G2::add  6.92e+00
-G2::mul  1.27e+03
+G1::add  1.48e+00
+G1::mul  5.40e+02
+G2::add  7.01e+00
+G2::mul  1.29e+03
 GT::mul  1.04e+01
-GT::pow  2.03e+03
-GTwindow 4.09e+02
-Mclk
+GT::pow  2.02e+03
+GTwindow 4.10e+02
 miller   2.08e+03
-finalExp 1.51e+03
-precomML 1.63e+03
-Kclk
-small m = 497626
-G1::mul  7.85e+01
-G2::mul  1.90e+02
-GT::pow  2.44e+02
+finalExp 1.49e+03
+precomML 1.65e+03
+small m = 748424
+G1::mul  7.55e+01
+G2::mul  1.79e+02
+GT::pow  2.22e+02
 GTwindow 2.10e+01
 encG1    6.07e+02
-encG2    1.50e+03
+encG2    1.51e+03
 encGT    7.66e+03
-decG1    5.44e+02
-degGT    6.25e+03
-mul      1.35e+04
+decG1    5.51e+02
+degGT    6.00e+03
+mul      1.34e+04
 addG1    3.08e+00
-addG2    1.02e+01
-addGT    4.37e+01
-reRandG1 6.06e+02
+addG2    1.03e+01
+addGT    4.26e+01
+reRandG1 6.15e+02
 reRandG2 1.50e+03
-reRandGT 7.67e+03
-mulG1    1.55e+02
-mulG2    3.81e+02
-mulGT    9.69e+02
+reRandGT 7.68e+03
+mulG1    1.53e+02
+mulG2    3.60e+02
+mulGT    8.85e+02
 ctest:name=she_test, module=11, total=2809, ok=2809, ng=0, exception=0
diff --git a/misc/she/bench8.txt b/misc/she/bench8.txt
index f68185c..f939615 100644
--- a/misc/she/bench8.txt
+++ b/misc/she/bench8.txt
@@ -8,58 +8,55 @@ ctest:module=add_mul_add_sub
 ctest:module=innerProduct
 ctest:module=io
 ctest:module=bench
-enc   5.108Mclk
-add  36.342Kclk
-mul  31.055Mclk
-dec  12.866Mclk
-add after mul  76.869Kclk
+enc   5.103Mclk
+add  36.406Kclk
+mul  30.673Mclk
+dec  13.132Mclk
+add after mul  76.518Kclk
 ctest:module=saveHash
 ctest:module=hashBench
-Mclk
-i= 0 dec(c2)=000fffff dec 1.29e+04
+Kclk
+i= 0 dec(c2)=000fffff dec 1.28e+04
 i= 1 dec(c2)=001fffff dec 1.29e+04
-i= 2 dec(c2)=003fffff dec 1.29e+04
+i= 2 dec(c2)=003fffff dec 1.28e+04
 i= 3 dec(c2)=007fffff dec 1.29e+04
 i= 4 dec(c2)=00ffffff dec 1.30e+04
-i= 5 dec(c2)=01ffffff dec 1.32e+04
-i= 6 dec(c2)=03ffffff dec 1.35e+04
+i= 5 dec(c2)=01ffffff dec 1.31e+04
+i= 6 dec(c2)=03ffffff dec 1.34e+04
 i= 7 dec(c2)=07ffffff dec 1.41e+04
 i= 8 dec(c2)=0fffffff dec 1.54e+04
-i= 9 dec(c2)=1fffffff dec 1.81e+04
-i=10 dec(c2)=3fffffff dec 2.34e+04
-i=11 dec(c2)=7fffffff dec 3.41e+04
-Kclk
+i= 9 dec(c2)=1fffffff dec 1.80e+04
+i=10 dec(c2)=3fffffff dec 2.33e+04
+i=11 dec(c2)=7fffffff dec 3.37e+04
 large m
-G1::add  3.41e+00
-G1::mul  1.44e+03
-G2::add  1.36e+01
-G2::mul  2.99e+03
-GT::mul  1.90e+01
-GT::pow  4.34e+03
-GTwindow 9.03e+02
-Mclk
-miller   4.89e+03
-finalExp 3.27e+03
-precomML 3.73e+03
-Kclk
-small m = 1341871
-G1::mul  1.51e+02
-G2::mul  3.74e+02
-GT::pow  4.73e+02
-GTwindow 5.86e+01
-encG1    1.62e+03
-encG2    3.51e+03
-encGT    1.77e+04
-decG1    1.47e+03
-degGT    1.29e+04
-mul      3.03e+04
-addG1    7.05e+00
-addG2    2.05e+01
-addGT    7.67e+01
-reRandG1 1.63e+03
-reRandG2 3.50e+03
-reRandGT 1.78e+04
-mulG1    2.98e+02
-mulG2    7.51e+02
-mulGT    1.90e+03
+G1::add  4.67e+00
+G1::mul  1.42e+03
+G2::add  1.37e+01
+G2::mul  2.93e+03
+GT::mul  1.95e+01
+GT::pow  4.24e+03
+GTwindow 1.00e+03
+miller   5.24e+03
+finalExp 3.52e+03
+precomML 4.00e+03
+small m = 34209
+G1::mul  1.23e+02
+G2::mul  2.84e+02
+GT::pow  3.32e+02
+GTwindow 4.04e+01
+encG1    1.70e+03
+encG2    3.67e+03
+encGT    1.87e+04
+decG1    1.52e+03
+degGT    1.32e+04
+mul      3.11e+04
+addG1    7.21e+00
+addG2    2.09e+01
+addGT    8.04e+01
+reRandG1 1.66e+03
+reRandG2 3.58e+03
+reRandGT 1.83e+04
+mulG1    2.36e+02
+mulG2    5.55e+02
+mulGT    1.30e+03
 ctest:name=she_test, module=11, total=2809, ok=2809, ng=0, exception=0
diff --git a/test/she_test.cpp b/test/she_test.cpp
index 3106b49..c4d0ca3 100644
--- a/test/she_test.cpp
+++ b/test/she_test.cpp
@@ -272,7 +272,6 @@ CYBOZU_TEST_AUTO(saveHash)
 }
 
 static inline void putK(double t) { printf("%.2e\n", t * 1e-3); }
-static inline void putM(double t) { printf("%.2e\n", t * 1e-3); }
 
 CYBOZU_TEST_AUTO(hashBench)
 {
@@ -289,8 +288,8 @@ CYBOZU_TEST_AUTO(hashBench)
 		pub.enc(c1, x);
 		pub.enc(one, 1, true);
 
-		puts("Mclk");
-		cybozu::bench::setPutCallback(putM);
+		puts("Kclk");
+		cybozu::bench::setPutCallback(putK);
 		for (int i = 0; i < 12; i++) {
 			int y = 1 << i;
 			CipherText c2;
@@ -328,9 +327,6 @@ CYBOZU_TEST_AUTO(hashBench)
 	Q2.clear();
 	e2 = 1;
 
-	puts("Kclk");
-	cybozu::bench::setPutCallback(putK);
-
 	printf("large m\n");
 	CYBOZU_BENCH_C("G1::add ", C, G1::add, P2, P2, P);
 	CYBOZU_BENCH_C("G1::mul ", C, G1::mul, P, P, mr);
@@ -351,8 +347,6 @@ CYBOZU_TEST_AUTO(hashBench)
 	CYBOZU_BENCH_C("GTwindow", C, wm.mul, static_cast<AG&>(e), mr);
 #endif
 
-	puts("Mclk");
-	cybozu::bench::setPutCallback(putM);
 	CYBOZU_BENCH_C("miller  ", C, BN::millerLoop, e, P, Q);
 	CYBOZU_BENCH_C("finalExp", C, BN::finalExp, e, e);
 	CYBOZU_BENCH_C("precomML", C, BN::precomputedMillerLoop, e, P, SHE::Qcoeff_);
@@ -361,9 +355,6 @@ CYBOZU_TEST_AUTO(hashBench)
 	CipherTextG2 ca2;
 	CipherTextM cm;
 
-	puts("Kclk");
-	cybozu::bench::setPutCallback(putK);
-
 	int m = int(mcl::she::local::g_rg() % hashSize);
 	printf("small m = %d\n", m);
 	CYBOZU_BENCH_C("G1::mul ", C, G1::mul, P, P, m);