christoph/wamr
1
Fork 0
Code Releases Activity

Enhance/Fix sample socket-api and workload (#2006)

Browse Source 
- Add python script to test socket-api cases
- Fix issues in socket-api send_recv wasm app
- Fix issues in building samples/workload/meshoptimizer
- Enhance build script of sample workload
This commit is contained in:
Wenyong Huang
2023-03-08 16:36:08 +08:00
committed by GitHub
parent a15a731e12
commit 289fc5efbf
10 changed files with 199 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/workload/CMakeLists.txt
View File

@ -24,7 +24,7 @@ ExternalProject_Add(iwasm
CONFIGURE_COMMAND
${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/../../product-mini/platforms/linux -B build -DWAMR_BUILD_LIBC_EMCC=1
BUILD_COMMAND
${CMAKE_COMMAND} --build build
${CMAKE_COMMAND} --build build --parallel 4
INSTALL_COMMAND
# FIXME: replace with --install
${CMAKE_COMMAND} -E copy_if_different
@ -43,7 +43,7 @@ ExternalProject_Add(wamrc
CONFIGURE_COMMAND
${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/../../wamr-compiler -B build
BUILD_COMMAND
${CMAKE_COMMAND} --build build
${CMAKE_COMMAND} --build build --parallel 4
INSTALL_COMMAND
# FIXME: replace with --install
${CMAKE_COMMAND} -E copy_if_different
@ -113,4 +113,4 @@ add_test(
./iwasm --dir=. testavx.aot ./wasm-av1/elephants_dream_480p24.ivf
WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}
)
)

4
samples/workload/bwa/CMakeLists.txt
View File

@ -50,7 +50,7 @@ ExternalProject_Add(bwa
-DCMAKE_SYSROOT=${WASISDK_SYSROOT}
-DCMAKE_C_FLAGS=-isystem\ ${CMAKE_CURRENT_SOURCE_DIR}/../include/sse\ -isystem\ ${CMAKE_CURRENT_SOURCE_DIR}/../include/libc/musl
${CMAKE_CURRENT_SOURCE_DIR}/bwa
BUILD_COMMAND make bwa_wasm_opt
BUILD_COMMAND make bwa_wasm_opt -j 4
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different ./bwa.opt.wasm ${CMAKE_CURRENT_BINARY_DIR}/bwa.wasm
)
@ -70,4 +70,4 @@ ExternalProject_Add(bwa-kit
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/bwa-kit/src/bwa-kit/resource-GRCh38/hs38DH-extra.fa
${CMAKE_CURRENT_BINARY_DIR}/hs38DH-extra.fa
)
)

4
samples/workload/meshoptimizer/CMakeLists.txt
View File

@ -21,7 +21,7 @@ include(ExternalProject)
ExternalProject_Add(codecbench
PREFIX codecbench
GIT_REPOSITORY https://github.com/zeux/meshoptimizer.git
GIT_TAG f926b288264522e1b331a41b07ba40167f396913
GIT_TAG f734fd572aed5bf76e84d9ed62ca6f4f6c47d84e
GIT_SHALLOW ON
GIT_PROGRESS ON
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/meshoptimizer
@ -33,6 +33,6 @@ ExternalProject_Add(codecbench
-DCMAKE_TOOLCHAIN_FILE=${WASISDK_TOOLCHAIN}
-DCMAKE_SYSROOT=${WASISDK_SYSROOT}
${CMAKE_CURRENT_SOURCE_DIR}/meshoptimizer
BUILD_COMMAND make codecbench
BUILD_COMMAND make codecbench -j 4
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different ./codecbench.wasm ${CMAKE_CURRENT_BINARY_DIR}/codecbench.wasm
)

18
samples/workload/meshoptimizer/codecbench.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b13d946..4254003 100644
index 612cf3b..22a365a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,3 +149,43 @@ install(FILES
@@ -158,3 +158,43 @@ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/meshoptimizerConfigVersion.cmake
COMPONENT meshoptimizer
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/meshoptimizer)
@ -47,10 +47,10 @@ index b13d946..4254003 100644
+
+add_dependencies(codecbench.opt codecbench)
diff --git a/src/vertexcodec.cpp b/src/vertexcodec.cpp
index 821c467..b7d30b1 100644
index 4bd1112..257c258 100644
--- a/src/vertexcodec.cpp
+++ b/src/vertexcodec.cpp
@@ -83,13 +83,13 @@
@@ -89,13 +89,13 @@
#endif
#ifdef SIMD_WASM
@ -71,7 +71,7 @@ index 821c467..b7d30b1 100644
#endif
namespace meshopt
@@ -691,7 +691,7 @@ static v128_t decodeShuffleMask(unsigned char mask0, unsigned char mask1)
@@ -757,7 +757,7 @@ static v128_t decodeShuffleMask(unsigned char mask0, unsigned char mask1)
v128_t sm1 = wasm_v128_load(&kDecodeBytesGroupShuffle[mask1]);
v128_t sm1off = wasm_v128_load(&kDecodeBytesGroupCount[mask0]);
@ -80,7 +80,7 @@ index 821c467..b7d30b1 100644
v128_t sm1r = wasm_i8x16_add(sm1, sm1off);
@@ -741,7 +741,7 @@ static const unsigned char* decodeBytesGroupSimd(const unsigned char* data, unsi
@@ -807,7 +807,7 @@ static const unsigned char* decodeBytesGroupSimd(const unsigned char* data, unsi
v128_t shuf = decodeShuffleMask(mask0, mask1);
@ -89,7 +89,7 @@ index 821c467..b7d30b1 100644
wasm_v128_store(buffer, result);
@@ -763,7 +763,7 @@ static const unsigned char* decodeBytesGroupSimd(const unsigned char* data, unsi
@@ -829,7 +829,7 @@ static const unsigned char* decodeBytesGroupSimd(const unsigned char* data, unsi
v128_t shuf = decodeShuffleMask(mask0, mask1);
@ -99,7 +99,7 @@ index 821c467..b7d30b1 100644
wasm_v128_store(buffer, result);
diff --git a/src/vertexfilter.cpp b/src/vertexfilter.cpp
index 14a73b1..8f4b3c1 100644
index 5c7589c..c79cad4 100644
--- a/src/vertexfilter.cpp
+++ b/src/vertexfilter.cpp
@@ -57,10 +57,10 @@
@ -116,4 +116,4 @@ index 14a73b1..8f4b3c1 100644
+#define wasmx_unziphi_v32x4(a, b) wasm_i32x4_shuffle(a, b, 1, 3, 5, 7)
#endif
namespace meshopt
#ifndef __has_builtin

2
samples/workload/wasm-av1/CMakeLists.txt
View File

@ -36,7 +36,7 @@ ExternalProject_Add(av1
-DCMAKE_SYSROOT=${WASISDK_SYSROOT}
-DCMAKE_C_FLAGS=-isystem\ ${CMAKE_CURRENT_SOURCE_DIR}/../include/sse\ -isystem\ ${CMAKE_CURRENT_SOURCE_DIR}/../include/libc/musl
${CMAKE_CURRENT_SOURCE_DIR}/av1
BUILD_COMMAND make testavx_opt
BUILD_COMMAND make testavx_opt -j 4
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different
testavx.opt.wasm
${CMAKE_CURRENT_SOURCE_DIR}/av1/third_party/samples/elephants_dream_480p24.ivf