update git_tag for util dependency, slightly improve MontgomeryForm convertOut

Author: hurchalla

modular_arithmetic/CMakeLists.txt

@@ -75,7 +75,7 @@ include(FetchContent)
 FetchContent_Declare(
     hurchalla_util
     GIT_REPOSITORY https://github.com/hurchalla/util.git
-    GIT_TAG        0e5a34dbd1d7b364f54934f8245214386673c509
+    GIT_TAG        b1e9990b4293bfaaa040731fc9ec97edfeeb85cb
 )
 FetchContent_MakeAvailable(hurchalla_util)
 

montgomery_arithmetic/CMakeLists.txt

@@ -78,7 +78,7 @@ include(FetchContent)
 FetchContent_Declare(
     hurchalla_util
     GIT_REPOSITORY https://github.com/hurchalla/util.git
-    GIT_TAG        0e5a34dbd1d7b364f54934f8245214386673c509
+    GIT_TAG        b1e9990b4293bfaaa040731fc9ec97edfeeb85cb
 )
 FetchContent_MakeAvailable(hurchalla_util)
 

montgomery_arithmetic/include/hurchalla/montgomery_arithmetic/detail/MontyCommonBase.h

@@ -97,7 +97,15 @@ class MontyCommonBase {
         // get a Natural number (i.e. number >= 0) congruent to x (mod n)
         T u_lo = static_cast<const D*>(this)->getNaturalEquivalence(x);
         namespace hc = ::hurchalla;
-        T result = hc::REDC_standard(u_hi, u_lo, n_, inv_n_, LowlatencyTag());
+        bool isNegative;
+        T result = hc::REDC_incomplete(isNegative, u_hi, u_lo, n_, inv_n_);
+        HPBC_CLOCKWORK_ASSERT2(result == 0 ?
+                               isNegative == false : isNegative == true);
+        // We would expect that result == 0 is usually very rare, so going by
+        // the assert above, the next 'if' should be well predicted.
+        if (isNegative)
+            result = static_cast<T>(result + n_);
+        HPBC_CLOCKWORK_ASSERT2(result==hc::REDC_standard(u_hi,u_lo,n_,inv_n_));
 
         HPBC_CLOCKWORK_POSTCONDITION2(result < n_);
         return result;

montgomery_arithmetic/include/hurchalla/montgomery_arithmetic/detail/experimental/montgomery_two_pow/experimental_montgomery_two_pow.h

@@ -114,7 +114,7 @@ if HURCHALLA_CPP17_CONSTEXPR (CODE_SECTION == 0) {
         RU num = static_cast<RU>(static_cast<RU>(1) << index);
         V result = MFE::convertInExtended(mf, num);
         while (shift >= P2) {
-            if (USE_SLIDING_WINDOW_OPTIMIZATION) {
+            if HURCHALLA_CPP17_CONSTEXPR (USE_SLIDING_WINDOW_OPTIMIZATION) {
                 while (shift > P2 && (static_cast<size_t>(n>>(shift-1)) & 1u) == 0) {
                     result = mf.square(result);
                     --shift;
@@ -235,7 +235,7 @@ goto break_0_1;
         HPBC_CLOCKWORK_ASSERT2(index <= MASK);
         V result = MFE::twoPowLimited(mf, index);
         while (shift >= P2) {
-            if (USE_SLIDING_WINDOW_OPTIMIZATION) {
+            if HURCHALLA_CPP17_CONSTEXPR (USE_SLIDING_WINDOW_OPTIMIZATION) {
                 while (shift > P2 && (static_cast<size_t>(n>>(shift-1)) & 1u) == 0) {
                     result = mf.square(result);
                     --shift;

montgomery_arithmetic/include/hurchalla/montgomery_arithmetic/detail/experimental/montgomery_two_pow/testbench.sh

@@ -462,9 +462,9 @@ cppcompiler=$1
 #optimization_level=O3
 optimization_level=$2
 
-#define_mont_type=-DPREDEF_MONT_TYPE=MontgomeryQuarter<U>
-define_mont_type=-DPREDEF_MONT_TYPE=$3
-define_uint_type=-DPREDEF_UINT_TYPE=$4
+#define_mont_type=-DDEF_MONT_TYPE=MontgomeryQuarter<U>
+define_mont_type=-DDEF_MONT_TYPE=$3
+define_uint_type=-DDEF_UINT_TYPE=$4
 
 define_use_asm=$8
 

montgomery_arithmetic/include/hurchalla/montgomery_arithmetic/detail/experimental/montgomery_two_pow/testbench_montgomery_two_pow.cpp

@@ -879,15 +879,15 @@ using namespace hurchalla;
 
 
 
-#ifndef PREDEF_UINT_TYPE
-#  error "PREDEF_UINT_TYPE was not defined"
+#ifndef DEF_UINT_TYPE
+#  error "DEF_UINT_TYPE was not defined"
 #else
-   using U = PREDEF_UINT_TYPE;
+   using U = DEF_UINT_TYPE;
 #endif
 
 //#define XSTR(x) STR(x)
 //#define STR(x) #x
-//#pragma message "The value of PREDEF_UINT_TYPE: " XSTR(PREDEF_UINT_TYPE)
+//#pragma message "The value of DEF_UINT_TYPE: " XSTR(DEF_UINT_TYPE)
 
 
 /*
@@ -898,10 +898,10 @@ using namespace hurchalla;
 #endif
 */
 
-#ifndef PREDEF_MONT_TYPE
-#  error "PREDEF_MONT_TYPE was not defined"
+#ifndef DEF_MONT_TYPE
+#  error "DEF_MONT_TYPE was not defined"
 #else
-   using MontType = PREDEF_MONT_TYPE<U>; // MontgomeryQuarter<U>;
+   using MontType = DEF_MONT_TYPE<U>; // MontgomeryQuarter<U>;
 #endif
 /*
 # if 1

montgomery_arithmetic/include/hurchalla/montgomery_arithmetic/detail/impl_montgomery_two_pow.h

@@ -170,7 +170,7 @@ goto break_0_1;
         HPBC_CLOCKWORK_ASSERT2(index <= MASK);
         V result = MFE::twoPowLimited(mf, index);
         while (shift >= P2) {
-            if (USE_SLIDING_WINDOW_OPTIMIZATION) {
+            if HURCHALLA_CPP17_CONSTEXPR (USE_SLIDING_WINDOW_OPTIMIZATION) {
                 while (shift > P2 && (static_cast<size_t>(n>>(shift-1)) & 1u) == 0) {
                     result = mf.square(result);
                     --shift;