From 83a0709174f9f99038b45914ee54acd7c126f11b Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 31 Aug 2013 12:17:18 +0000 Subject: * bignum.c: Use GMP to accelerate big Bignum multiplication. (bary_mul_gmp): New function. (bary_mul): Use bary_mul_gmp. (bigsq): Use different threshold with GMP. * configure.in: Detect GMP. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++ bignum.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++-- configure.in | 10 ++++++++ ext/-test-/bignum/mul.c | 11 +++++++++ internal.h | 3 +++ 5 files changed, 95 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b56d54687..7c04d44b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Sat Aug 31 21:02:07 2013 Tanaka Akira + + * bignum.c: Use GMP to accelerate big Bignum multiplication. + (bary_mul_gmp): New function. + (bary_mul): Use bary_mul_gmp. + (bigsq): Use different threshold with GMP. + + * configure.in: Detect GMP. + + [ruby-core:56658] [Feature #8796] + Sat Aug 31 15:03:00 2013 Charlie Somerville * compile.c (NODE_MATCH3): pass CALL_INFO to opt_regexpmatch2 diff --git a/bignum.c b/bignum.c index baf15070ba..f6f35fc662 100644 --- a/bignum.c +++ b/bignum.c @@ -25,6 +25,11 @@ #endif #include +#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) +#define USE_GMP +#include +#endif + VALUE rb_cBignum; const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz"; @@ -129,6 +134,7 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGITS % SIZEOF_LONG == 0); #define KARATSUBA_BALANCED(xn, yn) ((yn)/2 < (xn)) #define TOOM3_BALANCED(xn, yn) (((yn)+2)/3 * 2 < (xn)) +#define GMP_MUL_DIGITS 20 #define KARATSUBA_MUL_DIGITS 70 #define TOOM3_MUL_DIGITS 150 @@ -2409,6 +2415,42 @@ rb_big_mul_toom3(VALUE x, VALUE y) return z; } +#ifdef USE_GMP +static void +bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn) +{ + const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGITS)*CHAR_BIT; + mpz_t x, y, z; + size_t count; + + assert(xn + yn <= zn); + + mpz_inits(x, y, z, 0); + mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds); + if (xds == yds && xn == yn) { + mpz_mul(z, x, x); + } + else { + mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds); + mpz_mul(z, x, y); + } + mpz_export (zds, &count, -1, sizeof(BDIGIT), 0, nails, z); + BDIGITS_ZERO(zds+count, zn-count); + mpz_clears(x, y, z, 0); +} + +VALUE +rb_big_mul_gmp(VALUE x, VALUE y) +{ + size_t xn = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), zn = xn + yn; + VALUE z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y)); + bary_mul_gmp(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn); + RB_GC_GUARD(x); + RB_GC_GUARD(y); + return z; +} +#endif + static void bary_short_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn) { @@ -2601,8 +2643,13 @@ bary_mul_toom3_start(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const static void bary_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn) { +#ifdef USE_GMP + const size_t naive_threshold = GMP_MUL_DIGITS; +#else + const size_t naive_threshold = KARATSUBA_MUL_DIGITS; +#endif if (xn <= yn) { - if (xn < KARATSUBA_MUL_DIGITS) { + if (xn < naive_threshold) { if (xds == yds && xn == yn) bary_sq_fast(zds, zn, xds, xn); else @@ -2611,13 +2658,17 @@ bary_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds } } else { - if (yn < KARATSUBA_MUL_DIGITS) { + if (yn < naive_threshold) { bary_short_mul(zds, zn, yds, yn, xds, xn); return; } } +#ifdef USE_GMP + bary_mul_gmp(zds, zn, xds, xn, yds, yn); +#else bary_mul_toom3_start(zds, zn, xds, xn, yds, yn, NULL, 0); +#endif } struct big_div_struct { @@ -5566,10 +5617,17 @@ bigsq(VALUE x) xds = BDIGITS(x); zds = BDIGITS(z); +#ifdef USE_GMP + if (xn < GMP_MUL_DIGITS) + bary_sq_fast(zds, zn, xds, xn); + else + bary_mul(zds, zn, xds, xn, xds, xn); +#else if (xn < KARATSUBA_MUL_DIGITS) bary_sq_fast(zds, zn, xds, xn); else bary_mul(zds, zn, xds, xn, xds, xn); +#endif RB_GC_GUARD(x); return z; diff --git a/configure.in b/configure.in index 7a39da8bf0..a2b09ac3d8 100644 --- a/configure.in +++ b/configure.in @@ -1049,6 +1049,16 @@ AC_CHECK_HEADERS( \ setjmpex.h ) +AC_ARG_WITH([gmp], + [AS_HELP_STRING([--without-gmp], + [disable GNU GMP to accelerate Bignum operations])], + [], + [with_gmp=yes]) +AS_IF([test "x$with_gmp" != xno], + [AC_CHECK_HEADERS(gmp.h) + AS_IF([test "x$ac_cv_header_gmp_h" != xno], + AC_CHECK_LIB([gmp], [__gmpz_init]))]) + dnl check for large file stuff mv confdefs.h confdefs1.h : > confdefs.h diff --git a/ext/-test-/bignum/mul.c b/ext/-test-/bignum/mul.c index ad416a9112..758465b567 100644 --- a/ext/-test-/bignum/mul.c +++ b/ext/-test-/bignum/mul.c @@ -42,6 +42,16 @@ mul_toom3(VALUE x, VALUE y) return rb_big_norm(rb_big_mul_toom3(big(x), big(y))); } +#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) +static VALUE +mul_gmp(VALUE x, VALUE y) +{ + return rb_big_norm(rb_big_mul_gmp(big(x), big(y))); +} +#else +#define mul_gmp rb_f_notimplement +#endif + void Init_mul(VALUE klass) { @@ -52,4 +62,5 @@ Init_mul(VALUE klass) rb_define_method(rb_cInteger, "big_mul_balance", mul_balance, 1); rb_define_method(rb_cInteger, "big_mul_karatsuba", mul_karatsuba, 1); rb_define_method(rb_cInteger, "big_mul_toom3", mul_toom3, 1); + rb_define_method(rb_cInteger, "big_mul_gmp", mul_gmp, 1); } diff --git a/internal.h b/internal.h index 377baa09ee..f33059b985 100644 --- a/internal.h +++ b/internal.h @@ -518,6 +518,9 @@ VALUE rb_big_mul_normal(VALUE x, VALUE y); VALUE rb_big_mul_balance(VALUE x, VALUE y); VALUE rb_big_mul_karatsuba(VALUE x, VALUE y); VALUE rb_big_mul_toom3(VALUE x, VALUE y); +#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) +VALUE rb_big_mul_gmp(VALUE x, VALUE y); +#endif VALUE rb_big_sq_fast(VALUE x); /* file.c */ -- cgit v1.2.3