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

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/ba811f794da0
changeset: 16792:ba811f794da0
user:      Torbjorn Granlund <torbjorng at google.com>
date:      Tue Aug 25 21:12:28 2015 +0200
description:
Whitespace cleanup.

details:   /var/hg/gmp/rev/e116bd887014
changeset: 16793:e116bd887014
user:      Torbjorn Granlund <torbjorng at google.com>
date:      Sat Aug 29 11:56:30 2015 +0200
description:
(fake_cpuid_table): Add CPU aliases.

details:   /var/hg/gmp/rev/7a008d0f75a7
changeset: 16794:7a008d0f75a7
user:      Torbjorn Granlund <torbjorng at google.com>
date:      Sat Aug 29 11:56:38 2015 +0200
description:
ChangeLog

diffstat:

 ChangeLog             |   6 +++++-
 mpf/cmp.c             |   6 +++---
 mpn/generic/rootrem.c |   2 +-
 mpn/generic/sqrlo.c   |   2 +-
 mpn/x86_64/fat/fat.c  |  20 +++++++++++++++-----
 tests/mpn/t-broot.c   |   2 +-
 6 files changed, 26 insertions(+), 12 deletions(-)

diffs (115 lines):

diff -r 96c2d3d6be92 -r 7a008d0f75a7 ChangeLog
--- a/ChangeLog	Tue Aug 25 20:25:30 2015 +0200
+++ b/ChangeLog	Sat Aug 29 11:56:38 2015 +0200
@@ -1,3 +1,7 @@
+2015-08-29  Torbjörn Granlund  <torbjorng at google.com>
+
+	* mpn/x86_64/fat/fat.c (fake_cpuid_table): Add CPU aliases.
+
 2015-08-25 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* configure.ac (AH_VERBATIM): Add HAVE_NATIVE_mpn_mullo_basecase.
@@ -24,7 +28,7 @@
 
 2015-08-23  Torbjörn Granlund  <torbjorng at google.com>
 
-	* mpn/x86_64/fat/fat.c (__gmpn_cpuvec_init): Add more entries, handle
+	* mpn/x86_64/fat/fat.c (fake_cpuid_table): Add more entries, handle
 	Broadwell separately.
 
 	* configure.ac (fat_path): Add coreibwl.
diff -r 96c2d3d6be92 -r 7a008d0f75a7 mpf/cmp.c
--- a/mpf/cmp.c	Tue Aug 25 20:25:30 2015 +0200
+++ b/mpf/cmp.c	Sat Aug 29 11:56:38 2015 +0200
@@ -95,14 +95,14 @@
     {
       cmp = mpn_cmp (up + usize - vsize, vp, vsize);
       /* if (cmp == 0) */
-      /* 	return usign; */
-      ++cmp; 
+      /*	return usign; */
+      ++cmp;
     }
   else if (vsize > usize)
     {
       cmp = mpn_cmp (up, vp + vsize - usize, usize);
       /* if (cmp == 0) */
-      /* 	return -usign; */
+      /*	return -usign; */
     }
   else
     {
diff -r 96c2d3d6be92 -r 7a008d0f75a7 mpn/generic/rootrem.c
--- a/mpn/generic/rootrem.c	Tue Aug 25 20:25:30 2015 +0200
+++ b/mpn/generic/rootrem.c	Sat Aug 29 11:56:38 2015 +0200
@@ -256,7 +256,7 @@
   for (uh = k - 1, logk = 2; (uh >>= 1) != 0; ++logk )
     ;
   /* logk = ceil(log(k)/log(2)) + 1 */
-  
+
   /* xnb is the number of remaining bits to determine in the kth root */
   for (ni = 0; (sizes[ni] = xnb) > snb; ++ni)
     {
diff -r 96c2d3d6be92 -r 7a008d0f75a7 mpn/generic/sqrlo.c
--- a/mpn/generic/sqrlo.c	Tue Aug 25 20:25:30 2015 +0200
+++ b/mpn/generic/sqrlo.c	Sat Aug 29 11:56:38 2015 +0200
@@ -202,7 +202,7 @@
 #if HAVE_NATIVE_mpn_mullo_basecase || ! HAVE_NATIVE_mpn_sqr_basecase
       /* mullo computes as many products as sqr, but directly writes
 	 on the result area. */
-      mpn_mullo_basecase (rp, xp, xp, n);      
+      mpn_mullo_basecase (rp, xp, xp, n);
 #else
       /* Allocate workspace of fixed size on stack: fast! */
       mp_limb_t tp[SQR_BASECASE_ALLOC];
diff -r 96c2d3d6be92 -r 7a008d0f75a7 mpn/x86_64/fat/fat.c
--- a/mpn/x86_64/fat/fat.c	Tue Aug 25 20:25:30 2015 +0200
+++ b/mpn/x86_64/fat/fat.c	Sat Aug 29 11:56:38 2015 +0200
@@ -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-2014 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2009, 2011-2015 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
@@ -67,11 +67,21 @@
   unsigned    fms;
 } fake_cpuid_table[] = {
   { "core2",      "GenuineIntel", MAKE_FMS (6, 0xf) },
-  { "coreinhm",   "GenuineIntel", MAKE_FMS (6, 0x1a) },
-  { "coreiwsm",   "GenuineIntel", MAKE_FMS (6, 0x25) },
-  { "coreisbr",   "GenuineIntel", MAKE_FMS (6, 0x2a) },
-  { "coreihwl",   "GenuineIntel", MAKE_FMS (6, 0x3c) },
+  { "nehalem",    "GenuineIntel", MAKE_FMS (6, 0x1a) },
+  { "nhm",        "GenuineIntel", MAKE_FMS (6, 0x1a) },
   { "atom",       "GenuineIntel", MAKE_FMS (6, 0x1c) },
+  { "westmere",   "GenuineIntel", MAKE_FMS (6, 0x25) },
+  { "wsm",        "GenuineIntel", MAKE_FMS (6, 0x25) },
+  { "sandybridge","GenuineIntel", MAKE_FMS (6, 0x2a) },
+  { "sbr",        "GenuineIntel", MAKE_FMS (6, 0x2a) },
+  { "silvermont", "GenuineIntel", MAKE_FMS (6, 0x37) },
+  { "slm",        "GenuineIntel", MAKE_FMS (6, 0x37) },
+  { "haswell",    "GenuineIntel", MAKE_FMS (6, 0x3c) },
+  { "hwl",        "GenuineIntel", MAKE_FMS (6, 0x3c) },
+  { "broadwell"   "GenuineIntel", MAKE_FMS (6, 0x3d) },
+  { "bwl"         "GenuineIntel", MAKE_FMS (6, 0x3d) },
+  { "skylake"     "GenuineIntel", MAKE_FMS (6, 0x5e) },
+  { "sky"         "GenuineIntel", MAKE_FMS (6, 0x5e) },
   { "pentium4",   "GenuineIntel", MAKE_FMS (15, 3) },
 
   { "k8",         "AuthenticAMD", MAKE_FMS (15, 0) },
diff -r 96c2d3d6be92 -r 7a008d0f75a7 tests/mpn/t-broot.c
--- a/tests/mpn/t-broot.c	Tue Aug 25 20:25:30 2015 +0200
+++ b/tests/mpn/t-broot.c	Sat Aug 29 11:56:38 2015 +0200
@@ -99,7 +99,7 @@
 	  abort ();
 	}
     }
-  
+
   mpn_broot (rp, ap, MAX_LIMBS, 1);
   if (mpn_cmp (ap, rp, MAX_LIMBS) != 0)
     {