Merge pull request #5082

1bc5f9fa bulletproofs: speed up vector_power_sum (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-03-04 21:18:52 +02:00
commit 9d415495bf
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -202,20 +202,36 @@ static rct::keyV vector_powers(const rct::key &x, size_t n)
} }
/* Given a scalar, return the sum of its powers from 0 to n-1 */ /* Given a scalar, return the sum of its powers from 0 to n-1 */
static rct::key vector_power_sum(const rct::key &x, size_t n) static rct::key vector_power_sum(rct::key x, size_t n)
{ {
if (n == 0) if (n == 0)
return rct::zero(); return rct::zero();
rct::key res = rct::identity(); rct::key res = rct::identity();
if (n == 1) if (n == 1)
return res; return res;
rct::key prev = x;
for (size_t i = 1; i < n; ++i) const bool is_power_of_2 = (n & (n - 1)) == 0;
if (is_power_of_2)
{ {
if (i > 1) sc_add(res.bytes, res.bytes, x.bytes);
sc_mul(prev.bytes, prev.bytes, x.bytes); while (n > 2)
sc_add(res.bytes, res.bytes, prev.bytes); {
sc_mul(x.bytes, x.bytes, x.bytes);
sc_muladd(res.bytes, x.bytes, res.bytes, res.bytes);
n /= 2;
}
} }
else
{
rct::key prev = x;
for (size_t i = 1; i < n; ++i)
{
if (i > 1)
sc_mul(prev.bytes, prev.bytes, x.bytes);
sc_add(res.bytes, res.bytes, prev.bytes);
}
}
return res; return res;
} }