@@ -5,16 +5,15 @@ extern crate rand;
55
66const RAND_BENCH_N : u64 = 1000 ;
77
8- use test:: { black_box , Bencher } ;
8+ use test:: Bencher ;
99
1010use rand:: prelude:: * ;
1111use rand:: seq:: * ;
1212
1313#[ bench]
1414fn misc_gen_bool_const ( b : & mut Bencher ) {
15- let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
15+ let mut rng = StdRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
1616 b. iter ( || {
17- // Can be evaluated at compile time.
1817 let mut accum = true ;
1918 for _ in 0 ..:: RAND_BENCH_N {
2019 accum ^= rng. gen_bool ( 0.18 ) ;
@@ -25,19 +24,21 @@ fn misc_gen_bool_const(b: &mut Bencher) {
2524
2625#[ bench]
2726fn misc_gen_bool_var ( b : & mut Bencher ) {
28- let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
27+ let mut rng = StdRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
2928 b. iter ( || {
29+ let mut accum = true ;
3030 let mut p = 0.18 ;
31- black_box ( & mut p) ; // Avoid constant folding.
3231 for _ in 0 ..:: RAND_BENCH_N {
33- black_box ( rng. gen_bool ( p) ) ;
32+ accum ^= rng. gen_bool ( p) ;
33+ p += 0.0001 ;
3434 }
35+ accum
3536 } )
3637}
3738
3839#[ bench]
3940fn misc_bernoulli_const ( b : & mut Bencher ) {
40- let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
41+ let mut rng = StdRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
4142 let d = rand:: distributions:: Bernoulli :: new ( 0.18 ) ;
4243 b. iter ( || {
4344 // Can be evaluated at compile time.
@@ -51,14 +52,16 @@ fn misc_bernoulli_const(b: &mut Bencher) {
5152
5253#[ bench]
5354fn misc_bernoulli_var ( b : & mut Bencher ) {
54- let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
55+ let mut rng = StdRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
5556 b. iter ( || {
57+ let mut accum = true ;
5658 let mut p = 0.18 ;
57- black_box ( & mut p) ; // Avoid constant folding.
58- let d = rand:: distributions:: Bernoulli :: new ( p) ;
5959 for _ in 0 ..:: RAND_BENCH_N {
60- black_box ( rng. sample ( d) ) ;
60+ let d = rand:: distributions:: Bernoulli :: new ( p) ;
61+ accum ^= rng. sample ( d) ;
62+ p += 0.0001 ;
6163 }
64+ accum
6265 } )
6366}
6467
@@ -70,7 +73,7 @@ macro_rules! sample_binomial {
7073 let ( n, p) = ( $n, $p) ;
7174 b. iter( || {
7275 let d = rand:: distributions:: Binomial :: new( n, p) ;
73- black_box ( rng. sample( d) ) ;
76+ rng. sample( d)
7477 } )
7578 }
7679 }
@@ -88,7 +91,7 @@ fn misc_shuffle_100(b: &mut Bencher) {
8891 let x : & mut [ usize ] = & mut [ 1 ; 100 ] ;
8992 b. iter ( || {
9093 rng. shuffle ( x) ;
91- black_box ( & x ) ;
94+ x [ 0 ]
9295 } )
9396}
9497
@@ -97,7 +100,7 @@ fn misc_sample_iter_10_of_100(b: &mut Bencher) {
97100 let mut rng = SmallRng :: from_rng ( thread_rng ( ) ) . unwrap ( ) ;
98101 let x : & [ usize ] = & [ 1 ; 100 ] ;
99102 b. iter ( || {
100- black_box ( sample_iter ( & mut rng, x, 10 ) . unwrap_or_else ( |e| e) ) ;
103+ sample_iter ( & mut rng, x, 10 ) . unwrap_or_else ( |e| e)
101104 } )
102105}
103106
@@ -106,7 +109,7 @@ fn misc_sample_slice_10_of_100(b: &mut Bencher) {
106109 let mut rng = SmallRng :: from_rng ( thread_rng ( ) ) . unwrap ( ) ;
107110 let x : & [ usize ] = & [ 1 ; 100 ] ;
108111 b. iter ( || {
109- black_box ( sample_slice ( & mut rng, x, 10 ) ) ;
112+ sample_slice ( & mut rng, x, 10 )
110113 } )
111114}
112115
@@ -115,7 +118,7 @@ fn misc_sample_slice_ref_10_of_100(b: &mut Bencher) {
115118 let mut rng = SmallRng :: from_rng ( thread_rng ( ) ) . unwrap ( ) ;
116119 let x : & [ usize ] = & [ 1 ; 100 ] ;
117120 b. iter ( || {
118- black_box ( sample_slice_ref ( & mut rng, x, 10 ) ) ;
121+ sample_slice_ref ( & mut rng, x, 10 )
119122 } )
120123}
121124
@@ -125,7 +128,7 @@ macro_rules! sample_indices {
125128 fn $name( b: & mut Bencher ) {
126129 let mut rng = SmallRng :: from_rng( thread_rng( ) ) . unwrap( ) ;
127130 b. iter( || {
128- black_box ( sample_indices( & mut rng, $length, $amount) ) ;
131+ sample_indices( & mut rng, $length, $amount)
129132 } )
130133 }
131134 }
@@ -141,7 +144,7 @@ fn gen_1k_iter_repeat(b: &mut Bencher) {
141144 let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
142145 b. iter ( || {
143146 let v: Vec < u64 > = iter:: repeat ( ( ) ) . map ( |( ) | rng. gen ( ) ) . take ( 128 ) . collect ( ) ;
144- black_box ( v ) ;
147+ v
145148 } ) ;
146149 b. bytes = 1024 ;
147150}
@@ -152,7 +155,7 @@ fn gen_1k_gen_iter(b: &mut Bencher) {
152155 let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
153156 b. iter ( || {
154157 let v: Vec < u64 > = rng. gen_iter ( ) . take ( 128 ) . collect ( ) ;
155- black_box ( v ) ;
158+ v
156159 } ) ;
157160 b. bytes = 1024 ;
158161}
@@ -163,7 +166,7 @@ fn gen_1k_sample_iter(b: &mut Bencher) {
163166 let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
164167 b. iter ( || {
165168 let v: Vec < u64 > = Standard . sample_iter ( & mut rng) . take ( 128 ) . collect ( ) ;
166- black_box ( v ) ;
169+ v
167170 } ) ;
168171 b. bytes = 1024 ;
169172}
@@ -174,7 +177,7 @@ fn gen_1k_fill(b: &mut Bencher) {
174177 let mut buf = [ 0u64 ; 128 ] ;
175178 b. iter ( || {
176179 rng. fill ( & mut buf[ ..] ) ;
177- black_box ( buf) ;
180+ buf
178181 } ) ;
179182 b. bytes = 1024 ;
180183}
0 commit comments