mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
65651b34b1
This avoids O(n) on lookups with structs over 10 members.
This also avoids O(n) behavior on all assignments on Struct members.
Members 0..9 still use existing C methods to read in O(1) time
Benchmark results:
vm2_struct_big_aref_hi* 1.305
vm2_struct_big_aref_lo* 1.157
vm2_struct_big_aset* 3.306
vm2_struct_small_aref* 1.015
vm2_struct_small_aset* 3.273
Note: I chose use loading instructions from an array instead of writing
directly to linked-lists in compile.c for ease-of-maintainability. We
may move the method definitions to prelude.rb-like files in the future.
I have also tested this patch with the following patch to disable
the C ref_func methods and ensured the test suite and rubyspec works
--- a/struct.c
+++ b/struct.c
@@ -209,7 +209,7 @@ setup_struct(VALUE nstr, VALUE members)
ID id = SYM2ID(ptr_members[i]);
VALUE off = LONG2NUM(i);
- if (i < N_REF_FUNC) {
+ if (0 && i < N_REF_FUNC) {
rb_define_method_id(nstr, id, ref_func[i], 0);
}
else {
* iseq.c (rb_method_for_self_aref, rb_method_for_self_aset):
new methods to generate bytecode for struct.c
[Feature #10575]
* struct.c (rb_struct_ref, rb_struct_set): remove
(define_aref_method, define_aset_method): new functions
(setup_struct): use new functions
* test/ruby/test_struct.rb: add test for struct >10 members
* benchmark/bm_vm2_struct_big_aref_hi.rb: new benchmark
* benchmark/bm_vm2_struct_big_aref_lo.rb: ditto
* benchmark/bm_vm2_struct_big_aset.rb: ditto
* benchmark/bm_vm2_struct_small_aref.rb: ditto
* benchmark/bm_vm2_struct_small_aset.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
||
|---|---|---|
| .. | ||
| gc | ||
| other-lang | ||
| bm_app_answer.rb | ||
| bm_app_aobench.rb | ||
| bm_app_erb.rb | ||
| bm_app_factorial.rb | ||
| bm_app_fib.rb | ||
| bm_app_lc_fizzbuzz.rb | ||
| bm_app_mandelbrot.rb | ||
| bm_app_pentomino.rb | ||
| bm_app_raise.rb | ||
| bm_app_strconcat.rb | ||
| bm_app_tak.rb | ||
| bm_app_tarai.rb | ||
| bm_app_uri.rb | ||
| bm_hash_aref_miss.rb | ||
| bm_hash_aref_str.rb | ||
| bm_hash_aref_sym.rb | ||
| bm_hash_aref_sym_long.rb | ||
| bm_hash_flatten.rb | ||
| bm_hash_ident_num.rb | ||
| bm_hash_ident_obj.rb | ||
| bm_hash_ident_str.rb | ||
| bm_hash_ident_sym.rb | ||
| bm_hash_keys.rb | ||
| bm_hash_shift.rb | ||
| bm_hash_values.rb | ||
| bm_io_file_create.rb | ||
| bm_io_file_read.rb | ||
| bm_io_file_write.rb | ||
| bm_io_select.rb | ||
| bm_io_select2.rb | ||
| bm_io_select3.rb | ||
| bm_loop_for.rb | ||
| bm_loop_generator.rb | ||
| bm_loop_times.rb | ||
| bm_loop_whileloop.rb | ||
| bm_loop_whileloop2.rb | ||
| bm_securerandom.rb | ||
| bm_so_ackermann.rb | ||
| bm_so_array.rb | ||
| bm_so_binary_trees.rb | ||
| bm_so_concatenate.rb | ||
| bm_so_count_words.rb | ||
| bm_so_exception.rb | ||
| bm_so_fannkuch.rb | ||
| bm_so_fasta.rb | ||
| bm_so_k_nucleotide.rb | ||
| bm_so_lists.rb | ||
| bm_so_mandelbrot.rb | ||
| bm_so_matrix.rb | ||
| bm_so_meteor_contest.rb | ||
| bm_so_nbody.rb | ||
| bm_so_nested_loop.rb | ||
| bm_so_nsieve.rb | ||
| bm_so_nsieve_bits.rb | ||
| bm_so_object.rb | ||
| bm_so_partial_sums.rb | ||
| bm_so_pidigits.rb | ||
| bm_so_random.rb | ||
| bm_so_reverse_complement.rb | ||
| bm_so_sieve.rb | ||
| bm_so_spectralnorm.rb | ||
| bm_vm1_attr_ivar.rb | ||
| bm_vm1_attr_ivar_set.rb | ||
| bm_vm1_block.rb | ||
| bm_vm1_const.rb | ||
| bm_vm1_ensure.rb | ||
| bm_vm1_float_simple.rb | ||
| bm_vm1_gc_short_lived.rb | ||
| bm_vm1_gc_short_with_complex_long.rb | ||
| bm_vm1_gc_short_with_long.rb | ||
| bm_vm1_gc_short_with_symbol.rb | ||
| bm_vm1_gc_wb_ary.rb | ||
| bm_vm1_gc_wb_obj.rb | ||
| bm_vm1_ivar.rb | ||
| bm_vm1_ivar_set.rb | ||
| bm_vm1_length.rb | ||
| bm_vm1_lvar_init.rb | ||
| bm_vm1_lvar_set.rb | ||
| bm_vm1_neq.rb | ||
| bm_vm1_not.rb | ||
| bm_vm1_rescue.rb | ||
| bm_vm1_simplereturn.rb | ||
| bm_vm1_swap.rb | ||
| bm_vm1_yield.rb | ||
| bm_vm2_array.rb | ||
| bm_vm2_bigarray.rb | ||
| bm_vm2_bighash.rb | ||
| bm_vm2_case.rb | ||
| bm_vm2_defined_method.rb | ||
| bm_vm2_dstr.rb | ||
| bm_vm2_eval.rb | ||
| bm_vm2_method.rb | ||
| bm_vm2_method_missing.rb | ||
| bm_vm2_method_with_block.rb | ||
| bm_vm2_mutex.rb | ||
| bm_vm2_newlambda.rb | ||
| bm_vm2_poly_method.rb | ||
| bm_vm2_poly_method_ov.rb | ||
| bm_vm2_proc.rb | ||
| bm_vm2_raise1.rb | ||
| bm_vm2_raise2.rb | ||
| bm_vm2_regexp.rb | ||
| bm_vm2_send.rb | ||
| bm_vm2_struct_big_aref_hi.rb | ||
| bm_vm2_struct_big_aref_lo.rb | ||
| bm_vm2_struct_big_aset.rb | ||
| bm_vm2_struct_small_aref.rb | ||
| bm_vm2_struct_small_aset.rb | ||
| bm_vm2_super.rb | ||
| bm_vm2_unif1.rb | ||
| bm_vm2_zsuper.rb | ||
| bm_vm3_backtrace.rb | ||
| bm_vm3_clearmethodcache.rb | ||
| bm_vm3_gc.rb | ||
| bm_vm_thread_alive_check1.rb | ||
| bm_vm_thread_close.rb | ||
| bm_vm_thread_create_join.rb | ||
| bm_vm_thread_mutex1.rb | ||
| bm_vm_thread_mutex2.rb | ||
| bm_vm_thread_mutex3.rb | ||
| bm_vm_thread_pass.rb | ||
| bm_vm_thread_pass_flood.rb | ||
| bm_vm_thread_pipe.rb | ||
| bm_vm_thread_queue.rb | ||
| driver.rb | ||
| make_fasta_output.rb | ||
| prepare_so_count_words.rb | ||
| prepare_so_k_nucleotide.rb | ||
| prepare_so_reverse_complement.rb | ||
| report.rb | ||
| run.rb | ||
| runc.rb | ||
| wc.input.base | ||