[Gmp-commit] /var/hg/gmp: 10 new changesets

mercurial at gmplib.org mercurial at gmplib.org
Tue Nov 10 17:51:26 UTC 2020


details:   /var/hg/gmp/rev/b99d80db4707
changeset: 18128:b99d80db4707
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:25:11 2020 +0100
description:
configure.ac: X86_{,64_}PATTERN: GMP_ASM_COFF_TYPE for all ABIs

details:   /var/hg/gmp/rev/f06075fb049b
changeset: 18129:f06075fb049b
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:27:04 2020 +0100
description:
mpn/x86_64/x86_64-defs.m4 (COFF_TYPE): Copy from mpn/x86/x86-defs.m4

details:   /var/hg/gmp/rev/9e6bed0ef212
changeset: 18130:9e6bed0ef212
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:28:34 2020 +0100
description:
configure.ac: Consider *-*-msys as *-*-mingw* (almost everywhere)

details:   /var/hg/gmp/rev/60322fd713b2
changeset: 18131:60322fd713b2
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:30:16 2020 +0100
description:
configure.ac (fat_path): Add x86/bd1 x86/goldmont x86/silvermont for CPUVEC

details:   /var/hg/gmp/rev/50af005626ef
changeset: 18132:50af005626ef
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:31:15 2020 +0100
description:
mpn/x86_64/fat/fat.c: Add more CPUs

details:   /var/hg/gmp/rev/e3d240c38a0d
changeset: 18133:e3d240c38a0d
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:31:29 2020 +0100
description:
mpn/x86/fat/fat.c: Add more CPUs

details:   /var/hg/gmp/rev/a4c0616c1ca7
changeset: 18134:a4c0616c1ca7
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:33:30 2020 +0100
description:
mini-gmp/tests/run-tests: Update WINEPATH, instead of overwriting it

details:   /var/hg/gmp/rev/1f7edb4a2557
changeset: 18135:1f7edb4a2557
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:39:02 2020 +0100
description:
Makefile.am (EXTRA_DIST): Add mini-gmp/ChangeLog

details:   /var/hg/gmp/rev/84c29bb09feb
changeset: 18136:84c29bb09feb
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:39:59 2020 +0100
description:
tests/misc/t-locale.c (nl_langinfo): No redefine on __TERMUX__, spotted by Sanselme and Glisse.

details:   /var/hg/gmp/rev/36c93153e71c
changeset: 18137:36c93153e71c
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Tue Nov 10 18:51:19 2020 +0100
description:
ChangeLog

diffstat:

 ChangeLog                 |  22 ++++++++++++++++++++++
 Makefile.am               |   2 +-
 configure.ac              |  13 +++++++------
 mini-gmp/ChangeLog        |   4 ++++
 mini-gmp/tests/run-tests  |   2 +-
 mpn/x86/fat/fat.c         |  35 +++++++++++++++++++++++++++++++++--
 mpn/x86_64/fat/fat.c      |   5 +++--
 mpn/x86_64/x86_64-defs.m4 |  18 ++++++++++++++++++
 tests/misc/t-locale.c     |   4 ++--
 9 files changed, 91 insertions(+), 14 deletions(-)

diffs (288 lines):

diff -r c24ec399b59d -r 36c93153e71c ChangeLog
--- a/ChangeLog	Sat Oct 31 15:15:13 2020 +0100
+++ b/ChangeLog	Tue Nov 10 18:51:19 2020 +0100
@@ -1,9 +1,31 @@
+2020-11-10 Marco Bodrato <bodrato at mail.dm.unipi.it>
+
+	* configure.ac (fat_path): Add bd1, goldmont,silvermont for CPUVEC.
+	* mpn/x86_64/fat/fat.c: Add more CPUs.
+	* mpn/x86/fat/fat.c: Add more CPUs.
+
+2020-11-01 Marco Bodrato <bodrato at mail.dm.unipi.it>
+
+	* configure.ac: X86_{,64_}PATTERN: GMP_ASM_COFF_TYPE for all ABIs;
+	* mpn/x86_64/x86_64-defs.m4 (COFF_TYPE): Copy from mpn/x86/x86-defs.m4
+	as suggested by Jeremy Drake.
+
+	* tests/misc/t-locale.c (nl_langinfo): No redefine on __TERMUX__,
+	spotted by Sanselme and Glisse.
+	* configure.ac: Consider *-*-msys as *-*-mingw* (except on arm* |
+	aarch64*), as suggested by Ralph Peterson.
+	* Makefile.am (EXTRA_DIST): Add mini-gmp/ChangeLog.
+
 2020-10-30 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* tests/mpf/t-get_d_2exp.c: Test also the case zero.
 	* tests/mpz/t-get_d.c: Likewise.
 	* tests/mpf/t-trunc.c: Use mpf_size.
 
