From f883d6219e107554ebde5dff6d2f8383857f7518 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 13 Apr 2020 21:37:42 -0700 Subject: [PATCH] Unify vm benchmark prefixes to vm_ (#3028) The vm1_ prefix and vm2_ had had special meaning until 820ad9cb1d72d0897b73dae282df3793814b27e8 and 12068aa4e980ab32a0438408a519030e65dabf5e. AFAIK there's no special meaning in vm3_ prefix. As they have confused people (like "In `benchmark` what is difference between `vm1_`, `vm2_` and `vm3_`"), I'd like to remove the obsoleted prefix as we obviated that two years ago. --- benchmark/README.md | 8 ++++---- benchmark/{vm2_array.yml => vm_array.yml} | 2 +- benchmark/{vm1_attr_ivar.yml => vm_attr_ivar.yml} | 2 +- benchmark/{vm1_attr_ivar_set.yml => vm_attr_ivar_set.yml} | 2 +- benchmark/{vm3_backtrace.rb => vm_backtrace.rb} | 0 benchmark/{vm2_bigarray.yml => vm_bigarray.yml} | 2 +- benchmark/{vm2_bighash.yml => vm_bighash.yml} | 2 +- benchmark/{vm1_block.yml => vm_block.yml} | 2 +- benchmark/{vm1_blockparam.yml => vm_blockparam.yml} | 2 +- .../{vm1_blockparam_call.yml => vm_blockparam_call.yml} | 2 +- .../{vm1_blockparam_pass.yml => vm_blockparam_pass.yml} | 2 +- .../{vm1_blockparam_yield.yml => vm_blockparam_yield.yml} | 2 +- benchmark/{vm2_case.yml => vm_case.yml} | 2 +- benchmark/{vm2_case_lit.yml => vm_case_lit.yml} | 2 +- .../{vm3_clearmethodcache.rb => vm_clearmethodcache.rb} | 0 benchmark/{vm1_const.yml => vm_const.yml} | 2 +- .../{vm2_defined_method.yml => vm_defined_method.yml} | 2 +- benchmark/{vm2_dstr.yml => vm_dstr.yml} | 2 +- benchmark/{vm1_ensure.yml => vm_ensure.yml} | 2 +- benchmark/{vm2_eval.yml => vm_eval.yml} | 2 +- .../{vm2_fiber_allocate.yml => vm_fiber_allocate.yml} | 2 +- benchmark/{vm2_fiber_count.yml => vm_fiber_count.yml} | 2 +- benchmark/{vm2_fiber_reuse.yml => vm_fiber_reuse.yml} | 2 +- .../{vm2_fiber_reuse_gc.yml => vm_fiber_reuse_gc.yml} | 2 +- benchmark/{vm2_fiber_switch.yml => vm_fiber_switch.yml} | 2 +- benchmark/{vm1_float_simple.yml => vm_float_simple.yml} | 2 +- benchmark/{vm2_freezestring.yml => vm_freezestring.yml} | 2 +- benchmark/{vm3_gc.rb => vm_gc.rb} | 0 benchmark/{vm3_gc_old_full.rb => vm_gc_old_full.rb} | 0 .../{vm3_gc_old_immediate.rb => vm_gc_old_immediate.rb} | 0 benchmark/{vm3_gc_old_lazy.rb => vm_gc_old_lazy.rb} | 0 .../{vm1_gc_short_lived.yml => vm_gc_short_lived.yml} | 2 +- ...complex_long.yml => vm_gc_short_with_complex_long.yml} | 2 +- ...1_gc_short_with_long.yml => vm_gc_short_with_long.yml} | 2 +- ..._short_with_symbol.yml => vm_gc_short_with_symbol.yml} | 2 +- benchmark/{vm1_gc_wb_ary.yml => vm_gc_wb_ary.yml} | 2 +- ...1_gc_wb_ary_promoted.yml => vm_gc_wb_ary_promoted.yml} | 2 +- benchmark/{vm1_gc_wb_obj.yml => vm_gc_wb_obj.yml} | 2 +- ...1_gc_wb_obj_promoted.yml => vm_gc_wb_obj_promoted.yml} | 2 +- benchmark/{vm1_ivar.yml => vm_ivar.yml} | 2 +- benchmark/{vm1_ivar_set.yml => vm_ivar_set.yml} | 2 +- benchmark/{vm1_length.yml => vm_length.yml} | 2 +- benchmark/{vm1_lvar_init.yml => vm_lvar_init.yml} | 2 +- benchmark/{vm1_lvar_set.yml => vm_lvar_set.yml} | 2 +- benchmark/{vm2_method.yml => vm_method.yml} | 2 +- .../{vm2_method_missing.yml => vm_method_missing.yml} | 2 +- ...vm2_method_with_block.yml => vm_method_with_block.yml} | 2 +- ...dule_ann_const_set.yml => vm_module_ann_const_set.yml} | 2 +- .../{vm2_module_const_set.yml => vm_module_const_set.yml} | 2 +- benchmark/{vm2_mutex.yml => vm_mutex.yml} | 2 +- benchmark/{vm1_neq.yml => vm_neq.yml} | 2 +- benchmark/{vm2_newlambda.yml => vm_newlambda.yml} | 2 +- benchmark/{vm1_not.yml => vm_not.yml} | 2 +- benchmark/{vm2_poly_method.yml => vm_poly_method.yml} | 2 +- .../{vm2_poly_method_ov.yml => vm_poly_method_ov.yml} | 2 +- .../{vm2_poly_same_method.yml => vm_poly_same_method.yml} | 2 +- .../{vm2_poly_singleton.yml => vm_poly_singleton.yml} | 2 +- benchmark/{vm2_proc.yml => vm_proc.yml} | 2 +- benchmark/{vm2_raise1.yml => vm_raise1.yml} | 2 +- benchmark/{vm2_raise2.yml => vm_raise2.yml} | 2 +- benchmark/{vm2_regexp.yml => vm_regexp.yml} | 4 ++-- benchmark/{vm1_rescue.yml => vm_rescue.yml} | 2 +- benchmark/{vm2_send.yml => vm_send.yml} | 2 +- benchmark/{vm1_simplereturn.yml => vm_simplereturn.yml} | 2 +- .../{vm2_string_literal.yml => vm_string_literal.yml} | 2 +- ...2_struct_big_aref_hi.yml => vm_struct_big_aref_hi.yml} | 2 +- ...2_struct_big_aref_lo.yml => vm_struct_big_aref_lo.yml} | 2 +- .../{vm2_struct_big_aset.yml => vm_struct_big_aset.yml} | 2 +- ...2_struct_big_href_hi.yml => vm_struct_big_href_hi.yml} | 2 +- ...2_struct_big_href_lo.yml => vm_struct_big_href_lo.yml} | 2 +- .../{vm2_struct_big_hset.yml => vm_struct_big_hset.yml} | 2 +- ...vm2_struct_small_aref.yml => vm_struct_small_aref.yml} | 2 +- ...vm2_struct_small_aset.yml => vm_struct_small_aset.yml} | 2 +- ...vm2_struct_small_href.yml => vm_struct_small_href.yml} | 2 +- ...vm2_struct_small_hset.yml => vm_struct_small_hset.yml} | 2 +- benchmark/{vm2_super.yml => vm_super.yml} | 2 +- benchmark/{vm1_swap.yml => vm_swap.yml} | 2 +- benchmark/{vm2_unif1.yml => vm_unif1.yml} | 2 +- benchmark/{vm1_yield.yml => vm_yield.yml} | 2 +- benchmark/{vm2_zsuper.yml => vm_zsuper.yml} | 2 +- 80 files changed, 78 insertions(+), 78 deletions(-) rename benchmark/{vm2_array.yml => vm_array.yml} (80%) rename benchmark/{vm1_attr_ivar.yml => vm_attr_ivar.yml} (90%) rename benchmark/{vm1_attr_ivar_set.yml => vm_attr_ivar_set.yml} (88%) rename benchmark/{vm3_backtrace.rb => vm_backtrace.rb} (100%) rename benchmark/{vm2_bigarray.yml => vm_bigarray.yml} (99%) rename benchmark/{vm2_bighash.yml => vm_bighash.yml} (99%) rename benchmark/{vm1_block.yml => vm_block.yml} (84%) rename benchmark/{vm1_blockparam.yml => vm_blockparam.yml} (77%) rename benchmark/{vm1_blockparam_call.yml => vm_blockparam_call.yml} (75%) rename benchmark/{vm1_blockparam_pass.yml => vm_blockparam_pass.yml} (83%) rename benchmark/{vm1_blockparam_yield.yml => vm_blockparam_yield.yml} (77%) rename benchmark/{vm2_case.yml => vm_case.yml} (91%) rename benchmark/{vm2_case_lit.yml => vm_case_lit.yml} (96%) rename benchmark/{vm3_clearmethodcache.rb => vm_clearmethodcache.rb} (100%) rename benchmark/{vm1_const.yml => vm_const.yml} (84%) rename benchmark/{vm2_defined_method.yml => vm_defined_method.yml} (82%) rename benchmark/{vm2_dstr.yml => vm_dstr.yml} (86%) rename benchmark/{vm1_ensure.yml => vm_ensure.yml} (93%) rename benchmark/{vm2_eval.yml => vm_eval.yml} (76%) rename benchmark/{vm2_fiber_allocate.yml => vm_fiber_allocate.yml} (85%) rename benchmark/{vm2_fiber_count.yml => vm_fiber_count.yml} (91%) rename benchmark/{vm2_fiber_reuse.yml => vm_fiber_reuse.yml} (90%) rename benchmark/{vm2_fiber_reuse_gc.yml => vm_fiber_reuse_gc.yml} (89%) rename benchmark/{vm2_fiber_switch.yml => vm_fiber_switch.yml} (89%) rename benchmark/{vm1_float_simple.yml => vm_float_simple.yml} (84%) rename benchmark/{vm2_freezestring.yml => vm_freezestring.yml} (88%) rename benchmark/{vm3_gc.rb => vm_gc.rb} (100%) rename benchmark/{vm3_gc_old_full.rb => vm_gc_old_full.rb} (100%) rename benchmark/{vm3_gc_old_immediate.rb => vm_gc_old_immediate.rb} (100%) rename benchmark/{vm3_gc_old_lazy.rb => vm_gc_old_lazy.rb} (100%) rename benchmark/{vm1_gc_short_lived.yml => vm_gc_short_lived.yml} (83%) rename benchmark/{vm1_gc_short_with_complex_long.yml => vm_gc_short_with_complex_long.yml} (90%) rename benchmark/{vm1_gc_short_with_long.yml => vm_gc_short_with_long.yml} (87%) rename benchmark/{vm1_gc_short_with_symbol.yml => vm_gc_short_with_symbol.yml} (86%) rename benchmark/{vm1_gc_wb_ary.yml => vm_gc_wb_ary.yml} (92%) rename benchmark/{vm1_gc_wb_ary_promoted.yml => vm_gc_wb_ary_promoted.yml} (90%) rename benchmark/{vm1_gc_wb_obj.yml => vm_gc_wb_obj.yml} (93%) rename benchmark/{vm1_gc_wb_obj_promoted.yml => vm_gc_wb_obj_promoted.yml} (91%) rename benchmark/{vm1_ivar.yml => vm_ivar.yml} (84%) rename benchmark/{vm1_ivar_set.yml => vm_ivar_set.yml} (75%) rename benchmark/{vm1_length.yml => vm_length.yml} (85%) rename benchmark/{vm1_lvar_init.yml => vm_lvar_init.yml} (96%) rename benchmark/{vm1_lvar_set.yml => vm_lvar_set.yml} (85%) rename benchmark/{vm2_method.yml => vm_method.yml} (85%) rename benchmark/{vm2_method_missing.yml => vm_method_missing.yml} (87%) rename benchmark/{vm2_method_with_block.yml => vm_method_with_block.yml} (80%) rename benchmark/{vm2_module_ann_const_set.yml => vm_module_ann_const_set.yml} (70%) rename benchmark/{vm2_module_const_set.yml => vm_module_const_set.yml} (80%) rename benchmark/{vm2_mutex.yml => vm_mutex.yml} (87%) rename benchmark/{vm1_neq.yml => vm_neq.yml} (88%) rename benchmark/{vm2_newlambda.yml => vm_newlambda.yml} (70%) rename benchmark/{vm1_not.yml => vm_not.yml} (84%) rename benchmark/{vm2_poly_method.yml => vm_poly_method.yml} (94%) rename benchmark/{vm2_poly_method_ov.yml => vm_poly_method_ov.yml} (93%) rename benchmark/{vm2_poly_same_method.yml => vm_poly_same_method.yml} (94%) rename benchmark/{vm2_poly_singleton.yml => vm_poly_singleton.yml} (93%) rename benchmark/{vm2_proc.yml => vm_proc.yml} (87%) rename benchmark/{vm2_raise1.yml => vm_raise1.yml} (91%) rename benchmark/{vm2_raise2.yml => vm_raise2.yml} (91%) rename benchmark/{vm2_regexp.yml => vm_regexp.yml} (71%) rename benchmark/{vm1_rescue.yml => vm_rescue.yml} (79%) rename benchmark/{vm2_send.yml => vm_send.yml} (88%) rename benchmark/{vm1_simplereturn.yml => vm_simplereturn.yml} (76%) rename benchmark/{vm2_string_literal.yml => vm_string_literal.yml} (81%) rename benchmark/{vm2_struct_big_aref_hi.yml => vm_struct_big_aref_hi.yml} (81%) rename benchmark/{vm2_struct_big_aref_lo.yml => vm_struct_big_aref_lo.yml} (81%) rename benchmark/{vm2_struct_big_aset.yml => vm_struct_big_aset.yml} (90%) rename benchmark/{vm2_struct_big_href_hi.yml => vm_struct_big_href_hi.yml} (80%) rename benchmark/{vm2_struct_big_href_lo.yml => vm_struct_big_href_lo.yml} (80%) rename benchmark/{vm2_struct_big_hset.yml => vm_struct_big_hset.yml} (90%) rename benchmark/{vm2_struct_small_aref.yml => vm_struct_small_aref.yml} (77%) rename benchmark/{vm2_struct_small_aset.yml => vm_struct_small_aset.yml} (88%) rename benchmark/{vm2_struct_small_href.yml => vm_struct_small_href.yml} (77%) rename benchmark/{vm2_struct_small_hset.yml => vm_struct_small_hset.yml} (78%) rename benchmark/{vm2_super.yml => vm_super.yml} (89%) rename benchmark/{vm1_swap.yml => vm_swap.yml} (84%) rename benchmark/{vm2_unif1.yml => vm_unif1.yml} (83%) rename benchmark/{vm1_yield.yml => vm_yield.yml} (93%) rename benchmark/{vm2_zsuper.yml => vm_zsuper.yml} (91%) diff --git a/benchmark/README.md b/benchmark/README.md index 24a2669143ecc9..c6d7cc318d2fe9 100644 --- a/benchmark/README.md +++ b/benchmark/README.md @@ -53,11 +53,11 @@ make benchmark # Or compare with specific ruby binary make benchmark COMPARE_RUBY="/path/to/ruby --jit" -# Run vm1 benchmarks -make benchmark ITEM=vm1 +# Run vm benchmarks +make benchmark ITEM=vm # Run some limited benchmarks in ITEM-matched files -make benchmark ITEM=vm1 OPTS=--filter=block +make benchmark ITEM=vm OPTS=--filter=block # You can specify the benchmark by an exact filename instead of using the default argument: # ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb') @@ -68,5 +68,5 @@ make benchmark OPTS="--help" # With `make benchmark`, some special runner plugins are available: # -r peak, -r size, -r total, -r utime, -r stime, -r cutime, -r cstime -make benchmark ITEM=vm2_bigarray OPTS="-r peak" +make benchmark ITEM=vm_bigarray OPTS="-r peak" ``` diff --git a/benchmark/vm2_array.yml b/benchmark/vm_array.yml similarity index 80% rename from benchmark/vm2_array.yml rename to benchmark/vm_array.yml index 7373098d5e5a76..2a177237efb3bb 100644 --- a/benchmark/vm2_array.yml +++ b/benchmark/vm_array.yml @@ -1,4 +1,4 @@ benchmark: - vm2_array: | + vm_array: | a = [1,2,3,4,5,6,7,8,9,10] loop_count: 6000000 diff --git a/benchmark/vm1_attr_ivar.yml b/benchmark/vm_attr_ivar.yml similarity index 90% rename from benchmark/vm1_attr_ivar.yml rename to benchmark/vm_attr_ivar.yml index f714dd9bd9f3bb..75b803478eb9ae 100644 --- a/benchmark/vm1_attr_ivar.yml +++ b/benchmark/vm_attr_ivar.yml @@ -8,7 +8,7 @@ prelude: | end obj = C.new benchmark: - vm1_attr_ivar: | + vm_attr_ivar: | j = obj.a k = obj.b loop_count: 30000000 diff --git a/benchmark/vm1_attr_ivar_set.yml b/benchmark/vm_attr_ivar_set.yml similarity index 88% rename from benchmark/vm1_attr_ivar_set.yml rename to benchmark/vm_attr_ivar_set.yml index f383e59ef44284..a0d379b18a0d64 100644 --- a/benchmark/vm1_attr_ivar_set.yml +++ b/benchmark/vm_attr_ivar_set.yml @@ -8,7 +8,7 @@ prelude: | end obj = C.new benchmark: - vm1_attr_ivar_set: | + vm_attr_ivar_set: | obj.a = 1 obj.b = 2 loop_count: 30000000 diff --git a/benchmark/vm3_backtrace.rb b/benchmark/vm_backtrace.rb similarity index 100% rename from benchmark/vm3_backtrace.rb rename to benchmark/vm_backtrace.rb diff --git a/benchmark/vm2_bigarray.yml b/benchmark/vm_bigarray.yml similarity index 99% rename from benchmark/vm2_bigarray.yml rename to benchmark/vm_bigarray.yml index 2ad6da390506da..8b2d3f34430e50 100644 --- a/benchmark/vm2_bigarray.yml +++ b/benchmark/vm_bigarray.yml @@ -1,5 +1,5 @@ benchmark: - vm2_bigarray: | + vm_bigarray: | a = [ 1,2,3,4,5,6,7,8,9,10, 1,2,3,4,5,6,7,8,9,10, diff --git a/benchmark/vm2_bighash.yml b/benchmark/vm_bighash.yml similarity index 99% rename from benchmark/vm2_bighash.yml rename to benchmark/vm_bighash.yml index e9154e4ba96fc4..4dacfde793d168 100644 --- a/benchmark/vm2_bighash.yml +++ b/benchmark/vm_bighash.yml @@ -1,4 +1,4 @@ benchmark: - vm2_bighash: | + vm_bighash: | a = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9, 10=>10, 11=>11, 12=>12, 13=>13, 14=>14, 15=>15, 16=>16, 17=>17, 18=>18, 19=>19, 20=>20, 21=>21, 22=>22, 23=>23, 24=>24, 25=>25, 26=>26, 27=>27, 28=>28, 29=>29, 30=>30, 31=>31, 32=>32, 33=>33, 34=>34, 35=>35, 36=>36, 37=>37, 38=>38, 39=>39, 40=>40, 41=>41, 42=>42, 43=>43, 44=>44, 45=>45, 46=>46, 47=>47, 48=>48, 49=>49, 50=>50, 51=>51, 52=>52, 53=>53, 54=>54, 55=>55, 56=>56, 57=>57, 58=>58, 59=>59, 60=>60, 61=>61, 62=>62, 63=>63, 64=>64, 65=>65, 66=>66, 67=>67, 68=>68, 69=>69, 70=>70, 71=>71, 72=>72, 73=>73, 74=>74, 75=>75, 76=>76, 77=>77, 78=>78, 79=>79, 80=>80, 81=>81, 82=>82, 83=>83, 84=>84, 85=>85, 86=>86, 87=>87, 88=>88, 89=>89, 90=>90, 91=>91, 92=>92, 93=>93, 94=>94, 95=>95, 96=>96, 97=>97, 98=>98, 99=>99, 100=>100, 101=>101, 102=>102, 103=>103, 104=>104, 105=>105, 106=>106, 107=>107, 108=>108, 109=>109, 110=>110, 111=>111, 112=>112, 113=>113, 114=>114, 115=>115, 116=>116, 117=>117, 118=>118, 119=>119, 120=>120, 121=>121, 122=>122, 123=>123, 124=>124, 125=>125, 126=>126, 127=>127, 128=>128, 129=>129, 130=>130, 131=>131, 132=>132, 133=>133, 134=>134, 135=>135, 136=>136, 137=>137, 138=>138, 139=>139, 140=>140, 141=>141, 142=>142, 143=>143, 144=>144, 145=>145, 146=>146, 147=>147, 148=>148, 149=>149, 150=>150, 151=>151, 152=>152, 153=>153, 154=>154, 155=>155, 156=>156, 157=>157, 158=>158, 159=>159, 160=>160, 161=>161, 162=>162, 163=>163, 164=>164, 165=>165, 166=>166, 167=>167, 168=>168, 169=>169, 170=>170, 171=>171, 172=>172, 173=>173, 174=>174, 175=>175, 176=>176, 177=>177, 178=>178, 179=>179, 180=>180, 181=>181, 182=>182, 183=>183, 184=>184, 185=>185, 186=>186, 187=>187, 188=>188, 189=>189, 190=>190, 191=>191, 192=>192, 193=>193, 194=>194, 195=>195, 196=>196, 197=>197, 198=>198, 199=>199, 200=>200, 201=>201, 202=>202, 203=>203, 204=>204, 205=>205, 206=>206, 207=>207, 208=>208, 209=>209, 210=>210, 211=>211, 212=>212, 213=>213, 214=>214, 215=>215, 216=>216, 217=>217, 218=>218, 219=>219, 220=>220, 221=>221, 222=>222, 223=>223, 224=>224, 225=>225, 226=>226, 227=>227, 228=>228, 229=>229, 230=>230, 231=>231, 232=>232, 233=>233, 234=>234, 235=>235, 236=>236, 237=>237, 238=>238, 239=>239, 240=>240, 241=>241, 242=>242, 243=>243, 244=>244, 245=>245, 246=>246, 247=>247, 248=>248, 249=>249, 250=>250, 251=>251, 252=>252, 253=>253, 254=>254, 255=>255, 256=>256, 257=>257, 258=>258, 259=>259, 260=>260, 261=>261, 262=>262, 263=>263, 264=>264, 265=>265, 266=>266, 267=>267, 268=>268, 269=>269, 270=>270, 271=>271, 272=>272, 273=>273, 274=>274, 275=>275, 276=>276, 277=>277, 278=>278, 279=>279, 280=>280, 281=>281, 282=>282, 283=>283, 284=>284, 285=>285, 286=>286, 287=>287, 288=>288, 289=>289, 290=>290, 291=>291, 292=>292, 293=>293, 294=>294, 295=>295, 296=>296, 297=>297, 298=>298, 299=>299, 300=>300, 301=>301, 302=>302, 303=>303, 304=>304, 305=>305, 306=>306, 307=>307, 308=>308, 309=>309, 310=>310, 311=>311, 312=>312, 313=>313, 314=>314, 315=>315, 316=>316, 317=>317, 318=>318, 319=>319, 320=>320, 321=>321, 322=>322, 323=>323, 324=>324, 325=>325, 326=>326, 327=>327, 328=>328, 329=>329, 330=>330, 331=>331, 332=>332, 333=>333, 334=>334, 335=>335, 336=>336, 337=>337, 338=>338, 339=>339, 340=>340, 341=>341, 342=>342, 343=>343, 344=>344, 345=>345, 346=>346, 347=>347, 348=>348, 349=>349, 350=>350, 351=>351, 352=>352, 353=>353, 354=>354, 355=>355, 356=>356, 357=>357, 358=>358, 359=>359, 360=>360, 361=>361, 362=>362, 363=>363, 364=>364, 365=>365, 366=>366, 367=>367, 368=>368, 369=>369, 370=>370, 371=>371, 372=>372, 373=>373, 374=>374, 375=>375, 376=>376, 377=>377, 378=>378, 379=>379, 380=>380, 381=>381, 382=>382, 383=>383, 384=>384, 385=>385, 386=>386, 387=>387, 388=>388, 389=>389, 390=>390, 391=>391, 392=>392, 393=>393, 394=>394, 395=>395, 396=>396, 397=>397, 398=>398, 399=>399, 400=>400, 401=>401, 402=>402, 403=>403, 404=>404, 405=>405, 406=>406, 407=>407, 408=>408, 409=>409, 410=>410, 411=>411, 412=>412, 413=>413, 414=>414, 415=>415, 416=>416, 417=>417, 418=>418, 419=>419, 420=>420, 421=>421, 422=>422, 423=>423, 424=>424, 425=>425, 426=>426, 427=>427, 428=>428, 429=>429, 430=>430, 431=>431, 432=>432, 433=>433, 434=>434, 435=>435, 436=>436, 437=>437, 438=>438, 439=>439, 440=>440, 441=>441, 442=>442, 443=>443, 444=>444, 445=>445, 446=>446, 447=>447, 448=>448, 449=>449, 450=>450, 451=>451, 452=>452, 453=>453, 454=>454, 455=>455, 456=>456, 457=>457, 458=>458, 459=>459, 460=>460, 461=>461, 462=>462, 463=>463, 464=>464, 465=>465, 466=>466, 467=>467, 468=>468, 469=>469, 470=>470, 471=>471, 472=>472, 473=>473, 474=>474, 475=>475, 476=>476, 477=>477, 478=>478, 479=>479, 480=>480, 481=>481, 482=>482, 483=>483, 484=>484, 485=>485, 486=>486, 487=>487, 488=>488, 489=>489, 490=>490, 491=>491, 492=>492, 493=>493, 494=>494, 495=>495, 496=>496, 497=>497, 498=>498, 499=>499, 500=>500,} loop_count: 60000 diff --git a/benchmark/vm1_block.yml b/benchmark/vm_block.yml similarity index 84% rename from benchmark/vm1_block.yml rename to benchmark/vm_block.yml index ac7c940f9348f2..68b3e40bf5a204 100644 --- a/benchmark/vm1_block.yml +++ b/benchmark/vm_block.yml @@ -3,7 +3,7 @@ prelude: | yield end benchmark: - vm1_block: | + vm_block: | m{ } loop_count: 30000000 diff --git a/benchmark/vm1_blockparam.yml b/benchmark/vm_blockparam.yml similarity index 77% rename from benchmark/vm1_blockparam.yml rename to benchmark/vm_blockparam.yml index 947b8c53d5347c..5e5a0170a2126f 100644 --- a/benchmark/vm1_blockparam.yml +++ b/benchmark/vm_blockparam.yml @@ -2,6 +2,6 @@ prelude: | def m &b end benchmark: - vm1_blockparam: | + vm_blockparam: | m{} loop_count: 30000000 diff --git a/benchmark/vm1_blockparam_call.yml b/benchmark/vm_blockparam_call.yml similarity index 75% rename from benchmark/vm1_blockparam_call.yml rename to benchmark/vm_blockparam_call.yml index e2817a3ce2bc98..a7d8d366eae3ce 100644 --- a/benchmark/vm1_blockparam_call.yml +++ b/benchmark/vm_blockparam_call.yml @@ -3,6 +3,6 @@ prelude: | b.call end benchmark: - vm1_blockparam_call: | + vm_blockparam_call: | m{} loop_count: 30000000 diff --git a/benchmark/vm1_blockparam_pass.yml b/benchmark/vm_blockparam_pass.yml similarity index 83% rename from benchmark/vm1_blockparam_pass.yml rename to benchmark/vm_blockparam_pass.yml index ca1bef33693a95..841f5e7a634fb4 100644 --- a/benchmark/vm1_blockparam_pass.yml +++ b/benchmark/vm_blockparam_pass.yml @@ -7,6 +7,6 @@ prelude: | bp_yield &b end benchmark: - vm1_blockparam_pass: | + vm_blockparam_pass: | bp_pass{} loop_count: 30000000 diff --git a/benchmark/vm1_blockparam_yield.yml b/benchmark/vm_blockparam_yield.yml similarity index 77% rename from benchmark/vm1_blockparam_yield.yml rename to benchmark/vm_blockparam_yield.yml index 56ae617798f49e..8ea9b46ed266cf 100644 --- a/benchmark/vm1_blockparam_yield.yml +++ b/benchmark/vm_blockparam_yield.yml @@ -3,6 +3,6 @@ prelude: | yield end benchmark: - vm1_blockparam_yield: | + vm_blockparam_yield: | bp_yield{} loop_count: 30000000 diff --git a/benchmark/vm2_case.yml b/benchmark/vm_case.yml similarity index 91% rename from benchmark/vm2_case.yml rename to benchmark/vm_case.yml index 7716783c09802b..b26a491a15373e 100644 --- a/benchmark/vm2_case.yml +++ b/benchmark/vm_case.yml @@ -1,5 +1,5 @@ benchmark: - vm2_case: | + vm_case: | case :foo when :bar raise diff --git a/benchmark/vm2_case_lit.yml b/benchmark/vm_case_lit.yml similarity index 96% rename from benchmark/vm2_case_lit.yml rename to benchmark/vm_case_lit.yml index c49b8dfe5ee484..9f91801544538c 100644 --- a/benchmark/vm2_case_lit.yml +++ b/benchmark/vm_case_lit.yml @@ -1,6 +1,6 @@ # loop_count is not utilized since `i` is involved in the script benchmark: - vm2_case_lit: | + vm_case_lit: | i = 0 @ret = [ "foo", true, false, :sym, 6, nil, 0.1, 0xffffffffffffffff ] def foo(i) diff --git a/benchmark/vm3_clearmethodcache.rb b/benchmark/vm_clearmethodcache.rb similarity index 100% rename from benchmark/vm3_clearmethodcache.rb rename to benchmark/vm_clearmethodcache.rb diff --git a/benchmark/vm1_const.yml b/benchmark/vm_const.yml similarity index 84% rename from benchmark/vm1_const.yml rename to benchmark/vm_const.yml index b98db1545c2d01..6064d4eed0fe2c 100644 --- a/benchmark/vm1_const.yml +++ b/benchmark/vm_const.yml @@ -1,7 +1,7 @@ prelude: | Const = 1 benchmark: - vm1_const: | + vm_const: | j = Const k = Const loop_count: 30000000 diff --git a/benchmark/vm2_defined_method.yml b/benchmark/vm_defined_method.yml similarity index 82% rename from benchmark/vm2_defined_method.yml rename to benchmark/vm_defined_method.yml index e1b0d55674d400..347e0cfd33335f 100644 --- a/benchmark/vm2_defined_method.yml +++ b/benchmark/vm_defined_method.yml @@ -3,6 +3,6 @@ prelude: | define_method(:m){} end benchmark: - vm2_defined_method: | + vm_defined_method: | m; m; m; m; m; m; m; m; loop_count: 6000000 diff --git a/benchmark/vm2_dstr.yml b/benchmark/vm_dstr.yml similarity index 86% rename from benchmark/vm2_dstr.yml rename to benchmark/vm_dstr.yml index f8bd6e01338306..30c7a3193c71c7 100644 --- a/benchmark/vm2_dstr.yml +++ b/benchmark/vm_dstr.yml @@ -1,6 +1,6 @@ prelude: | x = y = 'z' benchmark: - vm2_dstr: | + vm_dstr: | str = "foo#{x}bar#{y}baz" loop_count: 6000000 diff --git a/benchmark/vm1_ensure.yml b/benchmark/vm_ensure.yml similarity index 93% rename from benchmark/vm1_ensure.yml rename to benchmark/vm_ensure.yml index afbbe38bec85ca..4ea62f30defb9f 100644 --- a/benchmark/vm1_ensure.yml +++ b/benchmark/vm_ensure.yml @@ -1,6 +1,6 @@ # Not utilizing loop_count since using it for this is too unstable for now benchmark: - vm1_ensure: | + vm_ensure: | i = 0 while i<30_000_000 i += 1 diff --git a/benchmark/vm2_eval.yml b/benchmark/vm_eval.yml similarity index 76% rename from benchmark/vm2_eval.yml rename to benchmark/vm_eval.yml index d506a9c0799998..7ba1a8d1de85e6 100644 --- a/benchmark/vm2_eval.yml +++ b/benchmark/vm_eval.yml @@ -1,4 +1,4 @@ benchmark: - vm2_eval: | + vm_eval: | eval("1") loop_count: 6000000 diff --git a/benchmark/vm2_fiber_allocate.yml b/benchmark/vm_fiber_allocate.yml similarity index 85% rename from benchmark/vm2_fiber_allocate.yml rename to benchmark/vm_fiber_allocate.yml index f29705f6942015..b5a54e1ddfb601 100644 --- a/benchmark/vm2_fiber_allocate.yml +++ b/benchmark/vm_fiber_allocate.yml @@ -2,7 +2,7 @@ prelude: | # Disable GC to see raw throughput: GC.disable benchmark: - vm2_fiber_allocate: | + vm_fiber_allocate: | fiber = Fiber.new{Fiber.yield} fiber.resume loop_count: 100000 diff --git a/benchmark/vm2_fiber_count.yml b/benchmark/vm_fiber_count.yml similarity index 91% rename from benchmark/vm2_fiber_count.yml rename to benchmark/vm_fiber_count.yml index 3ecf6bdcb2891b..b83d3152d47836 100644 --- a/benchmark/vm2_fiber_count.yml +++ b/benchmark/vm_fiber_count.yml @@ -3,7 +3,7 @@ prelude: | fibers = [] benchmark: - vm2_fiber_count: | + vm_fiber_count: | fiber = Fiber.new{Fiber.yield} fibers << fiber fiber.resume diff --git a/benchmark/vm2_fiber_reuse.yml b/benchmark/vm_fiber_reuse.yml similarity index 90% rename from benchmark/vm2_fiber_reuse.yml rename to benchmark/vm_fiber_reuse.yml index 017065063800ca..4ca41085b1d653 100644 --- a/benchmark/vm2_fiber_reuse.yml +++ b/benchmark/vm_fiber_reuse.yml @@ -2,7 +2,7 @@ prelude: | GC.disable fibers = [] benchmark: - vm2_fiber_reuse: | + vm_fiber_reuse: | 1024.times do fiber = Fiber.new{Fiber.yield} fibers << fiber diff --git a/benchmark/vm2_fiber_reuse_gc.yml b/benchmark/vm_fiber_reuse_gc.yml similarity index 89% rename from benchmark/vm2_fiber_reuse_gc.yml rename to benchmark/vm_fiber_reuse_gc.yml index 8fb91a84eb61a7..892622f121710b 100644 --- a/benchmark/vm2_fiber_reuse_gc.yml +++ b/benchmark/vm_fiber_reuse_gc.yml @@ -2,7 +2,7 @@ prelude: | fibers = [] benchmark: - vm2_fiber_reuse_gc: | + vm_fiber_reuse_gc: | 2000.times do fiber = Fiber.new{Fiber.yield} fibers << fiber diff --git a/benchmark/vm2_fiber_switch.yml b/benchmark/vm_fiber_switch.yml similarity index 89% rename from benchmark/vm2_fiber_switch.yml rename to benchmark/vm_fiber_switch.yml index fbf7283c298818..3de36b66ebe19c 100644 --- a/benchmark/vm2_fiber_switch.yml +++ b/benchmark/vm_fiber_switch.yml @@ -4,6 +4,6 @@ prelude: | loop { Fiber.yield } end benchmark: - vm2_fiber_switch: | + vm_fiber_switch: | fib.resume loop_count: 20000000 diff --git a/benchmark/vm1_float_simple.yml b/benchmark/vm_float_simple.yml similarity index 84% rename from benchmark/vm1_float_simple.yml rename to benchmark/vm_float_simple.yml index 4e9ad1852b00f1..92f5fd52aba658 100644 --- a/benchmark/vm1_float_simple.yml +++ b/benchmark/vm_float_simple.yml @@ -1,7 +1,7 @@ prelude: | f = 0.0 benchmark: - vm1_float_simple: | + vm_float_simple: | f += 0.1; f -= 0.1 f += 0.1; f -= 0.1 f += 0.1; f -= 0.1 diff --git a/benchmark/vm2_freezestring.yml b/benchmark/vm_freezestring.yml similarity index 88% rename from benchmark/vm2_freezestring.yml rename to benchmark/vm_freezestring.yml index b78af91a209e17..facc9aa0431935 100644 --- a/benchmark/vm2_freezestring.yml +++ b/benchmark/vm_freezestring.yml @@ -5,6 +5,6 @@ prelude: | end end benchmark: - vm2_freezestring: | + vm_freezestring: | "tXnL1BP5T1WPXMjuFNLQtallEtRcay1t2lHtJSrlVsDgvunlbtfpr/DGdH0NGYE9".freeze loop_count: 6000000 diff --git a/benchmark/vm3_gc.rb b/benchmark/vm_gc.rb similarity index 100% rename from benchmark/vm3_gc.rb rename to benchmark/vm_gc.rb diff --git a/benchmark/vm3_gc_old_full.rb b/benchmark/vm_gc_old_full.rb similarity index 100% rename from benchmark/vm3_gc_old_full.rb rename to benchmark/vm_gc_old_full.rb diff --git a/benchmark/vm3_gc_old_immediate.rb b/benchmark/vm_gc_old_immediate.rb similarity index 100% rename from benchmark/vm3_gc_old_immediate.rb rename to benchmark/vm_gc_old_immediate.rb diff --git a/benchmark/vm3_gc_old_lazy.rb b/benchmark/vm_gc_old_lazy.rb similarity index 100% rename from benchmark/vm3_gc_old_lazy.rb rename to benchmark/vm_gc_old_lazy.rb diff --git a/benchmark/vm1_gc_short_lived.yml b/benchmark/vm_gc_short_lived.yml similarity index 83% rename from benchmark/vm1_gc_short_lived.yml rename to benchmark/vm_gc_short_lived.yml index 8fdcb7371d00c2..29c803fee346f1 100644 --- a/benchmark/vm1_gc_short_lived.yml +++ b/benchmark/vm_gc_short_lived.yml @@ -1,5 +1,5 @@ benchmark: - vm1_gc_short_lived: | + vm_gc_short_lived: | a = '' # short-lived String b = '' c = '' diff --git a/benchmark/vm1_gc_short_with_complex_long.yml b/benchmark/vm_gc_short_with_complex_long.yml similarity index 90% rename from benchmark/vm1_gc_short_with_complex_long.yml rename to benchmark/vm_gc_short_with_complex_long.yml index c22ea74a6073af..4b6c3ed7b99953 100644 --- a/benchmark/vm1_gc_short_with_complex_long.yml +++ b/benchmark/vm_gc_short_with_complex_long.yml @@ -15,7 +15,7 @@ prelude: | GC.start GC.start benchmark: - vm1_gc_short_with_complex_long: | + vm_gc_short_with_complex_long: | a = '' # short-lived String b = '' c = '' diff --git a/benchmark/vm1_gc_short_with_long.yml b/benchmark/vm_gc_short_with_long.yml similarity index 87% rename from benchmark/vm1_gc_short_with_long.yml rename to benchmark/vm_gc_short_with_long.yml index c731aae5481833..03ba0f95a96780 100644 --- a/benchmark/vm1_gc_short_with_long.yml +++ b/benchmark/vm_gc_short_with_long.yml @@ -3,7 +3,7 @@ prelude: | GC.start GC.start benchmark: - vm1_gc_short_with_long: | + vm_gc_short_with_long: | a = '' # short-lived String b = '' c = '' diff --git a/benchmark/vm1_gc_short_with_symbol.yml b/benchmark/vm_gc_short_with_symbol.yml similarity index 86% rename from benchmark/vm1_gc_short_with_symbol.yml rename to benchmark/vm_gc_short_with_symbol.yml index 7fc1abedd8a7ed..129b8bf4ed2a17 100644 --- a/benchmark/vm1_gc_short_with_symbol.yml +++ b/benchmark/vm_gc_short_with_symbol.yml @@ -3,7 +3,7 @@ prelude: | GC.start GC.start benchmark: - vm1_gc_short_with_symbol: | + vm_gc_short_with_symbol: | a = '' # short-lived String b = '' c = '' diff --git a/benchmark/vm1_gc_wb_ary.yml b/benchmark/vm_gc_wb_ary.yml similarity index 92% rename from benchmark/vm1_gc_wb_ary.yml rename to benchmark/vm_gc_wb_ary.yml index 50fb4b6f844b8c..e3293e72d001c8 100644 --- a/benchmark/vm1_gc_wb_ary.yml +++ b/benchmark/vm_gc_wb_ary.yml @@ -7,6 +7,6 @@ prelude: | short_lived = '' benchmark: - vm1_gc_wb_ary: | + vm_gc_wb_ary: | short_lived_ary[0] = short_lived # write barrier loop_count: 30000000 diff --git a/benchmark/vm1_gc_wb_ary_promoted.yml b/benchmark/vm_gc_wb_ary_promoted.yml similarity index 90% rename from benchmark/vm1_gc_wb_ary_promoted.yml rename to benchmark/vm_gc_wb_ary_promoted.yml index cf9b5de005f915..003995945ba6b6 100644 --- a/benchmark/vm1_gc_wb_ary_promoted.yml +++ b/benchmark/vm_gc_wb_ary_promoted.yml @@ -10,6 +10,6 @@ prelude: | short_lived = '' benchmark: - vm1_gc_wb_ary_promoted: | + vm_gc_wb_ary_promoted: | long_lived[0] = short_lived # write barrier loop_count: 30000000 diff --git a/benchmark/vm1_gc_wb_obj.yml b/benchmark/vm_gc_wb_obj.yml similarity index 93% rename from benchmark/vm1_gc_wb_obj.yml rename to benchmark/vm_gc_wb_obj.yml index 9dc08e7e1ad72b..a2a2ce2d186501 100644 --- a/benchmark/vm1_gc_wb_obj.yml +++ b/benchmark/vm_gc_wb_obj.yml @@ -10,6 +10,6 @@ prelude: | short_lived = '' benchmark: - vm1_gc_wb_obj: | + vm_gc_wb_obj: | short_lived_obj.foo = short_lived # write barrier loop_count: 30000000 diff --git a/benchmark/vm1_gc_wb_obj_promoted.yml b/benchmark/vm_gc_wb_obj_promoted.yml similarity index 91% rename from benchmark/vm1_gc_wb_obj_promoted.yml rename to benchmark/vm_gc_wb_obj_promoted.yml index 26859d2a52fa2a..00a454ba7265ea 100644 --- a/benchmark/vm1_gc_wb_obj_promoted.yml +++ b/benchmark/vm_gc_wb_obj_promoted.yml @@ -12,6 +12,6 @@ prelude: | short_lived = '' benchmark: - vm1_gc_wb_obj_promoted: | + vm_gc_wb_obj_promoted: | long_lived.foo = short_lived # write barrier loop_count: 30000000 diff --git a/benchmark/vm1_ivar.yml b/benchmark/vm_ivar.yml similarity index 84% rename from benchmark/vm1_ivar.yml rename to benchmark/vm_ivar.yml index 7aa6fac729eb2f..119531d5ef854d 100644 --- a/benchmark/vm1_ivar.yml +++ b/benchmark/vm_ivar.yml @@ -1,6 +1,6 @@ prelude: "@a = 1\n" benchmark: - vm1_ivar: | + vm_ivar: | j = @a k = @a loop_count: 30000000 diff --git a/benchmark/vm1_ivar_set.yml b/benchmark/vm_ivar_set.yml similarity index 75% rename from benchmark/vm1_ivar_set.yml rename to benchmark/vm_ivar_set.yml index 6f19412d1688d4..8bbb60043b2048 100644 --- a/benchmark/vm1_ivar_set.yml +++ b/benchmark/vm_ivar_set.yml @@ -1,5 +1,5 @@ benchmark: - vm1_ivar_set: | + vm_ivar_set: | @a = 1 @b = 2 loop_count: 30000000 diff --git a/benchmark/vm1_length.yml b/benchmark/vm_length.yml similarity index 85% rename from benchmark/vm1_length.yml rename to benchmark/vm_length.yml index a18e2ca2e6adfa..5fd94e7d8648fe 100644 --- a/benchmark/vm1_length.yml +++ b/benchmark/vm_length.yml @@ -2,7 +2,7 @@ prelude: | a = 'abc' b = [1, 2, 3] benchmark: - vm1_length: | + vm_length: | a.length b.length loop_count: 30000000 diff --git a/benchmark/vm1_lvar_init.yml b/benchmark/vm_lvar_init.yml similarity index 96% rename from benchmark/vm1_lvar_init.yml rename to benchmark/vm_lvar_init.yml index 10e2becef9d90f..70a9b1c0ca6ae3 100644 --- a/benchmark/vm1_lvar_init.yml +++ b/benchmark/vm_lvar_init.yml @@ -1,6 +1,6 @@ # while loop cost is not removed because `i` is used in the script benchmark: - vm1_lvar_init: | + vm_lvar_init: | def m v unless v # unreachable code diff --git a/benchmark/vm1_lvar_set.yml b/benchmark/vm_lvar_set.yml similarity index 85% rename from benchmark/vm1_lvar_set.yml rename to benchmark/vm_lvar_set.yml index df8f6b6ea4bd30..f29f763d81b330 100644 --- a/benchmark/vm1_lvar_set.yml +++ b/benchmark/vm_lvar_set.yml @@ -1,4 +1,4 @@ benchmark: - vm1_lvar_set: | + vm_lvar_set: | a = b = c = d = e = f = g = h = j = k = l = m = n = o = p = q = r = 1 loop_count: 30000000 diff --git a/benchmark/vm2_method.yml b/benchmark/vm_method.yml similarity index 85% rename from benchmark/vm2_method.yml rename to benchmark/vm_method.yml index cc7b9b28ff1ca6..d45e4ec57224b8 100644 --- a/benchmark/vm2_method.yml +++ b/benchmark/vm_method.yml @@ -3,6 +3,6 @@ prelude: | nil end benchmark: - vm2_method: | + vm_method: | m; m; m; m; m; m; m; m; loop_count: 6000000 diff --git a/benchmark/vm2_method_missing.yml b/benchmark/vm_method_missing.yml similarity index 87% rename from benchmark/vm2_method_missing.yml rename to benchmark/vm_method_missing.yml index cbfb794b250c0a..3da456c0bb59db 100644 --- a/benchmark/vm2_method_missing.yml +++ b/benchmark/vm_method_missing.yml @@ -6,6 +6,6 @@ prelude: | obj = C.new benchmark: - vm2_method_missing: | + vm_method_missing: | obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; loop_count: 6000000 diff --git a/benchmark/vm2_method_with_block.yml b/benchmark/vm_method_with_block.yml similarity index 80% rename from benchmark/vm2_method_with_block.yml rename to benchmark/vm_method_with_block.yml index 6e522adccc5e0b..281a481394ca71 100644 --- a/benchmark/vm2_method_with_block.yml +++ b/benchmark/vm_method_with_block.yml @@ -3,6 +3,6 @@ prelude: | nil end benchmark: - vm2_method_with_block: | + vm_method_with_block: | m{}; m{}; m{}; m{}; m{}; m{}; m{}; m{}; loop_count: 6000000 diff --git a/benchmark/vm2_module_ann_const_set.yml b/benchmark/vm_module_ann_const_set.yml similarity index 70% rename from benchmark/vm2_module_ann_const_set.yml rename to benchmark/vm_module_ann_const_set.yml index b0becd9d3d7ed5..243229ba4a51b7 100644 --- a/benchmark/vm2_module_ann_const_set.yml +++ b/benchmark/vm_module_ann_const_set.yml @@ -1,4 +1,4 @@ benchmark: - vm2_module_ann_const_set: | + vm_module_ann_const_set: | Module.new.const_set(:X, Module.new) loop_count: 6000000 diff --git a/benchmark/vm2_module_const_set.yml b/benchmark/vm_module_const_set.yml similarity index 80% rename from benchmark/vm2_module_const_set.yml rename to benchmark/vm_module_const_set.yml index 05a640069ce66b..e5a24181a9cacd 100644 --- a/benchmark/vm2_module_const_set.yml +++ b/benchmark/vm_module_const_set.yml @@ -3,6 +3,6 @@ prelude: | end $VERBOSE = nil benchmark: - vm2_module_const_set: | + vm_module_const_set: | M.const_set(:X, Module.new) loop_count: 6000000 diff --git a/benchmark/vm2_mutex.yml b/benchmark/vm_mutex.yml similarity index 87% rename from benchmark/vm2_mutex.yml rename to benchmark/vm_mutex.yml index c40a90444a3ca6..abcf1e28ce37ee 100644 --- a/benchmark/vm2_mutex.yml +++ b/benchmark/vm_mutex.yml @@ -3,6 +3,6 @@ prelude: | m = Thread::Mutex.new benchmark: - vm2_mutex: | + vm_mutex: | m.synchronize{} loop_count: 6000000 diff --git a/benchmark/vm1_neq.yml b/benchmark/vm_neq.yml similarity index 88% rename from benchmark/vm1_neq.yml rename to benchmark/vm_neq.yml index 65a8128dda99aa..fb04d15ae899e1 100644 --- a/benchmark/vm1_neq.yml +++ b/benchmark/vm_neq.yml @@ -2,6 +2,6 @@ prelude: | obj1 = Object.new obj2 = Object.new benchmark: - vm1_neq: | + vm_neq: | obj1 != obj2 loop_count: 30000000 diff --git a/benchmark/vm2_newlambda.yml b/benchmark/vm_newlambda.yml similarity index 70% rename from benchmark/vm2_newlambda.yml rename to benchmark/vm_newlambda.yml index 93133f9f301cf7..0b9787d91a2eef 100644 --- a/benchmark/vm2_newlambda.yml +++ b/benchmark/vm_newlambda.yml @@ -1,4 +1,4 @@ benchmark: - vm2_newlambda: | + vm_newlambda: | lambda {} loop_count: 6000000 diff --git a/benchmark/vm1_not.yml b/benchmark/vm_not.yml similarity index 84% rename from benchmark/vm1_not.yml rename to benchmark/vm_not.yml index 0fb7b282a914f1..c68dde3c50a55b 100644 --- a/benchmark/vm1_not.yml +++ b/benchmark/vm_not.yml @@ -1,6 +1,6 @@ prelude: | obj = Object.new benchmark: - vm1_not: | + vm_not: | !obj loop_count: 30000000 diff --git a/benchmark/vm2_poly_method.yml b/benchmark/vm_poly_method.yml similarity index 94% rename from benchmark/vm2_poly_method.yml rename to benchmark/vm_poly_method.yml index 0104bdfb668165..dd2f4e71de9678 100644 --- a/benchmark/vm2_poly_method.yml +++ b/benchmark/vm_poly_method.yml @@ -1,6 +1,6 @@ # loop_count is not utilized since `i` is involved in the script benchmark: - vm2_poly_method: | + vm_poly_method: | class C1 def m 1 diff --git a/benchmark/vm2_poly_method_ov.yml b/benchmark/vm_poly_method_ov.yml similarity index 93% rename from benchmark/vm2_poly_method_ov.yml rename to benchmark/vm_poly_method_ov.yml index 3748073ba28f8b..bca1b62729f471 100644 --- a/benchmark/vm2_poly_method_ov.yml +++ b/benchmark/vm_poly_method_ov.yml @@ -1,6 +1,6 @@ # loop_count is not utilized since `i` is involved in the script benchmark: - vm2_poly_method_ov: | + vm_poly_method_ov: | class C1 def m 1 diff --git a/benchmark/vm2_poly_same_method.yml b/benchmark/vm_poly_same_method.yml similarity index 94% rename from benchmark/vm2_poly_same_method.yml rename to benchmark/vm_poly_same_method.yml index 867c433cf83aa3..6c5404ac84816c 100644 --- a/benchmark/vm2_poly_same_method.yml +++ b/benchmark/vm_poly_same_method.yml @@ -13,7 +13,7 @@ prelude: | o1 = Foo.new o2 = Bar.new benchmark: - vm2_poly_same_method: | + vm_poly_same_method: | o1.save; o2.save; o1.save; o2.save; o1.save; o2.save; diff --git a/benchmark/vm2_poly_singleton.yml b/benchmark/vm_poly_singleton.yml similarity index 93% rename from benchmark/vm2_poly_singleton.yml rename to benchmark/vm_poly_singleton.yml index e58d7bfb378fe9..c7923160fb4fdd 100644 --- a/benchmark/vm2_poly_singleton.yml +++ b/benchmark/vm_poly_singleton.yml @@ -1,6 +1,6 @@ # loop_count is not utilized since `i` is involved in the script benchmark: - vm2_poly_singleton: | + vm_poly_singleton: | class C1 def m; 1; end end diff --git a/benchmark/vm2_proc.yml b/benchmark/vm_proc.yml similarity index 87% rename from benchmark/vm2_proc.yml rename to benchmark/vm_proc.yml index 5c36e936d96d82..2f8de6c272fd92 100644 --- a/benchmark/vm2_proc.yml +++ b/benchmark/vm_proc.yml @@ -7,6 +7,6 @@ prelude: | a = 1 } benchmark: - vm2_proc: | + vm_proc: | pr.call loop_count: 6000000 diff --git a/benchmark/vm2_raise1.yml b/benchmark/vm_raise1.yml similarity index 91% rename from benchmark/vm2_raise1.yml rename to benchmark/vm_raise1.yml index f6eb308968cf67..247d9f70ee633c 100644 --- a/benchmark/vm2_raise1.yml +++ b/benchmark/vm_raise1.yml @@ -7,7 +7,7 @@ prelude: | end end benchmark: - vm2_raise1: | + vm_raise1: | begin rec 1 rescue diff --git a/benchmark/vm2_raise2.yml b/benchmark/vm_raise2.yml similarity index 91% rename from benchmark/vm2_raise2.yml rename to benchmark/vm_raise2.yml index 7d51b1b314e7cc..f0fa047b3c8b65 100644 --- a/benchmark/vm2_raise2.yml +++ b/benchmark/vm_raise2.yml @@ -7,7 +7,7 @@ prelude: | end end benchmark: - vm2_raise2: | + vm_raise2: | begin rec 10 rescue diff --git a/benchmark/vm2_regexp.yml b/benchmark/vm_regexp.yml similarity index 71% rename from benchmark/vm2_regexp.yml rename to benchmark/vm_regexp.yml index e53341f43bb11e..2aa3d94dbd6bb8 100644 --- a/benchmark/vm2_regexp.yml +++ b/benchmark/vm_regexp.yml @@ -1,8 +1,8 @@ prelude: | str = 'xxxhogexxx' benchmark: - vm2_regexp: | + vm_regexp: | /hoge/ =~ str - vm2_regexp_invert: | + vm_regexp_invert: | str =~ /hoge/ loop_count: 6000000 diff --git a/benchmark/vm1_rescue.yml b/benchmark/vm_rescue.yml similarity index 79% rename from benchmark/vm1_rescue.yml rename to benchmark/vm_rescue.yml index a175b823af6913..b4a0af521fcf89 100644 --- a/benchmark/vm1_rescue.yml +++ b/benchmark/vm_rescue.yml @@ -1,5 +1,5 @@ benchmark: - vm1_rescue: | + vm_rescue: | begin rescue end diff --git a/benchmark/vm2_send.yml b/benchmark/vm_send.yml similarity index 88% rename from benchmark/vm2_send.yml rename to benchmark/vm_send.yml index 44a12a27d98bea..753d3e83185a56 100644 --- a/benchmark/vm2_send.yml +++ b/benchmark/vm_send.yml @@ -6,6 +6,6 @@ prelude: | o = C.new benchmark: - vm2_send: | + vm_send: | o.__send__ :m loop_count: 6000000 diff --git a/benchmark/vm1_simplereturn.yml b/benchmark/vm_simplereturn.yml similarity index 76% rename from benchmark/vm1_simplereturn.yml rename to benchmark/vm_simplereturn.yml index 3564aac7e2f729..c9829cff0bc719 100644 --- a/benchmark/vm1_simplereturn.yml +++ b/benchmark/vm_simplereturn.yml @@ -3,5 +3,5 @@ prelude: | return 1 end benchmark: - vm1_simplereturn: m + vm_simplereturn: m loop_count: 30000000 diff --git a/benchmark/vm2_string_literal.yml b/benchmark/vm_string_literal.yml similarity index 81% rename from benchmark/vm2_string_literal.yml rename to benchmark/vm_string_literal.yml index 54b0aec1fe50d6..64439c79801ffc 100644 --- a/benchmark/vm2_string_literal.yml +++ b/benchmark/vm_string_literal.yml @@ -1,4 +1,4 @@ benchmark: - vm2_string_literal: | + vm_string_literal: | x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" loop_count: 6000000 diff --git a/benchmark/vm2_struct_big_aref_hi.yml b/benchmark/vm_struct_big_aref_hi.yml similarity index 81% rename from benchmark/vm2_struct_big_aref_hi.yml rename to benchmark/vm_struct_big_aref_hi.yml index eed1846d286086..4cf78970cbc7a7 100644 --- a/benchmark/vm2_struct_big_aref_hi.yml +++ b/benchmark/vm_struct_big_aref_hi.yml @@ -2,6 +2,6 @@ prelude: | s = Struct.new(*('a'..'z').map { |x| x.to_sym }) x = s.new benchmark: - vm2_struct_big_aref_hi: | + vm_struct_big_aref_hi: | x.z # x[25] loop_count: 6000000 diff --git a/benchmark/vm2_struct_big_aref_lo.yml b/benchmark/vm_struct_big_aref_lo.yml similarity index 81% rename from benchmark/vm2_struct_big_aref_lo.yml rename to benchmark/vm_struct_big_aref_lo.yml index 0915435b76e454..c91af27fa5111c 100644 --- a/benchmark/vm2_struct_big_aref_lo.yml +++ b/benchmark/vm_struct_big_aref_lo.yml @@ -2,6 +2,6 @@ prelude: | s = Struct.new(*('a'..'z').map { |x| x.to_sym }) x = s.new benchmark: - vm2_struct_big_aref_lo: | + vm_struct_big_aref_lo: | x.k # x[10] loop_count: 6000000 diff --git a/benchmark/vm2_struct_big_aset.yml b/benchmark/vm_struct_big_aset.yml similarity index 90% rename from benchmark/vm2_struct_big_aset.yml rename to benchmark/vm_struct_big_aset.yml index 6af50103d30d7a..69550d14ea215c 100644 --- a/benchmark/vm2_struct_big_aset.yml +++ b/benchmark/vm_struct_big_aset.yml @@ -1,6 +1,6 @@ # loop_count is not utilized since `i` is involved in the script benchmark: - vm2_struct_big_aset: | + vm_struct_big_aset: | s = Struct.new(*('a'..'z').map { |x| x.to_sym }) x = s.new i = 0 diff --git a/benchmark/vm2_struct_big_href_hi.yml b/benchmark/vm_struct_big_href_hi.yml similarity index 80% rename from benchmark/vm2_struct_big_href_hi.yml rename to benchmark/vm_struct_big_href_hi.yml index 60aa7fddf3eada..09b764dd13ad6d 100644 --- a/benchmark/vm2_struct_big_href_hi.yml +++ b/benchmark/vm_struct_big_href_hi.yml @@ -2,6 +2,6 @@ prelude: | s = Struct.new(*('a'..'z').map { |x| x.to_sym }) x = s.new benchmark: - vm2_struct_big_href_hi: | + vm_struct_big_href_hi: | x[:z] loop_count: 6000000 diff --git a/benchmark/vm2_struct_big_href_lo.yml b/benchmark/vm_struct_big_href_lo.yml similarity index 80% rename from benchmark/vm2_struct_big_href_lo.yml rename to benchmark/vm_struct_big_href_lo.yml index c55c0bd16c7c39..d2f00b220fef64 100644 --- a/benchmark/vm2_struct_big_href_lo.yml +++ b/benchmark/vm_struct_big_href_lo.yml @@ -2,6 +2,6 @@ prelude: | s = Struct.new(*('a'..'z').map { |x| x.to_sym }) x = s.new benchmark: - vm2_struct_big_href_lo: | + vm_struct_big_href_lo: | x[:k] loop_count: 6000000 diff --git a/benchmark/vm2_struct_big_hset.yml b/benchmark/vm_struct_big_hset.yml similarity index 90% rename from benchmark/vm2_struct_big_hset.yml rename to benchmark/vm_struct_big_hset.yml index d199c5bd4730a2..fc45cbee9c8478 100644 --- a/benchmark/vm2_struct_big_hset.yml +++ b/benchmark/vm_struct_big_hset.yml @@ -1,6 +1,6 @@ # loop_count is not utilized since `i` is involved in the script benchmark: - vm2_struct_big_hset: | + vm_struct_big_hset: | s = Struct.new(*('a'..'z').map { |x| x.to_sym }) x = s.new i = 0 diff --git a/benchmark/vm2_struct_small_aref.yml b/benchmark/vm_struct_small_aref.yml similarity index 77% rename from benchmark/vm2_struct_small_aref.yml rename to benchmark/vm_struct_small_aref.yml index 83381bed3af322..5a83251d1e9963 100644 --- a/benchmark/vm2_struct_small_aref.yml +++ b/benchmark/vm_struct_small_aref.yml @@ -2,6 +2,6 @@ prelude: | s = Struct.new(:a, :b, :c) x = s.new benchmark: - vm2_struct_small_aref: | + vm_struct_small_aref: | x.a loop_count: 6000000 diff --git a/benchmark/vm2_struct_small_aset.yml b/benchmark/vm_struct_small_aset.yml similarity index 88% rename from benchmark/vm2_struct_small_aset.yml rename to benchmark/vm_struct_small_aset.yml index 3e84a61dd0532a..74f435f1261afb 100644 --- a/benchmark/vm2_struct_small_aset.yml +++ b/benchmark/vm_struct_small_aset.yml @@ -1,6 +1,6 @@ # loop_count is not utilized since `i` is involved in the script benchmark: - vm2_struct_small_aset: | + vm_struct_small_aset: | s = Struct.new(:a, :b, :c) x = s.new i = 0 diff --git a/benchmark/vm2_struct_small_href.yml b/benchmark/vm_struct_small_href.yml similarity index 77% rename from benchmark/vm2_struct_small_href.yml rename to benchmark/vm_struct_small_href.yml index b744f070d19b79..6b7d7f39e7565a 100644 --- a/benchmark/vm2_struct_small_href.yml +++ b/benchmark/vm_struct_small_href.yml @@ -2,6 +2,6 @@ prelude: | s = Struct.new(:a, :b, :c) x = s.new benchmark: - vm2_struct_small_href: | + vm_struct_small_href: | x[:a] loop_count: 6000000 diff --git a/benchmark/vm2_struct_small_hset.yml b/benchmark/vm_struct_small_hset.yml similarity index 78% rename from benchmark/vm2_struct_small_hset.yml rename to benchmark/vm_struct_small_hset.yml index d43845d6e081bf..5d43b150de649c 100644 --- a/benchmark/vm2_struct_small_hset.yml +++ b/benchmark/vm_struct_small_hset.yml @@ -2,6 +2,6 @@ prelude: | s = Struct.new(:a, :b, :c) x = s.new benchmark: - vm2_struct_small_hset: | + vm_struct_small_hset: | x[:a] = 1 loop_count: 6000000 diff --git a/benchmark/vm2_super.yml b/benchmark/vm_super.yml similarity index 89% rename from benchmark/vm2_super.yml rename to benchmark/vm_super.yml index 674743762a64dc..0d1e965c6ec195 100644 --- a/benchmark/vm2_super.yml +++ b/benchmark/vm_super.yml @@ -13,5 +13,5 @@ prelude: | obj = CC.new benchmark: - vm2_super: obj.m + vm_super: obj.m loop_count: 6000000 diff --git a/benchmark/vm1_swap.yml b/benchmark/vm_swap.yml similarity index 84% rename from benchmark/vm1_swap.yml rename to benchmark/vm_swap.yml index fed87ccd62dc93..e824a65e0ac39e 100644 --- a/benchmark/vm1_swap.yml +++ b/benchmark/vm_swap.yml @@ -2,6 +2,6 @@ prelude: | a = 1 b = 2 benchmark: - vm1_swap: | + vm_swap: | a, b = b, a loop_count: 30000000 diff --git a/benchmark/vm2_unif1.yml b/benchmark/vm_unif1.yml similarity index 83% rename from benchmark/vm2_unif1.yml rename to benchmark/vm_unif1.yml index caef13279fe117..04187bb0e21fea 100644 --- a/benchmark/vm2_unif1.yml +++ b/benchmark/vm_unif1.yml @@ -2,6 +2,6 @@ prelude: | def m a, b end benchmark: - vm2_unif1: | + vm_unif1: | m 100, 200 loop_count: 6000000 diff --git a/benchmark/vm1_yield.yml b/benchmark/vm_yield.yml similarity index 93% rename from benchmark/vm1_yield.yml rename to benchmark/vm_yield.yml index ae1f9316f9de53..230be3d84f3a41 100644 --- a/benchmark/vm1_yield.yml +++ b/benchmark/vm_yield.yml @@ -1,6 +1,6 @@ # while loop cost is not removed due to benchmark_driver.gem's limitation benchmark: - vm1_yield: | + vm_yield: | def m i = 0 while i<30_000_000 diff --git a/benchmark/vm2_zsuper.yml b/benchmark/vm_zsuper.yml similarity index 91% rename from benchmark/vm2_zsuper.yml rename to benchmark/vm_zsuper.yml index f760cfd48ebc44..bfb5837578bc8f 100644 --- a/benchmark/vm2_zsuper.yml +++ b/benchmark/vm_zsuper.yml @@ -13,6 +13,6 @@ prelude: | obj = CC.new benchmark: - vm2_zsuper: | + vm_zsuper: | obj.m 10 loop_count: 6000000