Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit

Permalink
Merge branch 'master' into 235-update-ci-tests-for-placeholder
Browse files Browse the repository at this point in the history
  • Loading branch information
@vo-nil
vo-nil authored May 29, 2024
2 parents 57e2bd4 + 19e3323 commit 2969166
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 192 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/crypto3-testing-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
run: nix flake -L check .?submodules=1#
env:
NIX_CONFIG: |
cores = 2
max-jobs = 1
cores = 6
max-jobs = 4
- name: Copy test results
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crypto3-testing-mac.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: nix flake -L check .?submodules=1#
env:
NIX_CONFIG: |
cores = 2
cores = 0
max-jobs = 1
- name: Copy test results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-submodule-testing-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
jobs:
build-and-test:
name: "Build and test Linux"
runs-on: [self-hosted, Linux, X64, aws_autoscaling]
runs-on: [self-hosted, Linux, X64, aws_autoscaling, c5.9xlarge]
steps:
# https://github.com/actions/checkout/issues/1552
- name: Clean up after previous checkout
Expand Down
14 changes: 6 additions & 8 deletions libs/multiprecision/include/nil/crypto3/multiprecision/cpp_int_modular.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,11 @@ namespace boost {
}
};

private:
static BOOST_MP_CXX14_CONSTEXPR local_limb_type limb_mask =
limb_bits != Bits ?
static_cast<local_limb_type>(static_cast<local_limb_type>(~local_limb_type(0)) >>
(limb_bits - Bits)) :
static_cast<local_limb_type>(~local_limb_type(0));
// Even though we have just 1 limb here, we still name this variable upper_limb_mask to be similar to non-trivial.
static BOOST_MP_CXX14_CONSTEXPR local_limb_type upper_limb_mask = limb_bits != Bits ?
(~local_limb_type(0) >> (limb_bits - Bits)) : ~local_limb_type(0);

private:
local_limb_type m_data;
bool m_carry = false;

