[前][次][番号順一覧][スレッド一覧]

ruby-changes:54482

From: mrkn <ko1@a...>
Date: Thu, 3 Jan 2019 15:19:22 +0900 (JST)
Subject: [ruby-changes:54482] mrkn:r66697 (trunk): complex.c: Optimize Complex#* and Complex#**

mrkn	2019-01-03 15:19:17 +0900 (Thu, 03 Jan 2019)

  New Revision: 66697

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66697

  Log:
    complex.c: Optimize Complex#* and Complex#**
    
    Optimize f_mul for the core numeric class components.
    This change improves the computation time of Complex#* and Complex#**.
    
    ```
    $ make benchmark ITEM=complex_float_ COMPARE_RUBY=/Users/mrkn/.rbenv/versions/2.6.0/bin/ruby
    generating known_errors.inc
    known_errors.inc unchanged
    /Users/mrkn/src/github.com/ruby/ruby/revision.h unchanged
    /Users/mrkn/.rbenv/shims/ruby --disable=gems -rrubygems -I/Users/mrkn/src/github.com/ruby/ruby/benchmark/lib /Users/mrkn/src/github.com/ruby/ruby/benchmark/benchmark-driver/exe/benchmark-driver \
                        --executables="compare-ruby::/Users/mrkn/.rbenv/versions/2.6.0/bin/ruby -I.ext/common --disable-gem" \
                        --executables="built-ruby::./miniruby -I/Users/mrkn/src/github.com/ruby/ruby/lib -I. -I.ext/common  -r/Users/mrkn/src/github.com/ruby/ruby/prelude --disable-gem" \
                        $(find /Users/mrkn/src/github.com/ruby/ruby/benchmark -maxdepth 1 -name '*complex_float_*.yml' -o -name '*complex_float_*.rb' | sort)
    Calculating -------------------------------------
                         compare-ruby  built-ruby
       complex_float_add       6.558M     13.012M i/s -      1.000M times in 0.152480s 0.076850s
       complex_float_div     576.821k    567.969k i/s -      1.000M times in 1.733640s 1.760660s
       complex_float_mul       1.690M      2.628M i/s -      1.000M times in 0.591786s 0.380579s
       complex_float_new       1.350M      1.268M i/s -      1.000M times in 0.740669s 0.788762s
     complex_float_power       1.571M      1.835M i/s -      1.000M times in 0.636507s 0.544909s
       complex_float_sub       8.635M      8.779M i/s -      1.000M times in 0.115814s 0.113906s
    
    Comparison:
                    complex_float_add
              built-ruby:  13012361.7 i/s
            compare-ruby:   6558237.1 i/s - 1.98x  slower
    
                    complex_float_div
            compare-ruby:    576821.0 i/s
              built-ruby:    567968.8 i/s - 1.02x  slower
    
                    complex_float_mul
              built-ruby:   2627575.4 i/s
            compare-ruby:   1689800.0 i/s - 1.55x  slower
    
                    complex_float_new
            compare-ruby:   1350130.8 i/s
              built-ruby:   1267809.6 i/s - 1.06x  slower
    
                  complex_float_power
              built-ruby:   1835168.8 i/s
            compare-ruby:   1571074.6 i/s - 1.17x  slower
    
                    complex_float_sub
              built-ruby:   8779168.8 i/s
            compare-ruby:   8634534.7 i/s - 1.02x  slower
    ```

  Modified files:
    trunk/complex.c
    trunk/internal.h
    trunk/numeric.c
    trunk/rational.c
