[Gmp-commit] /var/hg/gmp: 2 new changesets
mercurial at gmplib.org
mercurial at gmplib.org
Mon Mar 24 21:00:25 UTC 2014
details: /var/hg/gmp/rev/f719331e3c2e
changeset: 16352:f719331e3c2e
user: Torbjorn Granlund <tege at gmplib.org>
date: Mon Mar 24 21:59:19 2014 +0100
description:
Retune.
details: /var/hg/gmp/rev/44b36a002f77
changeset: 16353:44b36a002f77
user: Torbjorn Granlund <tege at gmplib.org>
date: Mon Mar 24 22:00:21 2014 +0100
description:
Trivial merge.
diffstat:
ChangeLog | 9 ++-
Makefile.am | 15 ++--
gmp-h.in | 6 +-
mpn/x86/coreihwl/gmp-mparam.h | 14 ++-
mpn/x86/coreisbr/gmp-mparam.h | 16 ++--
mpn/x86_64/core2/gmp-mparam.h | 133 +++++++++++++++++++++++------------------
6 files changed, 109 insertions(+), 84 deletions(-)
diffs (298 lines):
diff -r 05e6f6b1c3a8 -r 44b36a002f77 ChangeLog
--- a/ChangeLog Sat Mar 22 15:42:23 2014 +0100
+++ b/ChangeLog Mon Mar 24 22:00:21 2014 +0100
@@ -1,3 +1,10 @@
+2014-03-22 Torbjorn Granlund <tege at gmplib.org>
+
+ * Version 6.0.0 released.
+
+ * Makefile.am (LIBGMP_LT_*, LIBGMPXX_LT_*): Bump version info.
+ * gmp-h.in: Bump version.
+
2014-03-17 Torbjorn Granlund <tege at gmplib.org>
* configure.ac: Remove clipper, i960, ns32k, pyr, a29k, z8000.
@@ -10,7 +17,7 @@
* mpn/Makefile.am (TARG_DIST): Purge removed directories.
* doc/gmp.texi: Remove special mentions of removed architectures.
-2014-02-21 Marco Bodrato <bodrato at mail.dm.unipi.it>
+2014-03-12 Marco Bodrato <bodrato at mail.dm.unipi.it>
* mini-gmp/mini-gmp.c (mpz_probab_prime_p): Micro-optimisation.
diff -r 05e6f6b1c3a8 -r 44b36a002f77 Makefile.am
--- a/Makefile.am Sat Mar 22 15:42:23 2014 +0100
+++ b/Makefile.am Mon Mar 24 22:00:21 2014 +0100
@@ -1,7 +1,7 @@
## Process this file with automake to generate Makefile.in
-# Copyright 1991, 1993, 1994, 1996, 1997, 1999-2004, 2006-2009, 2011-2013 Free
+# Copyright 1991, 1993, 1994, 1996, 1997, 1999-2004, 2006-2009, 2011-2014 Free
# Software Foundation, Inc.
#
# This file is part of the GNU MP Library.
@@ -85,6 +85,7 @@
# 5.1.0 11:0:1 7:0:3 -
# 5.1.1 11:1:1 7:1:3 -
# 5.1.2 11:2:1 7:2:3 -
+# 6.0.0 12:0:2 8:0:4 -
#
# Starting at 3:0:0 is a slight abuse of the versioning system, but it
# ensures we're past soname libgmp.so.2, which was used on Debian GNU/Linux
@@ -97,13 +98,13 @@
# it's still good to get the shared library filename (like
# libgmpxx.so.3.0.4) incrementing, to make it clear which GMP it's from.
-LIBGMP_LT_CURRENT = 11
-LIBGMP_LT_REVISION = 2
-LIBGMP_LT_AGE = 1
+LIBGMP_LT_CURRENT = 12
+LIBGMP_LT_REVISION = 0
+LIBGMP_LT_AGE = 2
-LIBGMPXX_LT_CURRENT = 7
-LIBGMPXX_LT_REVISION = 2
-LIBGMPXX_LT_AGE = 3
+LIBGMPXX_LT_CURRENT = 8
+LIBGMPXX_LT_REVISION = 0
+LIBGMPXX_LT_AGE = 4
SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
diff -r 05e6f6b1c3a8 -r 44b36a002f77 gmp-h.in
--- a/gmp-h.in Sat Mar 22 15:42:23 2014 +0100
+++ b/gmp-h.in Mon Mar 24 22:00:21 2014 +0100
@@ -2292,9 +2292,9 @@
#define __GMP_CFLAGS "@CFLAGS@"
/* Major version number is the value of __GNU_MP__ too, above and in mp.h. */
-#define __GNU_MP_VERSION 5
-#define __GNU_MP_VERSION_MINOR 1
-#define __GNU_MP_VERSION_PATCHLEVEL 90
+#define __GNU_MP_VERSION 6
+#define __GNU_MP_VERSION_MINOR 0
+#define __GNU_MP_VERSION_PATCHLEVEL 0
#define __GNU_MP_RELEASE (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL)
#define __GMP_H__
diff -r 05e6f6b1c3a8 -r 44b36a002f77 mpn/x86/coreihwl/gmp-mparam.h
--- a/mpn/x86/coreihwl/gmp-mparam.h Sat Mar 22 15:42:23 2014 +0100
+++ b/mpn/x86/coreihwl/gmp-mparam.h Mon Mar 24 22:00:21 2014 +0100
@@ -197,12 +197,14 @@
#define HGCD_THRESHOLD 61
#define HGCD_APPR_THRESHOLD 60
#define HGCD_REDUCE_THRESHOLD 3810
-/* Parameters beyond this point are not properly measured */
-#define GCD_DC_THRESHOLD 278
-#define GCDEXT_DC_THRESHOLD 298
+#define GCD_DC_THRESHOLD 263
+#define GCDEXT_DC_THRESHOLD 278
#define JACOBI_BASE_METHOD 4
#define GET_STR_DC_THRESHOLD 11
-#define GET_STR_PRECOMPUTE_THRESHOLD 23
-#define SET_STR_DC_THRESHOLD 438
-#define SET_STR_PRECOMPUTE_THRESHOLD 1206
+#define GET_STR_PRECOMPUTE_THRESHOLD 21
+#define SET_STR_DC_THRESHOLD 527
+#define SET_STR_PRECOMPUTE_THRESHOLD 1178
+
+#define FAC_DSC_THRESHOLD 187
+#define FAC_ODD_THRESHOLD 34
diff -r 05e6f6b1c3a8 -r 44b36a002f77 mpn/x86/coreisbr/gmp-mparam.h
--- a/mpn/x86/coreisbr/gmp-mparam.h Sat Mar 22 15:42:23 2014 +0100
+++ b/mpn/x86/coreisbr/gmp-mparam.h Mon Mar 24 22:00:21 2014 +0100
@@ -190,12 +190,14 @@
#define HGCD_THRESHOLD 61
#define HGCD_APPR_THRESHOLD 56
#define HGCD_REDUCE_THRESHOLD 3810
-/* Parameters beyond this point are not properly measured */
-#define GCD_DC_THRESHOLD 278
-#define GCDEXT_DC_THRESHOLD 298
+#define GCD_DC_THRESHOLD 283
+#define GCDEXT_DC_THRESHOLD 309
#define JACOBI_BASE_METHOD 4
-#define GET_STR_DC_THRESHOLD 11
-#define GET_STR_PRECOMPUTE_THRESHOLD 23
-#define SET_STR_DC_THRESHOLD 438
-#define SET_STR_PRECOMPUTE_THRESHOLD 1206
+#define GET_STR_DC_THRESHOLD 12
+#define GET_STR_PRECOMPUTE_THRESHOLD 21
+#define SET_STR_DC_THRESHOLD 399
+#define SET_STR_PRECOMPUTE_THRESHOLD 1183
+
+#define FAC_DSC_THRESHOLD 194
+#define FAC_ODD_THRESHOLD 34
diff -r 05e6f6b1c3a8 -r 44b36a002f77 mpn/x86_64/core2/gmp-mparam.h
--- a/mpn/x86_64/core2/gmp-mparam.h Sat Mar 22 15:42:23 2014 +0100
+++ b/mpn/x86_64/core2/gmp-mparam.h Mon Mar 24 22:00:21 2014 +0100
@@ -33,7 +33,7 @@
#define GMP_LIMB_BYTES 8
/* 2133 MHz Core 2 (65nm) */
-/* FFT tuning limit = 25000000 */
+/* FFT tuning limit = 60000000 */
/* Generated by tuneup.c, 2014-03-13, gcc 4.5 */
#define MOD_1_NORM_THRESHOLD 0 /* always */
@@ -78,14 +78,14 @@
#define MUL_FFT_TABLE3 \
{ { 372, 5}, { 17, 6}, { 9, 5}, { 19, 6}, \
{ 21, 7}, { 11, 6}, { 23, 7}, { 12, 6}, \
- { 25, 7}, { 21, 8}, { 11, 7}, { 24, 8}, \
- { 13, 7}, { 27, 8}, { 15, 7}, { 31, 8}, \
- { 17, 7}, { 35, 8}, { 19, 7}, { 39, 8}, \
+ { 25, 7}, { 21, 8}, { 11, 7}, { 25, 8}, \
+ { 13, 7}, { 27, 8}, { 15, 7}, { 32, 8}, \
+ { 17, 7}, { 36, 8}, { 19, 7}, { 40, 8}, \
{ 21, 9}, { 11, 8}, { 27, 9}, { 15, 8}, \
{ 35, 9}, { 19, 8}, { 41, 9}, { 23, 8}, \
- { 47, 9}, { 27,10}, { 15, 9}, { 39,10}, \
- { 23, 9}, { 55,11}, { 15,10}, { 31, 9}, \
- { 67,10}, { 39, 9}, { 83,10}, { 47, 9}, \
+ { 47, 9}, { 27,10}, { 15, 9}, { 43,10}, \
+ { 23, 9}, { 51,11}, { 15,10}, { 31, 9}, \
+ { 63,10}, { 39, 9}, { 83,10}, { 47, 9}, \
{ 95,10}, { 55,11}, { 31,10}, { 79,11}, \
{ 47,10}, { 95,12}, { 31,11}, { 63,10}, \
{ 127, 9}, { 255,10}, { 135, 9}, { 271,11}, \
@@ -96,70 +96,83 @@
{ 159,10}, { 319,12}, { 95,11}, { 191,10}, \
{ 383,11}, { 207,10}, { 415,11}, { 223,13}, \
{ 63,12}, { 127,11}, { 271,10}, { 543,11}, \
- { 287,10}, { 575,11}, { 303,12}, { 159,11}, \
- { 319,10}, { 671,11}, { 351,12}, { 191,11}, \
- { 415,12}, { 223,11}, { 479,13}, { 127,12}, \
- { 255,11}, { 543,12}, { 287,11}, { 607,12}, \
- { 319,11}, { 639,12}, { 351,11}, { 703,13}, \
- { 191,12}, { 415,11}, { 831,12}, { 479,14}, \
- { 127,13}, { 255,12}, { 543,11}, { 1087,12}, \
- { 607,13}, { 319,12}, { 703,13}, { 383,12}, \
- { 831,13}, { 447,12}, { 959,14}, { 255,13}, \
- { 511,12}, { 1023,13}, { 575,12}, { 1215,13}, \
- { 639,12}, { 1279,13}, { 703,14}, { 383,13}, \
- { 831,12}, { 1663,13}, { 959,15}, { 255,14}, \
- { 511,13}, { 1087,12}, { 2175,13}, { 1215,14}, \
- { 639,13}, { 1343,12}, { 2687,13}, { 1407,14}, \
- { 767,13}, { 1535,12}, { 3071,13}, { 1663,14}, \
- { 895,15}, { 511,14}, { 1023,13}, { 2175,14}, \
- { 1151,13}, { 2431,12}, { 4863,14}, { 1279,13}, \
- { 2687,14}, { 1407,15}, { 32768,16}, { 65536,17}, \
+ { 287,10}, { 575,11}, { 303,10}, { 607,12}, \
+ { 159,11}, { 319,10}, { 639,11}, { 351,12}, \
+ { 191,11}, { 415,12}, { 223,11}, { 479,13}, \
+ { 127,12}, { 255,11}, { 543,12}, { 287,11}, \
+ { 607,12}, { 319,11}, { 639,12}, { 351,11}, \
+ { 703,13}, { 191,12}, { 415,11}, { 831,12}, \
+ { 479,14}, { 127,13}, { 255,12}, { 607,13}, \
+ { 319,12}, { 703,13}, { 383,12}, { 831,13}, \
+ { 447,12}, { 959,14}, { 255,13}, { 511,12}, \
+ { 1023,13}, { 575,12}, { 1215,13}, { 639,12}, \
+ { 1279,13}, { 703,14}, { 383,13}, { 831,12}, \
+ { 1663,13}, { 895,15}, { 255,14}, { 511,13}, \
+ { 1151,14}, { 639,13}, { 1343,14}, { 767,13}, \
+ { 1599,14}, { 895,15}, { 511,14}, { 1279,13}, \
+ { 2687,14}, { 1407,13}, { 2815,15}, { 767,14}, \
+ { 1535,13}, { 3199,14}, { 1663,13}, { 3455,16}, \
+ { 511,15}, { 1023,14}, { 2047,13}, { 4095,14}, \
+ { 2175,12}, { 8959,14}, { 2303,13}, { 4607,12}, \
+ { 9471,14}, { 2431,13}, { 4863,12}, { 9983,15}, \
+ { 1279,14}, { 2559,12}, { 10239,14}, { 2687,12}, \
+ { 11775,15}, { 1535,14}, { 3327,13}, { 6655,14}, \
+ { 3455,13}, { 6911,14}, { 3583,12}, { 14335,11}, \
+ { 28671,10}, { 57343,11}, { 2048,12}, { 4096,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 159
+#define MUL_FFT_TABLE3_SIZE 183
#define MUL_FFT_THRESHOLD 4736
-#define SQR_FFT_MODF_THRESHOLD 344 /* k = 5 */
+#define SQR_FFT_MODF_THRESHOLD 340 /* k = 5 */
#define SQR_FFT_TABLE3 \
- { { 344, 5}, { 17, 6}, { 9, 5}, { 19, 6}, \
- { 23, 7}, { 12, 6}, { 25, 7}, { 25, 8}, \
+ { { 340, 5}, { 15, 6}, { 8, 5}, { 17, 6}, \
+ { 9, 5}, { 19, 6}, { 23, 7}, { 12, 6}, \
+ { 25, 7}, { 21, 8}, { 11, 7}, { 25, 8}, \
{ 13, 7}, { 27, 8}, { 15, 7}, { 31, 8}, \
- { 17, 7}, { 35, 8}, { 21, 9}, { 11, 8}, \
- { 27, 9}, { 15, 8}, { 35, 9}, { 19, 8}, \
- { 41, 9}, { 23, 8}, { 47, 9}, { 27,10}, \
- { 15, 9}, { 43,10}, { 23, 9}, { 51,11}, \
- { 15,10}, { 31, 9}, { 67,10}, { 39, 9}, \
- { 79,10}, { 47, 9}, { 95,11}, { 31,10}, \
+ { 21, 9}, { 11, 8}, { 27, 9}, { 15, 8}, \
+ { 33, 9}, { 19, 8}, { 41, 9}, { 23, 8}, \
+ { 47, 9}, { 27,10}, { 15, 9}, { 43,10}, \
+ { 23, 9}, { 55,10}, { 31, 9}, { 67,10}, \
+ { 39, 9}, { 79,10}, { 47,11}, { 31,10}, \
{ 79,11}, { 47,10}, { 95,12}, { 31,11}, \
{ 63,10}, { 127, 9}, { 255, 8}, { 511, 9}, \
- { 271,11}, { 79, 9}, { 319, 8}, { 639,10}, \
- { 175,11}, { 95,10}, { 191, 9}, { 383,10}, \
+ { 271, 8}, { 543,11}, { 79, 9}, { 319, 8}, \
+ { 639,11}, { 95,10}, { 191, 9}, { 383,10}, \
{ 207, 9}, { 415,12}, { 63,11}, { 127,10}, \
- { 271, 9}, { 543,11}, { 143,10}, { 287, 9}, \
- { 575,10}, { 303, 9}, { 607,10}, { 319, 9}, \
- { 639,11}, { 175,12}, { 95,11}, { 191,10}, \
- { 383,11}, { 207,10}, { 415,13}, { 63,12}, \
- { 127,11}, { 271,10}, { 543,11}, { 287,10}, \
- { 575,11}, { 303,10}, { 607,11}, { 319,10}, \
- { 639,11}, { 351,12}, { 191,11}, { 415,12}, \
- { 223,11}, { 479,13}, { 127,12}, { 255,11}, \
- { 543,12}, { 287,11}, { 607,12}, { 319,11}, \
- { 639,12}, { 351,11}, { 703,13}, { 191,12}, \
- { 415,11}, { 831,12}, { 479,14}, { 127,13}, \
- { 255,12}, { 607,13}, { 319,12}, { 703,13}, \
- { 383,12}, { 831,13}, { 447,12}, { 959,14}, \
- { 255,13}, { 511,12}, { 1023,13}, { 575,12}, \
- { 1215,13}, { 639,12}, { 1279,13}, { 703,14}, \
- { 383,13}, { 831,12}, { 1663,13}, { 959,15}, \
- { 255,14}, { 511,13}, { 1087,12}, { 2175,13}, \
- { 1215,14}, { 639,13}, { 1343,12}, { 2687,13}, \
- { 1407,12}, { 2815,14}, { 767,13}, { 1663,14}, \
- { 895,15}, { 511,14}, { 1023,13}, { 2175,14}, \
- { 1151,13}, { 2431,12}, { 4863,14}, { 1279,13}, \
- { 2687,14}, { 1407,15}, { 32768,16}, { 65536,17}, \
+ { 271, 9}, { 543,10}, { 287, 9}, { 575,10}, \
+ { 303, 9}, { 607,10}, { 319, 9}, { 639,11}, \
+ { 175,12}, { 95,11}, { 191,10}, { 383,11}, \
+ { 207,10}, { 415,13}, { 63,12}, { 127,11}, \
+ { 271,10}, { 543,11}, { 287,10}, { 575,11}, \
+ { 303,10}, { 607,11}, { 319,10}, { 639,11}, \
+ { 351,12}, { 191,11}, { 415,10}, { 831,12}, \
+ { 223,11}, { 447,10}, { 895,11}, { 479,13}, \
+ { 127,12}, { 255,11}, { 543,12}, { 287,11}, \
+ { 607,12}, { 319,11}, { 639,12}, { 351,13}, \
+ { 191,12}, { 415,11}, { 831,12}, { 479,14}, \
+ { 127,13}, { 255,12}, { 607,13}, { 319,12}, \
+ { 703,13}, { 383,12}, { 831,13}, { 447,12}, \
+ { 959,14}, { 255,13}, { 511,12}, { 1023,13}, \
+ { 575,12}, { 1215,13}, { 639,12}, { 1279,13}, \
+ { 703,14}, { 383,13}, { 831,12}, { 1663,13}, \
+ { 959,15}, { 255,14}, { 511,13}, { 1087,12}, \
+ { 2175,13}, { 1215,14}, { 639,13}, { 1343,12}, \
+ { 2687,13}, { 1407,12}, { 2815,14}, { 767,13}, \
+ { 1663,14}, { 895,15}, { 511,14}, { 1023,13}, \
+ { 2175,14}, { 1151,13}, { 2303,12}, { 4607,13}, \
+ { 2431,12}, { 4863,14}, { 1279,13}, { 2687,14}, \
+ { 1407,15}, { 767,14}, { 1535,13}, { 3071,14}, \
+ { 1663,13}, { 3455,12}, { 6911,14}, { 1791,13}, \
+ { 3583,16}, { 511,15}, { 1023,14}, { 2175,13}, \
+ { 4351,14}, { 2303,13}, { 4607,14}, { 2431,13}, \
+ { 4863,15}, { 1279,14}, { 2815,13}, { 5631,14}, \
+ { 2943,13}, { 5887,15}, { 1535,14}, { 3455,13}, \
+ { 6911,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 151
+#define SQR_FFT_TABLE3_SIZE 179
#define SQR_FFT_THRESHOLD 3008
#define MULLO_BASECASE_THRESHOLD 0 /* always */
More information about the gmp-commit
mailing list