---

yaml
---
r: 123727
b: refs/heads/try
c: 7d38994
h: refs/heads/master
i:
  123725: 8934738
  123723: fd5f263
  123719: a9c00c4
  123711: 8725349
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: da4e4e4e0a7778a85748aa4a303b13f603e96b4b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 8ddd286ea4ba4384a0dc9eae393ed515460a986e
-refs/heads/try: 90fe1a632bd38633006ea53f92a1da14944fd835
+refs/heads/try: 7d3899430b71d3ebed6b3fbf6ec47b042f513979
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcollections/vec.rs

@@ -2209,78 +2209,141 @@ mod tests {
         do_bench_clone(b, 1000)
     }
 
-    fn do_bench_clone_from(b: &mut Bencher, dst_len: uint, src_len: uint) {
+    fn do_bench_clone_from(b: &mut Bencher, times: uint, dst_len: uint, src_len: uint) {
         let dst: Vec<uint> = FromIterator::from_iter(range(0, src_len));
         let src: Vec<uint> = FromIterator::from_iter(range(dst_len, dst_len + src_len));
 
-        b.bytes = src_len as u64;
+        b.bytes = (times * src_len) as u64;
 
         b.iter(|| {
             let mut dst = dst.clone();
-            let src = src.clone();
-            dst.clone_from(&src);
-            assert_eq!(dst.len(), src_len);
-            assert!(dst.iter().enumerate().all(|(i, x)| dst_len + i == *x));
+
+            for _ in range(0, times) {
+                dst.clone_from(&src);
+
+                assert_eq!(dst.len(), src_len);
+                assert!(dst.iter().enumerate().all(|(i, x)| dst_len + i == *x));
+            }
         });
     }
 
     #[bench]
-    fn bench_clone_from_0000_0000(b: &mut Bencher) {
-        do_bench_clone_from(b, 0, 0)
+    fn bench_clone_from_01_0000_0000(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 0, 0)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0000_0010(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 0, 10)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0000_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 0, 100)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0000_1000(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 0, 1000)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0010_0010(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 10, 10)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0100_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 100, 100)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_1000_1000(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 1000, 1000)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0010_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 10, 100)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0100_1000(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 100, 1000)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0010_0000(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 10, 0)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_0100_0010(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 100, 10)
+    }
+
+    #[bench]
+    fn bench_clone_from_01_1000_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 1, 1000, 100)
+    }
+
+    #[bench]
+    fn bench_clone_from_10_0000_0000(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 0, 0)
     }
 
     #[bench]
-    fn bench_clone_from_0000_0010(b: &mut Bencher) {
-        do_bench_clone_from(b, 0, 10)
+    fn bench_clone_from_10_0000_0010(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 0, 10)
     }
 
     #[bench]
-    fn bench_clone_from_0000_0100(b: &mut Bencher) {
-        do_bench_clone_from(b, 0, 100)
+    fn bench_clone_from_10_0000_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 0, 100)
     }
 
     #[bench]
-    fn bench_clone_from_0000_1000(b: &mut Bencher) {
-        do_bench_clone_from(b, 0, 1000)
+    fn bench_clone_from_10_0000_1000(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 0, 1000)
     }
 
     #[bench]
-    fn bench_clone_from_0010_0010(b: &mut Bencher) {
-        do_bench_clone_from(b, 10, 10)
+    fn bench_clone_from_10_0010_0010(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 10, 10)
     }
 
     #[bench]
-    fn bench_clone_from_0100_0100(b: &mut Bencher) {
-        do_bench_clone_from(b, 100, 100)
+    fn bench_clone_from_10_0100_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 100, 100)
     }
 
     #[bench]
-    fn bench_clone_from_1000_1000(b: &mut Bencher) {
-        do_bench_clone_from(b, 1000, 1000)
+    fn bench_clone_from_10_1000_1000(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 1000, 1000)
     }
 
     #[bench]
-    fn bench_clone_from_0010_0100(b: &mut Bencher) {
-        do_bench_clone_from(b, 10, 100)
+    fn bench_clone_from_10_0010_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 10, 100)
     }
 
     #[bench]
-    fn bench_clone_from_0100_1000(b: &mut Bencher) {
-        do_bench_clone_from(b, 100, 1000)
+    fn bench_clone_from_10_0100_1000(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 100, 1000)
     }
 
     #[bench]
-    fn bench_clone_from_0010_0000(b: &mut Bencher) {
-        do_bench_clone_from(b, 10, 0)
+    fn bench_clone_from_10_0010_0000(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 10, 0)
     }
 
     #[bench]
-    fn bench_clone_from_0100_0010(b: &mut Bencher) {
-        do_bench_clone_from(b, 100, 10)
+    fn bench_clone_from_10_0100_0010(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 100, 10)
     }
 
     #[bench]
-    fn bench_clone_from_1000_0100(b: &mut Bencher) {
-        do_bench_clone_from(b, 1000, 100)
+    fn bench_clone_from_10_1000_0100(b: &mut Bencher) {
+        do_bench_clone_from(b, 10, 1000, 100)
     }
 }