Skip to content

Commit

Permalink
Update wasi-sdk and enable simd (#92)
Browse files Browse the repository at this point in the history
  • Loading branch information
anuraaga authored May 1, 2024
1 parent 8f6fdee commit c5353a8
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions buildtools/re2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2022 The OWASP Coraza contributors
# SPDX-License-Identifier: Apache-2.0

FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-20 AS base
FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-22 AS base

RUN apt-get update && apt-get install -y binaryen curl

Expand All @@ -28,7 +28,7 @@ RUN $CXX -c cre2.cpp -o cre2.o -I. -I/re2 $CXXFLAGS && \

FROM base AS wazero

ENV CFLAGS --target=wasm32-wasi-threads --sysroot=/wasi-sysroot -pthread -O3 -D__USE_ISOC11
ENV CFLAGS --target=wasm32-wasi-threads --sysroot=/wasi-sysroot -pthread -O3 -D__USE_ISOC11 -msimd128
ENV CXXFLAGS -fno-exceptions $CFLAGS
ENV LDFLAGS $CFLAGS -mexec-model=reactor

Expand Down Expand Up @@ -77,10 +77,17 @@ RUN $CXX -o libcre2-noopt.so -Wl,--global-base=1024 $LDFLAGS \

RUN wasm-opt -o libcre2.so --low-memory-unused --flatten --rereloop --converge -O3 libcre2-noopt.so

FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-20
FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-22

COPY --from=tinygo /re2/obj/libre2.a libre2.a
COPY --from=tinygo /cre2/libcre2.a libcre2.a
COPY --from=wazero /cre2/libcre2.so libcre2.so

CMD ["cp", "libre2.a", "libcre2.a", "libcre2.so", "/out/"]
CMD ["cp", \
"libre2.a", \
"libcre2.a", \
"libcre2.so", \
"/wasi-sysroot/lib/wasm32-wasi/libc++.a", \
"/wasi-sysroot/lib/wasm32-wasi/libc++abi.a", \
"/usr/lib/llvm-17/lib/clang/17/lib/wasi/libclang_rt.builtins-wasm32.a", \
"/out/"]
Binary file modified internal/wasm/libc++.a
Binary file not shown.
Binary file modified internal/wasm/libc++abi.a
Binary file not shown.
Binary file modified internal/wasm/libclang_rt.builtins-wasm32.a
Binary file not shown.
Binary file modified internal/wasm/libcre2.a
Binary file not shown.
Binary file modified internal/wasm/libcre2.so
Binary file not shown.
Binary file modified internal/wasm/libre2.a
Binary file not shown.

0 comments on commit c5353a8

Please sign in to comment.