chore: restructure runtime and reduce build dependencies

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

4 files changed, 0 insertions, 239 deletions

diff --git a/benchmarks/benches/argon2id.rs b/benchmarks/benches/argon2id.rs
deleted file mode 100644
index 92250b8..0000000
--- a/benchmarks/benches/argon2id.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-mod util;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-fn run_tinywasm(wasm: &[u8], params: (i32, i32, i32), name: &str) {
-    let (mut store, instance) = util::tinywasm(wasm);
-    let argon2 = instance.exported_func::<(i32, i32, i32), i32>(&store, name).expect("exported_func");
-    argon2.call(&mut store, params).expect("call");
-}
-
-fn run_wasmi(wasm: &[u8], params: (i32, i32, i32), name: &str) {
-    let (module, mut store, linker) = util::wasmi(wasm);
-    let instance = linker.instantiate(&mut store, &module).expect("instantiate").start(&mut store).expect("start");
-    let argon2 = instance.get_typed_func::<(i32, i32, i32), i32>(&mut store, name).expect("get_typed_func");
-    argon2.call(&mut store, params).expect("call");
-}
-
-fn run_wasmer(wasm: &[u8], params: (i32, i32, i32), name: &str) {
-    use wasmer::Value;
-    let (mut store, instance) = util::wasmer(wasm);
-    let argon2 = instance.exports.get_function(name).expect("get_function");
-    argon2.call(&mut store, &[Value::I32(params.0), Value::I32(params.1), Value::I32(params.2)]).expect("call");
-}
-
-fn run_native(params: (i32, i32, i32)) {
-    fn run_native(m_cost: i32, t_cost: i32, p_cost: i32) {
-        let password = b"password";
-        let salt = b"some random salt";
-
-        let params = argon2::Params::new(m_cost as u32, t_cost as u32, p_cost as u32, None).unwrap();
-        let argon = argon2::Argon2::new(argon2::Algorithm::Argon2id, argon2::Version::V0x13, params);
-
-        let mut hash = [0u8; 32];
-        argon.hash_password_into(password, salt, &mut hash).unwrap();
-    }
-    run_native(params.0, params.1, params.2)
-}
-
-static ARGON2ID: &[u8] = include_bytes!("../../examples/rust/out/argon2id.opt.wasm");
-fn criterion_benchmark(c: &mut Criterion) {
-    let params = (1000, 2, 1);
-
-    let mut group = c.benchmark_group("argon2id");
-    group.measurement_time(std::time::Duration::from_secs(7));
-    group.sample_size(10);
-
-    group.bench_function("native", |b| b.iter(|| run_native(black_box(params))));
-    group.bench_function("tinywasm", |b| b.iter(|| run_tinywasm(ARGON2ID, black_box(params), "argon2id")));
-    group.bench_function("wasmi", |b| b.iter(|| run_wasmi(ARGON2ID, black_box(params), "argon2id")));
-    group.bench_function("wasmer", |b| b.iter(|| run_wasmer(ARGON2ID, black_box(params), "argon2id")));
-}
-
-criterion_group!(
-    name = benches;
-    config = Criterion::default().significance_level(0.1);
-    targets = criterion_benchmark
-);
-
-criterion_main!(benches);
diff --git a/benchmarks/benches/fibonacci.rs b/benchmarks/benches/fibonacci.rs
deleted file mode 100644
index b1ece55..0000000
--- a/benchmarks/benches/fibonacci.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-mod util;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-fn run_tinywasm(wasm: &[u8], iterations: i32, name: &str) {
-    let (mut store, instance) = util::tinywasm(wasm);
-    let fib = instance.exported_func::<i32, i32>(&store, name).expect("exported_func");
-    fib.call(&mut store, iterations).expect("call");
-}
-
-fn run_wasmi(wasm: &[u8], iterations: i32, name: &str) {
-    let (module, mut store, linker) = util::wasmi(wasm);
-    let instance = linker.instantiate(&mut store, &module).expect("instantiate").start(&mut store).expect("start");
-    let fib = instance.get_typed_func::<i32, i32>(&mut store, name).expect("get_typed_func");
-    fib.call(&mut store, iterations).expect("call");
-}
-
-fn run_wasmer(wasm: &[u8], iterations: i32, name: &str) {
-    use wasmer::*;
-    let compiler = wasmer::Singlepass::default();
-    let mut store = Store::new(compiler);
-    let import_object = imports! {};
-    let module = wasmer::Module::from_binary(&store, wasm).expect("wasmer::Module::from_binary");
-    let instance = Instance::new(&mut store, &module, &import_object).expect("Instance::new");
-    let fib = instance.exports.get_typed_function::<i32, i32>(&store, name).expect("get_function");
-    fib.call(&mut store, iterations).expect("call");
-}
-
-fn run_native(n: i32) -> i32 {
-    let mut sum = 0;
-    let mut last = 0;
-    let mut curr = 1;
-    for _i in 1..n {
-        sum = last + curr;
-        last = curr;
-        curr = sum;
-    }
-    sum
-}
-
-fn run_native_recursive(n: i32) -> i32 {
-    if n <= 1 {
-        return n;
-    }
-    run_native_recursive(n - 1) + run_native_recursive(n - 2)
-}
-
-static FIBONACCI: &[u8] = include_bytes!("../../examples/rust/out/fibonacci.opt.wasm");
-fn criterion_benchmark(c: &mut Criterion) {
-    {
-        let mut group = c.benchmark_group("fibonacci");
-        group.bench_function("native", |b| b.iter(|| run_native(black_box(60))));
-        group.bench_function("tinywasm", |b| b.iter(|| run_tinywasm(FIBONACCI, black_box(60), "fibonacci")));
-        group.bench_function("wasmi", |b| b.iter(|| run_wasmi(FIBONACCI, black_box(60), "fibonacci")));
-        group.bench_function("wasmer", |b| b.iter(|| run_wasmer(FIBONACCI, black_box(60), "fibonacci")));
-    }
-
-    {
-        let mut group = c.benchmark_group("fibonacci-recursive");
-        group.measurement_time(std::time::Duration::from_secs(5));
-        group.bench_function("native", |b| b.iter(|| run_native_recursive(black_box(26))));
-        group.bench_function("tinywasm", |b| {
-            b.iter(|| run_tinywasm(black_box(FIBONACCI), black_box(26), "fibonacci_recursive"))
-        });
-        group.bench_function("wasmi", |b| b.iter(|| run_wasmi(FIBONACCI, black_box(26), "fibonacci_recursive")));
-        group.bench_function("wasmer", |b| b.iter(|| run_wasmer(FIBONACCI, black_box(26), "fibonacci_recursive")));
-    }
-}
-
-criterion_group!(
-    name = benches;
-    config = Criterion::default().significance_level(0.1);
-    targets = criterion_benchmark
-);
-
-criterion_main!(benches);
diff --git a/benchmarks/benches/selfhosted.rs b/benchmarks/benches/selfhosted.rs
deleted file mode 100644
index 16269b8..0000000
--- a/benchmarks/benches/selfhosted.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-mod util;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-fn run_native() {
-    use tinywasm::*;
-    let module = tinywasm::Module::parse_bytes(include_bytes!("../../examples/rust/out/print.wasm")).expect("parse");
-    let mut store = Store::default();
-    let mut imports = Imports::default();
-    imports.define("env", "printi32", Extern::typed_func(|_: FuncContext<'_>, _: i32| Ok(()))).expect("define");
-    let instance = ModuleInstance::instantiate(&mut store, module, Some(imports)).expect("instantiate");
-    let hello = instance.exported_func::<(i32, i32), ()>(&store, "add_and_print").expect("exported_func");
-    hello.call(&mut store, (2, 3)).expect("call");
-}
-
-fn run_tinywasm(twasm: &[u8]) {
-    use tinywasm::*;
-    let module = Module::parse_bytes(twasm).expect("Module::parse_bytes");
-    let mut store = Store::default();
-    let mut imports = Imports::default();
-    imports.define("env", "printi32", Extern::typed_func(|_: FuncContext<'_>, _: i32| Ok(()))).expect("define");
-    let instance = ModuleInstance::instantiate(&mut store, module, Some(imports)).expect("instantiate");
-    let hello = instance.exported_func::<(), ()>(&store, "hello").expect("exported_func");
-    hello.call(&mut store, ()).expect("call");
-}
-
-fn run_wasmi(wasm: &[u8]) {
-    use wasmi::*;
-    let engine = Engine::default();
-    let module = wasmi::Module::new(&engine, wasm).expect("wasmi::Module::new");
-    let mut store = Store::new(&engine, ());
-    let mut linker = <Linker<()>>::new(&engine);
-    linker.define("env", "printi32", Func::wrap(&mut store, |_: Caller<'_, ()>, _: i32| {})).expect("define");
-    let instance = linker.instantiate(&mut store, &module).expect("instantiate").start(&mut store).expect("start");
-    let hello = instance.get_typed_func::<(), ()>(&mut store, "hello").expect("get_typed_func");
-    hello.call(&mut store, ()).expect("call");
-}
-
-fn run_wasmer(wasm: &[u8]) {
-    use wasmer::*;
-    let engine = wasmer::Engine::default();
-    let mut store = Store::default();
-    let import_object = imports! {
-        "env" => {
-            "printi32" => Function::new_typed(&mut store, |_: i32| {}),
-        },
-    };
-    let module = wasmer::Module::from_binary(&engine, wasm).expect("wasmer::Module::from_binary");
-    let instance = Instance::new(&mut store, &module, &import_object).expect("Instance::new");
-    let hello = instance.exports.get_function("hello").expect("get_function");
-    hello.call(&mut store, &[]).expect("call");
-}
-
-static TINYWASM: &[u8] = include_bytes!("../../examples/rust/out/tinywasm.opt.wasm");
-fn criterion_benchmark(c: &mut Criterion) {
-    {
-        let mut group = c.benchmark_group("selfhosted-parse");
-        group.bench_function("tinywasm", |b| {
-            b.iter(|| tinywasm::Module::parse_bytes(black_box(TINYWASM)).expect("parse"))
-        });
-    }
-
-    {
-        let mut group = c.benchmark_group("selfhosted");
-        group.bench_function("native", |b| b.iter(run_native));
-        group.bench_function("tinywasm", |b| b.iter(|| run_tinywasm(black_box(TINYWASM))));
-        group.bench_function("wasmi", |b| b.iter(|| run_wasmi(black_box(TINYWASM))));
-        group.bench_function("wasmer", |b| b.iter(|| run_wasmer(black_box(TINYWASM))));
-    }
-}
-
-criterion_group!(
-    name = benches;
-    config = Criterion::default().sample_size(100).measurement_time(std::time::Duration::from_secs(5)).significance_level(0.1);
-    targets = criterion_benchmark
-);
-
-criterion_main!(benches);
diff --git a/benchmarks/benches/util/mod.rs b/benchmarks/benches/util/mod.rs
deleted file mode 100644
index 2961046..0000000
--- a/benchmarks/benches/util/mod.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-#![allow(dead_code)]
-
-pub fn tinywasm(wasm: &[u8]) -> (tinywasm::Store, tinywasm::ModuleInstance) {
-    use tinywasm::*;
-    let module = Module::parse_bytes(wasm).expect("Module::parse_bytes");
-    let mut store = Store::default();
-    let imports = Imports::default();
-    let instance = ModuleInstance::instantiate(&mut store, module, Some(imports)).expect("instantiate");
-    (store, instance)
-}
-
-pub fn wasmi(wasm: &[u8]) -> (wasmi::Module, wasmi::Store<()>, wasmi::Linker<()>) {
-    use wasmi::*;
-    let engine = Engine::default();
-    let module = wasmi::Module::new(&engine, wasm).expect("wasmi::Module::new");
-    let store = Store::new(&engine, ());
-    let linker = <Linker<()>>::new(&engine);
-    (module, store, linker)
-}
-
-pub fn wasmer(wasm: &[u8]) -> (wasmer::Store, wasmer::Instance) {
-    use wasmer::*;
-    let compiler = Singlepass::default();
-    let mut store = Store::new(compiler);
-    let import_object = imports! {};
-    let module = Module::new(&store, wasm).expect("wasmer::Module::new");
-    let instance = Instance::new(&mut store, &module, &import_object).expect("Instance::new");
-    (store, instance)
-}