August 2010 - macruby-changes - lists.macosforge.org

[4484] MacRuby/trunk/lib/stringio.rb
by source_changes＠macosforge.org 31 Aug '10

31 Aug '10

Revision: 4484 http://trac.macosforge.org/projects/ruby/changeset/4484 Author: lsansonetti(a)apple.com Date: 2010-08-31 15:54:57 -0700 (Tue, 31 Aug 2010) Log Message: ----------- StringIO#write: take care of encodings Modified Paths: -------------- MacRuby/trunk/lib/stringio.rb Modified: MacRuby/trunk/lib/stringio.rb =================================================================== --- MacRuby/trunk/lib/stringio.rb 2010-08-31 08:47:59 UTC (rev 4483) +++ MacRuby/trunk/lib/stringio.rb 2010-08-31 22:54:57 UTC (rev 4484) @@ -102,7 +102,7 @@ self end - + # strio.string = string -> string # # Changes underlying String object, the subject of IO. @@ -492,6 +492,10 @@ if @append || (pos >= string.length) # add padding in case it's needed str = str.rjust((pos + str.length) - string.length, "\000") if (pos > string.length) + enc1, enc2 = str.encoding, @string.encoding + if enc1 != enc2 + str = str.dup.force_encoding(enc2) + end @string << str @pos = string.length else

1 0

[4483] MacRuby/trunk/perf/misc/pi.rb
by source_changes＠macosforge.org 31 Aug '10

31 Aug '10

Revision: 4483 http://trac.macosforge.org/projects/ruby/changeset/4483 Author: lsansonetti(a)apple.com Date: 2010-08-31 01:47:59 -0700 (Tue, 31 Aug 2010) Log Message: ----------- adding pi perf test Added Paths: ----------- MacRuby/trunk/perf/misc/pi.rb Added: MacRuby/trunk/perf/misc/pi.rb =================================================================== --- MacRuby/trunk/perf/misc/pi.rb (rev 0) +++ MacRuby/trunk/perf/misc/pi.rb 2010-08-31 08:47:59 UTC (rev 4483) @@ -0,0 +1,19 @@ +def compute_pi(n) + k, a, b, a1, b1 = 2, 4, 1, 12, 4 + n.times do + # Next approximation + p, q, k = k*k, 2*k+1, k+1 + a, b, a1, b1 = a1, b1, p*a+q*a1, p*b+q*b1 + # Print common digits + d = a / b + d1 = a1 / b1 + while d == d1 + #print d + #$stdout.flush + a, a1 = 10*(a%b), 10*(a1%b1) + d, d1 = a/b, a1/b1 + end + end +end + +perf_test('pi') { compute_pi(10000) }

1 0

[4482] MacRuby/trunk/io.c
by source_changes＠macosforge.org 31 Aug '10

31 Aug '10

