Retune.

1 files changed, 84 insertions, 83 deletions

diff --git a/mpn/s390_64/z10/gmp-mparam.h b/mpn/s390_64/z10/gmp-mparam.h
index 20e7eb95d..88f9863d9 100644
--- a/mpn/s390_64/z10/gmp-mparam.h
+++ b/mpn/s390_64/z10/gmp-mparam.h
@@ -35,29 +35,29 @@ see https://www.gnu.org/licenses/.  */
 #define DIVREM_1_UNNORM_THRESHOLD            4
 #define MOD_1_1P_METHOD                      2
 #define MOD_1_NORM_THRESHOLD                 0  /* always */
-#define MOD_1_UNNORM_THRESHOLD               3
+#define MOD_1_UNNORM_THRESHOLD               0  /* always */
 #define MOD_1N_TO_MOD_1_1_THRESHOLD          8
-#define MOD_1U_TO_MOD_1_1_THRESHOLD          8
-#define MOD_1_1_TO_MOD_1_2_THRESHOLD        17
-#define MOD_1_2_TO_MOD_1_4_THRESHOLD        29
-#define PREINV_MOD_1_TO_MOD_1_THRESHOLD     29
+#define MOD_1U_TO_MOD_1_1_THRESHOLD          6
+#define MOD_1_1_TO_MOD_1_2_THRESHOLD        14
+#define MOD_1_2_TO_MOD_1_4_THRESHOLD        24
+#define PREINV_MOD_1_TO_MOD_1_THRESHOLD     28
 #define USE_PREINV_DIVREM_1                  1
 #define DIV_QR_1N_PI1_METHOD                 1
-#define DIV_QR_1_NORM_THRESHOLD              1
+#define DIV_QR_1_NORM_THRESHOLD              2
 #define DIV_QR_1_UNNORM_THRESHOLD        MP_SIZE_T_MAX  /* never */
 #define DIV_QR_2_PI2_THRESHOLD           MP_SIZE_T_MAX  /* never */
 #define DIVEXACT_1_THRESHOLD                 0  /* always */
 #define BMOD_1_TO_MOD_1_THRESHOLD           57
 
 #define MUL_TOOM22_THRESHOLD                10
-#define MUL_TOOM33_THRESHOLD                68
-#define MUL_TOOM44_THRESHOLD               106
-#define MUL_TOOM6H_THRESHOLD               141
-#define MUL_TOOM8H_THRESHOLD               212
+#define MUL_TOOM33_THRESHOLD                73
+#define MUL_TOOM44_THRESHOLD                99
+#define MUL_TOOM6H_THRESHOLD               145
+#define MUL_TOOM8H_THRESHOLD               199
 
 #define MUL_TOOM32_TO_TOOM43_THRESHOLD      73
 #define MUL_TOOM32_TO_TOOM53_THRESHOLD      69
-#define MUL_TOOM42_TO_TOOM53_THRESHOLD      73
+#define MUL_TOOM42_TO_TOOM53_THRESHOLD      71
 #define MUL_TOOM42_TO_TOOM63_THRESHOLD      72
 #define MUL_TOOM43_TO_TOOM54_THRESHOLD      94
 
@@ -70,38 +70,39 @@ see https://www.gnu.org/licenses/.  */
 
 #define MULMID_TOOM42_THRESHOLD             24
 
-#define MULMOD_BNM1_THRESHOLD                8
+#define MULMOD_BNM1_THRESHOLD                9
 #define SQRMOD_BNM1_THRESHOLD                9
 
-#define MUL_FFT_MODF_THRESHOLD             252  /* k = 5 */
+#define MUL_FFT_MODF_THRESHOLD             244  /* k = 5 */
 #define MUL_FFT_TABLE3                                      \