+	* tests/mpf/t-conv.c: Some more tests on zero.
+	* mpn/generic/mod_1.c (mpn_mod_1_unnorm): Compare r<d before shifting.
+	* mpf/mul.c: Use macros.
+
 2020-10-29 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* mpz/aors_ui.h: REALLOC with extra limb only when needed.
diff -r c24ec399b59d -r 36c93153e71c Makefile.am
--- a/Makefile.am	Sat Oct 31 15:15:13 2020 +0100
+++ b/Makefile.am	Tue Nov 10 18:51:19 2020 +0100
@@ -412,7 +412,7 @@
 
 # Distribute mini-gmp. Test sources copied by dist-hook.
 EXTRA_DIST += mini-gmp/README mini-gmp/mini-gmp.c mini-gmp/mini-gmp.h \
-	      mini-gmp/mini-mpq.c mini-gmp/mini-mpq.h \
+	      mini-gmp/ChangeLog mini-gmp/mini-mpq.c mini-gmp/mini-mpq.h \
 	      mini-gmp/tests/Makefile mini-gmp/tests/run-tests
 
 # Avoid: CVS - cvs directories
diff -r c24ec399b59d -r 36c93153e71c configure.ac
--- a/configure.ac	Sat Oct 31 15:15:13 2020 +0100
+++ b/configure.ac	Tue Nov 10 18:51:19 2020 +0100
@@ -2011,7 +2011,7 @@
 	    # Sun cc.
 	    cc_64_cflags="-xO3 -m64"
 	    ;;
-	  *-*-mingw* | *-*-cygwin)
+	  *-*-mingw* | *-*-msys | *-*-cygwin)
 	    limb_64=longlong
 	    CALLING_CONVENTIONS_OBJS_64=""
 	    AC_DEFINE(HOST_DOS64,1,[Define to 1 for Windos/64])
@@ -2037,7 +2037,7 @@
 # x86s, but allow any CPU here so as to catch "none" too.
 #
 case $host in
-  *-*-mingw*)
+  *-*-mingw* | *-*-msys)
     gcc_cflags_optlist="$gcc_cflags_optlist nocygwin"
     gcc_cflags_nocygwin="-mno-cygwin"
     ;;
@@ -2291,11 +2291,12 @@
 	fat_path="x86 x86/fat x86/i486
 		  x86/k6 x86/k6/mmx x86/k6/k62mmx
 		  x86/k7 x86/k7/mmx
-		  x86/k8 x86/k10 x86/bt1
+		  x86/k8 x86/k10 x86/bt1 x86/bd1
 		  x86/pentium x86/pentium/mmx
 		  x86/p6 x86/p6/mmx x86/p6/p3mmx x86/p6/sse2
 		  x86/pentium4 x86/pentium4/mmx x86/pentium4/sse2
 		  x86/core2 x86/coreinhm x86/coreisbr
+		  x86/goldmont x86/silvermont
 		  x86/atom x86/atom/mmx x86/atom/sse2 x86/nano"
       fi
 
@@ -2664,7 +2665,7 @@
 
 AC_SUBST(LIBGMP_DLL,0)
 case $host in
-  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+  *-*-cygwin* | *-*-mingw* | *-*-msys | *-*-pw32* | *-*-os2*)
     # By default, build only static.
     if test -z "$enable_shared"; then
       enable_shared=no
@@ -3782,11 +3783,11 @@
       if test "$x86_have_mulx" = yes; then
         GMP_ASM_X86_MULX
       fi
+      GMP_ASM_COFF_TYPE
       case $ABI in
         32)
           GMP_INCLUDE_MPN(x86/x86-defs.m4)
           AC_DEFINE(HAVE_HOST_CPU_FAMILY_x86)
-          GMP_ASM_COFF_TYPE
           GMP_ASM_X86_GOT_UNDERSCORE
           GMP_ASM_X86_SHLDL_CL
 	  case $enable_profiling in