Revision: 4482 http://trac.macosforge.org/projects/ruby/changeset/4482 Author: lsansonetti(a)apple.com Date: 2010-08-30 23:38:59 -0700 (Mon, 30 Aug 2010) Log Message: ----------- bring back the cached gets optim Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2010-08-31 06:25:25 UTC (rev 4481) +++ MacRuby/trunk/io.c 2010-08-31 06:38:59 UTC (rev 4482) @@ -718,8 +718,7 @@ * So <code>IO#sysread</code> doesn't work with <code>IO#eof?</code>. */ -static inline long rb_io_read_internal(rb_io_t *io_struct, UInt8 *buffer, - long len); +static long rb_io_read_internal(rb_io_t *io_struct, UInt8 *buffer, long len); VALUE rb_io_eof(VALUE io, SEL sel) @@ -970,7 +969,7 @@ } } -static inline long +static long rb_io_read_internal(rb_io_t *io_struct, UInt8 *buffer, long len) { assert(io_struct->read_fd != -1); @@ -1376,10 +1375,12 @@ if (range.location != kCFNotFound) { rb_io_create_buf(io_struct); long rest_size = r - (range.location + 1); - CFDataAppendBytes(io_struct->buf, bytes + range.location + 1, rest_size); + CFDataAppendBytes(io_struct->buf, bytes + range.location + 1, + rest_size); r = range.location + 1; } - // Resize the buffer to whatever was actually read (can be different from asked size) + // Resize the buffer to whatever was actually read (can be different + // from asked size). rb_bstr_resize(bstr, r); } else { @@ -1387,7 +1388,6 @@ const long seplen = RSTRING_LEN(sep); assert(seplen > 0); -#if 0 // TODO // Pre-cache if possible. rb_io_read_internal(io_struct, NULL, 0); if (io_struct->buf != NULL && CFDataGetLength(io_struct->buf) > 0) { @@ -1414,12 +1414,11 @@ if (data_read == 0) { return Qnil; } - CFDataAppendBytes(data, cache, data_read); + + rb_bstr_concat(bstr, cache, data_read); rb_io_read_update(io_struct, data_read); } - else -#endif - { + else { // Read from IO (slow). long s = 512; long data_read = 0; @@ -1553,13 +1552,15 @@ static VALUE rb_io_readlines(VALUE io, SEL sel, int argc, VALUE *argv) { - VALUE array = rb_ary_new(); - VALUE line = rb_io_gets_m(io, sel, argc, argv); - while (!NIL_P(line)) { - rb_ary_push(array, line); - line = rb_io_gets_m(io, sel, argc, argv); + VALUE lines = rb_ary_new(); + while (true) { + VALUE line = rb_io_gets_m(io, 0, argc, argv); + if (NIL_P(line)) { + break; + } + rb_ary_push(lines, line); } - return array; + return lines; } /* @@ -1595,11 +1596,13 @@ { RETURN_ENUMERATOR(io, argc, argv); - VALUE line = rb_io_gets_m(io, sel, argc, argv); - while (!NIL_P(line)) { + while (true) { + VALUE line = rb_io_gets_m(io, sel, argc, argv); + if (NIL_P(line)) { + break; + } rb_vm_yield(1, &line); RETURN_IF_BROKEN(); - line = rb_io_gets_m(io, sel, argc, argv); } return io; }

1 0

[4481] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 31 Aug '10

31 Aug '10

Revision: 4481 http://trac.macosforge.org/projects/ruby/changeset/4481 Author: watson1978(a)gmail.com Date: 2010-08-30 23:25:25 -0700 (Mon, 30 Aug 2010) Log Message: ----------- Fixed the alignment. - Fixed #880 Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-08-31 05:02:24 UTC (rev 4480) +++ MacRuby/trunk/gcd.c 2010-08-31 06:25:25 UTC (rev 4481) @@ -77,8 +77,8 @@ typedef struct { struct RBasic basic; int suspension_count; + dispatch_source_t source; source_enum_t source_enum; - dispatch_source_t source; rb_vm_block_t *event_handler; VALUE handle; } rb_source_t; @@ -87,6 +87,7 @@ typedef struct { struct RBasic basic; + int reserved; dispatch_semaphore_t sem; long count; } rb_semaphore_t;

1 0

[4480] MacRuby/trunk/io.c
by source_changes＠macosforge.org 31 Aug '10

31 Aug '10