-  { {    252, 5}, {      9, 6}, {      5, 5}, {     11, 6}, \
-    {      7, 5}, {     15, 6}, {     11, 7}, {      6, 6}, \
-    {     13, 7}, {      7, 6}, {     15, 7}, {      8, 6}, \
-    {     17, 7}, {     13, 8}, {      7, 7}, {     15, 8}, \
-    {      9, 7}, {     19, 8}, {     11, 7}, {     23, 8}, \
-    {     13, 9}, {      7, 8}, {     19, 9}, {     11, 8}, \
-    {     23,10}, {      7, 9}, {     15, 8}, {     31, 9}, \
-    {     19, 8}, {     39, 9}, {     23,10}, {     15, 9}, \
-    {     39,10}, {     23,11}, {     15,10}, {     31, 9}, \
-    {     67,10}, {     39, 9}, {     83,10}, {     47,11}, \
-    {     31,10}, {     63, 9}, {    127, 8}, {    255,10}, \
-    {     71, 9}, {    143, 8}, {    287,10}, {     79,11}, \
-    {     47,12}, {     31,11}, {     63,10}, {    127, 9}, \
-    {    255, 8}, {    511, 9}, {    287, 8}, {    575,11}, \
-    {     79,10}, {    159, 8}, {    639,10}, {    175, 9}, \
-    {    351, 8}, {    703, 7}, {   1407, 6}, {   2815,10}, \
-    {    191, 9}, {    383, 8}, {    767, 9}, {    415,10}, \
-    {    223, 8}, {    895, 9}, {    479,12}, {     63,11}, \
-    {    127,10}, {    255, 9}, {    543, 8}, {   1151,11}, \
-    {    159, 9}, {    639,11}, {    175,10}, {    351, 9}, \
-    {    703, 8}, {   1407, 7}, {   2815,11}, {    191,10}, \
-    {    383, 9}, {    767,10}, {    415,11}, {    223,10}, \
-    {    447, 9}, {    895,13}, {   8192,14}, {  16384,15}, \
-    {  32768,16}, {  65536,17}, { 131072,18}, { 262144,19}, \
-    { 524288,20}, {1048576,21}, {2097152,22}, {4194304,23}, \
-    {8388608,24} }
-#define MUL_FFT_TABLE3_SIZE 101
+  { {    244, 5}, {      9, 6}, {      5, 5}, {     11, 6}, \
+    {      6, 5}, {     13, 6}, {      7, 5}, {     15, 6}, \
+    {     11, 7}, {      6, 6}, {     13, 7}, {      7, 6}, \
+    {     15, 7}, {     13, 8}, {      7, 7}, {     16, 8}, \
+    {      9, 7}, {     19, 8}, {     13, 9}, {      7, 8}, \
+    {     19, 9}, {     11, 8}, {     23,10}, {      7, 9}, \
+    {     15, 8}, {     31, 9}, {     19, 8}, {     39, 9}, \
+    {     27,10}, {     15, 9}, {     39,10}, {     23,11}, \
+    {     15,10}, {     31, 9}, {     67,10}, {     39, 9}, \
+    {     83,10}, {     47,11}, {     31,10}, {     63, 9}, \
+    {    127, 8}, {    255, 7}, {    511,10}, {     71, 9}, \
+    {    143, 8}, {    287, 7}, {    575,10}, {     79, 9}, \
+    {    159,11}, {     47,12}, {     31,11}, {     63,10}, \
+    {    127, 9}, {    255, 8}, {    511,10}, {    143, 9}, \
+    {    287, 8}, {    575,11}, {     79,10}, {    159, 9}, \
+    {    319, 8}, {    639,10}, {    175, 8}, {    703, 7}, \
+    {   1407, 6}, {   2815,10}, {    191, 9}, {    383, 8}, \
+    {    767, 9}, {    415,10}, {    223, 9}, {    447, 8}, \
+    {    895,12}, {     63,11}, {    127,10}, {    255, 9}, \
+    {    511,11}, {    143,10}, {    287, 9}, {    575, 8}, \
+    {   1151,11}, {    159,10}, {    319, 9}, {    639,11}, \
+    {    175, 9}, {    703, 8}, {   1407, 7}, {   2815,11}, \
+    {    191,10}, {    383, 9}, {    767,10}, {    415,11}, \
+    {    223,10}, {    447, 9}, {    895,13}, {   8192,14}, \
+    {  16384,15}, {  32768,16}, {  65536,17}, { 131072,18}, \
+    { 262144,19}, { 524288,20}, {1048576,21}, {2097152,22}, \
+    {4194304,23}, {8388608,24} }
+#define MUL_FFT_TABLE3_SIZE 106
 #define MUL_FFT_THRESHOLD                 1728
 
 #define SQR_FFT_MODF_THRESHOLD             212  /* k = 5 */
