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

mov impl of Fp2 to Fp2T

Browse Source
dev
MITSUNARI Shigeo 9 years ago
parent aac79c045e
commit 636407d1b4
4 changed files with 139 additions and 106 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. 105
      include/mcl/fp.hpp
  2. 134
      include/mcl/fp_ext.hpp
  3. 2
      include/mcl/op.hpp
  4. 4
      test/fp_ext_test.cpp

105
include/mcl/fp.hpp
Unescape View File

@ -80,12 +80,6 @@ public:
op_.fp_add = fp_addW;
op_.fp_sub = fp_subW;
op_.fp_mul = fp_mulW;
// Fp2
op_.fp2_add = fp2_addW;
op_.fp2_sub = fp2_subW;
op_.fp2_mul = fp2_mulW;
op_.fp2_inv = fp2_invW;
op_.fp2_sqr = fp2_sqrW;
/*
priority : MCL_USE_XBYAK > MCL_USE_LLVM > none
Xbyak > llvm_opt > llvm > gmp
@ -460,105 +454,6 @@ private:
{
op_.mont(y, x, x, op_.p, op_.rp);
}
/*
default Fp2 operator
Fp2 = Fp[u]/(u^2 + 1)
*/
static inline void fp2_addW(Unit *z, const Unit *x, const Unit *y)
{
const fp::void3u fp_add = op_.fp_add;
const size_t n = maxSize;
fp_add(z, x, y);
fp_add(z + n, x + n, y + n);
}
static inline void fp2_subW(Unit *z, const Unit *x, const Unit *y)
{
const fp::void3u fp_sub = op_.fp_sub;
const size_t n = maxSize;
fp_sub(z, x, y);
fp_sub(z + n, x + n, y + n);
}
static inline void fp2_negW(Unit *y, const Unit *x)
{
const fp::void2u fp_neg = op_.fp_neg;
const size_t n = maxSize;
fp_neg(y, x);
fp_neg(y + n, x + n);
}
/*
x = a + bu, y = c + du, u^2 = -1
z = xy = (a + bu)(c + du) = (ac - bd) + (ad + bc)u
ad+bc = (a + b)(c + d) - ac - bd
*/
static inline void fp2_mulW(Unit *z, const Unit *x, const Unit *y)
{
const fp::void3u fp_add = op_.fp_add;
const fp::void3u fp_sub = op_.fp_sub;
const fp::void3u fp_mul = op_.fp_mul;
const size_t n = maxSize;
const Unit *a = x;
const Unit *b = x + n;
const Unit *c = y;
const Unit *d = y + n;
Unit t1[maxSize];
Unit t2[maxSize];
Unit ac[maxSize];
Unit bd[maxSize];
fp_add(t1, a, b);
fp_add(t2, c, d);
fp_mul(t1, t1, t2); // (a + b)(c + d)
fp_mul(ac, a, c);
fp_mul(bd, b, d);
fp_sub(z, ac, bd); // ac - bd
fp_sub(z + n, t1, ac);
fp_sub(z + n, z + n, bd);
}
/*
x = a + bu, u^2 = -1
y = x^2 = (a + bu)^2 = (a^2 - b^2) + 2abu
*/
static inline void fp2_sqrW(Unit *y, const Unit *x)
{
const fp::void3u fp_add = op_.fp_add;
const fp::void3u fp_sub = op_.fp_sub;
const fp::void2u fp_sqr = op_.fp_sqr;
const fp::void3u fp_mul = op_.fp_mul;
const size_t n = maxSize;
const Unit *a = x;
const Unit *b = x + n;
Unit aa[maxSize];
Unit bb[maxSize];
Unit t[maxSize];
fp_sqr(aa, a);
fp_sqr(bb, b);
fp_mul(t, a, b);
fp_sub(y, aa, bb); // a^2 - b^2
fp_add(y + n, t, t); // 2ab
}
/*
x = a + bu
1 / x = (a - bu) / (a^2 + b^2)
*/
static inline void fp2_invW(Unit *y, const Unit *x)
{
const fp::void3u fp_add = op_.fp_add;
const fp::void2u fp_sqr = op_.fp_sqr;
const fp::void3u fp_mul = op_.fp_mul;
const fp::void2uOp fp_invOp = op_.fp_invOp;
const fp::void2u fp_neg = op_.fp_neg;
const size_t n = maxSize;
const Unit *a = x;
const Unit *b = x + n;
Unit aa[maxSize];
Unit bb[maxSize];
fp_sqr(aa, a);
fp_sqr(bb, b);
fp_add(aa, aa, bb);
fp_invOp(aa, aa, op_); // aa = 1 / (a^2 + b^2)
fp_mul(y, y, aa);
fp_mul(y + n, y + n, aa);
fp_neg(y + n, y + n);
}
};
template<class tag, size_t maxBitSize> fp::Op FpT<tag, maxBitSize>::op_;