@@ -3803,7 +3804,7 @@
 	  case $host in
 	    *-*-darwin*)
 	      GMP_INCLUDE_MPN(x86_64/darwin.m4) ;;
-	    *-*-mingw* | *-*-cygwin)
+	    *-*-mingw* | *-*-msys | *-*-cygwin)
 	      GMP_INCLUDE_MPN(x86_64/dos64.m4) ;;
 	    *-openbsd*)
 	      GMP_DEFINE_RAW(["define(<OPENBSD>,1)"]) ;;
diff -r c24ec399b59d -r 36c93153e71c mini-gmp/ChangeLog
--- a/mini-gmp/ChangeLog	Sat Oct 31 15:15:13 2020 +0100
+++ b/mini-gmp/ChangeLog	Tue Nov 10 18:51:19 2020 +0100
@@ -1,3 +1,7 @@
+2020-11-10 Marco Bodrato <bodrato at mail.dm.unipi.it>
+
+	* tests/run-tests: Update WINEPATH, instead of overwriting it.
+
 2020-10-25 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* mini-mpq.c (mpq_canonical_sign): Use the correct type for size.
diff -r c24ec399b59d -r 36c93153e71c mini-gmp/tests/run-tests
--- a/mini-gmp/tests/run-tests	Sat Oct 31 15:15:13 2020 +0100
+++ b/mini-gmp/tests/run-tests	Tue Nov 10 18:51:19 2020 +0100
@@ -36,7 +36,7 @@
   # For Windows
   PATH="${TEST_SHLIB_DIR}:${PATH}"
   # For Wine
-  WINEPATH="${TEST_SHLIB_DIR}"
+  WINEPATH="${TEST_SHLIB_DIR}${WINEPATH:+;$WINEPATH}"
 
   export LD_LIBRARY_PATH
   export DYLD_LIBRARY_PATH
diff -r c24ec399b59d -r 36c93153e71c mpn/x86/fat/fat.c
--- a/mpn/x86/fat/fat.c	Sat Oct 31 15:15:13 2020 +0100
+++ b/mpn/x86/fat/fat.c	Tue Nov 10 18:51:19 2020 +0100
@@ -105,6 +105,7 @@
   { "steamroller","AuthenticAMD", MAKE_FMS (21, 0x30) },
   { "excavator",  "AuthenticAMD", MAKE_FMS (21, 0x60) },
   { "jaguar",     "AuthenticAMD", MAKE_FMS (22, 1) },
+  { "zen",        "AuthenticAMD", MAKE_FMS (23, 1) },
 
   { "viac3",      "CentaurHauls", MAKE_FMS (6, 0) },
   { "viac32",     "CentaurHauls", MAKE_FMS (6, 9) },
@@ -335,6 +336,28 @@
 		  CPUVEC_SETUP_atom_sse2;
 		  break;
 
+		case 0x37:		/* Silvermont */
+		case 0x4a:		/* Silvermont */
+		case 0x4c:		/* Airmont */
+		case 0x4d:		/* Silvermont/Avoton */
+		case 0x5a:		/* Silvermont */
+		  TRACE (printf ("  silvermont\n"));
+		  CPUVEC_SETUP_atom;
+		  CPUVEC_SETUP_atom_mmx;
+		  CPUVEC_SETUP_atom_sse2;
+		  CPUVEC_SETUP_silvermont;
+		  break;
+
+		case 0x5c:		/* Goldmont */
+		case 0x5f:		/* Goldmont */
+		case 0x7a:		/* Goldmont Plus */
+		  TRACE (printf ("  goldmont\n"));
+		  CPUVEC_SETUP_atom;
+		  CPUVEC_SETUP_atom_mmx;
+		  CPUVEC_SETUP_atom_sse2;
+		  CPUVEC_SETUP_goldmont;
+		  break;
+
 		case 0x1a:		/* NHM Gainestown */
 		case 0x1b:
 		case 0x1e:		/* NHM Lynnfield/Jasper */
@@ -362,6 +385,7 @@
 		case 0x2a:		/* SBR */
 		case 0x2d:		/* SBR-EP */
 		case 0x3a:		/* IBR */
+		case 0x3e:		/* IBR Ivytown */
 		case 0x3c:		/* Haswell client */
 		case 0x3f:		/* Haswell server */
 		case 0x45:		/* Haswell ULT */
