[Gmp-commit] /var/hg/gmp: Revert last change in favour of a simple change (th...

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/0e196cd5dead
changeset: 15368:0e196cd5dead
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu Jan 31 16:15:18 2013 +0100
description:
Revert last change in favour of a simple change (thanks Marco!).

diffstat:

 ChangeLog                |  6 ++++++
 mpn/generic/toom44_mul.c |  9 +--------
 mpn/generic/toom4_sqr.c  |  9 +--------
 3 files changed, 8 insertions(+), 16 deletions(-)

diffs (61 lines):

diff -r 73f1eb1f4fa8 -r 0e196cd5dead ChangeLog
--- a/ChangeLog	Wed Jan 30 02:08:51 2013 +0100
+++ b/ChangeLog	Thu Jan 31 16:15:18 2013 +0100
@@ -1,3 +1,9 @@
+2013-01-31  Torbjorn Granlund  <tege at gmplib.org>
+
+	* mpn/generic/toom44_mul.c: Revert last change in favour of a simple
+	change (thanks Marco!).
+	* mpn/generic/toom4_sqr.c: Likewise.
+
 2013-01-30  Torbjorn Granlund  <tege at gmplib.org>
 
 	* mpn/generic/toom44_mul.c (MAYBE_mul_toom44): Take toom6h and toom8h
diff -r 73f1eb1f4fa8 -r 0e196cd5dead mpn/generic/toom44_mul.c
--- a/mpn/generic/toom44_mul.c	Wed Jan 30 02:08:51 2013 +0100
+++ b/mpn/generic/toom44_mul.c	Thu Jan 31 16:15:18 2013 +0100
@@ -50,19 +50,12 @@
 #define MAYBE_mul_toom22   1
 #define MAYBE_mul_toom44   1
 #else
-#if MUL_TOOM6H_THRESHOLD != 0
-#define MUL_NEXTALG_THRESHOLD MUL_TOOM6H_THRESHOLD
-#elif MUL_TOOM8H_THRESHOLD != 0
-#define MUL_NEXTALG_THRESHOLD MUL_TOOM8H_THRESHOLD
-#else
-#define MUL_NEXTALG_THRESHOLD MUL_FFT_THRESHOLD
-#endif
 #define MAYBE_mul_basecase						\
   (MUL_TOOM44_THRESHOLD < 4 * MUL_TOOM22_THRESHOLD)
 #define MAYBE_mul_toom22						\
   (MUL_TOOM44_THRESHOLD < 4 * MUL_TOOM33_THRESHOLD)
 #define MAYBE_mul_toom44						\
-  (MUL_NEXTALG_THRESHOLD >= 4 * MUL_TOOM44_THRESHOLD)
+  (MUL_TOOM6H_THRESHOLD >= 4 * MUL_TOOM44_THRESHOLD)
 #endif
 
 #define TOOM44_MUL_N_REC(p, a, b, n, ws)				\
diff -r 73f1eb1f4fa8 -r 0e196cd5dead mpn/generic/toom4_sqr.c
--- a/mpn/generic/toom4_sqr.c	Wed Jan 30 02:08:51 2013 +0100
+++ b/mpn/generic/toom4_sqr.c	Thu Jan 31 16:15:18 2013 +0100
@@ -47,19 +47,12 @@
 #define MAYBE_sqr_toom2   1
 #define MAYBE_sqr_toom4   1
 #else
-#if SQR_TOOM6H_THRESHOLD != 0
-#define SQR_NEXTALG_THRESHOLD SQR_TOOM6H_THRESHOLD
-#elif SQR_TOOM8H_THRESHOLD != 0
-#define SQR_NEXTALG_THRESHOLD SQR_TOOM8H_THRESHOLD
-#else
-#define SQR_NEXTALG_THRESHOLD SQR_FFT_THRESHOLD
-#endif
 #define MAYBE_sqr_basecase						\
   (SQR_TOOM4_THRESHOLD < 4 * SQR_TOOM2_THRESHOLD)
 #define MAYBE_sqr_toom2							\
   (SQR_TOOM4_THRESHOLD < 4 * SQR_TOOM3_THRESHOLD)
 #define MAYBE_sqr_toom4							\
-  (SQR_NEXTALG_THRESHOLD >= 4 * SQR_TOOM4_THRESHOLD)
+  (SQR_TOOM6_THRESHOLD >= 4 * SQR_TOOM4_THRESHOLD)
 #endif
 
 #define TOOM4_SQR_REC(p, a, n, ws)					\