tune/common.c: #if:ed out speed_mpn_gcd_binary and

speed_mpn_gcd_accel.
* tune/speed.c (routine): #if:ed out mpn_gcd_binary, mpn_gcd_accel
and find_a.
* tune/Makefile.am (libspeed_la_SOURCES): Removed gcd_bin.c
gcd_accel.c gcd_finda_gen.c.
* tune/tuneup.c: Enable tuning of GCD_DC_THRESHOLD.

4 files changed, 12 insertions, 8 deletions

diff --git a/tune/Makefile.am b/tune/Makefile.am
index 8748cbc4d..a82d9dcfd 100644
--- a/tune/Makefile.am
+++ b/tune/Makefile.am
@@ -41,7 +41,7 @@ EXTRA_LTLIBRARIES = libspeed.la
 
 libspeed_la_SOURCES =							\
   common.c divrem1div.c divrem1inv.c divrem2div.c divrem2inv.c		\
-  freq.c gcd_bin.c gcd_accel.c gcd_finda_gen.c					\
+  freq.c					\
   gcdext_single.c gcdext_double.c gcdextod.c gcdextos.c			\
   jacbase1.c jacbase2.c jacbase3.c					\
   mod_1_div.c mod_1_inv.c modlinv.c					\
diff --git a/tune/common.c b/tune/common.c
index da6770bf4..1d39dd070 100644
--- a/tune/common.c
+++ b/tune/common.c
@@ -1079,6 +1079,7 @@ speed_mpn_gcd (struct speed_params *s)
 {
   SPEED_ROUTINE_MPN_GCD (mpn_gcd);
 }
+#if 0
 double
 speed_mpn_gcd_binary (struct speed_params *s)
 {
@@ -1089,7 +1090,7 @@ speed_mpn_gcd_accel (struct speed_params *s)
 {
   SPEED_ROUTINE_MPN_GCD (mpn_gcd_accel);
 }
-
+#endif
 #if HAVE_NATIVE_mpn_gcd_finda
 double
 speed_mpn_gcd_finda (struct speed_params *s)
diff --git a/tune/speed.c b/tune/speed.c
index f7a8474df..f230c1502 100644
--- a/tune/speed.c
+++ b/tune/speed.c
@@ -256,9 +256,11 @@ const struct routine_t {
   { "mpn_gcd_1N",        speed_mpn_gcd_1N, FLAG_R_OPTIONAL },
 
   { "mpn_gcd",           speed_mpn_gcd                    },
+#if 0
   { "mpn_gcd_binary",    speed_mpn_gcd_binary             },
   { "mpn_gcd_accel",     speed_mpn_gcd_accel              },
   { "find_a",            speed_find_a,        FLAG_NODATA },
+#endif
 #if HAVE_NATIVE_mpn_gcd_finda
   { "mpn_gcd_finda",     speed_mpn_gcd_finda, FLAG_NODATA },
 #endif
diff --git a/tune/tuneup.c b/tune/tuneup.c
index d74d1d5a0..3e5d4396f 100644
--- a/tune/tuneup.c
+++ b/tune/tuneup.c
@@ -164,7 +164,7 @@ mp_size_t  div_dc_threshold             = MP_SIZE_T_MAX;
 mp_size_t  powm_threshold               = MP_SIZE_T_MAX;
 mp_size_t  hgcd_threshold               = MP_SIZE_T_MAX;
 mp_size_t  gcd_accel_threshold          = MP_SIZE_T_MAX;
-mp_size_t  gcd_schoenhage_threshold     = MP_SIZE_T_MAX;
+mp_size_t  gcd_dc_threshold             = MP_SIZE_T_MAX;
 mp_size_t  gcdext_schoenhage_threshold  = MP_SIZE_T_MAX;
 mp_size_t  divrem_1_norm_threshold      = MP_SIZE_T_MAX;
 mp_size_t  divrem_1_unnorm_threshold    = MP_SIZE_T_MAX;
@@ -1018,6 +1018,7 @@ tune_hgcd (void)
   one (&hgcd_threshold, &param);
 }
 
+#if 0
 void
 tune_gcd_accel (void)
 {
@@ -1027,17 +1028,17 @@ tune_gcd_accel (void)
   param.min_size = 1;
   one (&gcd_accel_threshold, &param);
 }
-
+#endif
 void
-tune_gcd_schoenhage (void)
+tune_gcd_dc (void)
 {
   static struct param_t  param;
-  param.name = "GCD_SCHOENHAGE_THRESHOLD";
+  param.name = "GCD_DC_THRESHOLD";
   param.function = speed_mpn_gcd;
   param.min_size = hgcd_threshold;
   param.max_size = 3000;
   param.step_factor = 0.1;
-  one (&gcd_schoenhage_threshold, &param);
+  one (&gcd_dc_threshold, &param);
 }
 
 void
@@ -1772,9 +1773,9 @@ all (void)
   printf("\n");
 
   tune_hgcd ();
+  tune_gcd_dc ();
 #if 0
   tune_gcd_accel ();
-  tune_gcd_schoenhage ();
   tune_gcdext_schoenhage ();
 #endif
   tune_jacobi_base ();