Index: rational.c
===================================================================
--- rational.c	(revision 66696)
+++ rational.c	(revision 66697)
@@ -877,8 +877,8 @@ f_muldiv(VALUE self, VALUE anum, VALUE a https://github.com/ruby/ruby/blob/trunk/rational.c#L877
  *    Rational(9, 8)  * 4                #=> (9/2)
  *    Rational(20, 9) * 9.8              #=> 21.77777777777778
  */
-static VALUE
-nurat_mul(VALUE self, VALUE other)
+VALUE
+rb_rational_mul(VALUE self, VALUE other)
 {
     if (RB_INTEGER_TYPE_P(other)) {
 	{
@@ -1396,7 +1396,7 @@ f_round_common(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/rational.c#L1396
 	rb_raise(rb_eTypeError, "not an integer");
 
     b = f_expt10(n);
-    s = nurat_mul(self, b);
+    s = rb_rational_mul(self, b);
 
     if (k_float_p(s)) {
 	if (INT_NEGATIVE_P(n))
@@ -2734,7 +2734,7 @@ Init_Rational(void) https://github.com/ruby/ruby/blob/trunk/rational.c#L2734
     rb_define_method(rb_cRational, "-@", rb_rational_uminus, 0);
     rb_define_method(rb_cRational, "+", rb_rational_plus, 1);
     rb_define_method(rb_cRational, "-", nurat_sub, 1);
-    rb_define_method(rb_cRational, "*", nurat_mul, 1);
+    rb_define_method(rb_cRational, "*", rb_rational_mul, 1);
     rb_define_method(rb_cRational, "/", nurat_div, 1);
     rb_define_method(rb_cRational, "quo", nurat_div, 1);
     rb_define_method(rb_cRational, "fdiv", nurat_fdiv, 1);
Index: complex.c
===================================================================
--- complex.c	(revision 66696)
+++ complex.c	(revision 66697)
@@ -131,6 +131,17 @@ f_mul(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/complex.c#L131
             return ZERO;
         if (x == ONE) return y;
         if (y == ONE) return x;
+        return rb_int_mul(x, y);
+    }
+    else if (RB_FLOAT_TYPE_P(x) &&
+             UNLIKELY(rb_method_basic_definition_p(rb_cFloat, idMULT))) {
+        if (y == ONE) return x;
+        return rb_float_mul(x, y);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL) &&
+             UNLIKELY(rb_method_basic_definition_p(rb_cRational, idMULT))) {
+        if (y == ONE) return x;
+        return rb_rational_mul(x, y);
     }
     else if (UNLIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMULT))) {
         if (y == ONE) return x;
Index: numeric.c
===================================================================
--- numeric.c	(revision 66696)
+++ numeric.c	(revision 66697)
@@ -1066,8 +1066,8 @@ flo_minus(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L1066
  * Returns a new Float which is the product of +float+ and +other+.
  */
 
-static VALUE
-flo_mul(VALUE x, VALUE y)
+VALUE
+rb_float_mul(VALUE x, VALUE y)
 {
     if (RB_TYPE_P(y, T_FIXNUM)) {
 	return DBL2NUM(RFLOAT_VALUE(x) * (double)FIX2LONG(y));
@@ -5676,7 +5676,7 @@ Init_Numeric(void) https://github.com/ruby/ruby/blob/trunk/numeric.c#L5676
     rb_define_method(rb_cFloat, "-@", rb_float_uminus, 0);
     rb_define_method(rb_cFloat, "+", rb_float_plus, 1);
     rb_define_method(rb_cFloat, "-", flo_minus, 1);
-    rb_define_method(rb_cFloat, "*", flo_mul, 1);
+    rb_define_method(rb_cFloat, "*", rb_float_mul, 1);
     rb_define_method(rb_cFloat, "/", flo_div, 1);
     rb_define_method(rb_cFloat, "quo", flo_quo, 1);
     rb_define_method(rb_cFloat, "fdiv", flo_quo, 1);
Index: internal.h
===================================================================
--- internal.h	(revision 66696)
+++ internal.h	(revision 66697)
@@ -1658,6 +1658,7 @@ VALUE rb_int_plus(VALUE x, VALUE y); https://github.com/ruby/ruby/blob/trunk/internal.h#L1658
 VALUE rb_float_plus(VALUE x, VALUE y);
 VALUE rb_int_minus(VALUE x, VALUE y);
 VALUE rb_int_mul(VALUE x, VALUE y);
+VALUE rb_float_mul(VALUE x, VALUE y);
 VALUE rb_int_idiv(VALUE x, VALUE y);
 VALUE rb_int_modulo(VALUE x, VALUE y);
 VALUE rb_int_round(VALUE num, int ndigits, enum ruby_num_rounding_mode mode);
@@ -1949,6 +1950,7 @@ void rb_last_status_clear(void); https://github.com/ruby/ruby/blob/trunk/internal.h#L1950
 VALUE rb_rational_canonicalize(VALUE x);
 VALUE rb_rational_uminus(VALUE self);
 VALUE rb_rational_plus(VALUE self, VALUE other);
+VALUE rb_rational_mul(VALUE self, VALUE other);
 VALUE rb_lcm(VALUE x, VALUE y);
 VALUE rb_rational_reciprocal(VALUE x);
 VALUE rb_cstr_to_rat(const char *, int);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]