@@ -109,67 +110,67 @@ see https://www.gnu.org/licenses/.  */
   { {    212, 5}, {      7, 4}, {     15, 5}, {     11, 6}, \
     {      6, 5}, {     13, 6}, {      7, 5}, {     15, 6}, \
     {     13, 7}, {      7, 6}, {     15, 7}, {     13, 8}, \
-    {      7, 7}, {     17, 8}, {      9, 7}, {     19, 8}, \
+    {      7, 7}, {     16, 8}, {      9, 7}, {     19, 8}, \
     {     11, 7}, {     23, 8}, {     13, 9}, {      7, 8}, \
     {     19, 9}, {     11, 8}, {     23,10}, {      7, 9}, \
     {     15, 8}, {     31, 9}, {     19, 8}, {     39, 9}, \
     {     23,10}, {     15, 9}, {     39,10}, {     23,11}, \
     {     15,10}, {     31, 9}, {     63,10}, {     39, 9}, \
-    {     79,10}, {     47,11}, {     31,10}, {     63, 8}, \
-    {    255, 7}, {    511, 9}, {    143, 8}, {    287, 7}, \
-    {    575,10}, {     79,11}, {     47,12}, {     31,11}, \
-    {     63,10}, {    127, 9}, {    255, 8}, {    511,10}, \
-    {    143, 9}, {    287, 8}, {    575,11}, {     79, 9}, \
-    {    319, 8}, {    639, 9}, {    351, 8}, {    703, 7}, \
-    {   1407,11}, {     95,10}, {    191, 9}, {    383,11}, \
-    {    111, 9}, {    447,12}, {     63,11}, {    127,10}, \
-    {    255, 9}, {    511,11}, {    143,10}, {    287, 9}, \
-    {    575, 8}, {   1151,11}, {    159,10}, {    319, 9}, \
-    {    639,11}, {    175,10}, {    351, 9}, {    703, 8}, \
-    {   1407, 7}, {   2815,10}, {    383, 9}, {    767,11}, \
-    {    207,10}, {    415,11}, {    223,13}, {   8192,14}, \
-    {  16384,15}, {  32768,16}, {  65536,17}, { 131072,18}, \
-    { 262144,19}, { 524288,20}, {1048576,21}, {2097152,22}, \
-    {4194304,23}, {8388608,24} }
-#define SQR_FFT_TABLE3_SIZE 98
+    {     79,10}, {     47,11}, {     31,10}, {     63, 9}, \
+    {    127, 8}, {    255,10}, {     71, 9}, {    143, 8}, \
+    {    287, 7}, {    575,10}, {     79,11}, {     47,12}, \
+    {     31,11}, {     63,10}, {    127, 9}, {    255, 8}, \
+    {    511,10}, {    143, 9}, {    287, 8}, {    575,11}, \
+    {     79,10}, {    159, 9}, {    319, 8}, {    639,10}, \
+    {    175, 8}, {    703, 7}, {   1407, 6}, {   2815,10}, \
+    {    191, 9}, {    383, 8}, {    767,10}, {    207,11}, \
+    {    111,12}, {     63,11}, {    127,10}, {    255, 9}, \
+    {    511,11}, {    143,10}, {    287, 9}, {    575, 8}, \
+    {   1151,11}, {    159,10}, {    319, 9}, {    639,11}, \
+    {    175, 9}, {    703, 8}, {   1407, 7}, {   2815,11}, \
+    {    191,10}, {    383, 9}, {    767,11}, {    207,10}, \
+    {    415,13}, {   8192,14}, {  16384,15}, {  32768,16}, \
+    {  65536,17}, { 131072,18}, { 262144,19}, { 524288,20}, \
+    {1048576,21}, {2097152,22}, {4194304,23}, {8388608,24} }
+#define SQR_FFT_TABLE3_SIZE 100
 #define SQR_FFT_THRESHOLD                 1728
 
 #define MULLO_BASECASE_THRESHOLD             2
