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.

80 files changed, 78 insertions, 78 deletions

diff --git a/benchmark/README.md b/benchmark/README.md
index 24a2669143..c6d7cc318d 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
index 7373098d5e..2a177237ef 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
index f714dd9bd9..75b803478e 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
index f383e59ef4..a0d379b18a 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
index 0fbf73e1ca..0fbf73e1ca 100644
--- a/benchmark/vm3_backtrace.rb
+++ b/benchmark/vm_backtrace.rb
diff --git a/benchmark/vm2_bigarray.yml b/benchmark/vm_bigarray.yml
index 2ad6da3905..8b2d3f3443 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
index e9154e4ba9..4dacfde793 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
index ac7c940f93..68b3e40bf5 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
index 947b8c53d5..5e5a0170a2 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
index e2817a3ce2..a7d8d366ea 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
index ca1bef3369..841f5e7a63 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
index 56ae617798..8ea9b46ed2 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
index 7716783c09..b26a491a15 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
index c49b8dfe5e..9f91801544 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
index 9661323cd2..9661323cd2 100644
--- a/benchmark/vm3_clearmethodcache.rb
+++ b/benchmark/vm_clearmethodcache.rb
diff --git a/benchmark/vm1_const.yml b/benchmark/vm_const.yml
index b98db1545c..6064d4eed0 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
index e1b0d55674..347e0cfd33 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
index f8bd6e0133..30c7a3193c 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
index afbbe38bec..4ea62f30de 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
index d506a9c079..7ba1a8d1de 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
index f29705f694..b5a54e1ddf 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
index 3ecf6bdcb2..b83d3152d4 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
index 0170650638..4ca41085b1 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
index 8fb91a84eb..892622f121 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
index fbf7283c29..3de36b66eb 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
index 4e9ad1852b..92f5fd52ab 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
index b78af91a20..facc9aa043 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
index e668026915..e668026915 100644
--- a/benchmark/vm3_gc.rb
+++ b/benchmark/vm_gc.rb
diff --git a/benchmark/vm3_gc_old_full.rb b/benchmark/vm_gc_old_full.rb
index cfdfc8c5a5..cfdfc8c5a5 100644
--- a/benchmark/vm3_gc_old_full.rb
+++ b/benchmark/vm_gc_old_full.rb
diff --git a/benchmark/vm3_gc_old_immediate.rb b/benchmark/vm_gc_old_immediate.rb
index ad22feb655..ad22feb655 100644
--- a/benchmark/vm3_gc_old_immediate.rb
+++ b/benchmark/vm_gc_old_immediate.rb
diff --git a/benchmark/vm3_gc_old_lazy.rb b/benchmark/vm_gc_old_lazy.rb
index b74d44baf1..b74d44baf1 100644
--- a/benchmark/vm3_gc_old_lazy.rb
+++ b/benchmark/vm_gc_old_lazy.rb
diff --git a/benchmark/vm1_gc_short_lived.yml b/benchmark/vm_gc_short_lived.yml
index 8fdcb7371d..29c803fee3 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
index c22ea74a60..4b6c3ed7b9 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
index c731aae548..03ba0f95a9 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
index 7fc1abedd8..129b8bf4ed 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
index 50fb4b6f84..e3293e72d0 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
index cf9b5de005..003995945b 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
index 9dc08e7e1a..a2a2ce2d18 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
index 26859d2a52..00a454ba72 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
index 7aa6fac729..119531d5ef 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
index 6f19412d16..8bbb60043b 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
index a18e2ca2e6..5fd94e7d86 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
index 10e2becef9..70a9b1c0ca 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
index df8f6b6ea4..f29f763d81 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
index cc7b9b28ff..d45e4ec572 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
index cbfb794b25..3da456c0bb 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
index 6e522adccc..281a481394 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
index b0becd9d3d..243229ba4a 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
index 05a640069c..e5a24181a9 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
index c40a90444a..abcf1e28ce 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
index 65a8128dda..fb04d15ae8 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
index 93133f9f30..0b9787d91a 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
index 0fb7b282a9..c68dde3c50 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
index 0104bdfb66..dd2f4e71de 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
index 3748073ba2..bca1b62729 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
index 867c433cf8..6c5404ac84 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
index e58d7bfb37..c7923160fb 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
index 5c36e936d9..2f8de6c272 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
index f6eb308968..247d9f70ee 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
index 7d51b1b314..f0fa047b3c 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
index e53341f43b..2aa3d94dbd 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
index a175b823af..b4a0af521f 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
index 44a12a27d9..753d3e8318 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
index 3564aac7e2..c9829cff0b 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
index 54b0aec1fe..64439c7980 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
index eed1846d28..4cf78970cb 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
index 0915435b76..c91af27fa5 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
index 6af50103d3..69550d14ea 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
index 60aa7fddf3..09b764dd13 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
index c55c0bd16c..d2f00b220f 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
index d199c5bd47..fc45cbee9c 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
index 83381bed3a..5a83251d1e 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
index 3e84a61dd0..74f435f126 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
index b744f070d1..6b7d7f39e7 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
index d43845d6e0..5d43b150de 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
index 674743762a..0d1e965c6e 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
index fed87ccd62..e824a65e0a 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
index caef13279f..04187bb0e2 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
index ae1f9316f9..230be3d84f 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
index f760cfd48e..bfb5837578 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