[Gmp-commit] /home/hgfiles/gmp: Globally: Rename *mullow* to *mullo*, *MULLOW...
mercurial at gmplib.org
mercurial at gmplib.org
Sun Dec 6 20:50:31 CET 2009
details: /home/hgfiles/gmp/rev/a1941209ff0c
changeset: 13000:a1941209ff0c
user: Torbjorn Granlund <tege at gmplib.org>
date: Sun Dec 06 20:50:26 2009 +0100
description:
Globally: Rename *mullow* to *mullo*, *MULLOW* to *MULLO*.
diffstat:
ChangeLog | 2 +
configure.in | 2 +-
gmp-impl.h | 40 +++---
mpn/Makefile.am | 2 +-
mpn/alpha/ev5/gmp-mparam.h | 6 +-
mpn/alpha/ev6/gmp-mparam.h | 6 +-
mpn/alpha/gmp-mparam.h | 6 +-
mpn/arm/gmp-mparam.h | 6 +-
mpn/asm-defs.m4 | 2 +-
mpn/generic/binvert.c | 2 +-
mpn/generic/dcpi1_bdiv_q.c | 4 +-
mpn/generic/mu_bdiv_q.c | 12 +-
mpn/generic/mu_bdiv_qr.c | 10 +-
mpn/generic/mullo_basecase.c | 41 ++++++
mpn/generic/mullo_n.c | 215 +++++++++++++++++++++++++++++++++++
mpn/generic/mullow_basecase.c | 41 ------
mpn/generic/mullow_n.c | 215 -----------------------------------
mpn/generic/perfpow.c | 4 +-
mpn/generic/powlo.c | 6 +-
mpn/generic/redc_n.c | 2 +-
mpn/ia64/gmp-mparam.h | 6 +-
mpn/minithres/gmp-mparam.h | 6 +-
mpn/pa32/hppa2_0/gmp-mparam.h | 6 +-
mpn/pa64/gmp-mparam.h | 6 +-
mpn/powerpc32/750/gmp-mparam.h | 6 +-
mpn/powerpc32/gmp-mparam.h | 6 +-
mpn/powerpc64/mode64/gmp-mparam.h | 6 +-
mpn/powerpc64/mode64/p3/gmp-mparam.h | 6 +-
mpn/powerpc64/mode64/p4/gmp-mparam.h | 6 +-
mpn/powerpc64/mode64/p5/gmp-mparam.h | 6 +-
mpn/sparc32/v9/gmp-mparam.h | 6 +-
mpn/sparc64/gmp-mparam.h | 6 +-
mpn/x86/atom/gmp-mparam.h | 6 +-
mpn/x86/k6/gmp-mparam.h | 6 +-
mpn/x86/k7/gmp-mparam.h | 6 +-
mpn/x86/p6/mmx/gmp-mparam.h | 6 +-
mpn/x86/p6/sse2/gmp-mparam.h | 6 +-
mpn/x86/pentium/mmx/gmp-mparam.h | 6 +-
mpn/x86/pentium4/sse2/gmp-mparam.h | 6 +-
mpn/x86_64/atom/gmp-mparam.h | 6 +-
mpn/x86_64/core2/gmp-mparam.h | 6 +-
mpn/x86_64/corei/gmp-mparam.h | 6 +-
mpn/x86_64/gmp-mparam.h | 6 +-
mpn/x86_64/nano/gmp-mparam.h | 6 +-
mpn/x86_64/pentium4/gmp-mparam.h | 6 +-
mpz/powm.c | 2 +-
tests/devel/try.c | 10 +-
tests/mpn/t-mullo.c | 12 +-
tests/refmpn.c | 2 +-
tests/tests.h | 4 +-
tune/Makefile.am | 2 +-
tune/common.c | 8 +-
tune/speed.c | 4 +-
tune/speed.h | 12 +-
tune/tuneup.c | 42 +++---
55 files changed, 437 insertions(+), 435 deletions(-)
diffs (truncated from 1618 to 300 lines):
diff -r 5763ab535f37 -r a1941209ff0c ChangeLog
--- a/ChangeLog Sun Dec 06 20:21:32 2009 +0100
+++ b/ChangeLog Sun Dec 06 20:50:26 2009 +0100
@@ -1,5 +1,7 @@
2009-12-06 Torbjorn Granlund <tege at gmplib.org>
+ * Globally: Rename *mullow* to *mullo*, *MULLOW* to *MULLO*.
+
* configure.in: Don't include ev5 directory for ev6* and ev7. Misc
alpha path cleanups.
* mpn/alpha/add_n.asm: Replaced by mpn/alpha/ev5/add_n.asm.
diff -r 5763ab535f37 -r a1941209ff0c configure.in
--- a/configure.in Sun Dec 06 20:21:32 2009 +0100
+++ b/configure.in Sun Dec 06 20:50:26 2009 +0100
@@ -2479,7 +2479,7 @@
bdivmod gcd_1 gcd gcdext_1 gcdext gcd_lehmer gcd_subdiv_step \
gcdext_lehmer gcdext_subdiv_step \
tdiv_qr jacbase get_d \
- matrix22_mul hgcd2 hgcd mullow_n mullow_basecase \
+ matrix22_mul hgcd2 hgcd mullo_n mullo_basecase \
toom22_mul toom32_mul toom42_mul toom52_mul toom62_mul \
toom33_mul toom43_mul toom53_mul \
toom44_mul \
diff -r 5763ab535f37 -r a1941209ff0c gmp-impl.h
--- a/gmp-impl.h Sun Dec 06 20:21:32 2009 +0100
+++ b/gmp-impl.h Sun Dec 06 20:50:26 2009 +0100
@@ -901,11 +901,11 @@
__GMP_DECLSPEC void mpn_mul_basecase __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t));
#endif
-#define mpn_mullow_n __MPN(mullow_n)
-__GMP_DECLSPEC void mpn_mullow_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-
-#define mpn_mullow_basecase __MPN(mullow_basecase)
-__GMP_DECLSPEC void mpn_mullow_basecase __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
+#define mpn_mullo_n __MPN(mullo_n)
+__GMP_DECLSPEC void mpn_mullo_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
+
+#define mpn_mullo_basecase __MPN(mullo_basecase)
+__GMP_DECLSPEC void mpn_mullo_basecase __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
#define mpn_sqr_n __MPN(sqr_n)
__GMP_DECLSPEC void mpn_sqr_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t));
@@ -1644,8 +1644,8 @@
#ifndef MUL_TOOM33_THRESHOLD_LIMIT
#define MUL_TOOM33_THRESHOLD_LIMIT MUL_TOOM33_THRESHOLD
#endif
-#ifndef MULLOW_BASECASE_THRESHOLD_LIMIT
-#define MULLOW_BASECASE_THRESHOLD_LIMIT MULLOW_BASECASE_THRESHOLD
+#ifndef MULLO_BASECASE_THRESHOLD_LIMIT
+#define MULLO_BASECASE_THRESHOLD_LIMIT MULLO_BASECASE_THRESHOLD
#endif
/* SQR_BASECASE_THRESHOLD is where mpn_sqr_basecase should take over from
@@ -4125,17 +4125,17 @@
#undef SQR_FFT_TABLE
#define SQR_FFT_TABLE { 0 }
-#undef MULLOW_BASECASE_THRESHOLD
-#define MULLOW_BASECASE_THRESHOLD mullow_basecase_threshold
-extern mp_size_t mullow_basecase_threshold;
-
-#undef MULLOW_DC_THRESHOLD
-#define MULLOW_DC_THRESHOLD mullow_dc_threshold
-extern mp_size_t mullow_dc_threshold;
-
-#undef MULLOW_MUL_N_THRESHOLD
-#define MULLOW_MUL_N_THRESHOLD mullow_mul_n_threshold
-extern mp_size_t mullow_mul_n_threshold;
+#undef MULLO_BASECASE_THRESHOLD
+#define MULLO_BASECASE_THRESHOLD mullo_basecase_threshold
+extern mp_size_t mullo_basecase_threshold;
+
+#undef MULLO_DC_THRESHOLD
+#define MULLO_DC_THRESHOLD mullo_dc_threshold
+extern mp_size_t mullo_dc_threshold;
+
+#undef MULLO_MUL_N_THRESHOLD
+#define MULLO_MUL_N_THRESHOLD mullo_mul_n_threshold
+extern mp_size_t mullo_mul_n_threshold;
#if ! UDIV_PREINV_ALWAYS
@@ -4273,7 +4273,7 @@
/* Sizes the tune program tests up to, used in a couple of recompilations. */
#undef MUL_TOOM22_THRESHOLD_LIMIT
#undef MUL_TOOM33_THRESHOLD_LIMIT
-#undef MULLOW_BASECASE_THRESHOLD_LIMIT
+#undef MULLO_BASECASE_THRESHOLD_LIMIT
#undef SQR_TOOM3_THRESHOLD_LIMIT
#define SQR_TOOM2_MAX_GENERIC 200
#define MUL_TOOM22_THRESHOLD_LIMIT 700
@@ -4281,7 +4281,7 @@
#define SQR_TOOM3_THRESHOLD_LIMIT 400
#define MUL_TOOM44_THRESHOLD_LIMIT 1000
#define SQR_TOOM4_THRESHOLD_LIMIT 1000
-#define MULLOW_BASECASE_THRESHOLD_LIMIT 200
+#define MULLO_BASECASE_THRESHOLD_LIMIT 200
#define GET_STR_THRESHOLD_LIMIT 150
#endif /* TUNE_PROGRAM_BUILD */
diff -r 5763ab535f37 -r a1941209ff0c mpn/Makefile.am
--- a/mpn/Makefile.am Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/Makefile.am Sun Dec 06 20:50:26 2009 +0100
@@ -51,7 +51,7 @@
toom_eval_dgr3_pm1.c toom_eval_dgr3_pm2.c \
toom_eval_pm1.c toom_eval_pm1.c toom_eval_pm2exp.c \
toom_interpolate_5pts.c toom_interpolate_6pts.c toom_interpolate_7pts.c \
- mullow_n.c mullow_basecase.c nand_n.c neg_n.c nior_n.c perfsqr.c \
+ mullo_n.c mullo_basecase.c nand_n.c neg_n.c nior_n.c perfsqr.c \
popcount.c pre_divrem_1.c pre_mod_1.c pow_1.c random.c random2.c rshift.c \
rootrem.c sb_divrem_mn.c scan0.c scan1.c set_str.c \
sqr_basecase.c sqr_diagonal.c \
diff -r 5763ab535f37 -r a1941209ff0c mpn/alpha/ev5/gmp-mparam.h
--- a/mpn/alpha/ev5/gmp-mparam.h Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/alpha/ev5/gmp-mparam.h Sun Dec 06 20:50:26 2009 +0100
@@ -35,9 +35,9 @@
#define SQR_TOOM3_THRESHOLD 77
#define SQR_TOOM4_THRESHOLD 136
-#define MULLOW_BASECASE_THRESHOLD 0 /* always */
-#define MULLOW_DC_THRESHOLD 44
-#define MULLOW_MUL_N_THRESHOLD 246
+#define MULLO_BASECASE_THRESHOLD 0 /* always */
+#define MULLO_DC_THRESHOLD 44
+#define MULLO_MUL_N_THRESHOLD 246
#define DIV_SB_PREINV_THRESHOLD 0 /* preinv always */
#define DIV_DC_THRESHOLD 53
diff -r 5763ab535f37 -r a1941209ff0c mpn/alpha/ev6/gmp-mparam.h
--- a/mpn/alpha/ev6/gmp-mparam.h Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/alpha/ev6/gmp-mparam.h Sun Dec 06 20:50:26 2009 +0100
@@ -44,9 +44,9 @@
#define SQR_FFT_MODF_THRESHOLD 376
#define SQR_FFT_THRESHOLD 3712
-#define MULLOW_BASECASE_THRESHOLD 0 /* always */
-#define MULLOW_DC_THRESHOLD 129
-#define MULLOW_MUL_N_THRESHOLD 7842
+#define MULLO_BASECASE_THRESHOLD 0 /* always */
+#define MULLO_DC_THRESHOLD 129
+#define MULLO_MUL_N_THRESHOLD 7842
#define MULMOD_BNM1_THRESHOLD 16
diff -r 5763ab535f37 -r a1941209ff0c mpn/alpha/gmp-mparam.h
--- a/mpn/alpha/gmp-mparam.h Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/alpha/gmp-mparam.h Sun Dec 06 20:50:26 2009 +0100
@@ -35,9 +35,9 @@
#define SQR_TOOM3_THRESHOLD 62
#define SQR_TOOM4_THRESHOLD 155
-#define MULLOW_BASECASE_THRESHOLD 0 /* always */
-#define MULLOW_DC_THRESHOLD 40
-#define MULLOW_MUL_N_THRESHOLD 202
+#define MULLO_BASECASE_THRESHOLD 0 /* always */
+#define MULLO_DC_THRESHOLD 40
+#define MULLO_MUL_N_THRESHOLD 202
#define DIV_SB_PREINV_THRESHOLD 0 /* preinv always */
#define DIV_DC_THRESHOLD 38
diff -r 5763ab535f37 -r a1941209ff0c mpn/arm/gmp-mparam.h
--- a/mpn/arm/gmp-mparam.h Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/arm/gmp-mparam.h Sun Dec 06 20:50:26 2009 +0100
@@ -42,9 +42,9 @@
#define SQR_FFT_MODF_THRESHOLD 376
#define SQR_FFT_THRESHOLD 7168
-#define MULLOW_BASECASE_THRESHOLD 0 /* always */
-#define MULLOW_DC_THRESHOLD 120
-#define MULLOW_MUL_N_THRESHOLD 11138
+#define MULLO_BASECASE_THRESHOLD 0 /* always */
+#define MULLO_DC_THRESHOLD 120
+#define MULLO_MUL_N_THRESHOLD 11138
#define MULMOD_BNM1_THRESHOLD 20
diff -r 5763ab535f37 -r a1941209ff0c mpn/asm-defs.m4
--- a/mpn/asm-defs.m4 Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/asm-defs.m4 Sun Dec 06 20:50:26 2009 +0100
@@ -1373,7 +1373,7 @@
define_mpn(mul_4)
define_mpn(mul_basecase)
define_mpn(mul_n)
-define_mpn(mullow_basecase)
+define_mpn(mullo_basecase)
define_mpn(perfect_square_p)
define_mpn(popcount)
define_mpn(preinv_divrem_1)
diff -r 5763ab535f37 -r a1941209ff0c mpn/generic/binvert.c
--- a/mpn/generic/binvert.c Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/generic/binvert.c Sun Dec 06 20:50:26 2009 +0100
@@ -106,7 +106,7 @@
else
#endif
mpn_mul (xp, up, newrn, rp, rn);
- mpn_mullow_n (rp + rn, rp, xp + rn, newrn - rn);
+ mpn_mullo_n (rp + rn, rp, xp + rn, newrn - rn);
mpn_neg_n (rp + rn, rp + rn, newrn - rn);
}
}
diff -r 5763ab535f37 -r a1941209ff0c mpn/generic/dcpi1_bdiv_q.c
--- a/mpn/generic/dcpi1_bdiv_q.c Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/generic/dcpi1_bdiv_q.c Sun Dec 06 20:50:26 2009 +0100
@@ -32,7 +32,7 @@
mp_size_t
mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
{
- /* NOTE: Depends om mullow_n interface */
+ /* NOTE: Depends om mullo_n interface */
return n;
}
@@ -57,7 +57,7 @@
cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, lo, dinv, tp);
- mpn_mullow_n (tp, qp, dp + hi, lo);
+ mpn_mullo_n (tp, qp, dp + hi, lo);
mpn_sub_n (np + hi, np + hi, tp, lo);
if (lo < hi)
diff -r 5763ab535f37 -r a1941209ff0c mpn/generic/mu_bdiv_q.c
--- a/mpn/generic/mu_bdiv_q.c Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/generic/mu_bdiv_q.c Sun Dec 06 20:50:26 2009 +0100
@@ -95,7 +95,7 @@
/* Some notes on allocation:
- When in = dn, R dies when mpn_mullow returns, if in < dn the low in
+ When in = dn, R dies when mpn_mullo returns, if in < dn the low in
limbs of R dies at that point. We could save memory by letting T live
just under R, and let the upper part of T expand into R. These changes
should reduce itch to perhaps 3dn.
@@ -112,7 +112,7 @@
MPN_COPY (rp, np, dn);
np += dn;
- mpn_mullow_n (qp, rp, ip, in);
+ mpn_mullo_n (qp, rp, ip, in);
qn -= in;
#if WANT_FFT
@@ -164,7 +164,7 @@
/* Subtract tp[dn+in-1...dn] from dividend. */
cy = mpn_sub_nc (rp + dn - in, np, tp + dn, in, cy);
np += in;
- mpn_mullow_n (qp, rp, ip, in);
+ mpn_mullo_n (qp, rp, ip, in);
qn -= in;
}
@@ -199,7 +199,7 @@
}
mpn_sub_nc (rp + dn - in, np, tp + dn, qn - (dn - in), cy);
- mpn_mullow_n (qp, rp, ip, qn);
+ mpn_mullo_n (qp, rp, ip, qn);
}
else
{
@@ -215,7 +215,7 @@
mpn_binvert (ip, dp, in, scratch);
- mpn_mullow_n (qp, np, ip, in); /* low `in' quotient limbs */
+ mpn_mullo_n (qp, np, ip, in); /* low `in' quotient limbs */
#if WANT_FFT
if (ABOVE_THRESHOLD (qn, MUL_FFT_MODF_THRESHOLD))
{
@@ -233,7 +233,7 @@
mpn_mul (rp, dp, qn, qp, in); /* mulhigh */
mpn_sub_n (rp, np + in, rp + in, qn - in);
- mpn_mullow_n (qp + in, rp, ip, qn - in); /* high qn-in quotient limbs */
+ mpn_mullo_n (qp + in, rp, ip, qn - in); /* high qn-in quotient limbs */
}
}
diff -r 5763ab535f37 -r a1941209ff0c mpn/generic/mu_bdiv_qr.c
--- a/mpn/generic/mu_bdiv_qr.c Sun Dec 06 20:21:32 2009 +0100
+++ b/mpn/generic/mu_bdiv_qr.c Sun Dec 06 20:50:26 2009 +0100
@@ -94,7 +94,7 @@
/* Some notes on allocation:
- When in = dn, R dies when mpn_mullow returns, if in < dn the low in
+ When in = dn, R dies when mpn_mullo returns, if in < dn the low in
limbs of R dies at that point. We could save memory by letting T live
just under R, and let the upper part of T expand into R. These changes
should reduce itch to perhaps 3dn.
@@ -112,7 +112,7 @@
while (qn > in)
{
- mpn_mullow_n (qp, rp, ip, in);
+ mpn_mullo_n (qp, rp, ip, in);
#if WANT_FFT
if (ABOVE_THRESHOLD (dn, MUL_FFT_MODF_THRESHOLD))
More information about the gmp-commit
mailing list