134
include/mcl/fp_ext.hpp
Unescape View File

@ -17,6 +17,8 @@ namespace mcl {
*/
template<class Fp>
class Fp2T {
typedef fp::Unit Unit;
static Fp xi_c_;
public:
Fp a, b;
Fp2T() { }
@ -121,7 +123,137 @@ public:
{
powerArray(z, x, Gmp::getUnit(y), abs(y.get_mpz_t()->_mp_size), y < 0);
}
static inline void init(int xi_c)
{
xi_c_ = xi_c;
Fp::op_.fp2_add = fp2_addW;
Fp::op_.fp2_sub = fp2_subW;
Fp::op_.fp2_mul = fp2_mulW;
Fp::op_.fp2_neg = fp2_negW;
Fp::op_.fp2_inv = fp2_invW;
Fp::op_.fp2_sqr = fp2_sqrW;
Fp::op_.fp2_mul_xi = fp2_mul_xiW;
}
private:
/*
default Fp2 operator
Fp2 = Fp[u]/(u^2 + 1)
*/
static inline void fp2_addW(Unit *z, const Unit *x, const Unit *y)
{
const Fp *px = reinterpret_cast<const Fp*>(x);
const Fp *py = reinterpret_cast<const Fp*>(y);
Fp *pz = reinterpret_cast<Fp*>(z);
Fp::add(pz[0], px[0], py[0]);
Fp::add(pz[1], px[1], py[1]);
}
static inline void fp2_subW(Unit *z, const Unit *x, const Unit *y)
{
const Fp *px = reinterpret_cast<const Fp*>(x);
const Fp *py = reinterpret_cast<const Fp*>(y);
Fp *pz = reinterpret_cast<Fp*>(z);
Fp::sub(pz[0], px[0], py[0]);
Fp::sub(pz[1], px[1], py[1]);
}
static inline void fp2_negW(Unit *y, const Unit *x)
{
const Fp *px = reinterpret_cast<const Fp*>(x);
Fp *py = reinterpret_cast<Fp*>(y);
Fp::neg(py[0], px[0]);
Fp::neg(py[1], px[1]);
}
/*
x = a + bu, y = c + du, u^2 = -1
z = xy = (a + bu)(c + du) = (ac - bd) + (ad + bc)u
ad+bc = (a + b)(c + d) - ac - bd
*/
static inline void fp2_mulW(Unit *z, const Unit *x, const Unit *y)
{
const fp::void3u fp_add = Fp::op_.fp_add;
const fp::void3u fp_sub = Fp::op_.fp_sub;
const fp::void3u fp_mul = Fp::op_.fp_mul;
const size_t n = Fp::maxSize;
const Unit *a = x;
const Unit *b = x + n;
const Unit *c = y;
const Unit *d = y + n;
Unit t1[Fp::maxSize];
Unit t2[Fp::maxSize];
Unit ac[Fp::maxSize];
Unit bd[Fp::maxSize];
fp_add(t1, a, b);
fp_add(t2, c, d);
fp_mul(t1, t1, t2); // (a + b)(c + d)
fp_mul(ac, a, c);
fp_mul(bd, b, d);
fp_sub(z, ac, bd); // ac - bd
fp_sub(z + n, t1, ac);
fp_sub(z + n, z + n, bd);
}
/*
x = a + bu, u^2 = -1
y = x^2 = (a + bu)^2 = (a^2 - b^2) + 2abu
*/
static inline void fp2_sqrW(Unit *y, const Unit *x)
{
const fp::void3u fp_add = Fp::op_.fp_add;
const fp::void3u fp_sub = Fp::op_.fp_sub;
const fp::void2u fp_sqr = Fp::op_.fp_sqr;
const fp::void3u fp_mul = Fp::op_.fp_mul;
const size_t n = Fp::maxSize;
const Unit *a = x;
const Unit *b = x + n;
Unit aa[Fp::maxSize];
Unit bb[Fp::maxSize];
Unit t[Fp::maxSize];
fp_sqr(aa, a);
fp_sqr(bb, b);
fp_mul(t, a, b);
fp_sub(y, aa, bb); // a^2 - b^2
fp_add(y + n, t, t); // 2ab
}
/*
x = a + bu
y = (a + bu)xi = (a + bu)(xi_c + u)
=(a * x_ic - b) + (a + b xi_c)u
*/
static inline void fp2_mul_xiW(Unit *y, const Unit *x)
{
const Fp *px = reinterpret_cast<const Fp*>(x);
Fp *py = reinterpret_cast<Fp*>(y);
const Fp& a = px[0];
const Fp& b = px[1];
Fp t;
Fp::mul(t, a, xi_c_);
t -= b;
Fp::mul(py[1], b, xi_c_);
py[1] += a;
py[0] = t;
}
/*
x = a + bu
1 / x = (a - bu) / (a^2 + b^2)
*/
static inline void fp2_invW(Unit *y, const Unit *x)
{
const fp::void3u fp_add = Fp::op_.fp_add;
const fp::void2u fp_sqr = Fp::op_.fp_sqr;
const fp::void3u fp_mul = Fp::op_.fp_mul;
const fp::void2uOp fp_invOp = Fp::op_.fp_invOp;
const fp::void2u fp_neg = Fp::op_.fp_neg;
const size_t n = Fp::maxSize;
const Unit *a = x;
const Unit *b = x + n;
Unit aa[Fp::maxSize];
Unit bb[Fp::maxSize];
fp_sqr(aa, a);
fp_sqr(bb, b);
fp_add(aa, aa, bb);
fp_invOp(aa, aa, Fp::op_); // aa = 1 / (a^2 + b^2)
fp_mul(y, y, aa);
fp_mul(y + n, y + n, aa);
fp_neg(y + n, y + n);
}
static inline void powerArray(Fp2T& z, const Fp2T& x, const fp::Unit *y, size_t yn, bool isNegative)
{
Fp2T tmp;
@ -138,5 +270,7 @@ private:
}
};
template<class Fp> Fp Fp2T<Fp>::xi_c_;
} // mcl

2
include/mcl/op.hpp
Unescape View File

@ -99,7 +99,7 @@ struct Op {
for Fp2 = F[u] / (u^2 + 1)
x = a + bu
*/
int xi_c; // xi = u + xi_c
int xi_c; // xi = xi_c + u
void3u fp2_add;
void3u fp2_sub;
void3u fp2_mul;

4
test/fp_ext_test.cpp
Unescape View File

@ -11,6 +11,8 @@ typedef mcl::Fp2T<Fp> Fp2;
void testFp2()
{
puts(__FUNCTION__);
const int xi_c = 1;
Fp2::init(xi_c);
Fp2 x, y, z;
x.a = 1;
x.b = 2;
@ -29,6 +31,8 @@ void testFp2()
(1 + 2u)(3 + 4u) = (3 - 8) + (4 + 6)u = -5 + 10u
*/
CYBOZU_TEST_EQUAL(z, Fp2(-5, 10));
Fp2::neg(z, z);
CYBOZU_TEST_EQUAL(z, Fp2(5, -10));
z = x * x;
Fp2::sqr(y, x);
CYBOZU_TEST_EQUAL(z, y);

Write Preview
Loading…
Cancel
Save