Changeset 6e969c in git

Timestamp:

Apr 23, 2018, 6:10:26 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

2a26e5cb4fa3b3a9830c9062444f5d6051880a5f

Parents:

eb6e1d58eb9834a39221581ba56d2e26f61499cc

Message:

opt: Z/p arithm. for slimgb

Files:

• kernel/GBEngine/tgb_internal.h (modified) (1 diff)
• libpolys/coeffs/modulop.cc (modified) (3 diffs)
• libpolys/coeffs/modulop.h (modified) (2 diffs)

kernel/GBEngine/tgb_internal.h

@@ -71 +71 @@
 
 #define npInit n_Init
-#define npNeg n_InpNeg
-#define npInvers n_Invers
-#define npMult n_Mult
-#define npIsOne n_IsOne
-#define npIsZero n_IsZero
+#define npNeg npNegM
+#define npInvers npInversM
+#define npMult npMultM
+//#define npIsOne n_IsOne
+#define npIsZero npIsZeroM
 
 #else

libpolys/coeffs/modulop.cc

@@ -141 +141 @@
 }
 
-BOOLEAN npIsOne (number a, const coeffs r)
-{
-  n_Test(a, r);
-
-  return 1 == (long)a;
-}
-
 BOOLEAN npIsMOne (number a, const coeffs r)
 {
@@ -153 +146 @@
 
   return ((r->npPminus1M == (long)a) &&(1L!=(long)a))/*for char 2*/;
-}
-
-#ifdef USE_NTL_XGCD
-
-//ifdef HAVE_NTL // in ntl.a
-//extern void XGCD(long& d, long& s, long& t, long a, long b);
-#include <NTL/ZZ.h>
-#ifdef NTL_CLIENT
-NTL_CLIENT
-#endif
-
-#endif
-
-static inline long InvMod(long a, const coeffs R)
-{
-   long s, t;
-
-#ifdef USE_NTL_XGCD
-   long d;
-   XGCD(d, s, t, a, R->ch);
-   assume (d == 1);
-#else
-   long  u, v, u0, v0, u1, v1, u2, v2, q, r;
-
-   assume(a>0);
-   u1=1; u2=0;
-   u = a; v = R->ch;
-
-   while (v != 0)
-   {
-      q = u / v;
-      //r = u % v;
-      r = u - q*v;
-      u = v;
-      v = r;
-      u0 = u2;
-      u2 = u1 - q*u2;
-      u1 = u0;
-   }
-
-   assume(u==1);
-   s = u1;
-#endif
-#ifdef HAVE_GENERIC_ADD
-   if (s < 0)
-      return s + R->ch;
-   else
-      return s;
-#else
-  #if SIZEOF_LONG == 8
-  s += (s >> 63) & R->ch;
-  #else
-  s += (s >> 31) & R->ch;
-  #endif
-  return s;
-#endif
-}
-
-static inline number npInversM (number c, const coeffs r)
-{
-  n_Test(c, r);
-#ifndef HAVE_GENERIC_MULT
-  #ifndef HAVE_INVTABLE
-  number d = (number)(long)r->npExpTable[r->npPminus1M - r->npLogTable[(long)c]];
-  #else
-  long inv=(long)r->npInvTable[(long)c];
-  if (inv==0)
-  {
-    inv = (long)r->npExpTable[r->npPminus1M - r->npLogTable[(long)c]];
-    r->npInvTable[(long)c]=inv;
-  }
-  number d = (number)inv;
-  #endif
-#else
-  #ifdef HAVE_INVTABLE
-  long inv=(long)r->npInvTable[(long)c];
-  if (inv==0)
-  {
-    inv=InvMod((long)c,r);
-    r->npInvTable[(long)c]=inv;
-  }
-  #else
-  long  inv=InvMod((long)c,r);
-  #endif
-  number d = (number)inv;
-#endif
-  n_Test(d, r);
-  return d;
 }
 
@@ -826 +731 @@
 static inline number nvInversM (number c, const coeffs r)
 {
-  long inv=InvMod((long)c,r);
+  long inv=npInvMod((long)c,r);
   return (number)inv;
 }

libpolys/coeffs/modulop.h

@@ -29 +29 @@
 #define NV_MAX_PRIME 32749
 #define FACTORY_MAX_PRIME 536870909
+
+#ifdef USE_NTL_XGCD
+//ifdef HAVE_NTL // in ntl.a
+//extern void XGCD(long& d, long& s, long& t, long a, long b);
+#include <NTL/ZZ.h>
+#ifdef NTL_CLIENT
+NTL_CLIENT
+#endif
+#endif
 
 struct n_Procs_s; typedef struct  n_Procs_s  *coeffs;
@@ -173 +182 @@
   return 0 == (long)a;
 }
-
-// inline number npMultM(number a, number b, int npPrimeM)
-// {
-//   return (number)(((long)a*(long)b) % npPrimeM);
-// }
+static inline BOOLEAN npIsOne (number a, const coeffs)
+{
+  return 1 == (long)a;
+}
+
+static inline long npInvMod(long a, const coeffs R)
+{
+   long s, t;
+
+#ifdef USE_NTL_XGCD
+   long d;
+   XGCD(d, s, t, a, R->ch);
+   assume (d == 1);
+#else
+   long  u, v, u0, v0, u1, v1, u2, v2, q, r;
+
+   assume(a>0);
+   u1=1; u2=0;
+   u = a; v = R->ch;
+
+   while (v != 0)
+   {
+      q = u / v;
+      //r = u % v;
+      r = u - q*v;
+      u = v;
+      v = r;
+      u0 = u2;
+      u2 = u1 - q*u2;
+      u1 = u0;
+   }
+
+   assume(u==1);
+   s = u1;
+#endif
+#ifdef HAVE_GENERIC_ADD
+   if (s < 0)
+      return s + R->ch;
+   else
+      return s;
+#else
+  #if SIZEOF_LONG == 8
+  s += (s >> 63) & R->ch;
+  #else
+  s += (s >> 31) & R->ch;
+  #endif
+  return s;
+#endif
+}
+
+static inline number npInversM (number c, const coeffs r)
+{
+  n_Test(c, r);
+#ifndef HAVE_GENERIC_MULT
+  #ifndef HAVE_INVTABLE
+  number d = (number)(long)r->npExpTable[r->npPminus1M - r->npLogTable[(long)c]];
+  #else
+  long inv=(long)r->npInvTable[(long)c];
+  if (inv==0)
+  {
+    inv = (long)r->npExpTable[r->npPminus1M - r->npLogTable[(long)c]];
+    r->npInvTable[(long)c]=inv;
+  }
+  number d = (number)inv;
+  #endif
+#else
+  #ifdef HAVE_INVTABLE
+  long inv=(long)r->npInvTable[(long)c];
+  if (inv==0)
+  {
+    inv=npInvMod((long)c,r);
+    r->npInvTable[(long)c]=inv;
+  }
+  #else
+  long  inv=npInvMod((long)c,r);
+  #endif
+  number d = (number)inv;
+#endif
+  n_Test(d, r);
+  return d;
+}
+
 
 // The folloing is reused inside gnumpc.cc, gnumpfl.cc and longrat.cc