-#define MULLO_DC_THRESHOLD                  32
+#define MULLO_DC_THRESHOLD                  33
 #define MULLO_MUL_N_THRESHOLD             3176
 
-#define DC_DIV_QR_THRESHOLD                 30
-#define DC_DIVAPPR_Q_THRESHOLD             136
-#define DC_BDIV_QR_THRESHOLD                31
-#define DC_BDIV_Q_THRESHOLD                 90
+#define DC_DIV_QR_THRESHOLD                 34
+#define DC_DIVAPPR_Q_THRESHOLD             140
+#define DC_BDIV_QR_THRESHOLD                34
+#define DC_BDIV_Q_THRESHOLD                 88
 
-#define INV_MULMOD_BNM1_THRESHOLD           19
+#define INV_MULMOD_BNM1_THRESHOLD           18
 #define INV_NEWTON_THRESHOLD               163
-#define INV_APPR_THRESHOLD                 148
+#define INV_APPR_THRESHOLD                 138
 
-#define BINV_NEWTON_THRESHOLD              160
-#define REDC_1_TO_REDC_N_THRESHOLD          43
+#define BINV_NEWTON_THRESHOLD              149
+#define REDC_1_TO_REDC_N_THRESHOLD          40
 
-#define MU_DIV_QR_THRESHOLD                855
-#define MU_DIVAPPR_Q_THRESHOLD             942
+#define MU_DIV_QR_THRESHOLD                792
+#define MU_DIVAPPR_Q_THRESHOLD             807
 #define MUPI_DIV_QR_THRESHOLD               81
-#define MU_BDIV_QR_THRESHOLD               562
-#define MU_BDIV_Q_THRESHOLD                823
+#define MU_BDIV_QR_THRESHOLD               654
+#define MU_BDIV_Q_THRESHOLD                748
 
-#define POWM_SEC_TABLE  2,23,188,1052,1731
+#define POWM_SEC_TABLE  1,22,161,960,2577
 
-#define MATRIX22_STRASSEN_THRESHOLD         15
+#define MATRIX22_STRASSEN_THRESHOLD         17
 #define HGCD_THRESHOLD                     111
-#define HGCD_APPR_THRESHOLD                112
-#define HGCD_REDUCE_THRESHOLD             1615
-#define GCD_DC_THRESHOLD                   312
-#define GCDEXT_DC_THRESHOLD                214
+#define HGCD_APPR_THRESHOLD                107
+#define HGCD_REDUCE_THRESHOLD             1182
+#define GCD_DC_THRESHOLD                   306
+#define GCDEXT_DC_THRESHOLD                226
 #define JACOBI_BASE_METHOD                   4
 
-#define GET_STR_DC_THRESHOLD                19
-#define GET_STR_PRECOMPUTE_THRESHOLD        34
-#define SET_STR_DC_THRESHOLD               898
-#define SET_STR_PRECOMPUTE_THRESHOLD      1806
+#define GET_STR_DC_THRESHOLD                20
+#define GET_STR_PRECOMPUTE_THRESHOLD        33
+#define SET_STR_DC_THRESHOLD               915
+#define SET_STR_PRECOMPUTE_THRESHOLD      1771
 
-#define FAC_DSC_THRESHOLD                  274
-#define FAC_ODD_THRESHOLD                   23
+#define FAC_DSC_THRESHOLD                  348
+#define FAC_ODD_THRESHOLD                    0  /* always */