Retune.

2 files changed, 94 insertions, 86 deletions

diff --git a/mpn/alpha/ev5/gmp-mparam.h b/mpn/alpha/ev5/gmp-mparam.h
index 395353a46..e4396e5db 100644
--- a/mpn/alpha/ev5/gmp-mparam.h
+++ b/mpn/alpha/ev5/gmp-mparam.h
@@ -31,29 +31,30 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define MOD_1_UNNORM_THRESHOLD               0  /* always */
 #define MOD_1N_TO_MOD_1_1_THRESHOLD          6
 #define MOD_1U_TO_MOD_1_1_THRESHOLD          2
-#define MOD_1_1_TO_MOD_1_2_THRESHOLD         4
-#define MOD_1_2_TO_MOD_1_4_THRESHOLD        14
+#define MOD_1_1_TO_MOD_1_2_THRESHOLD        78
+#define MOD_1_2_TO_MOD_1_4_THRESHOLD         0  /* never mpn_mod_1s_2p */
 #define PREINV_MOD_1_TO_MOD_1_THRESHOLD     15
 #define USE_PREINV_DIVREM_1                  1  /* preinv always */
-#define DIV_QR_2_PI2_THRESHOLD              21
+#define DIV_QR_2_PI2_THRESHOLD              25
 #define DIVEXACT_1_THRESHOLD                 0  /* always */
-#define BMOD_1_TO_MOD_1_THRESHOLD           78
+#define BMOD_1_TO_MOD_1_THRESHOLD           80
 
 #define MUL_TOOM22_THRESHOLD                14
-#define MUL_TOOM33_THRESHOLD                57
+#define MUL_TOOM33_THRESHOLD                66
 #define MUL_TOOM44_THRESHOLD               118
-#define MUL_TOOM6H_THRESHOLD               173
-#define MUL_TOOM8H_THRESHOLD               240
+#define MUL_TOOM6H_THRESHOLD               157
+#define MUL_TOOM8H_THRESHOLD               236
 
-#define MUL_TOOM32_TO_TOOM43_THRESHOLD      57
-#define MUL_TOOM32_TO_TOOM53_THRESHOLD      91
+#define MUL_TOOM32_TO_TOOM43_THRESHOLD      73
+#define MUL_TOOM32_TO_TOOM53_THRESHOLD      84
 #define MUL_TOOM42_TO_TOOM53_THRESHOLD      81
 #define MUL_TOOM42_TO_TOOM63_THRESHOLD      56
+#define MUL_TOOM43_TO_TOOM54_THRESHOLD      66
 
-#define SQR_BASECASE_THRESHOLD               4
-#define SQR_TOOM2_THRESHOLD                 28
+#define SQR_BASECASE_THRESHOLD               5
+#define SQR_TOOM2_THRESHOLD                 26
 #define SQR_TOOM3_THRESHOLD                 77
-#define SQR_TOOM4_THRESHOLD                136
+#define SQR_TOOM4_THRESHOLD                130
 #define SQR_TOOM6_THRESHOLD                173
 #define SQR_TOOM8_THRESHOLD                260
 
@@ -62,8 +63,6 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define MULMOD_BNM1_THRESHOLD               11
 #define SQRMOD_BNM1_THRESHOLD               13
 
