christoph/wamr
1
Fork 0
Code Releases Activity

Update build scripts and documents of workload samples for wasi-sdk-12.0 (#484)

Browse Source 
Update the build scripts of sample workloads (meshoptimizer/bwa/wasm-av1) to use the wasi-sdk-12.0 firstly to build the workload and discard clang-11, as wasi-sdk-12 supports wasi, simd and pthread better. And update the related documents.
Also modify wasm mini loader to sync up with the change of wasm normal loader.

Signed-off-by: Wenyong Huang <wenyong.huang@intel.com>
This commit is contained in:
Wenyong Huang
2020-12-29 00:41:09 -06:00
committed by GitHub
parent 724858c731
commit 365ec6360b
16 changed files with 227 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
samples/workload/docker/Dockerfile
View File

@ -1,29 +1,32 @@
FROM ubuntu:18.04 as builder
RUN apt update \
&& apt install -y lsb-release software-properties-common build-essential \
wget curl git tree zip unzip
#
# install clang and llvm
COPY llvm.sh /tmp
RUN apt update \
&& apt install -y lsb-release wget software-properties-common build-essential \
&& cd /tmp \
&& chmod a+x llvm.sh \
&& ./llvm.sh 11
# COPY llvm.sh /tmp
# RUN apt update \
# && apt install -y lsb-release wget software-properties-common build-essential \
# && cd /tmp \
# && chmod a+x llvm.sh \
# && ./llvm.sh 11
ARG WASI_SDK_VER=11.0
ARG WABT_VER=1.0.19
ARG WASI_SDK_VER=12
ARG WABT_VER=1.0.20
ARG CMAKE_VER=3.16.2
ARG BINARYEN_VER=version_97
ARG BAZEL_VER=3.7.0
#
# install wasi-sdk
ARG WASI_SDK_FILE="wasi-sdk-${WASI_SDK_VER}-linux.tar.gz"
ARG WASI_SDK_FILE="wasi-sdk-${WASI_SDK_VER}.0-linux.tar.gz"
COPY ${WASI_SDK_FILE} /opt
RUN cd /opt \
&& tar zxf ${WASI_SDK_FILE} \
&& rm ${WASI_SDK_FILE} \
&& ln -sf /opt/wasi-sdk-${WASI_SDK_VER} /opt/wasi-sdk \
&& ln -sf /opt/wasi-sdk/lib/clang/10.0.0/lib/wasi/ /usr/lib/llvm-11/lib/clang/11.0.1/lib/
&& ln -sf /opt/wasi-sdk-${WASI_SDK_VER}.0 /opt/wasi-sdk
#
# install wabt
@ -44,11 +47,6 @@ RUN cd /tmp \
&& ./${CMAKE_FILE} --prefix=/opt/cmake --skip-license \
&& ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake
#
# install tools
RUN apt update \
&& apt install -y git tree
#
# install emsdk
RUN cd /opt \
@ -68,15 +66,13 @@ RUN cd /opt \
&& rm ${BINARYEN_FILE} \
&& ln -sf /opt/binaryen-${BINARYEN_VER} /opt/binaryen
RUN apt install -y unzip zip
#
# install bazel
ARG BAZEL_FILE=bazel-${BAZEL_VER}-installer-linux-x86_64.sh
COPY ${BAZEL_FILE} /tmp
RUN cd /tmp \
&& chmod a+x ${BAZEL_FILE} \
&& ./${BAZEL_FILE}
# #
# # install bazel
# ARG BAZEL_FILE=bazel-${BAZEL_VER}-installer-linux-x86_64.sh
# COPY ${BAZEL_FILE} /tmp
# RUN cd /tmp \
# && chmod a+x ${BAZEL_FILE} \
# && ./${BAZEL_FILE}
#
# Clean up