PoS_EVM
/
mcl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace bool to uint32_t

Browse Source
update-fork
MITSUNARI Shigeo 4 years ago
parent c0be1e91ce
commit 54155986b4
2 changed files with 28 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      misc/low_test.cpp
  2. 40
      src/low_func_wasm.hpp

14
misc/low_test.cpp
Unescape View File

@ -21,6 +21,8 @@ void dump(const char *msg, const uint32_t *x, size_t n)
#include <cybozu/benchmark.hpp> #include <cybozu/benchmark.hpp>
#include <mcl/util.hpp> #include <mcl/util.hpp>
const int C = 10000;
template<class RG> template<class RG>
void setRand(uint32_t *x, size_t n, RG& rg) void setRand(uint32_t *x, size_t n, RG& rg)
{ {
@ -61,8 +63,8 @@ void mulTest()
mcl::karatsubaT<N>(z, x, y); mcl::karatsubaT<N>(z, x, y);
CYBOZU_TEST_EQUAL_ARRAY(z, vx.getUnit(), N * 2); CYBOZU_TEST_EQUAL_ARRAY(z, vx.getUnit(), N * 2);
} }
CYBOZU_BENCH_C("mulT", 10000, mcl::mulT<N>, z, x, y); CYBOZU_BENCH_C("mulT", C, mcl::mulT<N>, z, x, y);
CYBOZU_BENCH_C("kara", 10000, mcl::karatsubaT<N>, z, x, y); CYBOZU_BENCH_C("kara", C, mcl::karatsubaT<N>, z, x, y);
} }
CYBOZU_TEST_AUTO(mulT) CYBOZU_TEST_AUTO(mulT)
@ -88,7 +90,7 @@ void sqrTest()
mcl::sqrT<N>(y, x); mcl::sqrT<N>(y, x);
CYBOZU_TEST_EQUAL_ARRAY(y, vx.getUnit(), N * 2); CYBOZU_TEST_EQUAL_ARRAY(y, vx.getUnit(), N * 2);
} }
CYBOZU_BENCH_C("sqrT", 10000, mcl::sqrT<N>, y, x); CYBOZU_BENCH_C("sqrT", C, mcl::sqrT<N>, y, x);
} }
CYBOZU_TEST_AUTO(sqrT) CYBOZU_TEST_AUTO(sqrT)
@ -185,8 +187,8 @@ void mulMontTest(const char *pStr)
mcl::sqrMontT<N>(z, x, p); mcl::sqrMontT<N>(z, x, p);
CYBOZU_TEST_EQUAL_ARRAY(z, vz.getUnit(), N); CYBOZU_TEST_EQUAL_ARRAY(z, vz.getUnit(), N);
} }
CYBOZU_BENCH_C("mulMontT", 10000, mcl::mulMontT<N>, x, x, y, p); CYBOZU_BENCH_C("mulMontT", C, mcl::mulMontT<N>, x, x, y, p);
CYBOZU_BENCH_C("sqrMontT", 10000, mcl::sqrMontT<N>, x, x, p); CYBOZU_BENCH_C("sqrMontT", C, mcl::sqrMontT<N>, x, x, p);
} }
template<size_t N> template<size_t N>
@ -214,7 +216,7 @@ void modTest(const char *pStr)
mcl::modT<N>(z, xy, p); mcl::modT<N>(z, xy, p);
CYBOZU_TEST_EQUAL_ARRAY(z, vz.getUnit(), N); CYBOZU_TEST_EQUAL_ARRAY(z, vz.getUnit(), N);
} }
CYBOZU_BENCH_C("modT", 10000, mcl::modT<N>, z, xy, p); CYBOZU_BENCH_C("modT", C, mcl::modT<N>, z, xy, p);
} }
CYBOZU_TEST_AUTO(mont) CYBOZU_TEST_AUTO(mont)

40
src/low_func_wasm.hpp
Unescape View File

