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

refactor all

Browse Source
dev
MITSUNARI Shigeo 10 years ago
parent 9a0b70eca2
commit 92962b71c7
6 changed files with 252 additions and 177 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. 8
      common.mk
  2. 43
      include/mcl/fp.hpp
  3. 362
      include/mcl/fp_base.hpp
  4. 2
      src/mul.txt
  5. 2
      src/once.txt
  6. 12
      test/Makefile

8
common.mk
Unescape View File

@ -66,6 +66,14 @@ endif
LIB=$(TOPDIR)lib/libmcl$(OBJSUF).a LIB=$(TOPDIR)lib/libmcl$(OBJSUF).a
LDFLAGS += -lpthread -m$(BIT) -lgmp -lgmpxx LDFLAGS += -lpthread -m$(BIT) -lgmp -lgmpxx
ifeq ($(USE_MONT_FP),1)
CFLAGS += -DUSE_MONT_FP
endif
ifeq ($(USE_LLVM),1)
CFLAGS += -DMCL_USE_LLVM
endif
#################################################### ####################################################
TOPDIR:=$(realpath $(dir $(lastword $(MAKEFILE_LIST))))/ TOPDIR:=$(realpath $(dir $(lastword $(MAKEFILE_LIST))))/

43
include/mcl/fp.hpp
Unescape View File

