benchmark/vm2_*.yml: fix ugly conversion errors

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

benchmark/vm2_array.yml

@@ -1,5 +1,4 @@
 benchmark:
-  vm2_array: 'a = [1,2,3,4,5,6,7,8,9,10]
+  vm2_array: |
-
+    a = [1,2,3,4,5,6,7,8,9,10]
-'
 loop_count: 6000000

benchmark/vm2_defined_method.yml

@@ -3,7 +3,6 @@ prelude: |
     define_method(:m){}
   end
 benchmark:
-  vm2_defined_method: 'm; m; m; m; m; m; m; m;
+  vm2_defined_method: |
-
+    m; m; m; m; m; m; m; m;
-'
 loop_count: 6000000

benchmark/vm2_eval.yml

@@ -1,5 +1,4 @@
 benchmark:
-  vm2_eval: 'eval("1")
+  vm2_eval: |
-
+    eval("1")
-'
 loop_count: 6000000

benchmark/vm2_method.yml

@@ -3,7 +3,6 @@ prelude: |
     nil
   end
 benchmark:
-  vm2_method: 'm; m; m; m; m; m; m; m;
+  vm2_method: |
-
+    m; m; m; m; m; m; m; m;
-'
 loop_count: 6000000

benchmark/vm2_method_missing.yml

@@ -6,7 +6,6 @@ prelude: |
 
   obj = C.new
 benchmark:
-  vm2_method_missing: 'obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m;
+  vm2_method_missing: |
-
+    obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m;
-'
 loop_count: 6000000

benchmark/vm2_method_with_block.yml

@@ -3,7 +3,6 @@ prelude: |
     nil
   end
 benchmark:
-  vm2_method_with_block: 'm{}; m{}; m{}; m{}; m{}; m{}; m{}; m{};
+  vm2_method_with_block: |
-
+    m{}; m{}; m{}; m{}; m{}; m{}; m{}; m{};
-'
 loop_count: 6000000

benchmark/vm2_module_ann_const_set.yml

@@ -1,5 +1,4 @@
 benchmark:
-  vm2_module_ann_const_set: 'Module.new.const_set(:X, Module.new)
+  vm2_module_ann_const_set: |
-
+    Module.new.const_set(:X, Module.new)
-'
 loop_count: 6000000

benchmark/vm2_mutex.yml

@@ -3,7 +3,6 @@ prelude: |
 
   m = Thread::Mutex.new
 benchmark:
-  vm2_mutex: 'm.synchronize{}
+  vm2_mutex: |
-
+    m.synchronize{}
-'
 loop_count: 6000000

benchmark/vm2_newlambda.yml

@@ -1,5 +1,4 @@
 benchmark:
-  vm2_newlambda: 'lambda {}
+  vm2_newlambda: |
-
+    lambda {}
-'
 loop_count: 6000000

benchmark/vm2_poly_method.yml

@@ -1,19 +1,24 @@
-prelude: |
+# loop_count is not utilized since `i` is involved in the script
-  class C1
-    def m
-      1
-    end
-  end
-  class C2
-    def m
-      2
-    end
-  end
-
-  o1 = C1.new
-  o2 = C2.new
 benchmark:
   vm2_poly_method: |
-    o = (i % 2 == 0) ? o1 : o2
+    class C1
-    o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+      def m
-loop_count: 6000000
+        1
+      end
+    end
+    class C2
+      def m
+        2
+      end
+    end
+
+    o1 = C1.new
+    o2 = C2.new
+
+    i = 0
+    while i<6_000_000
+      o = (i % 2 == 0) ? o1 : o2
+      o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+      i += 1
+    end
+loop_count: 1

benchmark/vm2_poly_method_ov.yml

@@ -1,19 +1,24 @@
-prelude: |
+# loop_count is not utilized since `i` is involved in the script
-  class C1
-    def m
-      1
-    end
-  end
-  class C2
-    def m
-      2
-    end
-  end
-
-  o1 = C1.new
-  o2 = C2.new
 benchmark:
   vm2_poly_method_ov: |
-    o = (i % 2 == 0) ? o1 : o2
+    class C1
+      def m
+        1
+      end
+    end
+    class C2
+      def m
+        2
+      end
+    end
+
+    o1 = C1.new
+    o2 = C2.new
+
+    i = 0
+    while i<6_000_000
+      o = (i % 2 == 0) ? o1 : o2
     #  o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
-loop_count: 6000000
+      i += 1
+    end
+loop_count: 1

benchmark/vm2_poly_singleton.yml

@@ -1,13 +1,18 @@
-prelude: |
+# loop_count is not utilized since `i` is involved in the script
-  class C1
-    def m; 1; end
-  end
-
-  o1 = C1.new
-  o2 = C1.new
-  o2.singleton_class
 benchmark:
   vm2_poly_singleton: |
