Changeset 55b747 in git

Timestamp:

Apr 4, 2018, 6:55:03 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

15d6bf96cee82d224cc98ac91b2ee533a290e13a

Parents:

d795761c5157c077e2f8451be201ede9fd36fb3f

Message:

opt: Z/p arithm.

Files:

• factory/ffops.h (modified) (7 diffs)
• libpolys/coeffs/modulop.h (modified) (1 diff)

factory/ffops.h

@@ -40 +40 @@
 {
     int n = a % ff_prime;
-#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
     return n;
@@ -52 +52 @@
 {
     long n = a % ff_prime;
-#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
     return n;
@@ -80 +80 @@
 {
     int n = (int)(a % (long)ff_prime);
-#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
     return n;
@@ -92 +92 @@
 {
     int n = (int)(a % (FACTORY_INT64)ff_prime);
-#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
     return n;
@@ -104 +104 @@
 {
     //return ff_norm( a + b );
-#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
     int r=( a + b );
     r -= ff_prime;
@@ -119 +119 @@
 {
     //return ff_norm( a - b );
-#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
     int r=( a - b );
     r += (r >> 31) & ff_prime;
@@ -134 +134 @@
     //return ff_norm( -a );
 // EXPERIMENT
-#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
     int r= -a;
     r += (r >> 31) & ff_prime;

libpolys/coeffs/modulop.h

@@ -56 +56 @@
 {
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
-  return (number)(long)r->npExpTable[x<=r->npPminus1M ? x : x- r->npPminus1M];
+  #ifdef HAVE_GENERIC_ADD
+  if (x>r->npPminus1M) x-=r->npPminus1M;
+  #else
+    x-=r->npPminus1M;
+    #if SIZEOF_LONG == 8
+     x += (x >> 63) & r->npPminus1M;
+    #else
+     x += (x >> 31) & r->npPminus1M;
+    #endif
+  #endif
+  return (number)(long)r->npExpTable[x];
 }
 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];
+  #ifdef HAVE_GENERIC_ADD
+  if (x>r->npPminus1M) x-=r->npPminus1M;
+  #else
+    x-=r->npPminus1M;
+    #if SIZEOF_LONG == 8
+     x += (x >> 63) & r->npPminus1M;
+    #else
+     x += (x >> 31) & r->npPminus1M;
+    #endif
+  #endif
+  a=(number)(long)r->npExpTable[x];
 }
 #endif