@ -6,6 +6,7 @@
@license modified new BSD license @license modified new BSD license
http://opensource.org/licenses/BSD-3-Clause http://opensource.org/licenses/BSD-3-Clause
*/ */
#include <iostream>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#ifdef _MSC_VER #ifdef _MSC_VER
@ -73,15 +74,20 @@ public:
static inline void setModulo(const std::string& mstr, int base = 0) static inline void setModulo(const std::string& mstr, int base = 0)
{ {
bool isMinus; bool isMinus;
mpz_class mp; inFromStr(op_.mp, &isMinus, mstr, base);
inFromStr(mp, &isMinus, mstr, base);
if (isMinus) throw cybozu::Exception("mcl:FpT:setModulo:mstr is not minus") << mstr; if (isMinus) throw cybozu::Exception("mcl:FpT:setModulo:mstr is not minus") << mstr;
const size_t bitLen = Gmp::getBitLen(mp); const size_t bitLen = Gmp::getBitLen(op_.mp);
if (bitLen > maxBitN) throw cybozu::Exception("mcl:FpT:setModulo:too large bitLen") << bitLen << maxBitN; if (bitLen > maxBitN) throw cybozu::Exception("mcl:FpT:setModulo:too large bitLen") << bitLen << maxBitN;
Unit p[maxUnitN] = {}; const size_t n = Gmp::getRaw(op_.p, maxUnitN, op_.mp);
const size_t n = Gmp::getRaw(p, maxUnitN, mp);
if (n == 0) throw cybozu::Exception("mcl:FpT:setModulo:bad mstr") << mstr; if (n == 0) throw cybozu::Exception("mcl:FpT:setModulo:bad mstr") << mstr;
mcl::fp::setOp(op_, p, bitLen); // mcl::fp::setOp(op_, p, bitLen);
// default
op_.neg = negG;
op_.inv = invG;
op_.add = addG;
op_.sub = subG;
op_.mul = mulG;
const Unit *p = op_.p;
#if 1 #if 1
#ifdef USE_MONT_FP #ifdef USE_MONT_FP
if (bitLen <= 128) { fp::MontFp<tag, 128>::init(op_, p); } if (bitLen <= 128) { fp::MontFp<tag, 128>::init(op_, p); }
@ -123,7 +129,8 @@ public:
assert(op_.N <= maxUnitN); assert(op_.N <= maxUnitN);
#endif #endif
op_.bitLen = bitLen; op_.bitLen = bitLen;
op_.sq.set(mp); std::cout << "QQQ : mp=" << op_.mp << std::endl;
op_.sq.set(op_.mp);
} }
static inline void getModulo(std::string& pstr) static inline void getModulo(std::string& pstr)
{ {
@ -192,7 +199,7 @@ public:
bool isMinus; bool isMinus;
mpz_class x; mpz_class x;
inFromStr(x, &isMinus, str, base); inFromStr(x, &isMinus, str, base);
if (x >= op_.mp) throw cybozu::Exception("fp:FpT:fromStr:large str") << str; if (x >= op_.mp) throw cybozu::Exception("fp:FpT:fromStr:large str") << str << op_.mp;
fp::local::toArray(v_, op_.N, x.get_mpz_t()); fp::local::toArray(v_, op_.N, x.get_mpz_t());
if (isMinus) { if (isMinus) {
neg(*this, *this); neg(*this, *this);
@ -297,7 +304,7 @@ public:
static inline void mul(FpT& z, const FpT& x, const FpT& y) { op_.mul(z.v_, x.v_, y.v_); } static inline void mul(FpT& z, const FpT& x, const FpT& y) { op_.mul(z.v_, x.v_, y.v_); }
static inline void inv(FpT& y, const FpT& x) { op_.inv(y.v_, x.v_); } static inline void inv(FpT& y, const FpT& x) { op_.inv(y.v_, x.v_); }
static inline void neg(FpT& y, const FpT& x) { op_.neg(y.v_, x.v_); } static inline void neg(FpT& y, const FpT& x) { op_.neg(y.v_, x.v_); }
static inline void square(FpT& y, const FpT& x) { op_.square(y.v_, x.v_); } static inline void square(FpT& y, const FpT& x) { mul(y, x, x); }
static inline void div(FpT& z, const FpT& x, const FpT& y) static inline void div(FpT& z, const FpT& x, const FpT& y)
{ {
FpT rev; FpT rev;
@ -421,6 +428,24 @@ public:
{ {
op_.addG(z, x, y, op_.p); op_.addG(z, x, y, op_.p);
} }
static inline void subG(Unit *z, const Unit *x, const Unit *y)
{
op_.subG(z, x, y, op_.p);
}
static inline void mulG(Unit *z, const Unit *x, const Unit *y)
{
Unit xy[maxUnitN * 2];
op_.mulPreG(xy, x, y);
op_.modG(z, xy, op_.p);
}
static inline void negG(Unit *y, const Unit *x)
{
op_.negG(y, x, op_.p);
}
static inline void invG(Unit *y, const Unit *x)
{
op_.invG(y, x, op_.p);
}
private: private:
static inline void inFromStr(mpz_class& x, bool *isMinus, const std::string& str, int base) static inline void inFromStr(mpz_class& x, bool *isMinus, const std::string& str, int base)
{ {

362
include/mcl/fp_base.hpp
Unescape View File

@ -15,6 +15,7 @@
#pragma warning(disable : 4512) #pragma warning(disable : 4512)
#pragma warning(disable : 4146) #pragma warning(disable : 4146)
#endif #endif
#include <iostream>
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include <mcl/gmp_util.hpp> #include <mcl/gmp_util.hpp>
@ -51,7 +52,7 @@ void mcl_fp_add ## len ## S(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp:
void mcl_fp_add ## len ## L(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \ void mcl_fp_add ## len ## L(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \
void mcl_fp_sub ## len ## S(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \ void mcl_fp_sub ## len ## S(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \
void mcl_fp_sub ## len ## L(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \ void mcl_fp_sub ## len ## L(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \
void mcl_fp_mul ## len ## pre(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \ void mcl_fp_mulPre ## len(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*); \
void mcl_fp_mont ## len(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, mcl::fp::Unit); void mcl_fp_mont ## len(mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, const mcl::fp::Unit*, mcl::fp::Unit);
MCL_FP_DEF_FUNC(128) MCL_FP_DEF_FUNC(128)
@ -128,53 +129,82 @@ inline void toArray(Unit *y, size_t yn, const mpz_srcptr x)
clearArray(y, xn, yn); clearArray(y, xn, yn);
} }
} // mcl::fp inline void set_mpz_t(mpz_t& z, const Unit* p, int n)
{
z->_mp_alloc = n;
int i = n;
while (i > 0 && p[i - 1] == 0) {
i--;
}
z->_mp_size = i;
z->_mp_d = (mp_limb_t*)const_cast<Unit*>(p);
}
inline void set_zero(mpz_t& z, Unit *p, size_t n)
{
z->_mp_alloc = (int)n;
z->_mp_size = 0;
z->_mp_d = (mp_limb_t*)p;
}
} // mcl::fp::local
struct TagDefault; struct TagDefault;
static inline void modC(Unit *y, const Unit *x, const mpz_class& mp, size_t N)
{
mpz_t mx, my;
local::set_mpz_t(mx, x, N * 2);
local::set_mpz_t(my, y, N);
mpz_mod(my, mx, mp.get_mpz_t());
local::clearArray(y, my->_mp_size, N);
}
#ifndef MCL_FP_BLOCK_MAX_BIT_N
#define MCL_FP_BLOCK_MAX_BIT_N 521
#endif
struct Op { struct Op {
static const size_t UnitByteN = sizeof(Unit);
static const size_t maxUnitN = (MCL_FP_BLOCK_MAX_BIT_N + UnitByteN * 8 - 1) / (UnitByteN * 8);
mpz_class mp; mpz_class mp;
const Unit* p; mcl::SquareRoot sq;
Unit p[maxUnitN];
size_t N; size_t N;
size_t bitLen; size_t bitLen;
// independent from p
bool (*isZero)(const Unit*); bool (*isZero)(const Unit*);
void1op clear; void1op clear;
void2op copy;
// not require p(function having p)
void2op neg; void2op neg;
void2op inv; void2op inv;
void2op square;
void2op copy;
void3op add; void3op add;
void3op sub; void3op sub;
void3op mul; void3op mul;
// for Montgomery // for Montgomery
void2op toMont; void2op toMont;
void2op fromMont; void2op fromMont;
// for generic p // require p
void3op negG; void3op negG;
void3op invG; void3op invG;
void4op addG; void4op addG;
void4op subG; void4op subG;
void4op mulG; void3op mulPreG;
mcl::SquareRoot sq; void3op modG;
Op() Op()
: p(0), N(0), isZero(0), clear(0), neg(0), inv(0) : p(), N(0), bitLen(0)
, square(0), copy(0),add(0), sub(0), mul(0), toMont(0), fromMont(0) , isZero(0), clear(0), copy(0)
, neg(0), inv(0), add(0), sub(0), mul(0)
, toMont(0), fromMont(0)
, negG(0), invG(0), addG(0), subG(0), mulPreG(0), modG(0)
{ {
} }
}; };
template<class tag, size_t bitN> template<size_t bitN>
struct FixedFp { struct OpeFunc {
typedef fp::Unit Unit; typedef fp::Unit Unit;
static const size_t N = (bitN + sizeof(Unit) * 8 - 1) / (sizeof(Unit) * 8); static const size_t N = (bitN + sizeof(Unit) * 8 - 1) / (sizeof(Unit) * 8);
static mpz_class mp_;
static Unit p_[N];
static inline void setModulo(const Unit* p)
{
assert(N >= 2);
assert(sizeof(mp_limb_t) == sizeof(Unit));
copy(p_, p);
Gmp::setRaw(mp_, p, N);
}
static inline void set_mpz_t(mpz_t& z, const Unit* p, int n = (int)N) static inline void set_mpz_t(mpz_t& z, const Unit* p, int n = (int)N)
{ {
z->_mp_alloc = n; z->_mp_alloc = n;
@ -191,59 +221,29 @@ struct FixedFp {
z->_mp_size = 0; z->_mp_size = 0;
z->_mp_d = (mp_limb_t*)p; z->_mp_d = (mp_limb_t*)p;
} }
static inline void clear(Unit *x) static inline void clearC(Unit *x)
{ {
local::clearArray(x, 0, N); local::clearArray(x, 0, N);
} }
static inline void copy(Unit *y, const Unit *x) static inline void copyC(Unit *y, const Unit *x)
{ {
local::copyArray(y, x, N); local::copyArray(y, x, N);
} }
static inline void add(Unit *z, const Unit *x, const Unit *y) static inline void addC(Unit *z, const Unit *x, const Unit *y, const Unit *p)
{ {
Unit ret[N + 2]; // not N + 1 Unit ret[N + 2]; // not N + 1
mpz_t mz, mx, my; mpz_t mz, mx, my, mp;
set_zero(mz, ret, N + 2); set_zero(mz, ret, N + 2);
set_mpz_t(mx, x); set_mpz_t(mx, x);
set_mpz_t(my, y); set_mpz_t(my, y);
set_mpz_t(mp, p);
mpz_add(mz, mx, my); mpz_add(mz, mx, my);
if (mpz_cmp(mz, mp_.get_mpz_t()) >= 0) { if (mpz_cmp(mz, mp) >= 0) {
mpz_sub(mz, mz, mp_.get_mpz_t()); mpz_sub(mz, mz, mp);
} }
local::toArray(z, N, mz); local::toArray(z, N, mz);
} }
#ifdef MCL_USE_LLVM static inline void subC(Unit *z, const Unit *x, const Unit *y, const Unit *p)
#if CYBOZU_OS_BIT == 64
static inline void add128(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add128S(z, x, y, p_); }
static inline void sub128(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub128S(z, x, y, p_); }
static inline void add192(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add192S(z, x, y, p_); }
static inline void sub192(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub192S(z, x, y, p_); }
static inline void add256(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add256S(z, x, y, p_); }
static inline void sub256(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub256S(z, x, y, p_); }
static inline void add384(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add384L(z, x, y, p_); }
static inline void sub384(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub384L(z, x, y, p_); }
static inline void add576(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add576L(z, x, y, p_); }
static inline void sub576(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub576L(z, x, y, p_); }
#else
static inline void add128(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add128S(z, x, y, p_); }
static inline void sub128(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub128S(z, x, y, p_); }
static inline void add192(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add192L(z, x, y, p_); }
static inline void sub192(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub192L(z, x, y, p_); }
static inline void add256(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add256L(z, x, y, p_); }
static inline void sub256(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub256L(z, x, y, p_); }
static inline void add384(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add384L(z, x, y, p_); }
static inline void sub384(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub384L(z, x, y, p_); }
static inline void add160(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add160L(z, x, y, p_); }
static inline void sub160(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub160L(z, x, y, p_); }
static inline void add224(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add224L(z, x, y, p_); }
static inline void sub224(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub224L(z, x, y, p_); }
static inline void add544(Unit *z, const Unit *x, const Unit *y) { mcl_fp_add544L(z, x, y, p_); }
static inline void sub544(Unit *z, const Unit *x, const Unit *y) { mcl_fp_sub544L(z, x, y, p_); }
#endif
#endif
static inline void sub(Unit *z, const Unit *x, const Unit *y)
{ {
Unit ret[N + 1]; Unit ret[N + 1];
mpz_t mz, mx, my; mpz_t mz, mx, my;
@ -252,44 +252,13 @@ struct FixedFp {
set_mpz_t(my, y); set_mpz_t(my, y);
mpz_sub(mz, mx, my); mpz_sub(mz, mx, my);
if (mpz_sgn(mz) < 0) { if (mpz_sgn(mz) < 0) {
mpz_add(mz, mz, mp_.get_mpz_t()); mpz_t mp;
set_mpz_t(mp, p);
mpz_add(mz, mz, mp);
} }
local::toArray(z, N, mz); local::toArray(z, N, mz);
} }
static inline void mul(Unit *z, const Unit *x, const Unit *y) static inline void mulPreC(Unit *z, const Unit *x, const Unit *y)
{
Unit ret[N * 2];
#ifdef MCL_USE_LLVM
#if CYBOZU_OS_BIT == 64
if (bitN <= 128) { mcl_fp_mul128pre(ret, x, y); mod(z, ret); return; }
if (bitN <= 192) { mcl_fp_mul192pre(ret, x, y); mod(z, ret); return; }
if (bitN <= 256) { mcl_fp_mul256pre(ret, x, y); mod(z, ret); return; }
if (bitN <= 384) { mcl_fp_mul384pre(ret, x, y); mod(z, ret); return; }
// if (bitN <= 576) { mcl_fp_mul576pre(ret, x, y); mod(z, ret); return; }
#else
if (bitN <= 128) { mcl_fp_mul128pre(ret, x, y); mod(z, ret); return; }
if (bitN <= 160) { mcl_fp_mul160pre(ret, x, y); mod(z, ret); return; }
if (bitN <= 192) { mcl_fp_mul192pre(ret, x, y); mod(z, ret); return; }
if (bitN <= 224) { mcl_fp_mul224pre(ret, x, y); mod(z, ret); return; }
// if (bitN <= 256) { mcl_fp_mul256pre(ret, x, y); mod(z, ret); return; }
// if (bitN <= 384) { mcl_fp_mul384pre(ret, x, y); mod(z, ret); return; }
// if (bitN <= 544) { mcl_fp_mul544pre(ret, x, y); mod(z, ret); return; }
#endif
#endif
#if 0
pre_mul(ret, x, y);
mod(z, ret);
#else
mpz_t mx, my, mz;
set_zero(mz, ret, N * 2);
set_mpz_t(mx, x);
set_mpz_t(my, y);
mpz_mul(mz, mx, my);
mpz_mod(mz, mz, mp_.get_mpz_t());
local::toArray(z, N, mz);
#endif
}
static inline void pre_mul(Unit *z, const Unit *x, const Unit *y)
{ {
mpz_t mx, my, mz; mpz_t mx, my, mz;
set_zero(mz, z, N * 2); set_zero(mz, z, N * 2);
@ -299,110 +268,192 @@ struct FixedFp {
local::toArray(z, N * 2, mz); local::toArray(z, N * 2, mz);
} }
// x[N * 2] -> y[N] // x[N * 2] -> y[N]
static inline void mod(Unit *y, const Unit *x) static inline void modC(Unit *y, const Unit *x, const Unit *p)
{ {
mpz_t mx, my; mpz_t mx, my, mp;
set_mpz_t(mx, x, N * 2); set_mpz_t(mx, x, N * 2);
set_mpz_t(my, y, N); set_mpz_t(my, y);
mpz_mod(my, mx, mp_.get_mpz_t()); set_mpz_t(mp, p);
mpz_mod(my, mx, mp);
local::clearArray(y, my->_mp_size, N); local::clearArray(y, my->_mp_size, N);
} }
static inline void square(Unit *z, const Unit *x) static inline void invC(Unit *y, const Unit *x, const Unit *p)
{
mul(z, x, x); // QQQ : use powMod with 2?
}
static inline void inv(Unit *y, const Unit *x)
{ {
mpz_class my; mpz_class my;
mpz_t mx; mpz_t mx, mp;
set_mpz_t(mx, x); set_mpz_t(mx, x);
mpz_invert(my.get_mpz_t(), mx, mp_.get_mpz_t()); set_mpz_t(mp, p);
mpz_invert(my.get_mpz_t(), mx, mp);
local::toArray(y, N, my.get_mpz_t()); local::toArray(y, N, my.get_mpz_t());
} }
static inline bool isZero(const Unit *x) static inline bool isZeroC(const Unit *x)
{ {
return local::isZeroArray(x, N); return local::isZeroArray(x, N);
} }
static inline void neg(Unit *y, const Unit *x) static inline void negC(Unit *y, const Unit *x, const Unit *p)
{ {
if (isZero(x)) { if (isZeroC(x)) {
if (x != y) clear(y); if (x != y) clearC(y);
return; return;
} }
sub(y, p_, x); subC(y, p, x, p);
} }
static inline void init(Op& op, const Unit *p) };
template<class tag, size_t bitN>
struct FixedFp {
typedef fp::Unit Unit;
static const size_t N = (bitN + sizeof(Unit) * 8 - 1) / (sizeof(Unit) * 8);
static inline void init(Op& op, const Unit*)
{ {
setModulo(p); assert(N >= 2);
assert(sizeof(mp_limb_t) == sizeof(Unit));
op.N = N; op.N = N;
op.isZero = &isZero;
op.clear = &clear;
op.neg = &neg;
op.inv = &inv;
op.square = &square;
op.copy = &copy;
#ifdef MCL_USE_LLVM
printf("fp2 use llvm bitN=%zd\n", bitN);
if (bitN <= 128) { if (bitN <= 128) {
op.add = &add128; op.isZero = OpeFunc<128>::isZeroC;
op.sub = &sub128; op.clear = OpeFunc<128>::clearC;
op.copy = OpeFunc<128>::copyC;
op.negG = OpeFunc<128>::negC;
op.invG = OpeFunc<128>::invC;
op.addG = OpeFunc<128>::addC;
op.subG = OpeFunc<128>::subC;
op.mulPreG = OpeFunc<128>::mulPreC;
op.modG = OpeFunc<128>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add128S; op.addG = mcl_fp_add128S;
op.subG = mcl_fp_sub128S;
op.mulPreG = mcl_fp_mulPre128;
#endif
} else } else
#if CYBOZU_OS_BIT == 32 #if CYBOZU_OS_BIT == 32
if (bitN <= 160) { if (bitN <= 160) {
op.add = &add160; op.isZero = OpeFunc<160>::isZeroC;
op.sub = &sub160; op.clear = OpeFunc<160>::clearC;
op.copy = OpeFunc<160>::copyC;
op.negG = OpeFunc<160>::negC;
op.invG = OpeFunc<160>::invC;
op.addG = OpeFunc<160>::addC;
op.subG = OpeFunc<160>::subC;
op.mulPreG = OpeFunc<160>::mulPreC;
op.modG = OpeFunc<160>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add160S;
op.subG = mcl_fp_sub160S;
op.mulPreG = mcl_fp_mulPre160;
#endif
} else } else
#endif #endif
if (bitN <= 192) { if (bitN <= 192) {
op.add = &add192; op.isZero = OpeFunc<192>::isZeroC;
op.sub = &sub192; op.clear = OpeFunc<192>::clearC;
op.copy = OpeFunc<192>::copyC;
op.negG = OpeFunc<192>::negC;
op.invG = OpeFunc<192>::invC;
op.addG = OpeFunc<192>::addC;
op.subG = OpeFunc<192>::subC;
op.mulPreG = OpeFunc<192>::mulPreC;
op.modG = OpeFunc<192>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add192S;
op.subG = mcl_fp_sub192S;
op.mulPreG = mcl_fp_mulPre192;
#endif
} else } else
#if CYBOZU_OS_BIT == 32 #if CYBOZU_OS_BIT == 32
if (bitN <= 224) { if (bitN <= 224) {
op.add = &add224; op.isZero = OpeFunc<224>::isZeroC;
op.sub = &sub224; op.clear = OpeFunc<224>::clearC;
op.copy = OpeFunc<224>::copyC;
op.negG = OpeFunc<224>::negC;
op.invG = OpeFunc<224>::invC;
op.addG = OpeFunc<224>::addC;
op.subG = OpeFunc<224>::subC;
op.mulPreG = OpeFunc<224>::mulPreC;
op.modG = OpeFunc<224>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add224S;
op.subG = mcl_fp_sub224S;
op.mulPreG = mcl_fp_mulPre224;
#endif
} else } else
#endif #endif
if (bitN <= 256) { if (bitN <= 256) {
op.add = &add256; op.isZero = OpeFunc<256>::isZeroC;
op.sub = &sub256; op.clear = OpeFunc<256>::clearC;
op.copy = OpeFunc<256>::copyC;
op.negG = OpeFunc<256>::negC;
op.invG = OpeFunc<256>::invC;
op.addG = OpeFunc<256>::addC;
op.subG = OpeFunc<256>::subC;
op.mulPreG = OpeFunc<256>::mulPreC;
op.modG = OpeFunc<256>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add256S;
op.subG = mcl_fp_sub256S;
op.mulPreG = mcl_fp_mulPre256;
#endif
} else } else
if (bitN <= 384) { if (bitN <= 384) {
op.add = &add384; op.isZero = OpeFunc<384>::isZeroC;
op.sub = &sub384; op.clear = OpeFunc<384>::clearC;
op.copy = OpeFunc<384>::copyC;
op.negG = OpeFunc<384>::negC;
op.invG = OpeFunc<384>::invC;
op.addG = OpeFunc<384>::addC;
op.subG = OpeFunc<384>::subC;
op.mulPreG = OpeFunc<384>::mulPreC;
op.modG = OpeFunc<384>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add384S;
op.subG = mcl_fp_sub384S;
op.mulPreG = mcl_fp_mulPre384;
#endif
} else } else
#if CYBOZU_OS_BIT == 64 #if CYBOZU_OS_BIT == 64
if (bitN <= 576) { if (bitN <= 576) {
op.add = &add576; op.isZero = OpeFunc<576>::isZeroC;
op.sub = &sub576; op.clear = OpeFunc<576>::clearC;
} else op.copy = OpeFunc<576>::copyC;
op.negG = OpeFunc<576>::negC;
op.invG = OpeFunc<576>::invC;
op.addG = OpeFunc<576>::addC;
op.subG = OpeFunc<576>::subC;
op.mulPreG = OpeFunc<576>::mulPreC;
op.modG = OpeFunc<576>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add576S;
op.subG = mcl_fp_sub576S;
op.mulPreG = mcl_fp_mulPre576;
#endif
}
#else #else
if (bitN <= 544) { if (bitN <= 544) {
op.add = &add544; op.isZero = OpeFunc<544>::isZeroC;
op.sub = &sub544; op.clear = OpeFunc<544>::clearC;
} else op.copy = OpeFunc<544>::copyC;
#endif op.negG = OpeFunc<544>::negC;
op.invG = OpeFunc<544>::invC;
op.addG = OpeFunc<544>::addC;
op.subG = OpeFunc<544>::subC;
op.mulPreG = OpeFunc<544>::mulPreC;
op.modG = OpeFunc<544>::modC;
#ifdef MCL_USE_LLVM
op.addG = mcl_fp_add544S;
op.subG = mcl_fp_sub544S;
op.mulPreG = mcl_fp_mulPre544;
#endif #endif
{
op.add = &add;
op.sub = &sub;
} }
#endif
#ifdef MCL_USE_LLVM #ifdef MCL_USE_LLVM
if (mp_ == mpz_class("0xfffffffffffffffffffffffffffffffeffffffffffffffff")) { if (op.mp == mpz_class("0xfffffffffffffffffffffffffffffffeffffffffffffffff")) {
op.mul = &mcl_fp_mul_NIST_P192; // slower than MontFp192 op.mul = &mcl_fp_mul_NIST_P192; // slower than MontFp192
} else
#endif
{
op.mul = &mul;
} }
op.mp = mp_; #endif
op.p = &p_[0];
} }
}; };
template<class tag, size_t bitN> mpz_class FixedFp<tag, bitN>::mp_;
template<class tag, size_t bitN> fp::Unit FixedFp<tag, bitN>::p_[FixedFp<tag, bitN>::N];
#ifdef USE_MONT_FP #ifdef USE_MONT_FP
template<class tag, size_t bitN> template<class tag, size_t bitN>
@ -499,14 +550,17 @@ puts("use MontFp2");
op.clear = &clear; op.clear = &clear;
op.neg = Xbyak::CastTo<void2op>(fg_.neg_); op.neg = Xbyak::CastTo<void2op>(fg_.neg_);
op.inv = &invC; op.inv = &invC;
op.square = Xbyak::CastTo<void2op>(fg_.sqr_); // {
if (op.square == 0) op.square = &squareC; // void2op square = Xbyak::CastTo<void2op>(fg_.sqr_);
// if (square) op.square = square;
// }
op.copy = &copy; op.copy = &copy;
op.add = add_; op.add = add_;
op.sub = Xbyak::CastTo<void3op>(fg_.sub_); op.sub = Xbyak::CastTo<void3op>(fg_.sub_);
op.mul = mul_; op.mul = mul_;
op.mp = mp_; op.mp = mp_;
op.p = &p_[0]; // op.p = &p_[0];
copy(op.p, p_);
op.toMont = &toMont; op.toMont = &toMont;
op.fromMont = &fromMont; op.fromMont = &fromMont;

2
src/mul.txt
Unescape View File

@ -18,7 +18,7 @@ noinline
@endfor @endfor
ret i$(bu) %t$(N-2) ret i$(bu) %t$(N-2)
} }
define void @mcl_fp_mul$(bit)pre(i$(unit)* %pz, i$(bit)* %px, i$(bit)* %py) { define void @mcl_fp_mulPre$(bit)(i$(unit)* %pz, i$(bit)* %px, i$(bit)* %py) {
%x = load i$(bit)* %px %x = load i$(bit)* %px
%y = load i$(bit)* %py %y = load i$(bit)* %py
@for i, 0, N @for i, 0, N

2
src/once.txt
Unescape View File

@ -68,7 +68,7 @@ define internal void @modNIST_P192(i192* %out, i192* %px) {
define void @mcl_fp_mul_NIST_P192(i192* %pz, i192* %px, i192* %py) { define void @mcl_fp_mul_NIST_P192(i192* %pz, i192* %px, i192* %py) {
%buf = alloca i192, i32 2 %buf = alloca i192, i32 2
%p = bitcast i192* %buf to i$(unit)* %p = bitcast i192* %buf to i$(unit)*
call void @mcl_fp_mul192pre(i$(unit)* %p, i192* %px, i192* %py) call void @mcl_fp_mulPre192(i$(unit)* %p, i192* %px, i192* %py)
call void @modNIST_P192(i192* %pz, i192* %buf) call void @modNIST_P192(i192* %pz, i192* %buf)
ret void ret void
} }

12
test/Makefile
Unescape View File

@ -1,17 +1,5 @@
include ../common.mk include ../common.mk
ifeq ($(USE_MONT_FP),1)
CFLAGS += -DUSE_MONT_FP
endif
ifeq ($(USE_LLVM),1)
CFLAGS += -DMIE_USE_LLVM
ASM_SRC=../src/$(CPU).s
ASM_OBJ=$(ASM_SRC:.s=.o)
SRC+=$(ASM_SRC)
LDFLAGS+=$(ASM_OBJ)
endif
TARGET=$(TEST_FILE) TARGET=$(TEST_FILE)
SRC=fp_test.cpp ec_test.cpp fp_util_test.cpp SRC=fp_test.cpp ec_test.cpp fp_util_test.cpp

Write Preview
Loading…
Cancel
Save