christoph/wamr
1
Fork 0
Code Releases Activity

Import SIMD feature and add some workload samples (#438)

Browse Source
This commit is contained in:
Wenyong Huang
2020-11-05 18:15:15 +08:00
committed by GitHub
parent 667282eea9
commit a3074df21b
84 changed files with 7780 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
samples/workload/tensorflow/build.sh
View File

@ -1,8 +1,20 @@
#
# Copyright (C) 2019 Intel Corporation. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#
#!/bin/bash
####################################
# build tensorflow-lite sample #
####################################
if [ ! -d "${EMSDK}" ]; then
echo "can not find emsdk. "
echo "please refer to https://emscripten.org/docs/getting_started/downloads.html "
echo "to install it, or active it by 'source <emsdk_dir>emsdk_env.sh'"
exit
fi
set -xe
EMSDK_WASM_DIR="$EM_CACHE/wasm"
@ -64,7 +76,15 @@ fi
if [ -d "${TF_LITE_BUILD_DIR}/gen" ]; then
rm -fr ${TF_LITE_BUILD_DIR}/gen
fi
make -j 4 -C "${TENSORFLOW_DIR}" -f ${TF_LITE_BUILD_DIR}/Makefile
if [[ $1 == '--sgx' ]]; then
make -j 4 -C "${TENSORFLOW_DIR}" -f ${TF_LITE_BUILD_DIR}/Makefile
else
export BUILD_WITH_SIMD=true
make -j 4 -C "${TENSORFLOW_DIR}" -f ${TF_LITE_BUILD_DIR}/Makefile
fi
# remove patch file and recover emcc libc.a after building
Clear_Before_Exit
# 2.5 copy /make/gen target files to out/
rm -rf ${OUT_DIR}
@ -84,7 +104,7 @@ cd ${OUT_DIR}
if [[ $1 == '--sgx' ]]; then
${WAMRC_CMD} -sgx -o benchmark_model.aot benchmark_model.wasm
else
${WAMRC_CMD} -o benchmark_model.aot benchmark_model.wasm
${WAMRC_CMD} --enable-simd -o benchmark_model.aot benchmark_model.wasm
fi
# 4. build iwasm with pthread and libc_emcc enable
@ -101,7 +121,7 @@ if [[ $1 == '--sgx' ]]; then
else
cd ${WAMR_PLATFORM_DIR}/linux
rm -fr build && mkdir build
cd build && cmake .. -DWAMR_BUILD_LIB_PTHREAD=1 -DWAMR_BUILD_LIBC_EMCC=1
cd build && cmake .. -DWAMR_BUILD_SIMD=1 -DWAMR_BUILD_LIB_PTHREAD=1 -DWAMR_BUILD_LIBC_EMCC=1
make
fi
@ -122,8 +142,6 @@ else
fi
${IWASM_CMD} --heap-size=10475860 \
${OUT_DIR}/benchmark_model.aot \
--graph=mobilenet_quant_v1_224.tflite --max_secs=300
Clear_Before_Exit
${OUT_DIR}/benchmark_model.aot \
--graph=mobilenet_quant_v1_224.tflite --max_secs=300

12
samples/workload/tensorflow/tf_lite.patch
View File

@ -1,5 +1,5 @@
diff --git a/tensorflow/lite/tools/make/Makefile b/tensorflow/lite/tools/make/Makefile
index c7ddff5844..1082644043 100644
index c7ddff5844..17146868f7 100644
--- a/tensorflow/lite/tools/make/Makefile
+++ b/tensorflow/lite/tools/make/Makefile
@@ -48,11 +48,7 @@ INCLUDES += -I/usr/local/include
@ -15,10 +15,16 @@ index c7ddff5844..1082644043 100644
-ldl
# There are no rules for compiling objects for the host system (since we don't
@@ -84,14 +80,18 @@ endif # ifeq ($(HOST_ARCH),$(TARGET_ARCH))
@@ -84,14 +80,24 @@ endif # ifeq ($(HOST_ARCH),$(TARGET_ARCH))
endif # ifeq ($(HOST_OS),$(TARGET))
endif
+BUILD_WITH_SIMD ?= false
+ifeq ($(BUILD_WITH_SIMD), true)
+CFLAGS+=-msimd128
+CXXFLAGS+=-msimd128
+endif
+
+LIBFLAGS += -s TOTAL_STACK=1048576 \
+ -Wl,--export=__data_end -Wl,--export=__heap_base \
+ -s ERROR_ON_UNDEFINED_SYMBOLS=0
@ -36,7 +42,7 @@ index c7ddff5844..1082644043 100644
# A small example program that shows how to link against the library.
MINIMAL_SRCS := \
@@ -277,12 +277,16 @@ LIB_PATH := $(LIBDIR)$(LIB_NAME)
@@ -277,12 +283,16 @@ LIB_PATH := $(LIBDIR)$(LIB_NAME)
BENCHMARK_LIB := $(LIBDIR)$(BENCHMARK_LIB_NAME)
BENCHMARK_BINARY := $(BINDIR)$(BENCHMARK_BINARY_NAME)
BENCHMARK_PERF_OPTIONS_BINARY := $(BINDIR)$(BENCHMARK_PERF_OPTIONS_BINARY_NAME)