diff options
| author | Torbjorn Granlund <tege@gmplib.org> | 2013-01-31 16:15:18 +0100 |
|---|---|---|
| committer | Torbjorn Granlund <tege@gmplib.org> | 2013-01-31 16:15:18 +0100 |
| commit | 0e69f083d2c4d177c5c516140f8587025f9ecbfa (patch) | |
| tree | 61c28c2a623eeb3623fe8f383b8f8adcfad28868 | |
| parent | 9860c701fb5e28ea2cd833625d15412159013566 (diff) | |
| download | gmp-0e69f083d2c4d177c5c516140f8587025f9ecbfa.tar.gz | |
Revert last change in favour of a simple change (thanks Marco!).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | mpn/generic/toom44_mul.c | 9 | ||||
| -rw-r--r-- | mpn/generic/toom4_sqr.c | 9 |
3 files changed, 8 insertions, 16 deletions
@@ -1,3 +1,9 @@ +2013-01-31 Torbjorn Granlund <tege@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@gmplib.org> * mpn/generic/toom44_mul.c (MAYBE_mul_toom44): Take toom6h and toom8h diff --git a/mpn/generic/toom44_mul.c b/mpn/generic/toom44_mul.c index 8c1e56702..c77e3592c 100644 --- a/mpn/generic/toom44_mul.c +++ b/mpn/generic/toom44_mul.c @@ -50,19 +50,12 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ #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 --git a/mpn/generic/toom4_sqr.c b/mpn/generic/toom4_sqr.c index b1af9201d..a97202d48 100644 --- a/mpn/generic/toom4_sqr.c +++ b/mpn/generic/toom4_sqr.c @@ -47,19 +47,12 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ #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) \ |