-    o = (i % 2 == 0) ? o1 : o2
+    class C1
-    o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+      def m; 1; end
-loop_count: 6000000
+    end
+
+    o1 = C1.new
+    o2 = C1.new
+    o2.singleton_class
+
+    i = 0
+    while i<6_000_000 # benchmark loop 2
+      o = (i % 2 == 0) ? o1 : o2
+      o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+      i += 1
+    end
+loop_count: 1

benchmark/vm2_proc.yml

@@ -7,7 +7,6 @@ prelude: |
     a = 1
   }
 benchmark:
-  vm2_proc: 'pr.call
+  vm2_proc: |
-
+    pr.call
-'
 loop_count: 6000000

benchmark/vm2_send.yml

@@ -6,7 +6,6 @@ prelude: |
 
   o = C.new
 benchmark:
-  vm2_send: 'o.__send__ :m
+  vm2_send: |
-
+    o.__send__ :m
-'
 loop_count: 6000000

benchmark/vm2_string_literal.yml

@@ -1,5 +1,4 @@
 benchmark:
-  vm2_string_literal: 'x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+  vm2_string_literal: |
-
+    x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-'
 loop_count: 6000000

benchmark/vm2_struct_big_aref_hi.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(*('a'..'z').map { |x| x.to_sym })
   x = s.new
 benchmark:
-  vm2_struct_big_aref_hi: 'x.z # x[25]
+  vm2_struct_big_aref_hi: |
-
+    x.z # x[25]
-'
 loop_count: 6000000

benchmark/vm2_struct_big_aref_lo.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(*('a'..'z').map { |x| x.to_sym })
   x = s.new
 benchmark:
-  vm2_struct_big_aref_lo: 'x.k # x[10]
+  vm2_struct_big_aref_lo: |
-
+    x.k # x[10]
-'
 loop_count: 6000000

benchmark/vm2_struct_big_aset.yml

@@ -1,8 +1,11 @@
-prelude: |
+# loop_count is not utilized since `i` is involved in the script
-  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-  x = s.new
 benchmark:
-  vm2_struct_big_aset: 'x.k = i # x[10] = i
+  vm2_struct_big_aset: |
-
+    s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-'
+    x = s.new
-loop_count: 6000000
+    i = 0
+    while i<6_000_000
+      i += 1
+      x.k = i # x[10] = i
+    end
+loop_count: 1

benchmark/vm2_struct_big_href_hi.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(*('a'..'z').map { |x| x.to_sym })
   x = s.new
 benchmark:
-  vm2_struct_big_href_hi: 'x[:z]
+  vm2_struct_big_href_hi: |
-
+    x[:z]
-'
 loop_count: 6000000

benchmark/vm2_struct_big_href_lo.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(*('a'..'z').map { |x| x.to_sym })
   x = s.new
 benchmark:
-  vm2_struct_big_href_lo: 'x[:k]
+  vm2_struct_big_href_lo: |
-
+    x[:k]
-'
 loop_count: 6000000

benchmark/vm2_struct_big_hset.yml

@@ -1,8 +1,11 @@
-prelude: |
+# loop_count is not utilized since `i` is involved in the script
-  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-  x = s.new
 benchmark:
-  vm2_struct_big_hset: 'x[:k] = i
+  vm2_struct_big_hset: |
-
+    s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-'
+    x = s.new
-loop_count: 6000000
+    i = 0
+    while i<6_000_000
+      i += 1
+      x[:k] = i
+    end
+loop_count: 1

benchmark/vm2_struct_small_aref.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(:a, :b, :c)
   x = s.new
 benchmark:
-  vm2_struct_small_aref: 'x.a
+  vm2_struct_small_aref: |
-
+    x.a
-'
 loop_count: 6000000

benchmark/vm2_struct_small_aset.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(:a, :b, :c)
   x = s.new
 benchmark:
-  vm2_struct_small_aset: 'x.a = i
+  vm2_struct_small_aset: |
-
+    x.a = i
-'
 loop_count: 6000000

benchmark/vm2_struct_small_href.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(:a, :b, :c)
   x = s.new
 benchmark:
-  vm2_struct_small_href: 'x[:a]
+  vm2_struct_small_href: |
-
+    x[:a]
-'
 loop_count: 6000000

benchmark/vm2_struct_small_hset.yml

@@ -2,7 +2,6 @@ prelude: |
   s = Struct.new(:a, :b, :c)
   x = s.new
 benchmark:
-  vm2_struct_small_hset: 'x[:a] = 1
+  vm2_struct_small_hset: |
-
+    x[:a] = 1
-'
 loop_count: 6000000

benchmark/vm2_super.yml

@@ -1,5 +1,4 @@
-prelude: |2
+prelude: |
-
   class C
     def m
       1
@@ -14,7 +13,5 @@ prelude: |2
 
   obj = CC.new
 benchmark:
-  vm2_super: 'obj.m
+  vm2_super: obj.m
-
-'
 loop_count: 6000000