Changeset 8145ac in git

Timestamp:

May 22, 2018, 5:04:36 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

12ee77b62cb7d3d9f449254ecb5a95bcd817ff4c

Parents:

e289a43a50430377cea7498d5fd2ec6ce97604e3

Message:

opt: factory/ffops.*

- removed ff_longnorm
- use ff_big_norm only for 32bit
- rely on NTL for NTL_AVOID_BRANCHING

Location:

factory

Files:

• ffops.cc (modified) (1 diff)
• ffops.h (modified) (8 diffs)

factory/ffops.cc

@@ -19 +19 @@
 void ff_setprime ( const int p )
 {
-    if ( p != ff_prime ) {
+    if ( p != ff_prime )
+    {
         ff_prime = p;
         ff_halfprime = ff_prime / 2;

factory/ffops.h

@@ -40 +40 @@
 {
     int n = a % ff_prime;
-#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
+#if defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
     return n;
@@ -51 +51 @@
 inline long ff_norm ( const long a )
 {
-    long n = a % ff_prime;
-#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
+    long n = a % (long)ff_prime;
+#if defined(NTL_AVOID_BRANCHING)
     #if SIZEOF_LONG==8
     n += (n >> 63) & ff_prime;
@@ -60 +60 @@
     return n;
 #else
-    if (n < 0) n += ff_prime;
+    if (n < 0) n += (long)ff_prime;
     return n;
 #endif
@@ -81 +81 @@
 }
 
-inline int ff_longnorm ( const long a )
+#if SIZEOF_LONG==4
+inline int ff_bignorm ( const FACTORY_INT64 a )
 {
-    int n = (int)(a % (long)ff_prime);
-#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
+    int n = (int)(a % (FACTORY_INT64)ff_prime);
+#if defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
     return n;
@@ -92 +93 @@
 #endif
 }
-
-inline int ff_bignorm ( const FACTORY_INT64 a )
-{
-    int n = (int)(a % (FACTORY_INT64)ff_prime);
-#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
-    n += (n >> 31) & ff_prime;
-    return n;
-#else
-    if (n < 0) n += ff_prime;
-    return n;
 #endif
-}
 
 inline int ff_add ( const int a, const int b )
 {
     //return ff_norm( a + b );
-#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
+#if defined(NTL_AVOID_BRANCHING)
     int r=( a + b );
     r -= ff_prime;
@@ -123 +113 @@
 {
     //return ff_norm( a - b );
-#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
+#if defined(NTL_AVOID_BRANCHING)
     int r=( a - b );
     r += (r >> 31) & ff_prime;
@@ -138 +128 @@
     //return ff_norm( -a );
 // EXPERIMENT
-#if defined(i386) || defined(__x86_64__) || defined(NTL_AVOID_BRANCHING)
+#if defined(NTL_AVOID_BRANCHING)
     int r= -a;
     r += (r >> 31) & ff_prime;
@@ -149 +139 @@
 inline int ff_mul ( const int a, const int b )
 {
+#if SIZEOF_LONG==4
     if ( ff_big )
         return ff_bignorm( (FACTORY_INT64)a * (FACTORY_INT64)b );
     else
-        return ff_longnorm ( (long)a * (long)b );
+#endif /* else: FACTORY_INT64 is long, i.e. ff_bignorm is the same as ff_norm(long) */
+        return ff_norm ( (long)a * (long)b );
 }