@@ -428,8 +452,6 @@
             case 0x0f:		/* k8 */
             case 0x11:		/* "fam 11h", mix of k8 and k10 */
             case 0x13:		/* unknown, conservatively assume k8  */
-            case 0x16:		/* unknown, conservatively assume k8  */
-            case 0x17:		/* unknown, conservatively assume k8  */
               TRACE (printf ("  k8\n"));
               CPUVEC_SETUP_k7;
               CPUVEC_SETUP_k7_mmx;
@@ -444,6 +466,7 @@
 	      break;
 
             case 0x14:		/* bobcat */
+            case 0x16:		/* jaguar */
               TRACE (printf ("  bobcat\n"));
               CPUVEC_SETUP_k7;
               CPUVEC_SETUP_k7_mmx;
@@ -454,6 +477,14 @@
               TRACE (printf ("  bulldozer\n"));
               CPUVEC_SETUP_k7;
               CPUVEC_SETUP_k7_mmx;
+              CPUVEC_SETUP_bd1;
+	      break;
+
+	    case 0x17:		/* zen */
+	    case 0x19:		/* zen3 */
+	      TRACE (printf ("  zen\n"));
+	      CPUVEC_SETUP_k7;
+	      CPUVEC_SETUP_k7_mmx;
 	      break;
             }
         }
diff -r c24ec399b59d -r 36c93153e71c mpn/x86_64/fat/fat.c
--- a/mpn/x86_64/fat/fat.c	Sat Oct 31 15:15:13 2020 +0100
+++ b/mpn/x86_64/fat/fat.c	Tue Nov 10 18:51:19 2020 +0100
@@ -433,13 +433,14 @@
 	  CPUVEC_SETUP_bt2;
 	  break;
 
-	case 0x15:	    /* bulldozer, piledriver, steamroller, excavator */
+	case 0x15:		/* bulldozer, piledriver, steamroller, excavator */
 	  CPUVEC_SETUP_k8;
 	  CPUVEC_SETUP_k10;
 	  CPUVEC_SETUP_bd1;
 	  break;
 
-	case 0x17:	    /* zen */
+	case 0x17:		/* zen */
+	case 0x19:		/* zen3 */
 	  CPUVEC_SETUP_zen;
 	  break;
 	}
diff -r c24ec399b59d -r 36c93153e71c mpn/x86_64/x86_64-defs.m4
--- a/mpn/x86_64/x86_64-defs.m4	Sat Oct 31 15:15:13 2020 +0100
+++ b/mpn/x86_64/x86_64-defs.m4	Tue Nov 10 18:51:19 2020 +0100
@@ -93,10 +93,28 @@
 m4_assert_numargs(1)
 `	GLOBL	$1
 	TYPE($1,`function')
+	COFF_TYPE($1)
 $1:
 ')
 
 
+dnl  Usage: COFF_TYPE(GSYM_PREFIX`'foo)
+dnl
+dnl  Emit COFF style ".def ... .endef" type information for a function, when
+dnl  supported.  The argument should include any GSYM_PREFIX.
+dnl
+dnl  See autoconf macro GMP_ASM_COFF_TYPE for HAVE_COFF_TYPE.
+
+define(COFF_TYPE,
+m4_assert_numargs(1)
+m4_assert_defined(`HAVE_COFF_TYPE')
+`ifelse(HAVE_COFF_TYPE,yes,
+	`.def	$1
+	.scl	2
+	.type	32
+	.endef')')
+
+
 dnl  Usage: ASSERT([cond][,instructions])
 dnl
 dnl  If WANT_ASSERT is 1, output the given instructions and expect the given
diff -r c24ec399b59d -r 36c93153e71c tests/misc/t-locale.c
--- a/tests/misc/t-locale.c	Sat Oct 31 15:15:13 2020 +0100
+++ b/tests/misc/t-locale.c	Tue Nov 10 18:51:19 2020 +0100
@@ -1,6 +1,6 @@
 /* Test locale support, or attempt to do so.
 
-Copyright 2001, 2002, 2011, 2014 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2011, 2014, 2020 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library test suite.
 
@@ -57,7 +57,7 @@
 #endif
 
 /* Replace the libc nl_langinfo with one we can manipulate. */
-#if HAVE_NL_LANGINFO
+#if HAVE_NL_LANGINFO && ! defined __TERMUX__
 char *
 nl_langinfo (nl_item n)
 #if defined __cplusplus && defined __GLIBC__



More information about the gmp-commit mailing list