[Gmp-commit] /home/hgfiles/gmp: 2 new changesets
mercurial at gmplib.org
mercurial at gmplib.org
Sat Mar 20 10:03:06 CET 2010
details: /home/hgfiles/gmp/rev/af118b7d1b21
changeset: 13517:af118b7d1b21
user: Torbjorn Granlund <tege at gmplib.org>
date: Sat Mar 20 09:58:17 2010 +0100
description:
Fix incorrect headers.
details: /home/hgfiles/gmp/rev/04abb4422ccb
changeset: 13518:04abb4422ccb
user: Torbjorn Granlund <tege at gmplib.org>
date: Sat Mar 20 09:59:39 2010 +0100
description:
Trivial merge.
diffstat:
ChangeLog | 4 ++++
mpn/generic/toom_interpolate_8pts.c | 12 +++++++++---
mpn/powerpc64/mode64/aorslsh1_n.asm | 12 +++++-------
mpn/powerpc64/mode64/aorslsh2_n.asm | 12 +++++-------
mpn/powerpc64/mode64/aorslshC_n.asm | 12 +++++-------
mpn/x86/pentium4/sse2/submul_1.asm | 2 +-
6 files changed, 29 insertions(+), 25 deletions(-)
diffs (161 lines):
diff -r 25151aa3e54e -r 04abb4422ccb ChangeLog
--- a/ChangeLog Sat Mar 20 02:10:53 2010 +0100
+++ b/ChangeLog Sat Mar 20 09:59:39 2010 +0100
@@ -1,3 +1,7 @@
+2010-03-20 Marco Bodrato <bodrato at mail.dm.unipi.it>
+
+ * mpn/generic/toom_interpolate_8pts.c: Use mpn_sublsh2_n.
+
2010-03-20 Torbjorn Granlund <tege at gmplib.org>
* mpn/powerpc64/mode64/aorslshC_n.asm: New file, generlised from
diff -r 25151aa3e54e -r 04abb4422ccb mpn/generic/toom_interpolate_8pts.c
--- a/mpn/generic/toom_interpolate_8pts.c Sat Mar 20 02:10:53 2010 +0100
+++ b/mpn/generic/toom_interpolate_8pts.c Sat Mar 20 09:59:39 2010 +0100
@@ -54,18 +54,24 @@
#endif
#endif
+#if HAVE_NATIVE_mpn_sublsh2_n
+#define DO_mpn_sublsh2_n(dst,src,n,ws) mpn_sublsh2_n(dst,dst,src,n)
+#else
+#define DO_mpn_sublsh2_n(dst,src,n,ws) DO_mpn_sublsh_n(dst,src,n,2,ws)
+#endif
+
#if HAVE_NATIVE_mpn_sublsh_n
#define DO_mpn_sublsh_n(dst,src,n,s,ws) mpn_sublsh_n (dst,src,n,s)
#else
static mp_limb_t
DO_mpn_sublsh_n (mp_ptr dst, mp_srcptr src, mp_size_t n, unsigned int s, mp_ptr ws)
{
-#if USE_MUL_1
+#if USE_MUL_1 && 0
return mpn_submul_1(dst,src,n,CNST_LIMB(1) <<(s));
#else
mp_limb_t __cy;
__cy = mpn_lshift (ws,src,n,s);
- return __cy + mpn_sub_n (dst,dst,ws,n);
+ return __cy + mpn_sub_n (dst,dst,ws,n);
#endif
}
#endif
@@ -146,7 +152,7 @@
ASSERT_NOCARRY(mpn_divexact_by3 (r5, r5, 3 * n + 1));
- ASSERT_NOCARRY(DO_mpn_sublsh_n (r5, r3, 3 * n + 1, 2, ws));
+ ASSERT_NOCARRY(DO_mpn_sublsh2_n (r5, r3, 3 * n + 1, ws));
/* last interpolation steps... */
/* ... are mixed with recomposition */
diff -r 25151aa3e54e -r 04abb4422ccb mpn/powerpc64/mode64/aorslsh1_n.asm
--- a/mpn/powerpc64/mode64/aorslsh1_n.asm Sat Mar 20 02:10:53 2010 +0100
+++ b/mpn/powerpc64/mode64/aorslsh1_n.asm Sat Mar 20 09:59:39 2010 +0100
@@ -6,7 +6,7 @@
dnl The GNU MP Library is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU Lesser General Public License as published
-dnl by the Free Software Foundation; either version 2.1 of the License, or (at
+dnl by the Free Software Foundation; either version 3 of the License, or (at
dnl your option) any later version.
dnl The GNU MP Library is distributed in the hope that it will be useful, but
@@ -15,16 +15,14 @@
dnl License for more details.
dnl You should have received a copy of the GNU Lesser General Public License
-dnl along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-dnl MA 02111-1307, USA.
+dnl along with the GNU MP Library. If not, see http://www.gnu.org/licenses/.
include(`../config.m4')
C cycles/limb
-C POWER3/PPC630: 1.75 (1.5 c/l should be possible)
-C POWER4/PPC970: 2 (2.0 c/l should be possible)
-C POWER5: ?
+C POWER3/PPC630: 2 (1.5 c/l should be possible)
+C POWER4/PPC970: 3 (2.0 c/l should be possible)
+C POWER5: 3
define(LSH, 1)
diff -r 25151aa3e54e -r 04abb4422ccb mpn/powerpc64/mode64/aorslsh2_n.asm
--- a/mpn/powerpc64/mode64/aorslsh2_n.asm Sat Mar 20 02:10:53 2010 +0100
+++ b/mpn/powerpc64/mode64/aorslsh2_n.asm Sat Mar 20 09:59:39 2010 +0100
@@ -6,7 +6,7 @@
dnl The GNU MP Library is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU Lesser General Public License as published
-dnl by the Free Software Foundation; either version 2.1 of the License, or (at
+dnl by the Free Software Foundation; either version 3 of the License, or (at
dnl your option) any later version.
dnl The GNU MP Library is distributed in the hope that it will be useful, but
@@ -15,16 +15,14 @@
dnl License for more details.
dnl You should have received a copy of the GNU Lesser General Public License
-dnl along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-dnl MA 02111-1307, USA.
+dnl along with the GNU MP Library. If not, see http://www.gnu.org/licenses/.
include(`../config.m4')
C cycles/limb
-C POWER3/PPC630: 1.75 (1.5 c/l should be possible)
-C POWER4/PPC970: 2 (2.0 c/l should be possible)
-C POWER5: ?
+C POWER3/PPC630: 2 (1.5 c/l should be possible)
+C POWER4/PPC970: 3 (2.0 c/l should be possible)
+C POWER5: 3
define(LSH, 2)
diff -r 25151aa3e54e -r 04abb4422ccb mpn/powerpc64/mode64/aorslshC_n.asm
--- a/mpn/powerpc64/mode64/aorslshC_n.asm Sat Mar 20 02:10:53 2010 +0100
+++ b/mpn/powerpc64/mode64/aorslshC_n.asm Sat Mar 20 09:59:39 2010 +0100
@@ -6,7 +6,7 @@
dnl The GNU MP Library is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU Lesser General Public License as published
-dnl by the Free Software Foundation; either version 2.1 of the License, or (at
+dnl by the Free Software Foundation; either version 3 of the License, or (at
dnl your option) any later version.
dnl The GNU MP Library is distributed in the hope that it will be useful, but
@@ -15,16 +15,14 @@
dnl License for more details.
dnl You should have received a copy of the GNU Lesser General Public License
-dnl along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-dnl MA 02111-1307, USA.
+dnl along with the GNU MP Library. If not, see http://www.gnu.org/licenses/.
include(`../config.m4')
C cycles/limb
-C POWER3/PPC630: 1.75 (1.5 c/l should be possible)
-C POWER4/PPC970: 2 (2.0 c/l should be possible)
-C POWER5: ?
+C POWER3/PPC630: 2 (1.5 c/l should be possible)
+C POWER4/PPC970: 3 (2.0 c/l should be possible)
+C POWER5: 3
C INPUT PARAMETERS
C rp r3
diff -r 25151aa3e54e -r 04abb4422ccb mpn/x86/pentium4/sse2/submul_1.asm
--- a/mpn/x86/pentium4/sse2/submul_1.asm Sat Mar 20 02:10:53 2010 +0100
+++ b/mpn/x86/pentium4/sse2/submul_1.asm Sat Mar 20 09:59:39 2010 +0100
@@ -30,7 +30,7 @@
C P4 model 3-4 (Prescott): 6.5
C This code represents a step forwards compared to the code available before
-C GMP 5.1, but it is not carefully tuned for either P6 or P4. In fact, ot is
+C GMP 5.1, but it is not carefully tuned for either P6 or P4. In fact, it is
C not good for P6. For P4 it saved a bit over 1 c/l for both Northwood and
C Prescott compared to the old code.
C
More information about the gmp-commit
mailing list