Revision: 4480 http://trac.macosforge.org/projects/ruby/changeset/4480 Author: lsansonetti(a)apple.com Date: 2010-08-30 22:02:24 -0700 (Mon, 30 Aug 2010) Log Message: ----------- when reading all, try to determine the input's remaining data length before actually reading it in chunks Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2010-08-31 02:04:11 UTC (rev 4479) +++ MacRuby/trunk/io.c 2010-08-31 05:02:24 UTC (rev 4480) @@ -1011,16 +1011,26 @@ static VALUE rb_io_read_all(rb_io_t *io_struct, VALUE outbuf) { + struct stat st; + long bufsize = 512; + if (fstat(io_struct->read_fd, &st) == 0 && S_ISREG(st.st_mode)) { + const off_t pos = lseek(io_struct->read_fd, 0, SEEK_CUR); + if (st.st_size >= pos && pos >= 0) { + bufsize = st.st_size - pos; + if (bufsize > LONG_MAX) { + rb_raise(rb_eIOError, "file too big for single read"); + } + } + } + outbuf = rb_str_bstr(outbuf); - - const long BUFSIZE = 512; long bytes_read = 0; const long original_position = rb_bstr_length(outbuf); while (true) { - rb_bstr_resize(outbuf, original_position + bytes_read + BUFSIZE); + rb_bstr_resize(outbuf, original_position + bytes_read + bufsize); uint8_t *bytes = rb_bstr_bytes(outbuf) + original_position + bytes_read; - const long last_read = rb_io_read_internal(io_struct, bytes, BUFSIZE); + const long last_read = rb_io_read_internal(io_struct, bytes, bufsize); bytes_read += last_read; if (last_read == 0) { break;

1 0

[4479] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 31 Aug '10

31 Aug '10

Revision: 4479 http://trac.macosforge.org/projects/ruby/changeset/4479 Author: watson1978(a)gmail.com Date: 2010-08-30 19:04:11 -0700 (Mon, 30 Aug 2010) Log Message: ----------- Added the initialization. - Fixed #882 Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-08-30 20:52:55 UTC (rev 4478) +++ MacRuby/trunk/vm.cpp 2010-08-31 02:04:11 UTC (rev 4479) @@ -400,6 +400,7 @@ parse_in_eval = false; has_ensure = false; return_from_block = -1; + special_exc = NULL; current_super_class = NULL; current_super_sel = 0;

1 0

[4478] MacRuby/trunk/sprintf.c
by source_changes＠macosforge.org 30 Aug '10

30 Aug '10

Revision: 4478 http://trac.macosforge.org/projects/ruby/changeset/4478 Author: lsansonetti(a)apple.com Date: 2010-08-30 13:52:55 -0700 (Mon, 30 Aug 2010) Log Message: ----------- #sprintf: don't try to mutate symbols Modified Paths: -------------- MacRuby/trunk/sprintf.c Modified: MacRuby/trunk/sprintf.c =================================================================== --- MacRuby/trunk/sprintf.c 2010-08-30 20:52:28 UTC (rev 4477) +++ MacRuby/trunk/sprintf.c 2010-08-30 20:52:55 UTC (rev 4478) @@ -794,6 +794,11 @@ tainted = true; } + if (TYPE(arg) == T_SYMBOL) { + // Because symbols are not mutable and pad_format_value() + // mutates its first argument. + arg = rb_sym_to_s(arg); + } pad_format_value(arg, minus_flag ? -1 : 0, width, rb_str_new2(" ")); num = cstr_update(&format_str, &format_str_capa, start, i - start + 1, arg);

1 0

[4477] MacRuby/trunk/lib
by source_changes＠macosforge.org 30 Aug '10

30 Aug '10

Revision: 4477 http://trac.macosforge.org/projects/ruby/changeset/4477 Author: lsansonetti(a)apple.com Date: 2010-08-30 13:52:28 -0700 (Mon, 30 Aug 2010) Log Message: ----------- require 'etc' not 'etc.so' Modified Paths: -------------- MacRuby/trunk/lib/pp.rb MacRuby/trunk/lib/tmpdir.rb Modified: MacRuby/trunk/lib/pp.rb =================================================================== --- MacRuby/trunk/lib/pp.rb 2010-08-28 01:08:34 UTC (rev 4476) +++ MacRuby/trunk/lib/pp.rb 2010-08-30 20:52:28 UTC (rev 4477) @@ -399,7 +399,7 @@ class File class Stat def pretty_print(q) - require 'etc.so' + require 'etc' q.object_group(self) { q.breakable q.text sprintf("dev=0x%x", self.dev); q.comma_breakable Modified: MacRuby/trunk/lib/tmpdir.rb =================================================================== --- MacRuby/trunk/lib/tmpdir.rb 2010-08-28 01:08:34 UTC (rev 4476) +++ MacRuby/trunk/lib/tmpdir.rb 2010-08-30 20:52:28 UTC (rev 4477) @@ -6,7 +6,7 @@ require 'fileutils' begin - require 'etc.so' + require 'etc' rescue LoadError end

