bytecodealliance · jlb6740 · Apr 29, 2024 · Apr 23, 2024 · Apr 24, 2024 · Apr 29, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,5 +32,6 @@ exclude = [
     "benchmarks/shootout-switch",
     "benchmarks/shootout-xblabla20",
     "benchmarks/shootout-xchacha20",
-    "engines/native/libengine"
+    "benchmarks/tract-onnx-image-classification",
+    "engines/native/libengine",
 ]
diff --git a/benchmarks/all.suite b/benchmarks/all.suite
@@ -117,3 +117,4 @@ shootout/shootout-switch.wasm
 shootout/shootout-xblabla20.wasm
 shootout/shootout-xchacha20.wasm
 spidermonkey/benchmark.wasm
+tract-onnx-image-classification/benchmark.wasm
diff --git a/benchmarks/libsodium/Dockerfile b/benchmarks/libsodium/Dockerfile
@@ -5,9 +5,9 @@ RUN apt update && apt install -y wget xz-utils unzip git
 # Download and extract the latest stable version of Zig and retrieve the
 # `stable` branch of libsodium that can be built by it.
 WORKDIR /
-RUN wget https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz
-RUN tar --extract --verbose --file=zig-linux-x86_64-0.11.0.tar.xz
-ENV PATH="${PATH}:/zig-linux-x86_64-0.11.0"
+RUN wget https://ziglang.org/download/0.12.0/zig-linux-x86_64-0.12.0.tar.xz
+RUN tar --extract --verbose --file=zig-linux-x86_64-0.12.0.tar.xz
+ENV PATH="${PATH}:/zig-linux-x86_64-0.12.0"
 RUN echo "zig version = $(zig version)"
 RUN wget https://github.com/jedisct1/libsodium/archive/stable.zip
 RUN unzip stable.zip

