Merge pull request #252 from rust-lang-nursery/fixup-bench

Touch up benchmarks.
rust-lang · Jun 20, 2016 · 6ab5646 · 6ab5646
2 parents e25dcd1 + 6231325
commit 6ab5646
Show file tree

Hide file tree

Showing 6 changed files with 83,389 additions and 4 deletions.
diff --git a/bench/compile b/bench/compile
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Enable SIMD.
-export RUSTFLAGS="-C target-feature=+ssse3"
+export RUSTFLAGS="-C target-cpu=native"
 
 exec cargo build \
   --release \

diff --git a/bench/run b/bench/run
@@ -10,7 +10,8 @@ if [ $# = 0 ] || [ $1 = '-h' ] || [ $1 = '--help' ]; then
 fi
 
 # Enable SIMD.
-export RUSTFLAGS="-C target-feature=+ssse3"
+# export RUSTFLAGS="-C target-feature=+ssse3"
+export RUSTFLAGS="-C target-cpu=native"
 
 which="$1"
 shift

diff --git a/bench/src/bench.rs b/bench/src/bench.rs
@@ -66,7 +66,6 @@ macro_rules! regex {
 }
 
 #[cfg(feature = "re-rust-bytes")]
-#[cfg(not(feature = "re-rust-plugin"))]
 macro_rules! regex {
     ($re:expr) => {{
         // Always enable the Unicode flag for byte based regexes.
@@ -250,4 +249,5 @@ macro_rules! bench_find {
 
 mod ffi;
 mod misc;
+mod regexdna;
 mod sherlock;