diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs
index 955729ed2fe..5ba10a9eb14 100644
--- a/src/libstd/bitv.rs
+++ b/src/libstd/bitv.rs
@@ -869,12 +869,16 @@ priv impl BitvSet {
#[cfg(test)]
mod tests {
use core::prelude::*;
+ use std::test::BenchHarness;
use bitv::*;
use bitv;
use core::uint;
use core::vec;
+ use core::rand;
+
+ const bench_bits : uint = 1 << 14;
#[test]
pub fn test_to_str() {
@@ -1419,6 +1423,94 @@ mod tests {
assert a.remove(&1000);
assert a.capacity() == uint::bits;
}
+
+ fn rng() -> rand::Rng {
+ let seed = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+ rand::seeded_rng(&seed)
+ }
+
+ #[bench]
+ pub fn bench_uint_small(b: &mut BenchHarness) {
+ let r = rng();
+ let mut bitv = 0 as uint;
+ do b.iter {
+ bitv |= (1 << ((r.next() as uint) % uint::bits));
+ }
+ }
+
+ #[bench]
+ pub fn bench_small_bitv_small(b: &mut BenchHarness) {
+ let r = rng();
+ let mut bitv = SmallBitv::new(uint::bits);
+ do b.iter {
+ bitv.set((r.next() as uint) % uint::bits, true);
+ }
+ }
+
+ #[bench]
+ pub fn bench_big_bitv_small(b: &mut BenchHarness) {
+ let r = rng();
+ let mut bitv = BigBitv::new(~[0]);
+ do b.iter {
+ bitv.set((r.next() as uint) % uint::bits, true);
+ }
+ }
+
+ #[bench]
+ pub fn bench_big_bitv_big(b: &mut BenchHarness) {
+ let r = rng();
+ let mut storage = ~[];
+ storage.grow(bench_bits / uint::bits, &0);
+ let mut bitv = BigBitv::new(storage);
+ do b.iter {
+ bitv.set((r.next() as uint) % bench_bits, true);
+ }
+ }
+
+ #[bench]
+ pub fn bench_bitv_big(b: &mut BenchHarness) {
+ let r = rng();
+ let mut bitv = Bitv::new(bench_bits, false);
+ do b.iter {
+ bitv.set((r.next() as uint) % bench_bits, true);
+ }
+ }
+
+ #[bench]
+ pub fn bench_bitv_small(b: &mut BenchHarness) {
+ let r = rng();
+ let mut bitv = Bitv::new(uint::bits, false);
+ do b.iter {
+ bitv.set((r.next() as uint) % uint::bits, true);
+ }
+ }
+
+ #[bench]
+ pub fn bench_bitv_set_small(b: &mut BenchHarness) {
+ let r = rng();
+ let mut bitv = BitvSet::new();
+ do b.iter {
+ bitv.insert((r.next() as uint) % uint::bits);
+ }
+ }
+
+ #[bench]
+ pub fn bench_bitv_set_big(b: &mut BenchHarness) {
+ let r = rng();
+ let mut bitv = BitvSet::new();
+ do b.iter {
+ bitv.insert((r.next() as uint) % bench_bits);
+ }
+ }
+
+ #[bench]
+ pub fn bench_bitv_big_union(b: &mut BenchHarness) {
+ let mut b1 = Bitv::new(bench_bits, false);
+ let mut b2 = Bitv::new(bench_bits, false);
+ do b.iter {
+ b1.union(&b2);
+ }
+ }
}
//
diff --git a/src/test/bench/core-set.rs b/src/test/bench/core-set.rs
new file mode 100644
index 00000000000..cfb27329174
--- /dev/null
+++ b/src/test/bench/core-set.rs
@@ -0,0 +1,180 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+extern mod std;
+use core::hashmap::linear::LinearSet;
+use std::bitv::BitvSet;
+use std::treemap::TreeSet;
+use core::io::WriterUtil;
+
+struct Results {
+ sequential_ints: float,
+ random_ints: float,
+ delete_ints: float,
+
+ sequential_strings: float,
+ random_strings: float,
+ delete_strings: float
+}
+
+fn timed(result: &mut float, op: fn()) {
+ let start = std::time::precise_time_s();
+ op();
+ let end = std::time::precise_time_s();
+ *result = (end - start);
+}
+
+impl Results {
+ fn bench_int<T: Set<uint>>(&mut self, rng: @rand::Rng, num_keys: uint,
+ rand_cap: uint, f: fn() -> T) {
+ {
+ let mut set = f();
+ do timed(&mut self.sequential_ints) {
+ for uint::range(0, num_keys) |i| {
+ set.insert(i);
+ }
+
+ for uint::range(0, num_keys) |i| {
+ assert set.contains(&i);
+ }
+ }
+ }
+
+ {
+ let mut set = f();
+ do timed(&mut self.random_ints) {
+ for num_keys.times {
+ set.insert((rng.next() as uint) % rand_cap);
+ }
+ }
+ }
+
+ {
+ let mut set = f();
+ for uint::range(0, num_keys) |i| {
+ set.insert(i);
+ }
+
+ do timed(&mut self.delete_ints) {
+ for uint::range(0, num_keys) |i| {
+ assert set.remove(&i);
+ }
+ }
+ }
+ }
+
+ fn bench_str<T: Set<~str>>(&mut self, rng: @rand::Rng, num_keys: uint,
+ f: fn() -> T) {
+ {
+ let mut set = f();
+ do timed(&mut self.sequential_strings) {
+ for uint::range(0, num_keys) |i| {
+ let s = uint::to_str(i);
+ set.insert(s);
+ }
+
+ for uint::range(0, num_keys) |i| {
+ let s = uint::to_str(i);
+ assert set.contains(&s);
+ }
+ }
+ }
+
+ {
+ let mut set = f();
+ do timed(&mut self.random_strings) {
+ for num_keys.times {
+ let s = uint::to_str(rng.next() as uint);
+ set.insert(s);
+ }
+ }
+ }
+
+ {
+ let mut set = f();
+ for uint::range(0, num_keys) |i| {
+ set.insert(uint::to_str(i));
+ }
+ do timed(&mut self.delete_strings) {
+ for uint::range(0, num_keys) |i| {
+ assert set.remove(&uint::to_str(i));
+ }
+ }
+ }
+ }
+}
+
+fn write_header(header: &str) {
+ io::stdout().write_str(header);
+ io::stdout().write_str("\n");
+}
+
+fn write_row(label: &str, value: float) {
+ io::stdout().write_str(fmt!("%30s %f s\n", label, value));
+}
+
+fn write_results(label: &str, results: &Results) {
+ write_header(label);
+ write_row("sequential_ints", results.sequential_ints);
+ write_row("random_ints", results.random_ints);
+ write_row("delete_ints", results.delete_ints);
+ write_row("sequential_strings", results.sequential_strings);
+ write_row("random_strings", results.random_strings);
+ write_row("delete_strings", results.delete_strings);
+}
+
+fn empty_results() -> Results {
+ Results {
+ sequential_ints: 0f,
+ random_ints: 0f,
+ delete_ints: 0f,
+
+ sequential_strings: 0f,
+ random_strings: 0f,
+ delete_strings: 0f,
+ }
+}
+
+fn main() {
+ let args = os::args();
+ let num_keys = {
+ if args.len() == 2 {
+ uint::from_str(args[1]).get()
+ } else {
+ 100 // woefully inadequate for any real measurement
+ }
+ };
+
+ let seed = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+ let max = 200000;
+
+ {
+ let rng = rand::seeded_rng(&seed);
+ let mut results = empty_results();
+ results.bench_int(rng, num_keys, max, || LinearSet::new::<uint>());
+ results.bench_str(rng, num_keys, || LinearSet::new::<~str>());
+ write_results("core::hashmap::LinearSet", &results);
+ }
+
+ {
+ let rng = rand::seeded_rng(&seed);
+ let mut results = empty_results();
+ results.bench_int(rng, num_keys, max, || TreeSet::new::<uint>());
+ results.bench_str(rng, num_keys, || TreeSet::new::<~str>());
+ write_results("std::treemap::TreeSet", &results);
+ }
+
+ {
+ let rng = rand::seeded_rng(&seed);
+ let mut results = empty_results();
+ results.bench_int(rng, num_keys, max, || BitvSet::new());
+ write_results("std::bitv::BitvSet", &results);
+ }
+}