Changeset bb865e in git for libpolys

Timestamp:

Jul 27, 2017, 3:49:53 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

6310b17eabaf8a6adfd0f335e522b7de83ddd648

Parents:

99c34cc0dbf214fef21abb247bd17d346ebe019c

Message:

opt: npInpAdd, npInpMult

Location:

libpolys/coeffs

Files:

• modulop.cc (modified) (3 diffs)
• modulop.h (modified) (4 diffs)

libpolys/coeffs/modulop.cc

@@ -29 +29 @@
 number  npInit        (long i, const coeffs r);
 long    npInt         (number &n, const coeffs r);
-number  npAdd         (number a, number b,const coeffs r);
-number  npSub         (number a, number b,const coeffs r);
 void    npPower       (number a, int i, number * result,const coeffs r);
 BOOLEAN npIsZero      (number a,const coeffs r);
@@ -123 +121 @@
 }
 
-number npAdd (number a, number b, const coeffs r)
-{
-  n_Test(a, r);
-  n_Test(b, r);
-
-  number c = npAddM(a,b, r);
-
-  n_Test(c, r);
-
-  return c;
-}
-
-number npSub (number a, number b, const coeffs r)
-{
-  n_Test(a, r);
-  n_Test(b, r);
-
-  number c = npSubM(a,b,r);
-
-  n_Test(c, r);
-
-  return c;
-}
-
 BOOLEAN npIsZero (number  a, const coeffs r)
 {
@@ -497 +471 @@
 
   r->cfMult  = npMult;
-  r->cfSub   = npSub;
-  r->cfAdd   = npAdd;
+  r->cfInpMult  = npInpMultM;
+  r->cfSub   = npSubM;
+  r->cfAdd   = npAddM;
+  r->cfInpAdd   = npInpAddM;
   r->cfDiv   = npDiv;
   r->cfInit = npInit;

libpolys/coeffs/modulop.h

@@ -46 +46 @@
     ((((unsigned long) a)*((unsigned long) b)) % ((unsigned long) r->ch));
 }
+static inline void npInpMultM(number &a, number b, const coeffs r)
+{
+  a=(number)
+    ((((unsigned long) a)*((unsigned long) b)) % ((unsigned long) r->ch));
+}
 #else
 static inline number npMultM(number a, number b, const coeffs r)
@@ -51 +56 @@
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
   return (number)(long)r->npExpTable[x<r->npPminus1M ? x : x- r->npPminus1M];
+}
+static inline void npInpMultM(number &a, number b, const coeffs r)
+{
+  long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
+  a=(number)(long)r->npExpTable[x<r->npPminus1M ? x : x- r->npPminus1M];
 }
 #endif
@@ -80 +90 @@
   return (number)(R >= r->ch ? R - r->ch : R);
 }
+static inline void npInpAddM(number &a, number b, const coeffs r)
+{
+  unsigned long R = (unsigned long)a + (unsigned long)b;
+  a=(number)(R >= r->ch ? R - r->ch : R);
+}
 static inline number npSubM(number a, number b, const coeffs r)
 {
@@ -96 +111 @@
 #endif
    return (number)res;
+}
+static inline void npInpAddM(number &a, number b, const coeffs r)
+{
+   unsigned long res = (long)((unsigned long)a + (unsigned long)b);
+   res -= r->ch;
+#if SIZEOF_LONG == 8
+   res += ((long)res >> 63) & r->ch;
+#else
+   res += ((long)res >> 31) & r->ch;
+#endif
+   a=(number)res;
 }
 static inline number npSubM(number a, number b, const coeffs r)