Merge pull request #289 from abrown/update-docker-images

Update docker images

Author: fitzgen

benchmarks/Dockerfile.emscripten

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.8
+FROM emscripten/emsdk:4.0.10
 
 WORKDIR /
 COPY benchmark.c .

benchmarks/Dockerfile.rust

@@ -1,11 +1,11 @@
-FROM rust:1.70
-RUN rustup target add wasm32-wasi
+FROM rust:1.87
+RUN rustup target add wasm32-wasip1
 WORKDIR /usr/src
 ADD rust-benchmark rust-benchmark
 WORKDIR /usr/src/rust-benchmark
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-RUN cargo build --release --target wasm32-wasi
+RUN cargo build --release --target wasm32-wasip1
 RUN mkdir /benchmark
-RUN cp target/wasm32-wasi/release/*benchmark.wasm /benchmark/
+RUN cp target/wasm32-wasip1/release/*benchmark.wasm /benchmark/
 # We output the Wasm file to the `/benchmark` directory, where the client
 # expects it.

benchmarks/blake3-scalar/benchmark.wasm

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.8
+FROM emscripten/emsdk:4.0.10
 
 WORKDIR /usr/src
 RUN git clone https://github.com/BLAKE3-team/BLAKE3.git
@@ -14,7 +14,7 @@ RUN emcc -O3 -s STANDALONE_WASM=1 \
     -s INITIAL_MEMORY=1048576 -s MAXIMUM_MEMORY=16777216 \
     -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_STACK=131072 \
     -s "EXPORTED_FUNCTIONS=['_main']" \
-    -msimd128 -msse2 -msse3 -msse4.1 -msse4.2 \
+    -msimd128 -msse4.1 -msse4.2 \
     -DBLAKE3_NO_SSE41 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_AVX512 \
     -o /benchmark/benchmark.wasm \
     blake3.c blake3_sse2.c blake3_dispatch.c \

benchmarks/blake3-simd/Dockerfile

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.8
+FROM emscripten/emsdk:4.0.10
 
 WORKDIR /usr/src
 RUN git clone https://github.com/kpu/intgemm.git
@@ -23,7 +23,6 @@ RUN emcc -O3 -s STANDALONE_WASM=1 \
     -s INITIAL_MEMORY=33554432 -s MAXIMUM_MEMORY=33554432 \
     -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_STACK=2097152 \
     -msimd128 -mssse3 -O3 -Ibuild \
-    -s "EXPORTED_FUNCTIONS=['_main']" \
     -o /benchmark/benchmark.wasm \
     benchmark.cpp build/libintgemm.a
 # We output the Wasm file to the `/benchmark` directory, where the client