Implement SIMD latest opcodes and update LLVM to 13.0 (#758)

Implement the latest SIMD opcodes and update LLVM 13.0,
update the llvm build scripts, update the sample workloads‘ build scripts,
and build customized wasi-sdk to build some workloads.
Also refine the CI rules.

Signed-off-by: Wenyong Huang <wenyong.huang@intel.com>

samples/workload/wasm-av1/CMakeLists.avx_wasm.txt

@@ -5,8 +5,10 @@ cmake_minimum_required (VERSION 2.8...3.16)
 
 project(testavx)
 
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/preparation.cmake)
+
 # a workaround to let aom find our non-public headers
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include/libc)
+include_directories(${WASI_SDK_HOME}/share/wasi-sysroot/include/libc/musl)
 
 ################  AOM  ################
 set(ENABLE_CCACHE ON)
@@ -58,15 +60,6 @@ target_link_libraries(${PROJECT_NAME}
 
 add_dependencies(${PROJECT_NAME} aom)
 
-find_program(WASM_OPT
-    NAMES wasm-opt
-    PATHS /opt/binaryen-version_97/bin /opt/binaryen/bin
-)
-
-if (NOT WASM_OPT)
-  message(WARNING "can not find wasm-opt and will not optimize any wasm module")
-endif()
-
 add_custom_target(${PROJECT_NAME}_opt ALL
   COMMAND
     ${WASM_OPT} -Oz --enable-simd -o ${PROJECT_NAME}.opt.wasm ${PROJECT_NAME}.wasm

samples/workload/wasm-av1/CMakeLists.txt

@@ -10,27 +10,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/preparation.cmake)
 #######################################
 include(ExternalProject)
 
-################ HEADERS ################
-set(EMSDK_SYSTEM_HEADERS "$ENV{EMSDK}/upstream/emscripten/system/include")
-set(EMSDK_LIBC_HEADERS "${EMSDK_SYSTEM_HEADERS}/libc")
-ExternalProject_Add(headers_from_emcc
-   PREFIX headers
-   SOURCE_DIR "${EMSDK_SYSTEM_HEADERS}"
-   CONFIGURE_COMMAND ""
-   BUILD_COMMAND  ""
-   INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/pthread/sys
-                     && ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/libc/bits
-                     # copy emscripten pthread related header files
-                     && ${CMAKE_COMMAND} -E copy ${EMSDK_LIBC_HEADERS}/pthread.h ${CMAKE_CURRENT_SOURCE_DIR}/include/pthread/
-                     && ${CMAKE_COMMAND} -E copy ${EMSDK_LIBC_HEADERS}/signal.h ${CMAKE_CURRENT_SOURCE_DIR}/include/pthread/
-                     && ${CMAKE_COMMAND} -E copy ${EMSDK_LIBC_HEADERS}/netdb.h ${CMAKE_CURRENT_SOURCE_DIR}/include/pthread/
-                     && ${CMAKE_COMMAND} -E copy ${EMSDK_LIBC_HEADERS}/sys/wait.h ${CMAKE_CURRENT_SOURCE_DIR}/include/pthread/sys/
-                     && ${CMAKE_COMMAND} -E copy ${EMSDK_LIBC_HEADERS}/sys/socket.h ${CMAKE_CURRENT_SOURCE_DIR}/include/pthread/sys/
-                     # copy emscripten setjmp headers
-                     && ${CMAKE_COMMAND} -E copy ${EMSDK_LIBC_HEADERS}/setjmp.h ${CMAKE_CURRENT_SOURCE_DIR}/include/libc/setjmp.h
-                     && ${CMAKE_COMMAND} -E copy ${EMSDK_SYSTEM_HEADERS}/../lib/libc/musl/arch/emscripten/bits/setjmp.h ${CMAKE_CURRENT_SOURCE_DIR}/include/libc/bits/setjmp.h
-)
-
 ################ av1 ################
 ExternalProject_Add(av1
   PREFIX av1
@@ -39,15 +18,15 @@ ExternalProject_Add(av1
   GIT_PROGRESS   ON
   GIT_SHALLOW    ON
   SOURCE_DIR     ${CMAKE_CURRENT_SOURCE_DIR}/av1
-  DEPENDS        headers_from_emcc
   UPDATE_COMMAND git clean -fd && git checkout -- *
                   && ${CMAKE_COMMAND} -E echo "Copying pre-installed CMakeLists.txt"
                   && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.avx_wasm.txt CMakeLists.txt
                   && git apply ../av1-clang.patch
   CONFIGURE_COMMAND  ${CMAKE_COMMAND}
-                         -DWASI_SDK_PREFIX=${WASI_SDK_HOME}/wasi-sdk
-                         -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_HOME}/wasi-sdk/share/cmake/wasi-sdk.cmake
-                         ${CMAKE_CURRENT_SOURCE_DIR}/av1
+                      -DWASI_SDK_PREFIX=${WASI_SDK_HOME}
+                      -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_HOME}/share/cmake/wasi-sdk.cmake
+                      -DCMAKE_SYSROOT=${WASI_SDK_HOME}/share/wasi-sysroot
+                      ${CMAKE_CURRENT_SOURCE_DIR}/av1
   BUILD_COMMAND     make testavx_opt
   INSTALL_COMMAND   ${CMAKE_COMMAND} -E copy testavx.opt.wasm ${CMAKE_CURRENT_BINARY_DIR}/testavx.wasm
 )

samples/workload/wasm-av1/build.sh

@@ -17,7 +17,7 @@ fi
 
 set -xe
 
-EMSDK_WASM_DIR="${EMSDK}/upstream/emscripten/cache/wasm"
+EMSDK_WASM_DIR="${EMSDK}/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten"
 BUILD_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 OUT_DIR="${BUILD_SCRIPT_DIR}/out"
 WASM_AV1_DIR="${BUILD_SCRIPT_DIR}/wasm-av1"

samples/workload/wasm-av1/build_workload.sh

@@ -0,0 +1 @@
+../docker/build_workload.sh

samples/workload/wasm-av1/docker_build.sh

@@ -1 +0,0 @@
-../docker/docker_build.sh