Upgrade toolkits (#1878)
Upgrade the version of related toolkits: - upgrade llvm to 15.0 - upgrade wasi-sdk to 19.0 - upgrade emsdk to 3.1.28 - upgrade wabt to 1.0.31 - upgrade binaryen to 111 And upgrade the CI scripts, sample workload build scripts, Dockerfiles, and documents.
This commit is contained in:
43
samples/workload/cmake/FindBinaryen.cmake
Normal file
43
samples/workload/cmake/FindBinaryen.cmake
Normal file
@ -0,0 +1,43 @@
|
||||
# Copyright (C) 2019 Intel Corporation. All rights reserved.
|
||||
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
|
||||
#
|
||||
# Output below variables:
|
||||
# - Binaryen_HOME. the installation location
|
||||
#
|
||||
|
||||
include(CMakePrintHelpers)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
file(GLOB Binaryen_SEARCH_PATH "/opt/binaryen*")
|
||||
find_path(Binaryen_HOME
|
||||
NAMES bin/wasm-opt
|
||||
PATHS ${Binaryen_SEARCH_PATH}
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
NO_SYSTEM_ENVIRONMENT_PATH
|
||||
REQUIRED
|
||||
)
|
||||
|
||||
execute_process(
|
||||
COMMAND ${Binaryen_HOME}/bin/wasm-opt --version
|
||||
OUTPUT_VARIABLE WASM_OPT_OUTPUT
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
|
||||
string(REGEX MATCH version_[0-9]+ Binaryen_VERSION_tmp ${WASM_OPT_OUTPUT})
|
||||
string(REGEX MATCH [0-9]+ Binaryen_VERSION ${Binaryen_VERSION_tmp})
|
||||
|
||||
#cmake_print_variables(Binaryen_VERSION_tmp Binaryen_VERSION)
|
||||
|
||||
find_package_handle_standard_args(Binaryen REQUIRED_VARS Binaryen_HOME VERSION_VAR Binaryen_VERSION)
|
||||
|
||||
if(Binaryen_FOUND)
|
||||
mark_as_advanced(Binaryen_SEARCH_PATH)
|
||||
mark_as_advanced(Binaryen_VERSION_tmp)
|
||||
mark_as_advanced(Binaryen_VERSION)
|
||||
mark_as_advanced(WASM_OPT_OUTPUT)
|
||||
|
||||
set(Binaryen_WASM_OPT ${Binaryen_HOME}/bin/wasm-opt)
|
||||
else()
|
||||
# TODO: install WASISDK
|
||||
endif()
|
||||
38
samples/workload/cmake/FindWASISDK.cmake
Normal file
38
samples/workload/cmake/FindWASISDK.cmake
Normal file
@ -0,0 +1,38 @@
|
||||
# Copyright (C) 2019 Intel Corporation. All rights reserved.
|
||||
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
|
||||
#
|
||||
# Output below variables:
|
||||
# - WASISDK_HOME. the installation location
|
||||
# - WASISDK_SYSROOT. where wasi-sysroot is
|
||||
# - WASISDK_TOOLCHAIN. where wasi-sdk.cmake is
|
||||
#
|
||||
|
||||
include(CMakePrintHelpers)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
file(GLOB WASISDK_SEARCH_PATH "/opt/wasi-sdk-*")
|
||||
find_path(WASISDK_HOME
|
||||
NAMES share/wasi-sysroot
|
||||
PATHS ${WASISDK_SEARCH_PATH}
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
NO_SYSTEM_ENVIRONMENT_PATH
|
||||
REQUIRED
|
||||
)
|
||||
|
||||
string(REGEX MATCH [0-9]+\.[0-9]+\.*[0-9]* WASISDK_VERSION ${WASISDK_HOME})
|
||||
|
||||
#cmake_print_variables(WASISDK_HOME WASISDK_VERSION)
|
||||
find_package_handle_standard_args(WASISDK REQUIRED_VARS WASISDK_HOME VERSION_VAR WASISDK_VERSION)
|
||||
|
||||
if(WASISDK_FOUND)
|
||||
mark_as_advanced(WASISDK_SEARCH_PATH)
|
||||
mark_as_advanced(WASISDK_VERSION)
|
||||
|
||||
set(WASISDK_CC_COMMAND ${WASISDK_HOME}/bin/clang)
|
||||
set(WASISDK_CXX_COMMAND ${WASISDK_HOME}/bin/clang++)
|
||||
set(WASISDK_SYSROOT ${WASISDK_HOME}/share/wasi-sysroot)
|
||||
set(WASISDK_TOOLCHAIN ${WASISDK_HOME}/share/cmake/wasi-sdk.cmake)
|
||||
else()
|
||||
# TODO: install WASISDK
|
||||
endif()
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright (C) 2019 Intel Corporation. All rights reserved.
|
||||
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
|
||||
#######################################
|
||||
include(ExternalProject)
|
||||
|
||||
file(REAL_PATH ../../.. WAMR_ROOT
|
||||
BASE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
||||
)
|
||||
|
||||
find_path(WASI_SDK_PARENT
|
||||
name wasi-sdk
|
||||
PATHS ${WAMR_ROOT}/test-tools/
|
||||
NO_DEFAULT_PATH
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
)
|
||||
|
||||
if(NOT WASI_SDK_PARENT)
|
||||
message(FATAL_ERROR
|
||||
"can not find 'wasi-sdk' under ${WAMR_ROOT}/test-tools, "
|
||||
"please run ${WAMR_ROOT}/test-tools/build-wasi-sdk/build_wasi_sdk.py "
|
||||
"to build wasi-sdk and try again"
|
||||
)
|
||||
endif()
|
||||
|
||||
set(WASI_SDK_HOME ${WASI_SDK_PARENT}/wasi-sdk)
|
||||
message(CHECK_START "Detecting WASI-SDK at ${WASI_SDK_HOME}")
|
||||
if(EXISTS "${WASI_SDK_HOME}/share/cmake/wasi-sdk.cmake")
|
||||
message(CHECK_PASS "found")
|
||||
else()
|
||||
message(CHECK_FAIL "not found")
|
||||
endif()
|
||||
|
||||
################ BINARYEN ################
|
||||
find_program(WASM_OPT
|
||||
NAMES wasm-opt
|
||||
PATHS /opt/binaryen-version_101/bin /opt/binaryen/bin
|
||||
NO_DEFAULT_PATH
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
)
|
||||
|
||||
if(NOT WASM_OPT)
|
||||
message(FATAL_ERROR
|
||||
"can not find wasm-opt. "
|
||||
"please download it from "
|
||||
"https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz "
|
||||
"and install it under /opt"
|
||||
)
|
||||
endif()
|
||||
Reference in New Issue
Block a user