1 0

[4476] MacRuby/trunk
by source_changes＠macosforge.org 28 Aug '10

28 Aug '10

Revision: 4476 http://trac.macosforge.org/projects/ruby/changeset/4476 Author: lsansonetti(a)apple.com Date: 2010-08-27 18:08:34 -0700 (Fri, 27 Aug 2010) Log Message: ----------- optimizing symetric masgns Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-08-27 21:04:51 UTC (rev 4475) +++ MacRuby/trunk/compiler.cpp 2010-08-28 01:08:34 UTC (rev 4476) @@ -1050,6 +1050,61 @@ } Value * +RoxorCompiler::compile_multiple_assignment(NODE *node) +{ + assert(node->nd_value != NULL); + + if (node->nd_next == NULL + && node->nd_head != NULL + && nd_type(node->nd_head) == NODE_ARRAY + && nd_type(node->nd_value) == NODE_ARRAY + && node->nd_head->nd_alen == node->nd_value->nd_alen) { + + // Symetric multiple-assignment optimization. + // Grab all left operands in separate Allocas. + Instruction *first = bb->getParent()->getEntryBlock().getFirstNonPHI(); + std::vector<Value *> tmp_rights; + NODE *right = node->nd_value; + for (int i = 0; i < node->nd_head->nd_alen; i++) { + Value *slot = new AllocaInst(RubyObjTy, "", first); + assert(right->nd_head != NULL); + new StoreInst(compile_node(right->nd_head), slot, bb); + tmp_rights.push_back(new LoadInst(slot, "", bb)); + right = right->nd_next; + } + + // Compile assignments. + NODE *left = node->nd_head; + for (std::vector<Value *>::iterator i = tmp_rights.begin(); + i != tmp_rights.end(); ++i) { + assert(left->nd_head != NULL); + compile_multiple_assignment_element(left->nd_head, *i); + left = left->nd_next; + } + + // Compile return value (a new Array) which is eliminated later if + // never used. + CallInst *ary = CallInst::Create(newArrayFunc, + ConstantInt::get(Int32Ty, tmp_rights.size()), "", bb); + RoxorCompiler::MAsgnValue val; + val.ary = ary; + for (unsigned int i = 0; i < tmp_rights.size(); i++) { + Value *args[] = { + ary, + ConstantInt::get(Int32Ty, i), + tmp_rights[i] + }; + CallInst *insn = CallInst::Create(asetArrayFunc, args, args + 3, + "", bb); + val.sets.push_back(insn); + } + masgn_values.push_back(val); + return ary; + } + return compile_multiple_assignment(node, compile_node(node->nd_value)); +} + +Value * RoxorCompiler::compile_prepare_block_args(Function *func, int *flags) { return compile_const_pointer(func); @@ -2610,6 +2665,9 @@ std::map<ID, Value *> old_lvars = lvars; lvars.clear(); + std::vector<MAsgnValue> old_masgn_values = masgn_values; + masgn_values.clear(); + Value *old_self = current_self; Function::arg_iterator arg; @@ -2858,6 +2916,19 @@ } } + for (std::vector<MAsgnValue>::iterator i = masgn_values.begin(); + i != masgn_values.end(); ++i) { + MAsgnValue &v = *i; + if (v.ary->hasNUses(v.sets.size())) { + for (std::vector<CallInst *>::iterator j = v.sets.begin(); + j != v.sets.end(); ++j) { + CallInst *insn = *j; + insn->eraseFromParent(); + } + v.ary->eraseFromParent(); + } + } + rescue_rethrow_bb = old_rescue_rethrow_bb; rescue_invoke_bb = old_rescue_invoke_bb; @@ -2865,6 +2936,7 @@ bb = old_bb; entry_bb = old_entry_bb; lvars = old_lvars; + masgn_values = old_masgn_values; current_self = old_self; current_var_uses = old_current_var_uses; running_block = old_running_block; @@ -3223,9 +3295,7 @@ compile_node(node->nd_value)); case NODE_MASGN: - assert(node->nd_value != NULL); - return compile_multiple_assignment(node, - compile_node(node->nd_value)); + return compile_multiple_assignment(node); case NODE_DASGN: case NODE_DASGN_CURR: Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-08-27 21:04:51 UTC (rev 4475) +++ MacRuby/trunk/compiler.h 2010-08-28 01:08:34 UTC (rev 4476) @@ -93,6 +93,13 @@ std::map<std::string, GlobalVariable *> static_strings; std::map<CFHashCode, GlobalVariable *> static_ustrings; + class MAsgnValue { + public: + CallInst *ary; + std::vector<CallInst *> sets; + }; + std::vector<MAsgnValue> masgn_values; + #if ROXOR_COMPILER_DEBUG int level; # define DEBUG_LEVEL_INC() (level++) @@ -355,6 +362,7 @@ Value *compile_gvar_assignment(NODE *node, Value *val); Value *compile_gvar_get(NODE *node); Value *compile_constant_declaration(NODE *node, Value *val); + Value *compile_multiple_assignment(NODE *node); Value *compile_multiple_assignment(NODE *node, Value *val); void compile_multiple_assignment_element(NODE *node, Value *val); Value *compile_current_class(void);

