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

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/88da31eced73
changeset: 14738:88da31eced73
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu Mar 08 09:08:33 2012 +0100
description:
Adjust bulldozer path_64.

details:   /var/hg/gmp/rev/d8195107574f
changeset: 14739:d8195107574f
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu Mar 08 09:11:59 2012 +0100
description:
Make x86-64 fat setup match configure.in.

diffstat:

 ChangeLog            |   7 +++++++
 configure.in         |   2 +-
 mpn/x86_64/fat/fat.c |  23 +++++++++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diffs (82 lines):

diff -r 26ac6a9c8fe8 -r d8195107574f ChangeLog
--- a/ChangeLog	Wed Mar 07 23:58:38 2012 +0100
+++ b/ChangeLog	Thu Mar 08 09:11:59 2012 +0100
@@ -1,3 +1,10 @@
+2012-03-08  Torbjorn Granlund  <tege at gmplib.org>
+
+	* mpn/x86_64/fat/fat.c (fake_cpuid_table): Recognise "bulldozer".
+	(__gmpn_cpuvec_init): Overhaul to match configure.in.
+
+	* configure.in: Adjust bulldozer path_64.
+
 2012-03-07  Torbjorn Granlund  <tege at gmplib.org>
 
 	* configure.in (x86_64 fat_path): List recently added AMD directories.
diff -r 26ac6a9c8fe8 -r d8195107574f configure.in
--- a/configure.in	Wed Mar 07 23:58:38 2012 +0100
+++ b/configure.in	Thu Mar 08 09:11:59 2012 +0100
@@ -1579,7 +1579,7 @@
 	gcc_cflags_cpu="-mtune=bdver1 -mtune=amdfam10 -mtune=k8"
 	gcc_cflags_arch="-march=bdver1 -march=amdfam10 -march=k8 -march=k8~-mno-sse2"
 	path="x86/bd1 x86/k7/mmx x86/k7 x86"
-	path_64="x86_64/bd1 x86_64"
+	path_64="x86_64/bd1 x86_64/k10 x86_64/k8 x86_64"
 	;;
       core2)
 	gcc_cflags_cpu="-mtune=core2 -mtune=k8"
diff -r 26ac6a9c8fe8 -r d8195107574f mpn/x86_64/fat/fat.c
--- a/mpn/x86_64/fat/fat.c	Wed Mar 07 23:58:38 2012 +0100
+++ b/mpn/x86_64/fat/fat.c	Thu Mar 08 09:11:59 2012 +0100
@@ -7,7 +7,7 @@
    THEY'RE ALMOST CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR
    COMPLETELY IN FUTURE GNU MP RELEASES.
 
-Copyright 2003, 2004, 2009, 2011 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2009, 2011, 2012 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
@@ -69,6 +69,7 @@
   { "k8",         "AuthenticAMD", MAKE_FMS (15, 0) },
   { "k10",        "AuthenticAMD", MAKE_FMS (16, 0) },
   { "bobcat",     "AuthenticAMD", MAKE_FMS (20, 1) },
+  { "bulldozer",  "AuthenticAMD", MAKE_FMS (21, 1) },
 
   { "nano",       "CentaurHauls", MAKE_FMS (6, 15) },
 };
@@ -270,6 +271,7 @@
 	    case 0x2a:		/* SB */
 	    case 0x2d:		/* SBC-EP */
 	      CPUVEC_SETUP_core2;
+	      CPUVEC_SETUP_coreinhm;
 	      CPUVEC_SETUP_coreisbr;
 	      break;
 	    }
@@ -289,9 +291,26 @@
 	  abort ();
 
 	case 15:		/* k8 */
+	case 17:		/* "fam 11h", mix of k8 and k10 */
+	case 19:
+	case 22:
+	case 23:
+	  CPUVEC_SETUP_k8;
+	  break;
 	case 16:		/* k10 */
-	  /* CPUVEC_SETUP_athlon */
+	case 18:		/* k10 (llano) */
+	  CPUVEC_SETUP_k8;
+	  CPUVEC_SETUP_k10;
 	  break;
+	case 20:		/* bobcat */
+	  CPUVEC_SETUP_k8;
+	  CPUVEC_SETUP_k10;
+	  CPUVEC_SETUP_bobcat;
+	  break;
+	case 21:		/* bulldozer */
+	  CPUVEC_SETUP_k8;
+	  CPUVEC_SETUP_k10;
+	  CPUVEC_SETUP_bd1;
 	}
     }
   else if (strcmp (vendor_string, "CentaurHauls") == 0)