Merge branch 'master' into coolreader18/ctx-rust-classes

Author: coolreader18

Cargo.lock

@@ -7,6 +7,11 @@ edition = "2018"
 [workspace]
 members = [".", "derive", "vm", "wasm/lib", "parser"]
 
+[[bench]]
+name = "bench"
+path = "./benchmarks/bench.rs"
+
+
 [dependencies]
 log="0.4.1"
 env_logger="0.5.10"
@@ -15,3 +20,6 @@ rustpython_parser = {path = "parser"}
 rustpython_vm = {path = "vm"}
 rustyline = "2.1.0"
 xdg = "2.2.0"
+
+[dev-dependencies.cpython]
+version = "0.2"

Cargo.toml

@@ -1,5 +1,10 @@
 from _os import *
 
+if name == 'nt':
+    sep = '\\'
+else:
+    sep = '/'
+
 # Change environ to automatically call putenv(), unsetenv if they exist.
 from _collections_abc import MutableMapping
 

Lib/os.py

@@ -0,0 +1,125 @@
+#![feature(test)]
+
+extern crate cpython;
+extern crate rustpython_parser;
+extern crate rustpython_vm;
+extern crate test;
+
+use rustpython_vm::pyobject::PyResult;
+use rustpython_vm::{compile, VirtualMachine};
+
+#[bench]
+fn bench_tokenization(b: &mut test::Bencher) {
+    use rustpython_parser::lexer::{make_tokenizer, Tok};
+
+    let source = include_str!("./benchmarks/minidom.py");
+
+    b.bytes = source.len() as _;
+    b.iter(|| {
+        let lexer = make_tokenizer(source);
+        for res in lexer {
+            let _token: Tok = res.unwrap().1;
+        }
+    })
+}
+
+#[bench]
+fn bench_rustpy_parse_to_ast(b: &mut test::Bencher) {
+    use rustpython_parser::parser::parse_program;
+
+    let source = include_str!("./benchmarks/minidom.py");
+
+    b.bytes = source.len() as _;
+    b.iter(|| parse_program(source).unwrap())
+}
+
+#[bench]
+fn bench_cpython_parse_to_ast(b: &mut test::Bencher) {
+    let source = include_str!("./benchmarks/minidom.py");
+
+    let gil = cpython::Python::acquire_gil();
+    let python = gil.python();
+
+    let globals = None;
+    let locals = cpython::PyDict::new(python);
+
+    locals.set_item(python, "SOURCE_CODE", source).unwrap();
+
+    let code = "compile(SOURCE_CODE, mode=\"exec\", filename=\"minidom.py\")";
+
+    b.bytes = source.len() as _;
+    b.iter(|| {
+        let res: cpython::PyResult<cpython::PyObject> = python.eval(code, globals, Some(&locals));
+        assert!(res.is_ok());
+    })
+}
+
+#[bench]
+fn bench_cpython_nbody(b: &mut test::Bencher) {
+    let source = include_str!("./benchmarks/nbody.py");
+
+    let gil = cpython::Python::acquire_gil();
+    let python = gil.python();
+
+    let globals = None;
+    let locals = None;
+
+    b.iter(|| {
+        let res: cpython::PyResult<()> = python.run(source, globals, locals);
+        assert!(res.is_ok());
+    })
+}
+
+#[bench]
+fn bench_cpython_mandelbrot(b: &mut test::Bencher) {
+    let source = include_str!("./benchmarks/mandelbrot.py");
+
+    let gil = cpython::Python::acquire_gil();
+    let python = gil.python();
+
+    let globals = None;
+    let locals = None;
+
+    b.iter(|| {
+        let res: cpython::PyResult<()> = python.run(source, globals, locals);
+        assert!(res.is_ok());
+    })
+}
+
+#[bench]
+fn bench_rustpy_nbody(b: &mut test::Bencher) {
+    // NOTE: Take long time.
+    let source = include_str!("./benchmarks/nbody.py");
+
+    let vm = VirtualMachine::new();
+
+    let code = match compile::compile(&vm, source, &compile::Mode::Single, "<stdin>".to_string()) {
+        Ok(code) => code,
+        Err(e) => panic!("{:?}", e),
+    };
+
+    b.iter(|| {
+        let scope = vm.ctx.new_scope();
+        let res: PyResult = vm.run_code_obj(code.clone(), scope);
+        assert!(res.is_ok());
+    })
+}
+
+#[bench]
+fn bench_rustpy_mandelbrot(b: &mut test::Bencher) {
+    // NOTE: Take long time.
+    let source = include_str!("./benchmarks/mandelbrot.py");
+
+    let vm = VirtualMachine::new();
+
+    let code = match compile::compile(&vm, source, &compile::Mode::Single, "<stdin>".to_string()) {
+        Ok(code) => code,
+        Err(e) => panic!("{:?}", e),
+    };
+
+    b.iter(|| {
+        let scope = vm.ctx.new_scope();
+        let res: PyResult = vm.run_code_obj(code.clone(), scope);
+        assert!(res.is_ok());
+    })
+}

benchmarks/bench.rs

@@ -21,11 +21,13 @@
 			i = i+1
 
 		if Tr+Ti <= 4:
-			print('*', end='')
+			# print('*', end='')
+			pass
 		else:
-			print('·', end='')
+			# print('·', end='')
+			pass
 
 		x = x+1
 
-	print()
+	# print()
 	y = y+1