diff --git a/benchmarks/libsodium/libsodium-aead_aegis128l.wasm b/benchmarks/libsodium/libsodium-aead_aegis128l.wasm
diff --git a/benchmarks/libsodium/libsodium-aead_aegis256.wasm b/benchmarks/libsodium/libsodium-aead_aegis256.wasm
diff --git a/benchmarks/libsodium/libsodium-aead_aes256gcm.wasm b/benchmarks/libsodium/libsodium-aead_aes256gcm.wasm
diff --git a/benchmarks/libsodium/libsodium-aead_aes256gcm2.wasm b/benchmarks/libsodium/libsodium-aead_aes256gcm2.wasm
diff --git a/benchmarks/libsodium/libsodium-aead_chacha20poly1305.wasm b/benchmarks/libsodium/libsodium-aead_chacha20poly1305.wasm
diff --git a/benchmarks/libsodium/libsodium-aead_chacha20poly13052.wasm b/benchmarks/libsodium/libsodium-aead_chacha20poly13052.wasm
diff --git a/benchmarks/libsodium/libsodium-aead_xchacha20poly1305.wasm b/benchmarks/libsodium/libsodium-aead_xchacha20poly1305.wasm
diff --git a/benchmarks/libsodium/libsodium-auth.wasm b/benchmarks/libsodium/libsodium-auth.wasm
diff --git a/benchmarks/libsodium/libsodium-auth2.wasm b/benchmarks/libsodium/libsodium-auth2.wasm
diff --git a/benchmarks/libsodium/libsodium-auth3.wasm b/benchmarks/libsodium/libsodium-auth3.wasm
diff --git a/benchmarks/libsodium/libsodium-auth5.wasm b/benchmarks/libsodium/libsodium-auth5.wasm
diff --git a/benchmarks/libsodium/libsodium-auth6.wasm b/benchmarks/libsodium/libsodium-auth6.wasm
diff --git a/benchmarks/libsodium/libsodium-auth7.wasm b/benchmarks/libsodium/libsodium-auth7.wasm
diff --git a/benchmarks/libsodium/libsodium-box.wasm b/benchmarks/libsodium/libsodium-box.wasm
diff --git a/benchmarks/libsodium/libsodium-box2.wasm b/benchmarks/libsodium/libsodium-box2.wasm
diff --git a/benchmarks/libsodium/libsodium-box7.wasm b/benchmarks/libsodium/libsodium-box7.wasm
diff --git a/benchmarks/libsodium/libsodium-box8.wasm b/benchmarks/libsodium/libsodium-box8.wasm
diff --git a/benchmarks/libsodium/libsodium-box_easy.wasm b/benchmarks/libsodium/libsodium-box_easy.wasm
diff --git a/benchmarks/libsodium/libsodium-box_easy2.wasm b/benchmarks/libsodium/libsodium-box_easy2.wasm
diff --git a/benchmarks/libsodium/libsodium-box_seal.wasm b/benchmarks/libsodium/libsodium-box_seal.wasm
diff --git a/benchmarks/libsodium/libsodium-box_seed.wasm b/benchmarks/libsodium/libsodium-box_seed.wasm
diff --git a/benchmarks/libsodium/libsodium-chacha20.wasm b/benchmarks/libsodium/libsodium-chacha20.wasm
diff --git a/benchmarks/libsodium/libsodium-codecs.wasm b/benchmarks/libsodium/libsodium-codecs.wasm
diff --git a/benchmarks/libsodium/libsodium-core1.wasm b/benchmarks/libsodium/libsodium-core1.wasm
diff --git a/benchmarks/libsodium/libsodium-core2.wasm b/benchmarks/libsodium/libsodium-core2.wasm
diff --git a/benchmarks/libsodium/libsodium-core3.wasm b/benchmarks/libsodium/libsodium-core3.wasm
diff --git a/benchmarks/libsodium/libsodium-core4.wasm b/benchmarks/libsodium/libsodium-core4.wasm
diff --git a/benchmarks/libsodium/libsodium-core5.wasm b/benchmarks/libsodium/libsodium-core5.wasm
diff --git a/benchmarks/libsodium/libsodium-core6.wasm b/benchmarks/libsodium/libsodium-core6.wasm
diff --git a/benchmarks/libsodium/libsodium-core_ed25519.wasm b/benchmarks/libsodium/libsodium-core_ed25519.wasm
diff --git a/benchmarks/libsodium/libsodium-core_ristretto255.wasm b/benchmarks/libsodium/libsodium-core_ristretto255.wasm
diff --git a/benchmarks/libsodium/libsodium-ed25519_convert.wasm b/benchmarks/libsodium/libsodium-ed25519_convert.wasm
diff --git a/benchmarks/libsodium/libsodium-generichash.wasm b/benchmarks/libsodium/libsodium-generichash.wasm
diff --git a/benchmarks/libsodium/libsodium-generichash2.wasm b/benchmarks/libsodium/libsodium-generichash2.wasm
diff --git a/benchmarks/libsodium/libsodium-generichash3.wasm b/benchmarks/libsodium/libsodium-generichash3.wasm
diff --git a/benchmarks/libsodium/libsodium-hash.wasm b/benchmarks/libsodium/libsodium-hash.wasm
diff --git a/benchmarks/libsodium/libsodium-hash3.wasm b/benchmarks/libsodium/libsodium-hash3.wasm
diff --git a/benchmarks/libsodium/libsodium-kdf.wasm b/benchmarks/libsodium/libsodium-kdf.wasm
diff --git a/benchmarks/libsodium/libsodium-kdf_hkdf.wasm b/benchmarks/libsodium/libsodium-kdf_hkdf.wasm
diff --git a/benchmarks/libsodium/libsodium-keygen.wasm b/benchmarks/libsodium/libsodium-keygen.wasm
diff --git a/benchmarks/libsodium/libsodium-kx.wasm b/benchmarks/libsodium/libsodium-kx.wasm
diff --git a/benchmarks/libsodium/libsodium-metamorphic.wasm b/benchmarks/libsodium/libsodium-metamorphic.wasm
diff --git a/benchmarks/libsodium/libsodium-misuse.wasm b/benchmarks/libsodium/libsodium-misuse.wasm
diff --git a/benchmarks/libsodium/libsodium-onetimeauth.wasm b/benchmarks/libsodium/libsodium-onetimeauth.wasm
diff --git a/benchmarks/libsodium/libsodium-onetimeauth2.wasm b/benchmarks/libsodium/libsodium-onetimeauth2.wasm
diff --git a/benchmarks/libsodium/libsodium-onetimeauth7.wasm b/benchmarks/libsodium/libsodium-onetimeauth7.wasm
diff --git a/benchmarks/libsodium/libsodium-pwhash_argon2i.wasm b/benchmarks/libsodium/libsodium-pwhash_argon2i.wasm
diff --git a/benchmarks/libsodium/libsodium-pwhash_argon2id.wasm b/benchmarks/libsodium/libsodium-pwhash_argon2id.wasm
diff --git a/benchmarks/libsodium/libsodium-pwhash_scrypt.wasm b/benchmarks/libsodium/libsodium-pwhash_scrypt.wasm
diff --git a/benchmarks/libsodium/libsodium-pwhash_scrypt_ll.wasm b/benchmarks/libsodium/libsodium-pwhash_scrypt_ll.wasm
diff --git a/benchmarks/libsodium/libsodium-randombytes.wasm b/benchmarks/libsodium/libsodium-randombytes.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult.wasm b/benchmarks/libsodium/libsodium-scalarmult.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult2.wasm b/benchmarks/libsodium/libsodium-scalarmult2.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult5.wasm b/benchmarks/libsodium/libsodium-scalarmult5.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult6.wasm b/benchmarks/libsodium/libsodium-scalarmult6.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult7.wasm b/benchmarks/libsodium/libsodium-scalarmult7.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult8.wasm b/benchmarks/libsodium/libsodium-scalarmult8.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult_ed25519.wasm b/benchmarks/libsodium/libsodium-scalarmult_ed25519.wasm
diff --git a/benchmarks/libsodium/libsodium-scalarmult_ristretto255.wasm b/benchmarks/libsodium/libsodium-scalarmult_ristretto255.wasm
diff --git a/benchmarks/libsodium/libsodium-secretbox.wasm b/benchmarks/libsodium/libsodium-secretbox.wasm
diff --git a/benchmarks/libsodium/libsodium-secretbox2.wasm b/benchmarks/libsodium/libsodium-secretbox2.wasm
diff --git a/benchmarks/libsodium/libsodium-secretbox7.wasm b/benchmarks/libsodium/libsodium-secretbox7.wasm
diff --git a/benchmarks/libsodium/libsodium-secretbox8.wasm b/benchmarks/libsodium/libsodium-secretbox8.wasm
diff --git a/benchmarks/libsodium/libsodium-secretbox_easy.wasm b/benchmarks/libsodium/libsodium-secretbox_easy.wasm
diff --git a/benchmarks/libsodium/libsodium-secretbox_easy2.wasm b/benchmarks/libsodium/libsodium-secretbox_easy2.wasm
diff --git a/benchmarks/libsodium/libsodium-secretstream_xchacha20poly1305.wasm b/benchmarks/libsodium/libsodium-secretstream_xchacha20poly1305.wasm
diff --git a/benchmarks/libsodium/libsodium-shorthash.wasm b/benchmarks/libsodium/libsodium-shorthash.wasm
diff --git a/benchmarks/libsodium/libsodium-sign.wasm b/benchmarks/libsodium/libsodium-sign.wasm
diff --git a/benchmarks/libsodium/libsodium-siphashx24.wasm b/benchmarks/libsodium/libsodium-siphashx24.wasm
diff --git a/benchmarks/libsodium/libsodium-sodium_core.wasm b/benchmarks/libsodium/libsodium-sodium_core.wasm
diff --git a/benchmarks/libsodium/libsodium-sodium_utils.wasm b/benchmarks/libsodium/libsodium-sodium_utils.wasm
diff --git a/benchmarks/libsodium/libsodium-sodium_version.wasm b/benchmarks/libsodium/libsodium-sodium_version.wasm
diff --git a/benchmarks/libsodium/libsodium-stream.wasm b/benchmarks/libsodium/libsodium-stream.wasm
diff --git a/benchmarks/libsodium/libsodium-stream2.wasm b/benchmarks/libsodium/libsodium-stream2.wasm
diff --git a/benchmarks/libsodium/libsodium-stream3.wasm b/benchmarks/libsodium/libsodium-stream3.wasm
diff --git a/benchmarks/libsodium/libsodium-stream4.wasm b/benchmarks/libsodium/libsodium-stream4.wasm
diff --git a/benchmarks/libsodium/libsodium-verify1.wasm b/benchmarks/libsodium/libsodium-verify1.wasm
diff --git a/benchmarks/libsodium/libsodium-xchacha20.wasm b/benchmarks/libsodium/libsodium-xchacha20.wasm
diff --git a/benchmarks/tract-onnx-image-classification/.gitignore b/benchmarks/tract-onnx-image-classification/.gitignore
@@ -0,0 +1,3 @@
+/rust-benchmark/target
+/rust-benchmark/Cargo.lock
+/assets/mobilenetv2-7.onnx
diff --git a/benchmarks/tract-onnx-image-classification/Dockerfile b/benchmarks/tract-onnx-image-classification/Dockerfile
@@ -0,0 +1,14 @@
+FROM rust:1.75
+RUN rustup target add wasm32-wasi
+WORKDIR /usr/src
+ADD rust-benchmark rust-benchmark
+ADD assets assets
+ADD setup.sh setup.sh
+RUN ./setup.sh
+WORKDIR /usr/src/rust-benchmark
+ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+RUN cargo build --release --target wasm32-wasi
+RUN mkdir /benchmark
+RUN cp target/wasm32-wasi/release/benchmark.wasm /benchmark/
+# We output the Wasm file to the `/benchmark` directory, where the client
+# expects it.
diff --git a/benchmarks/tract-onnx-image-classification/README.md b/benchmarks/tract-onnx-image-classification/README.md
@@ -0,0 +1,7 @@
+# Image Classification Wasmtime Benchmark
+
+A benchmark that runs an image classifier in pure Wasm. This can be used to
+benchmark the performance of float heavy computations.
+
+Note that the classifier model is not included in the repo because it is large
+and is instead downloaded if needed when running the `setup.sh` script.
diff --git a/benchmarks/tract-onnx-image-classification/assets/.gitignore b/benchmarks/tract-onnx-image-classification/assets/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/benchmarks/tract-onnx-image-classification/benchmark.stderr.expected b/benchmarks/tract-onnx-image-classification/benchmark.stderr.expected
diff --git a/benchmarks/tract-onnx-image-classification/benchmark.stdout.expected b/benchmarks/tract-onnx-image-classification/benchmark.stdout.expected
@@ -0,0 +1 @@
+[Classification { label: "tiger", score: 17.559244 }, Classification { label: "tiger cat", score: 14.740076 }, Classification { label: "zebra", score: 12.357242 }]
diff --git a/benchmarks/tract-onnx-image-classification/benchmark.wasm b/benchmarks/tract-onnx-image-classification/benchmark.wasm
diff --git a/benchmarks/tract-onnx-image-classification/input.png b/benchmarks/tract-onnx-image-classification/input.png
diff --git a/benchmarks/tract-onnx-image-classification/rust-benchmark/Cargo.toml b/benchmarks/tract-onnx-image-classification/rust-benchmark/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "benchmark"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+anyhow = "1.0"
+bytes = "1.5.0"
+prost = "0.11.0"
+image = { version = "0.25.1", features = ["png"], default-features = false }
+tract-onnx = "0.21.4"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[Classification { label: "tiger", score: 17.559244 }, Classification { label: "tiger cat", score: 14.740076 }, Classification { label: "zebra", score: 12.357242 }]