Bump Zig version for libsodium (#271)

* Bump Zig version for libsodium The current stable libsodium requires zig 0.11.0 to build. * add new benches to all.suite
bytecodealliance · Apr 25, 2024 · 19fb7a2 · 19fb7a2
1 parent 8bc0d50
commit 19fb7a2
Show file tree

Hide file tree

Showing 80 changed files with 23 additions and 20 deletions.
diff --git a/benchmarks/all.suite b/benchmarks/all.suite
@@ -5,33 +5,34 @@
 #   | sort -z \
 #   | xargs -r0 -i -L 1 echo \
 #   | tee -a all.suite
-
 blake3-scalar/benchmark.wasm
 blake3-simd/benchmark.wasm
 blind-sig/benchmark.wasm
 bz2/benchmark.wasm
 hex-simd/benchmark.wasm
 # image-classification/image-classification-benchmark.wasm
 intgemm-simd/benchmark.wasm
-libsodium/libsodium-aead_aes256gcm2.wasm
+libsodium/libsodium-aead_aegis128l.wasm
+libsodium/libsodium-aead_aegis256.wasm
 libsodium/libsodium-aead_aes256gcm.wasm
-libsodium/libsodium-aead_chacha20poly13052.wasm
+libsodium/libsodium-aead_aes256gcm2.wasm
 libsodium/libsodium-aead_chacha20poly1305.wasm
+libsodium/libsodium-aead_chacha20poly13052.wasm
 libsodium/libsodium-aead_xchacha20poly1305.wasm
+libsodium/libsodium-auth.wasm
 libsodium/libsodium-auth2.wasm
 libsodium/libsodium-auth3.wasm
 libsodium/libsodium-auth5.wasm
 libsodium/libsodium-auth6.wasm
 libsodium/libsodium-auth7.wasm
-libsodium/libsodium-auth.wasm
+libsodium/libsodium-box.wasm
 libsodium/libsodium-box2.wasm
 libsodium/libsodium-box7.wasm
 libsodium/libsodium-box8.wasm
-libsodium/libsodium-box_easy2.wasm
 libsodium/libsodium-box_easy.wasm
+libsodium/libsodium-box_easy2.wasm
 libsodium/libsodium-box_seal.wasm
 libsodium/libsodium-box_seed.wasm
-libsodium/libsodium-box.wasm
 libsodium/libsodium-chacha20.wasm
 libsodium/libsodium-codecs.wasm
 libsodium/libsodium-core1.wasm
@@ -43,51 +44,53 @@ libsodium/libsodium-core6.wasm
 libsodium/libsodium-core_ed25519.wasm
 libsodium/libsodium-core_ristretto255.wasm
 libsodium/libsodium-ed25519_convert.wasm
+libsodium/libsodium-generichash.wasm
 libsodium/libsodium-generichash2.wasm
 libsodium/libsodium-generichash3.wasm
-libsodium/libsodium-generichash.wasm
-libsodium/libsodium-hash3.wasm
 libsodium/libsodium-hash.wasm
+libsodium/libsodium-hash3.wasm
 libsodium/libsodium-kdf.wasm
+libsodium/libsodium-kdf_hkdf.wasm
 libsodium/libsodium-keygen.wasm
 libsodium/libsodium-kx.wasm
 libsodium/libsodium-metamorphic.wasm
 libsodium/libsodium-misuse.wasm
+libsodium/libsodium-onetimeauth.wasm
 libsodium/libsodium-onetimeauth2.wasm
 libsodium/libsodium-onetimeauth7.wasm
-libsodium/libsodium-onetimeauth.wasm
-libsodium/libsodium-pwhash_argon2id.wasm
 libsodium/libsodium-pwhash_argon2i.wasm
-libsodium/libsodium-pwhash_scrypt_ll.wasm
+libsodium/libsodium-pwhash_argon2id.wasm
 libsodium/libsodium-pwhash_scrypt.wasm
+libsodium/libsodium-pwhash_scrypt_ll.wasm
 libsodium/libsodium-randombytes.wasm
+libsodium/libsodium-scalarmult.wasm
 libsodium/libsodium-scalarmult2.wasm
 libsodium/libsodium-scalarmult5.wasm
 libsodium/libsodium-scalarmult6.wasm
 libsodium/libsodium-scalarmult7.wasm
 libsodium/libsodium-scalarmult8.wasm
 libsodium/libsodium-scalarmult_ed25519.wasm
 libsodium/libsodium-scalarmult_ristretto255.wasm
-libsodium/libsodium-scalarmult.wasm
+libsodium/libsodium-secretbox.wasm
 libsodium/libsodium-secretbox2.wasm
 libsodium/libsodium-secretbox7.wasm
 libsodium/libsodium-secretbox8.wasm
-libsodium/libsodium-secretbox_easy2.wasm
 libsodium/libsodium-secretbox_easy.wasm
-libsodium/libsodium-secretbox.wasm
+libsodium/libsodium-secretbox_easy2.wasm
 libsodium/libsodium-secretstream.wasm
+libsodium/libsodium-secretstream_xchacha20poly1305.wasm
 libsodium/libsodium-shorthash.wasm
 libsodium/libsodium-sign.wasm
 libsodium/libsodium-siphashx24.wasm
 libsodium/libsodium-sodium_core.wasm
+libsodium/libsodium-sodium_utils.wasm
 libsodium/libsodium-sodium_utils2.wasm
 libsodium/libsodium-sodium_utils3.wasm
-libsodium/libsodium-sodium_utils.wasm
 libsodium/libsodium-sodium_version.wasm
+libsodium/libsodium-stream.wasm
 libsodium/libsodium-stream2.wasm
 libsodium/libsodium-stream3.wasm
 libsodium/libsodium-stream4.wasm
-libsodium/libsodium-stream.wasm
 libsodium/libsodium-verify1.wasm
 libsodium/libsodium-xchacha20.wasm
 meshoptimizer/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.10.1/zig-linux-x86_64-0.10.1.tar.xz
-RUN tar --extract --verbose --file=zig-linux-x86_64-0.10.1.tar.xz
-ENV PATH="${PATH}:/zig-linux-x86_64-0.10.1"
+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 echo "zig version = $(zig version)"
 RUN wget https://github.com/jedisct1/libsodium/archive/stable.zip
 RUN unzip stable.zip
@@ -22,7 +22,7 @@ COPY sightglass.h src/libsodium/include/
 COPY add-bench-calls.diff .
 RUN git apply add-bench-calls.diff
 RUN zig build -Dtarget=wasm32-wasi \
-    -Drelease-fast -Dcpu=generic+bulk_memory+simd128 \
+    -Doptimize=ReleaseFast -Dcpu=generic+bulk_memory+simd128 \
     -Denable_benchmarks=true -Diterations=1
 
 # Place all of the WebAssembly benchmarks in `/benchmark`. Some benchmarks lose

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