Expand All @@ -362,7 +360,7 @@ namespace boost {
UI i,
typename std::enable_if<boost::multiprecision::detail::is_unsigned<UI>::value
>::type const* = 0) noexcept :
m_data(static_cast<local_limb_type>(i) & limb_mask) {
m_data(static_cast<local_limb_type>(i) & upper_limb_mask) {
}
BOOST_MP_CXX14_CONSTEXPR cpp_int_modular_base(boost::multiprecision::literals::detail::value_pack<>) noexcept :
m_data(static_cast<local_limb_type>(0u)) {
Expand Down Expand Up @@ -390,7 +388,7 @@ namespace boost {
return &m_data;
}
inline BOOST_MP_CXX14_CONSTEXPR void normalize() noexcept {
m_data &= limb_mask;
m_data &= upper_limb_mask;
}
inline BOOST_MP_CXX14_CONSTEXPR cpp_int_modular_base() noexcept : m_data(0) {
}
Expand Down
18 changes: 14 additions & 4 deletions libs/multiprecision/include/nil/crypto3/multiprecision/cpp_int_modular/add.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace boost {
namespace multiprecision {
namespace backends {
//
// As above, but for adding a single limb to a non-trivial cpp_int:
// Adding a single limb to a non-trivial cpp_int:
//
template<unsigned Bits>
inline BOOST_MP_CXX14_CONSTEXPR void
Expand All @@ -39,7 +39,16 @@ namespace boost {
if (&a != &result) {
boost::multiprecision::std_constexpr::copy(pa + i, pa + a.size(), pr + i);
}
result.set_carry(carry);
if (Bits % cpp_int_modular_backend<Bits>::limb_bits == 0)
result.set_carry(carry);
else {
limb_type mask = cpp_int_modular_backend<Bits>::upper_limb_mask;
// If we have set any bit above "Bits", then we have a carry.
if (pr[result.size() - 1] & ~mask) {
pr[result.size() - 1] &= mask;
result.set_carry(true);
}
}
}

//
Expand Down Expand Up @@ -223,9 +232,10 @@ namespace boost {
const cpp_int_modular_backend<Bits>& o) noexcept {
double_limb_type sum = *result.limbs();
sum += *o.limbs();
if (sum > cpp_int_modular_backend<Bits>::max_limb_value) {
double_limb_type mask = cpp_int_modular_backend<Bits>::upper_limb_mask;
if ((sum & ~mask) != 0) {
result.set_carry(true);
*result.limbs() = static_cast<limb_type>(sum);
*result.limbs() = sum & mask;
} else {
*result.limbs() = sum;
}
Expand Down
34 changes: 28 additions & 6 deletions libs/multiprecision/include/nil/crypto3/multiprecision/cpp_int_modular/add_unsigned.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ namespace boost {
std::size_t s = a.size();
if (s == 1) {
double_limb_type r = static_cast<double_limb_type>(*a.limbs()) + static_cast<double_limb_type>(*b.limbs());
if (r > cpp_int_modular_backend<Bits>::max_limb_value) {
result = r - cpp_int_modular_backend<Bits>::max_limb_value;
double_limb_type mask = cpp_int_modular_backend<Bits>::upper_limb_mask;
if (r & ~mask) {
result = r & mask;
result.set_carry(true);
} else {
result = r;
Expand All @@ -54,7 +55,16 @@ namespace boost {
carry >>= cpp_int_modular_backend<Bits>::limb_bits;
++pr, ++pa, ++pb;
}
result.set_carry(carry);
if (Bits % cpp_int_modular_backend<Bits>::limb_bits == 0)
result.set_carry(carry);
else {
limb_type mask = cpp_int_modular_backend<Bits>::upper_limb_mask;
// If we have set any bit above "Bits", then we have a carry.
if (result.limbs()[s - 1] & ~mask) {
result.limbs()[s - 1] &= mask;
result.set_carry(true);
}
}
}

//
Expand Down Expand Up @@ -129,11 +139,13 @@ namespace boost {
if (s == 1) {
double_limb_type v = static_cast<double_limb_type>(*a.limbs()) +
static_cast<double_limb_type>(*b.limbs());
if (v > cpp_int_modular_backend<Bits>::max_limb_value) {
v ^= (double_limb_type(1) << Bits);
double_limb_type mask = cpp_int_modular_backend<Bits>::upper_limb_mask;
if (v & ~mask) {
v &= mask;
result.set_carry(true);
}
result = v;
return;
}
typename cpp_int_modular_backend<Bits>::const_limb_pointer pa = a.limbs();
typename cpp_int_modular_backend<Bits>::const_limb_pointer pb = b.limbs();
Expand Down Expand Up @@ -170,7 +182,17 @@ namespace boost {
#endif
for (; i < s; ++i)
carry = ::boost::multiprecision::detail::addcarry_limb(carry, pa[i], pb[i], pr + i);
result.set_carry(carry);

if (Bits % cpp_int_modular_backend<Bits>::limb_bits == 0)
result.set_carry(carry);
else {
limb_type mask = cpp_int_modular_backend<Bits>::upper_limb_mask;
// If we have set any bit above "Bits", then we have a carry.
if (result.limbs()[s - 1] & ~mask) {
result.limbs()[s - 1] &= mask;
result.set_carry(true);
}
}
}
}

Expand Down
20 changes: 10 additions & 10 deletions libs/multiprecision/include/nil/crypto3/multiprecision/modular/modular_functions_fixed.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,7 @@ namespace boost {
}

BOOST_MP_CXX14_CONSTEXPR void initialize_montgomery_params() {
if (check_montgomery_constraints(m_mod)) {
find_const_variables();
}
find_const_variables();
}

/*
Expand Down Expand Up @@ -225,16 +223,18 @@ namespace boost {
}

BOOST_MP_CXX14_CONSTEXPR void find_const_variables() {
m_montgomery_p_dash = monty_inverse(m_mod.limbs()[0]);
if (check_montgomery_constraints(m_mod)) {
m_montgomery_p_dash = monty_inverse(m_mod.limbs()[0]);

Backend_doubled_padded_limbs r;
eval_bit_set(r, 2 * m_mod.size() * limb_bits);
barrett_reduce(r);
Backend_doubled_padded_limbs r;
eval_bit_set(r, 2 * m_mod.size() * limb_bits);
barrett_reduce(r);

// Here we are intentionally throwing away half of the bits of r, it's correct.
m_montgomery_r2 = static_cast<Backend>(r);
// Here we are intentionally throwing away half of the bits of r, it's correct.
m_montgomery_r2 = static_cast<Backend>(r);
}

// Compute 2^Bits - Modulus.
// Compute 2^Bits - Modulus, no matter if modulus is even or odd.
Backend_padded_limbs compliment = static_cast<limb_type>(1u), modulus = m_mod;
eval_left_shift(compliment, Bits);
eval_subtract(compliment, modulus);
Expand Down
3 changes: 0 additions & 3 deletions libs/multiprecision/include/nil/crypto3/multiprecision/modular/modular_params.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ namespace boost {
}
}

// Martun: This needs to be called when setting numbers to 0, which takes lots of time when creating
// empty vectors.

/* Conversion from the regular number A into Montgomery form r*A:
Montgomery_reduce((A mod N)*(r^2 mod N)) = Montgomery_reduce(A*r^2 mod N) = A*r mod N,
where result is A and get_mod() is N.
Expand Down
146 changes: 0 additions & 146 deletions libs/multiprecision/include/nil/crypto3/multiprecision/modular/montgomery_params.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,161 +35,15 @@ namespace boost {
*/
template<typename Backend>
class montgomery_params : virtual public base_params<Backend> {
protected:
template<typename Number>
inline void initialize_montgomery_params(const Number& p) {
this->initialize_base_params(p);
find_const_variables(p);
}

inline void initialize_montgomery_params(const montgomery_params<Backend>& p) {
this->initialize_base_params(p);
find_const_variables(p);
}

/*
* Compute -input^-1 mod 2^limb_bits. Throws an exception if input
* is even. If input is odd, then input and 2^n are relatively prime
* and an inverse exists.
*/
limb_type monty_inverse(limb_type a) {
assert(a % 2 == 1);

limb_type b = 1;
limb_type r = 0;

for (size_t i = 0; i != sizeof(limb_type) * CHAR_BIT; ++i) {
const limb_type bi = b % 2;
r >>= 1;
r += bi << (sizeof(limb_type) * CHAR_BIT - 1);

b -= a * bi;
b >>= 1;
}

// Now invert in addition space
r = (~static_cast<limb_type>(0) - r) + 1;

return r;
}

template<typename T>
void find_const_variables(const T& pp) {
Backend p = pp;
if (p <= 0 || !(p % 2)) {
return;
}

m_p_words = this->m_mod.size();

m_p_dash = monty_inverse(this->m_mod.limbs()[0]);

Backend r;

boost::multiprecision::default_ops::eval_bit_set(r, m_p_words * sizeof(limb_type) * CHAR_BIT);

m_r2 = r * r;
barrett_params<Backend> barrettParams(this->m_mod);
barrettParams.barrett_reduce(m_r2);
}

public:
montgomery_params() : base_params<Backend>() {
}

template<typename Number>
explicit montgomery_params(const Number& p) : base_params<Backend>(p) {
initialize_montgomery_params(p);
}

inline const Backend& r2() const {
return m_r2;
}

inline limb_type p_dash() const {
return m_p_dash;
}

inline size_t p_words() const {
return m_p_words;
}

template<class V>
montgomery_params& operator=(const V& v) {
initialize_montgomery_params(v);
return *this;
}

inline void montgomery_reduce(Backend& result) const {
using boost::multiprecision::default_ops::eval_multiply_add;
using boost::multiprecision::default_ops::eval_right_shift;
using boost::multiprecision::default_ops::eval_add;

typedef cpp_int_modular_backend<sizeof(limb_type) * CHAR_BIT * 3>
cpp_three_int_backend;

const size_t p_size = m_p_words;
const limb_type p_dash = m_p_dash;
const size_t z_size = 2 * (p_words() + 1);

boost::container::vector<limb_type> z(
result.size(), 0); // container::vector<limb_type, alloc> z(result.size(), 0);
for (size_t i = 0; i < result.size(); ++i) {
z[i] = result.limbs()[i];
}

if (result.size() < z_size) {
result.resize(z_size, z_size);
z.resize(z_size, 0);
}

cpp_three_int_backend w(z[0]);

result.limbs()[0] = w.limbs()[0] * p_dash;

eval_multiply_add(w, result.limbs()[0], this->m_mod.limbs()[0]);
eval_right_shift(w, sizeof(limb_type) * CHAR_BIT);

for (size_t i = 1; i != p_size; ++i) {
for (size_t j = 0; j < i; ++j) {
eval_multiply_add(w, result.limbs()[j], this->m_mod.limbs()[i - j]);
}

eval_add(w, z[i]);

result.limbs()[i] = w.limbs()[0] * p_dash;

eval_multiply_add(w, result.limbs()[i], this->m_mod.limbs()[0]);

eval_right_shift(w, sizeof(limb_type) * CHAR_BIT);
}

for (size_t i = 0; i != p_size; ++i) {
for (size_t j = i + 1; j != p_size; ++j) {
eval_multiply_add(w, result.limbs()[j], this->m_mod.limbs()[p_size + i - j]);
}

eval_add(w, z[p_size + i]);

result.limbs()[i] = w.limbs()[0];

eval_right_shift(w, sizeof(limb_type) * CHAR_BIT);
}

eval_add(w, z[z_size - 1]);

result.limbs()[p_size] = w.limbs()[0];
result.limbs()[p_size + 1] = w.limbs()[1];

// TODO(mart we cannot resize any more.
if (result.size() != p_size + 1) {
result.resize(p_size + 1, p_size + 1);
}
}

protected:
Backend m_r2;
limb_type m_p_dash;
size_t m_p_words;

};
Expand Down
3 changes: 1 addition & 2 deletions libs/multiprecision/test/bench_test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@

include(CMTest)

cm_test(NAME ${CURRENT_PROJECT_NAME}_bench_test_modular_adaptor_fixed_cpp_int SOURCES ${CURRENT_TEST_SOURCES_DIR}/bench_test/bench_test_modular_adaptor_fixed.cpp)
cm_test(NAME ${CURRENT_PROJECT_NAME}_bench_test_modular_adaptor_fixed_cpp_int SOURCES bench_test_modular_adaptor_fixed.cpp)
target_compile_definitions(${CURRENT_PROJECT_NAME}_bench_test_modular_adaptor_fixed_cpp_int PUBLIC -DTEST_CPP_INT)
target_link_libraries(${CURRENT_PROJECT_NAME}_bench_test_modular_adaptor_fixed_cpp_int no_eh_support)
add_dependencies(${CURRENT_PROJECT_NAME}_test_suite_modular_cpp_int_tests ${CURRENT_PROJECT_NAME}_bench_test_modular_adaptor_fixed_cpp_int)
set_target_properties(${CURRENT_PROJECT_NAME}_bench_test_modular_adaptor_fixed_cpp_int PROPERTIES CXX_STANDARD 17)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand Down
Loading

0 comments on commit 2969166

Please sign in to comment.