* tune/tuneup.c, tune/Makefile.am, gmp-impl.h, mpn/*/gmp-mparam.h:

	Remove FIB_THRESHOLD, no longer required.

2 files changed, 2 insertions, 27 deletions

diff --git a/tune/Makefile.am b/tune/Makefile.am
index d5a630f05..ded190f06 100644
--- a/tune/Makefile.am
+++ b/tune/Makefile.am
@@ -117,7 +117,7 @@ DISTCLEANFILES = sqr_basecase.c
 TUNE_MPN_SRCS = $(TUNE_MPN_SRCS_BASIC) divrem_1.c mod_1.c
 TUNE_MPN_SRCS_BASIC = dc_divrem_n.c divrem_2.c gcd.c mul_n.c mul_fft.c mul.c \
   sb_divrem_mn.c tdiv_qr.c
-TUNE_MPZ_SRCS = fib_ui.c
+TUNE_MPZ_SRCS =
 
 $(TUNE_MPN_SRCS_BASIC):
 	for i in $(TUNE_MPN_SRCS_BASIC); do \
@@ -175,7 +175,7 @@ dc:
 	./speed -s 5-40 -c mpn_dc_divrem_sb mpn_dc_divrem_n mpn_dc_tdiv_qr
 
 fib:
-	./speed -s 80-120 -c mpz_fib_ui
+	./speed -s 40-60 -c mpz_fib_ui
 fibg:
 	./speed -s 10-300 -P fibg mpz_fib_ui
 
diff --git a/tune/tuneup.c b/tune/tuneup.c
index 513a10caf..4f052975d 100644
--- a/tune/tuneup.c
+++ b/tune/tuneup.c
@@ -131,7 +131,6 @@ mp_size_t  mul_threshold[MAX_TABLE+1] = { MP_SIZE_T_MAX };
 mp_size_t  sqr_threshold[MAX_TABLE+1] = { MP_SIZE_T_MAX };
 mp_size_t  sb_preinv_threshold[2] = { MP_SIZE_T_MAX };
 mp_size_t  dc_threshold[2] = { MP_SIZE_T_MAX };
-mp_size_t  fib_threshold[2] = { MP_SIZE_T_MAX };
 mp_size_t  powm_threshold[2] = { MP_SIZE_T_MAX };
 mp_size_t  gcd_accel_threshold[2] = { MP_SIZE_T_MAX };
 mp_size_t  gcdext_threshold[2] = { MP_SIZE_T_MAX };
@@ -923,30 +922,6 @@ all (void)
 
   {
     static struct param_t  param;
-    param.name[0] = "FIB_THRESHOLD";
-    param.function = speed_mpz_fib_ui;
-
-    /* Bigcase odd and even sizes run at noticably different speeds, so
-       always step by 1, and don't let stop_factor truncate the search.  */
-    param.step_factor = 0.001;
-    param.stop_factor = 5.0;
-
-    /* start the search from a point after the table data */
-    switch (BITS_PER_MP_LIMB) {
-    case 32: param.min_size[0] = 93; break;
-    case 64: param.min_size[0] = 186; break;
-    default:
-      printf ("Don't know FIB_THRESHOLD starting point for BITS_PER_MP_LIMB == %d\n",
-              BITS_PER_MP_LIMB);
-      abort ();
-    }
-
-    one (fib_threshold, 1, &param);
-  }
-  printf("\n");
-
-  {
-    static struct param_t  param;
     param.name[0] = "GCD_ACCEL_THRESHOLD";
     param.function = speed_mpn_gcd;
     param.min_size[0] = 1;