diff options
| author | Torbjorn Granlund <tg@gmplib.org> | 2019-09-14 22:41:40 +0200 |
|---|---|---|
| committer | Torbjorn Granlund <tg@gmplib.org> | 2019-09-14 22:41:40 +0200 |
| commit | 053527715989fad2a417a52421076f2d7bf9b9b6 (patch) | |
| tree | 7bede6973d2be52104a3707365794d3418c6f429 | |
| parent | fc872da47d6c2b2865603da02ee913d1be17ce0f (diff) | |
| parent | 86b37224f6b720192f78615adb87369fb161d92d (diff) | |
| download | gmp-053527715989fad2a417a52421076f2d7bf9b9b6.tar.gz | |
Trivial merge.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | mpn/generic/hgcd2.c | 12 | ||||
| -rw-r--r-- | tune/hgcd2-1.c | 4 | ||||
| -rw-r--r-- | tune/hgcd2-2.c | 4 | ||||
| -rw-r--r-- | tune/hgcd2-3.c | 4 | ||||
| -rw-r--r-- | tune/tuneup.c | 2 |
6 files changed, 19 insertions, 13 deletions
@@ -1,3 +1,9 @@ +2019-09-14 Niels Möller <nisse@lysator.liu.se> + + * mpn/generic/hgcd2.c (HGCD2_DIV1_METHOD): Rename, and change + default to 3. Updated all usage. + (HGCD2_METHOD): ... the old name, deleted. + 2019-09-14 Torbjörn Granlund <tg@gmplib.org> * configure.ac: Remove obsolete path-triggered invocation of diff --git a/mpn/generic/hgcd2.c b/mpn/generic/hgcd2.c index 53c22ad15..2ce075671 100644 --- a/mpn/generic/hgcd2.c +++ b/mpn/generic/hgcd2.c @@ -36,8 +36,8 @@ see https://www.gnu.org/licenses/. */ #include "gmp-impl.h" #include "longlong.h" -#ifndef HGCD2_METHOD -#define HGCD2_METHOD 2 +#ifndef HGCD2_DIV1_METHOD +#define HGCD2_DIV1_METHOD 3 #endif #if GMP_NAIL_BITS != 0 @@ -49,7 +49,7 @@ see https://www.gnu.org/licenses/. */ static inline mp_double_limb_t div1 (mp_limb_t n0, mp_limb_t d0); -#if HGCD2_METHOD == 1 +#if HGCD2_DIV1_METHOD == 1 static inline mp_double_limb_t div1 (mp_limb_t n0, mp_limb_t d0) @@ -61,7 +61,7 @@ div1 (mp_limb_t n0, mp_limb_t d0) return res; } -#elif HGCD2_METHOD == 2 +#elif HGCD2_DIV1_METHOD == 2 static mp_double_limb_t div1 (mp_limb_t n0, mp_limb_t d0) @@ -97,7 +97,7 @@ div1 (mp_limb_t n0, mp_limb_t d0) return res; } -#elif HGCD2_METHOD == 3 +#elif HGCD2_DIV1_METHOD == 3 static inline mp_double_limb_t div1 (mp_limb_t n0, mp_limb_t d0) @@ -135,7 +135,7 @@ div1 (mp_limb_t n0, mp_limb_t d0) return res; } #else -#error Unknown HGCD2_METHOD +#error Unknown HGCD2_DIV1_METHOD #endif /* Two-limb division optimized for small quotients. */ diff --git a/tune/hgcd2-1.c b/tune/hgcd2-1.c index ecc033b50..1e8948c16 100644 --- a/tune/hgcd2-1.c +++ b/tune/hgcd2-1.c @@ -30,8 +30,8 @@ see https://www.gnu.org/licenses/. */ #include "gmp-impl.h" -#undef HGCD2_METHOD -#define HGCD2_METHOD 1 +#undef HGCD2_DIV1_METHOD +#define HGCD2_DIV1_METHOD 1 #define __gmpn_hgcd2 mpn_hgcd2_1 /* Not used, but renamed to not get duplicate definitions */ #define __gmpn_hgcd_mul_matrix1_vector mpn_hgcd_mul_matrix1_vector_1 diff --git a/tune/hgcd2-2.c b/tune/hgcd2-2.c index aa045dd7b..bbb123b11 100644 --- a/tune/hgcd2-2.c +++ b/tune/hgcd2-2.c @@ -30,8 +30,8 @@ see https://www.gnu.org/licenses/. */ #include "gmp-impl.h" -#undef HGCD2_METHOD -#define HGCD2_METHOD 2 +#undef HGCD2_DIV1_METHOD +#define HGCD2_DIV1_METHOD 2 #define __gmpn_hgcd2 mpn_hgcd2_2 /* Not used, but renamed to not get duplicate definitions */ #define __gmpn_hgcd_mul_matrix1_vector mpn_hgcd_mul_matrix1_vector_2 diff --git a/tune/hgcd2-3.c b/tune/hgcd2-3.c index 8027347b6..ac6210830 100644 --- a/tune/hgcd2-3.c +++ b/tune/hgcd2-3.c @@ -30,8 +30,8 @@ see https://www.gnu.org/licenses/. */ #include "gmp-impl.h" -#undef HGCD2_METHOD -#define HGCD2_METHOD 3 +#undef HGCD2_DIV1_METHOD +#define HGCD2_DIV1_METHOD 3 #define __gmpn_hgcd2 mpn_hgcd2_3 /* Not used, but renamed to not get duplicate definitions */ #define __gmpn_hgcd_mul_matrix1_vector mpn_hgcd_mul_matrix1_vector_3 diff --git a/tune/tuneup.c b/tune/tuneup.c index 19a65da5f..a60c3960f 100644 --- a/tune/tuneup.c +++ b/tune/tuneup.c @@ -1961,7 +1961,7 @@ tune_hgcd2 (void) }; s.size = 1; - one_method (3, f, "mpn_hgcd2", "HGCD2_METHOD", ¶m); + one_method (3, f, "mpn_hgcd2", "HGCD2_DIV1_METHOD", ¶m); } void |