@ -41,40 +41,40 @@ uint32_t shlT(uint32_t y[N], const uint32_t x[N], size_t bit)
// [return:y[N]] += x // [return:y[N]] += x
template<size_t N> template<size_t N>
inline bool addUnitT(uint32_t y[N], uint32_t x) inline uint32_t addUnitT(uint32_t y[N], uint32_t x)
{ {
uint64_t v = uint64_t(y[0]) + x; uint64_t v = uint64_t(y[0]) + x;
y[0] = uint32_t(v); y[0] = uint32_t(v);
bool c = (v >> 32) != 0; uint32_t c = v >> 32;
if (!c) return false; if (c == 0) return 0;
for (size_t i = 1; i < N; i++) { for (size_t i = 1; i < N; i++) {
v = uint64_t(y[i]) + 1; v = uint64_t(y[i]) + 1;
y[i] = uint32_t(v); y[i] = uint32_t(v);
if ((v >> 32) == 0) return false; if ((v >> 32) == 0) return 0;
} }
return true; return 1;
} }
template<size_t N> template<size_t N>
bool addT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N]) uint32_t addT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N])
{ {
bool c = false; uint32_t c = 0;
for (size_t i = 0; i < N; i++) { for (size_t i = 0; i < N; i++) {
uint64_t v = uint64_t(x[i]) + y[i] + c; uint64_t v = uint64_t(x[i]) + y[i] + c;
z[i] = uint32_t(v); z[i] = uint32_t(v);
c = (v >> 32) != 0; c = uint32_t(v >> 32);
} }
return c; return c;
} }
template<size_t N> template<size_t N>
bool subT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N]) uint32_t subT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N])
{ {
bool c = false; uint32_t c = 0;
for (size_t i = 0; i < N; i++) { for (size_t i = 0; i < N; i++) {
uint64_t v = uint64_t(x[i]) - y[i] - c; uint64_t v = uint64_t(x[i]) - y[i] - c;
z[i] = uint32_t(v); z[i] = uint32_t(v);
c = (v >> 32) != 0; c = uint32_t(v >> 63);
} }
return c; return c;
} }
@ -187,8 +187,8 @@ void karatsubaT(uint32_t z[N * 2], const uint32_t x[N], const uint32_t y[N])
const size_t H = N / 2; const size_t H = N / 2;
uint32_t a_b[H]; uint32_t a_b[H];
uint32_t c_d[H]; uint32_t c_d[H];
bool c1 = addT<H>(a_b, x, x + H); // a + b uint32_t c1 = addT<H>(a_b, x, x + H); // a + b
bool c2 = addT<H>(c_d, y, y + H); // c + d uint32_t c2 = addT<H>(c_d, y, y + H); // c + d
uint32_t tmp[N]; uint32_t tmp[N];
mulT<H>(tmp, a_b, c_d); mulT<H>(tmp, a_b, c_d);
if (c1) { if (c1) {
@ -220,11 +220,10 @@ void sqrT(uint32_t y[N * 2], const uint32_t x[N])
assert((x[N - 1] & 0x80000000) == 0); assert((x[N - 1] & 0x80000000) == 0);
const size_t H = N / 2; const size_t H = N / 2;
uint32_t a_b[H]; uint32_t a_b[H];
bool c = addT<H>(a_b, x, x + H); // a + b uint32_t c = addT<H>(a_b, x, x + H); // a + b
uint32_t tmp[N]; uint32_t tmp[N];
mulT<H>(tmp, a_b, a_b); mulT<H>(tmp, a_b, a_b);
if (c) { if (c) {
// addT<H>(a_b, a_b, a_b);
shlT<H>(a_b, a_b, 1); shlT<H>(a_b, a_b, 1);
addT<H>(tmp + H, tmp + H, a_b); addT<H>(tmp + H, tmp + H, a_b);
} }
@ -244,7 +243,7 @@ void addModT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N], const uint
{ {
uint32_t t[N]; uint32_t t[N];
addT<N>(z, x, y); addT<N>(z, x, y);
bool c = subT<N>(t, z, p); uint32_t c = subT<N>(t, z, p);
if (!c) { if (!c) {
copyT<N>(z, t); copyT<N>(z, t);
} }
@ -253,7 +252,7 @@ void addModT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N], const uint
template<size_t N> template<size_t N>
void subModT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N], const uint32_t p[N]) void subModT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N], const uint32_t p[N])
{ {
bool c = subT<N>(z, x, y); uint32_t c = subT<N>(z, x, y);
if (c) { if (c) {
addT<N>(z, z, p); addT<N>(z, z, p);
} }
@ -284,7 +283,7 @@ void mulMontT(uint32_t z[N], const uint32_t x[N], const uint32_t y[N], const uin
// [return:z[N+1]] = z[N+1] + x[N] * y + (cc << (N * 32)) // [return:z[N+1]] = z[N+1] + x[N] * y + (cc << (N * 32))
template<size_t N> template<size_t N>
bool addMulUnit2T(uint32_t z[N + 1], const uint32_t x[N], uint32_t y, const bool *cc = 0) uint32_t addMulUnit2T(uint32_t z[N + 1], const uint32_t x[N], uint32_t y, const uint32_t *cc = 0)
{ {
uint32_t H = 0; uint32_t H = 0;
for (size_t i = 0; i < N; i++) { for (size_t i = 0; i < N; i++) {
@ -298,7 +297,7 @@ bool addMulUnit2T(uint32_t z[N + 1], const uint32_t x[N], uint32_t y, const bool
uint64_t v = uint64_t(z[N]); uint64_t v = uint64_t(z[N]);
v += H; v += H;
z[N] = uint32_t(v); z[N] = uint32_t(v);
return (v >> 32) != 0; return uint32_t(v >> 32);
} }
/* /*
@ -312,7 +311,7 @@ void modT(uint32_t y[N], const uint32_t xy[N * 2], const uint32_t p[N])
assert((p[N - 1] & 0x80000000) == 0); assert((p[N - 1] & 0x80000000) == 0);
uint32_t buf[N * 2]; uint32_t buf[N * 2];
copyT<N * 2>(buf, xy); copyT<N * 2>(buf, xy);
bool c = 0; uint32_t c = 0;
for (size_t i = 0; i < N; i++) { for (size_t i = 0; i < N; i++) {
uint32_t q = buf[i] * rp; uint32_t q = buf[i] * rp;
c = addMulUnit2T<N>(buf + i, p, q, &c); c = addMulUnit2T<N>(buf + i, p, q, &c);
@ -332,6 +331,7 @@ void sqrMontT(uint32_t y[N], const uint32_t x[N], const uint32_t p[N])
#if 1 #if 1
mulMontT<N>(y, x, x, p); mulMontT<N>(y, x, x, p);
#else #else
// slower
uint32_t xx[N * 2]; uint32_t xx[N * 2];
sqrT<N>(xx, x); sqrT<N>(xx, x);
modT<N>(y, xx, p); modT<N>(y, xx, p);

Write Preview
Loading…
Cancel
Save