-#define POWM_SEC_TABLE  2,17,322,387
-
 #define MUL_FFT_MODF_THRESHOLD             244  /* k = 5 */
 #define MUL_FFT_TABLE3                                      \
   { {    244, 5}, {     11, 6}, {      6, 5}, {     13, 6}, \
@@ -105,7 +104,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define MUL_FFT_TABLE3_SIZE 141
 #define MUL_FFT_THRESHOLD                 3008
 
-#define SQR_FFT_MODF_THRESHOLD             220  /* k = 5 */
+#define SQR_FFT_MODF_THRESHOLD             212  /* k = 5 */
 #define SQR_FFT_TABLE3                                      \
   { {    220, 5}, {     13, 6}, {     15, 7}, {      8, 6}, \
     {     17, 7}, {      9, 6}, {     19, 7}, {     13, 8}, \
@@ -142,39 +141,44 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
     { 131072,18}, { 262144,19}, { 524288,20}, {1048576,21}, \
     {2097152,22}, {4194304,23}, {8388608,24} }
 #define SQR_FFT_TABLE3_SIZE 135
-#define SQR_FFT_THRESHOLD                 2240
+#define SQR_FFT_THRESHOLD                 1984
 
-#define MULLO_BASECASE_THRESHOLD             0  /* always */
-#define MULLO_DC_THRESHOLD                  55
-#define MULLO_MUL_N_THRESHOLD             5558
+#define MULLO_BASECASE_THRESHOLD             2
+#define MULLO_DC_THRESHOLD                  50
+#define MULLO_MUL_N_THRESHOLD             5397
 
-#define DC_DIV_QR_THRESHOLD                 55
-#define DC_DIVAPPR_Q_THRESHOLD             192
+#define DC_DIV_QR_THRESHOLD                 52
+#define DC_DIVAPPR_Q_THRESHOLD             172
 #define DC_BDIV_QR_THRESHOLD                51
-#define DC_BDIV_Q_THRESHOLD                120
+#define DC_BDIV_Q_THRESHOLD                112
 
-#define INV_MULMOD_BNM1_THRESHOLD           34
-#define INV_NEWTON_THRESHOLD               188
-#define INV_APPR_THRESHOLD                 189
+#define INV_MULMOD_BNM1_THRESHOLD           38
+#define INV_NEWTON_THRESHOLD               179
+#define INV_APPR_THRESHOLD                 180
 
-#define BINV_NEWTON_THRESHOLD              228
-#define REDC_1_TO_REDC_N_THRESHOLD          55
+#define BINV_NEWTON_THRESHOLD              197
+#define REDC_1_TO_REDC_N_THRESHOLD          51
 
-#define MU_DIV_QR_THRESHOLD                979
+#define MU_DIV_QR_THRESHOLD                998
 #define MU_DIVAPPR_Q_THRESHOLD             998
-#define MUPI_DIV_QR_THRESHOLD              106
-#define MU_BDIV_QR_THRESHOLD               792
-#define MU_BDIV_Q_THRESHOLD                942
+#define MUPI_DIV_QR_THRESHOLD               90
+#define MU_BDIV_QR_THRESHOLD               807
+#define MU_BDIV_Q_THRESHOLD               1078
+
+#define POWM_SEC_TABLE  2,17,188,393
 
-#define MATRIX22_STRASSEN_THRESHOLD         13
+#define MATRIX22_STRASSEN_THRESHOLD         11
 #define HGCD_THRESHOLD                     105
-#define HGCD_APPR_THRESHOLD                111
-#define HGCD_REDUCE_THRESHOLD             1437
-#define GCD_DC_THRESHOLD                   318
-#define GCDEXT_DC_THRESHOLD                214
-#define JACOBI_BASE_METHOD                   2
-
-#define GET_STR_DC_THRESHOLD                16
-#define GET_STR_PRECOMPUTE_THRESHOLD        31
-#define SET_STR_DC_THRESHOLD               422
-#define SET_STR_PRECOMPUTE_THRESHOLD      1524
+#define HGCD_APPR_THRESHOLD                105
+#define HGCD_REDUCE_THRESHOLD             1494
+#define GCD_DC_THRESHOLD                   285
+#define GCDEXT_DC_THRESHOLD                206
+#define JACOBI_BASE_METHOD                   3
+
+#define GET_STR_DC_THRESHOLD                14
+#define GET_STR_PRECOMPUTE_THRESHOLD        29
+#define SET_STR_DC_THRESHOLD               426
+#define SET_STR_PRECOMPUTE_THRESHOLD      1535
+
+#define FAC_DSC_THRESHOLD                 1502
+#define FAC_ODD_THRESHOLD                    0  /* always */
diff --git a/mpn/alpha/ev6/gmp-mparam.h b/mpn/alpha/ev6/gmp-mparam.h
index ce865f4cc..9932ec1fb 100644
--- a/mpn/alpha/ev6/gmp-mparam.h
+++ b/mpn/alpha/ev6/gmp-mparam.h
@@ -34,40 +34,39 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define MOD_1_UNNORM_THRESHOLD               0  /* always */
 #define MOD_1N_TO_MOD_1_1_THRESHOLD          3
 #define MOD_1U_TO_MOD_1_1_THRESHOLD          2
-#define MOD_1_1_TO_MOD_1_2_THRESHOLD         4
-#define MOD_1_2_TO_MOD_1_4_THRESHOLD        16
-#define PREINV_MOD_1_TO_MOD_1_THRESHOLD      8
+#define MOD_1_1_TO_MOD_1_2_THRESHOLD        10
+#define MOD_1_2_TO_MOD_1_4_THRESHOLD        17
+#define PREINV_MOD_1_TO_MOD_1_THRESHOLD      7
 #define USE_PREINV_DIVREM_1                  1  /* preinv always */
 #define DIV_QR_2_PI2_THRESHOLD               8
 #define DIVEXACT_1_THRESHOLD                 0  /* always */
-#define BMOD_1_TO_MOD_1_THRESHOLD           20
+#define BMOD_1_TO_MOD_1_THRESHOLD           19
 
-#define MUL_TOOM22_THRESHOLD                35
-#define MUL_TOOM33_THRESHOLD                77
-#define MUL_TOOM44_THRESHOLD               184
-#define MUL_TOOM6H_THRESHOLD               228
-#define MUL_TOOM8H_THRESHOLD               288
+#define MUL_TOOM22_THRESHOLD                32
+#define MUL_TOOM33_THRESHOLD               105
+#define MUL_TOOM44_THRESHOLD               166
+#define MUL_TOOM6H_THRESHOLD               232
+#define MUL_TOOM8H_THRESHOLD               357
 
-#define MUL_TOOM32_TO_TOOM43_THRESHOLD      89
+#define MUL_TOOM32_TO_TOOM43_THRESHOLD      96
 #define MUL_TOOM32_TO_TOOM53_THRESHOLD     110
-#define MUL_TOOM42_TO_TOOM53_THRESHOLD     105
-#define MUL_TOOM42_TO_TOOM63_THRESHOLD      73
-
-#define SQR_BASECASE_THRESHOLD               0  /* always */
-#define SQR_TOOM2_THRESHOLD                 58
-#define SQR_TOOM3_THRESHOLD                103
-#define SQR_TOOM4_THRESHOLD                172
-#define SQR_TOOM6_THRESHOLD                264
+#define MUL_TOOM42_TO_TOOM53_THRESHOLD      93
+#define MUL_TOOM42_TO_TOOM63_THRESHOLD     113
+#define MUL_TOOM43_TO_TOOM54_THRESHOLD     133
+
+#define SQR_BASECASE_THRESHOLD               4
+#define SQR_TOOM2_THRESHOLD                 60
+#define SQR_TOOM3_THRESHOLD                102
+#define SQR_TOOM4_THRESHOLD                155
+#define SQR_TOOM6_THRESHOLD                306
 #define SQR_TOOM8_THRESHOLD                333
 
 #define MULMID_TOOM42_THRESHOLD             52
 
-#define MULMOD_BNM1_THRESHOLD               20
+#define MULMOD_BNM1_THRESHOLD               15
 #define SQRMOD_BNM1_THRESHOLD               23
 
-#define POWM_SEC_TABLE  4,17,246,2388
-
-#define MUL_FFT_MODF_THRESHOLD             480  /* k = 5 */
+#define MUL_FFT_MODF_THRESHOLD             412  /* k = 5 */
 #define MUL_FFT_TABLE3                                      \
   { {    480, 5}, {     18, 6}, {     10, 5}, {     21, 6}, \
     {     11, 5}, {     23, 6}, {     12, 5}, {     25, 6}, \
@@ -110,7 +109,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define MUL_FFT_TABLE3_SIZE 151
 #define MUL_FFT_THRESHOLD                 5760
 
-#define SQR_FFT_MODF_THRESHOLD             476  /* k = 5 */
+#define SQR_FFT_MODF_THRESHOLD             412  /* k = 5 */
 #define SQR_FFT_TABLE3                                      \
   { {    476, 5}, {     19, 6}, {     10, 5}, {     23, 6}, \
     {     12, 5}, {     25, 6}, {     27, 7}, {     14, 6}, \
@@ -151,39 +150,44 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
     {  65536,17}, { 131072,18}, { 262144,19}, { 524288,20}, \
     {1048576,21}, {2097152,22}, {4194304,23}, {8388608,24} }
 #define SQR_FFT_TABLE3_SIZE 152
-#define SQR_FFT_THRESHOLD                 3136
+#define SQR_FFT_THRESHOLD                 4224
 
 #define MULLO_BASECASE_THRESHOLD             0  /* always */
-#define MULLO_DC_THRESHOLD                 173
-#define MULLO_MUL_N_THRESHOLD            11355
+#define MULLO_DC_THRESHOLD                 113
+#define MULLO_MUL_N_THRESHOLD            11278
 
 #define DC_DIV_QR_THRESHOLD                112
-#define DC_DIVAPPR_Q_THRESHOLD             422
+#define DC_DIVAPPR_Q_THRESHOLD             390
 #define DC_BDIV_QR_THRESHOLD               110
-#define DC_BDIV_Q_THRESHOLD                348
+#define DC_BDIV_Q_THRESHOLD                286
 
-#define INV_MULMOD_BNM1_THRESHOLD           68
-#define INV_NEWTON_THRESHOLD               402
-#define INV_APPR_THRESHOLD                 396
+#define INV_MULMOD_BNM1_THRESHOLD           62
+#define INV_NEWTON_THRESHOLD               393
+#define INV_APPR_THRESHOLD                 375
 
-#define BINV_NEWTON_THRESHOLD              399
-#define REDC_1_TO_REDC_N_THRESHOLD         110
+#define BINV_NEWTON_THRESHOLD              390
+#define REDC_1_TO_REDC_N_THRESHOLD         124
 
-#define MU_DIV_QR_THRESHOLD               1718
-#define MU_DIVAPPR_Q_THRESHOLD            1895
-#define MUPI_DIV_QR_THRESHOLD              180
-#define MU_BDIV_QR_THRESHOLD              1387
+#define MU_DIV_QR_THRESHOLD               1652
+#define MU_DIVAPPR_Q_THRESHOLD            1685
+#define MUPI_DIV_QR_THRESHOLD              171
+#define MU_BDIV_QR_THRESHOLD              1470
 #define MU_BDIV_Q_THRESHOLD               1652
 
-#define MATRIX22_STRASSEN_THRESHOLD         17
+#define POWM_SEC_TABLE  2,23,88,387,961,2578
+
+#define MATRIX22_STRASSEN_THRESHOLD         15
 #define HGCD_THRESHOLD                     278
-#define HGCD_APPR_THRESHOLD                366
-#define HGCD_REDUCE_THRESHOLD             2681
+#define HGCD_APPR_THRESHOLD                357
+#define HGCD_REDUCE_THRESHOLD             2899
 #define GCD_DC_THRESHOLD                  1258
 #define GCDEXT_DC_THRESHOLD                777
 #define JACOBI_BASE_METHOD                   3
 
-#define GET_STR_DC_THRESHOLD                13
-#define GET_STR_PRECOMPUTE_THRESHOLD        25
-#define SET_STR_DC_THRESHOLD              3539
-#define SET_STR_PRECOMPUTE_THRESHOLD      7784
+#define GET_STR_DC_THRESHOLD                15
+#define GET_STR_PRECOMPUTE_THRESHOLD        24
+#define SET_STR_DC_THRESHOLD              3866
+#define SET_STR_PRECOMPUTE_THRESHOLD      7708
+
+#define FAC_DSC_THRESHOLD                 1025
+#define FAC_ODD_THRESHOLD                   24