Refactor benchmarking suite to use Criterion

RustPython · coolreader18 · Dec 14, 2020 · Dec 10, 2020 · Dec 11, 2020 · Dec 11, 2020
commit 5788e7bf8e1e0019e47f24ad6521c5836f3b146e
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ flame.txt
 flamescope.json
 /wapm.lock
 /wapm_packages
+/.cargo/config
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,10 +14,6 @@ members = [
     "derive", "jit", "parser", "vm", "vm/pylib-crate", "wasm/lib",
 ]
 
-[[bench]]
-name = "bench"
-path = "./benchmarks/bench.rs"
-
 [features]
 default = ["threading", "pylib"]
 flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
@@ -43,11 +39,22 @@ libc = "0.2"
 flame = { version = "0.2", optional = true }
 flamescope = { version = "0.1", optional = true }
 
+cpython = "0.5.0"
+
 [target.'cfg(not(target_os = "wasi"))'.dependencies]
 rustyline = "6.0"
 
 [dev-dependencies]
 cpython = "0.5.0"
+criterion = "0.3"
+
+[[bench]]
+name = "parsing"
+harness = false
+
+[[bench]]
+name = "execution"
+harness = false
 
 [[bin]]
 name = "rustpython"
@@ -63,3 +70,5 @@ opt-level = 3
 # crossbeam-utils = { git = "https://github.com/crossbeam-rs/crossbeam" }
 # socket2 = { git = "https://github.com/alexcrichton/socket2-rs" }
 # REDOX END
+
+[target.bench]
diff --git a/benches/README.md b/benches/README.md
@@ -0,0 +1,38 @@
+# Benchmarking
+
+These are some files to determine performance of rustpython.
+
+## Usage
+
+Install pytest and pytest-benchmark:
+
+    $ pip install pytest-benchmark
+
+Then run:
+
+    $ pytest
+
+You can also benchmark the Rust benchmarks by just running
+`cargo bench` from the root of the repository. To view Python tracebacks during benchmarks,
+run `RUST_BACKTRACE=1 cargo bench`.
+
+You can bench against a specific Python version by running:
+
+```shell
+$ PYTHON_SYS_EXECUTABLE=python3.7 cargo bench
+```
+
+On MacOS you will need to
+add the following to a `.cargo/config` file:
+
+```toml
+[target.x86_64-apple-darwin]
+rustflags = [
+    "-C", "link-arg=-undefined",
+    "-C", "link-arg=dynamic_lookup",
+]
+```
+
+## Benchmark source
+
+- https://benchmarksgame-team.pages.debian.net/benchmarksgame/program/nbody-python3-2.html
diff --git a/benchmarks/benchmarks/mandelbrot.py → benches/benchmarks/mandelbrot.py b/benchmarks/benchmarks/mandelbrot.py → benches/benchmarks/mandelbrot.py
diff --git a/benchmarks/benchmarks/minidom.py → benches/benchmarks/minidom.py b/benchmarks/benchmarks/minidom.py → benches/benchmarks/minidom.py