1 0

[4475] MacRuby/trunk/perf/misc/fannkuch.rb
by source_changes＠macosforge.org 27 Aug '10

27 Aug '10

Revision: 4475 http://trac.macosforge.org/projects/ruby/changeset/4475 Author: lsansonetti(a)apple.com Date: 2010-08-27 14:04:51 -0700 (Fri, 27 Aug 2010) Log Message: ----------- added fannkuch benchmark Added Paths: ----------- MacRuby/trunk/perf/misc/fannkuch.rb Added: MacRuby/trunk/perf/misc/fannkuch.rb =================================================================== --- MacRuby/trunk/perf/misc/fannkuch.rb (rev 0) +++ MacRuby/trunk/perf/misc/fannkuch.rb 2010-08-27 21:04:51 UTC (rev 4475) @@ -0,0 +1,62 @@ +# From The Computer Language Benchmarks Game +# http://shootout.alioth.debian.org/ +# Contributed by Wesley Moxam + +def fannkuch(n) + sign, maxflips, sum = 1, 0, 0 + + p = [nil].concat((1..n).to_a) + q = p.dup + s = p.dup + + while(true) + # Copy and flip. + q1 = p[1] # Cache 1st element. + if q1 != 1 + q = p.dup + flips = 1 + while(true) + qq = q[q1] + if qq == 1 # ... until 1st element is 1. + sum = sum + sign * flips + maxflips = flips if flips > maxflips # New maximum? + break + end + q[q1] = q1 + if q1 >= 4 + i, j = 2, q1 - 1 + begin + q[i], q[j] = q[j], q[i] + i = i + 1 + j = j - 1 + end while i < j + end + q1 = qq + flips = flips + 1 + end + end + # Permute. + if sign == 1 + # Rotate 1<-2. + p[1], p[2] = p[2], p[1] + sign = -1 + else + # Rotate 1<-2 and 1<-2<-3. + p[2], p[3] = p[3], p[2] + sign = 1 + 3.upto(n) do |i| + (s[i] = s[i] - 1) && break unless s[i] == 1 + return [sum, maxflips] if i == n # Out of permutations. + s[i] = i + # Rotate 1<-...<-i+1. + t = p[1] + 1.upto(i) do |j| + p[j] = p[j+1] + end + p[i+1] = t + end + end + end +end + +perf_test('fannkuch') { fannkuch(9) } Property changes on: MacRuby/trunk/perf/misc/fannkuch.rb ___________________________________________________________________ Added: svn:executable + *

1 0