From acc4d93f6050b97d0cfbb0b54dae78ef1eff2ce3 Mon Sep 17 00:00:00 2001 From: turuslan Date: Wed, 31 Jan 2024 14:06:27 +0300 Subject: [PATCH 1/8] [qdrvm] hunter --- CMakeLists.txt | 14 + cmake/Hunter/config.cmake | 6 + cmake/HunterGate.cmake | 539 ++++++++++++++++++++ cmake/wasmedge-config.cmake | 13 + lib/api/CMakeLists.txt | 24 +- lib/loader/CMakeLists.txt | 2 +- lib/loader/ast/component/component_type.cpp | 3 + 7 files changed, 592 insertions(+), 9 deletions(-) create mode 100644 cmake/Hunter/config.cmake create mode 100644 cmake/HunterGate.cmake create mode 100644 cmake/wasmedge-config.cmake create mode 100644 lib/loader/ast/component/component_type.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 7962eaf6f98e..1f275201b575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,14 @@ cmake_policy(SET CMP0091 NEW) if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") cmake_policy(SET CMP0135 NEW) endif() + +include(cmake/HunterGate.cmake) +HunterGate( + URL https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm1.zip + SHA1 8c0faf2b0d643a97e00dd0520d66fe2faaf5e573 + LOCAL +) + project(WasmEdge) # Overwrite it if you want to use static MSVC runtime library. @@ -138,6 +146,12 @@ if(WASMEDGE_BUILD_COVERAGE) append_coverage_compiler_flags() endif() +if(WASMEDGE_BUILD_AOT_RUNTIME) + hunter_add_package(ZLIB) + hunter_add_package(LLVM) + hunter_add_package(LLD) +endif() + include(Helper) include(GNUInstallDirs) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake new file mode 100644 index 000000000000..2654aaa0078e --- /dev/null +++ b/cmake/Hunter/config.cmake @@ -0,0 +1,6 @@ + +hunter_config( + LLVM + VERSION 16.0.1 + CMAKE_ARGS LLVM_ENABLE_PROJECTS=compiler-rt +) diff --git a/cmake/HunterGate.cmake b/cmake/HunterGate.cmake new file mode 100644 index 000000000000..1da4c2de259a --- /dev/null +++ b/cmake/HunterGate.cmake @@ -0,0 +1,539 @@ +# Copyright (c) 2013-2019, Ruslan Baratov +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# This is a gate file to Hunter package manager. +# Include this file using `include` command and add package you need, example: +# +# cmake_minimum_required(VERSION 3.5) +# +# include("cmake/HunterGate.cmake") +# HunterGate( +# URL "https://github.com/path/to/hunter/archive.tar.gz" +# SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d" +# ) +# +# project(MyProject) +# +# hunter_add_package(Foo) +# hunter_add_package(Boo COMPONENTS Bar Baz) +# +# Projects: +# * https://github.com/hunter-packages/gate/ +# * https://github.com/ruslo/hunter + +option(HUNTER_ENABLED "Enable Hunter package manager support" ON) + +if(HUNTER_ENABLED) + if(CMAKE_VERSION VERSION_LESS "3.2") + message( + FATAL_ERROR + "At least CMake version 3.2 required for Hunter dependency management." + " Update CMake or set HUNTER_ENABLED to OFF." + ) + endif() +endif() + +include(CMakeParseArguments) # cmake_parse_arguments + +option(HUNTER_STATUS_PRINT "Print working status" ON) +option(HUNTER_STATUS_DEBUG "Print a lot info" OFF) +option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON) + +set(HUNTER_ERROR_PAGE "https://docs.hunter.sh/en/latest/reference/errors") + +function(hunter_gate_status_print) + if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG) + foreach(print_message ${ARGV}) + message(STATUS "[hunter] ${print_message}") + endforeach() + endif() +endfunction() + +function(hunter_gate_status_debug) + if(HUNTER_STATUS_DEBUG) + foreach(print_message ${ARGV}) + string(TIMESTAMP timestamp) + message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}") + endforeach() + endif() +endfunction() + +function(hunter_gate_error_page error_page) + message("------------------------------ ERROR ------------------------------") + message(" ${HUNTER_ERROR_PAGE}/${error_page}.html") + message("-------------------------------------------------------------------") + message("") + message(FATAL_ERROR "") +endfunction() + +function(hunter_gate_internal_error) + message("") + foreach(print_message ${ARGV}) + message("[hunter ** INTERNAL **] ${print_message}") + endforeach() + message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]") + message("") + hunter_gate_error_page("error.internal") +endfunction() + +function(hunter_gate_fatal_error) + cmake_parse_arguments(hunter "" "ERROR_PAGE" "" "${ARGV}") + if("${hunter_ERROR_PAGE}" STREQUAL "") + hunter_gate_internal_error("Expected ERROR_PAGE") + endif() + message("") + foreach(x ${hunter_UNPARSED_ARGUMENTS}) + message("[hunter ** FATAL ERROR **] ${x}") + endforeach() + message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]") + message("") + hunter_gate_error_page("${hunter_ERROR_PAGE}") +endfunction() + +function(hunter_gate_user_error) + hunter_gate_fatal_error(${ARGV} ERROR_PAGE "error.incorrect.input.data") +endfunction() + +function(hunter_gate_self root version sha1 result) + string(COMPARE EQUAL "${root}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("root is empty") + endif() + + string(COMPARE EQUAL "${version}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("version is empty") + endif() + + string(COMPARE EQUAL "${sha1}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("sha1 is empty") + endif() + + string(SUBSTRING "${sha1}" 0 7 archive_id) + + if(EXISTS "${root}/cmake/Hunter") + set(hunter_self "${root}") + else() + set( + hunter_self + "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked" + ) + endif() + + set("${result}" "${hunter_self}" PARENT_SCOPE) +endfunction() + +# Set HUNTER_GATE_ROOT cmake variable to suitable value. +function(hunter_gate_detect_root) + # Check CMake variable + string(COMPARE NOTEQUAL "${HUNTER_ROOT}" "" not_empty) + if(not_empty) + set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE) + hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable") + return() + endif() + + # Check environment variable + string(COMPARE NOTEQUAL "$ENV{HUNTER_ROOT}" "" not_empty) + if(not_empty) + set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE) + hunter_gate_status_debug("HUNTER_ROOT detected by environment variable") + return() + endif() + + # Check HOME environment variable + string(COMPARE NOTEQUAL "$ENV{HOME}" "" result) + if(result) + set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE) + hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable") + return() + endif() + + # Check SYSTEMDRIVE and USERPROFILE environment variable (windows only) + if(WIN32) + string(COMPARE NOTEQUAL "$ENV{SYSTEMDRIVE}" "" result) + if(result) + set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE) + hunter_gate_status_debug( + "HUNTER_ROOT set using SYSTEMDRIVE environment variable" + ) + return() + endif() + + string(COMPARE NOTEQUAL "$ENV{USERPROFILE}" "" result) + if(result) + set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE) + hunter_gate_status_debug( + "HUNTER_ROOT set using USERPROFILE environment variable" + ) + return() + endif() + endif() + + hunter_gate_fatal_error( + "Can't detect HUNTER_ROOT" + ERROR_PAGE "error.detect.hunter.root" + ) +endfunction() + +function(hunter_gate_download dir) + string( + COMPARE + NOTEQUAL + "$ENV{HUNTER_DISABLE_AUTOINSTALL}" + "" + disable_autoinstall + ) + if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL) + hunter_gate_fatal_error( + "Hunter not found in '${dir}'" + "Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'" + "Settings:" + " HUNTER_ROOT: ${HUNTER_GATE_ROOT}" + " HUNTER_SHA1: ${HUNTER_GATE_SHA1}" + ERROR_PAGE "error.run.install" + ) + endif() + string(COMPARE EQUAL "${dir}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("Empty 'dir' argument") + endif() + + string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("HUNTER_GATE_SHA1 empty") + endif() + + string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("HUNTER_GATE_URL empty") + endif() + + set(done_location "${dir}/DONE") + set(sha1_location "${dir}/SHA1") + + set(build_dir "${dir}/Build") + set(cmakelists "${dir}/CMakeLists.txt") + + hunter_gate_status_debug("Locking directory: ${dir}") + file(LOCK "${dir}" DIRECTORY GUARD FUNCTION) + hunter_gate_status_debug("Lock done") + + if(EXISTS "${done_location}") + # while waiting for lock other instance can do all the job + hunter_gate_status_debug("File '${done_location}' found, skip install") + return() + endif() + + file(REMOVE_RECURSE "${build_dir}") + file(REMOVE_RECURSE "${cmakelists}") + + file(MAKE_DIRECTORY "${build_dir}") # check directory permissions + + # Disabling languages speeds up a little bit, reduces noise in the output + # and avoids path too long windows error + file( + WRITE + "${cmakelists}" + "cmake_minimum_required(VERSION 3.5)\n" + "project(HunterDownload LANGUAGES NONE)\n" + "include(ExternalProject)\n" + "ExternalProject_Add(\n" + " Hunter\n" + " URL\n" + " \"${HUNTER_GATE_URL}\"\n" + " URL_HASH\n" + " SHA1=${HUNTER_GATE_SHA1}\n" + " DOWNLOAD_DIR\n" + " \"${dir}\"\n" + " TLS_VERIFY\n" + " ${HUNTER_TLS_VERIFY}\n" + " SOURCE_DIR\n" + " \"${dir}/Unpacked\"\n" + " CONFIGURE_COMMAND\n" + " \"\"\n" + " BUILD_COMMAND\n" + " \"\"\n" + " INSTALL_COMMAND\n" + " \"\"\n" + ")\n" + ) + + if(HUNTER_STATUS_DEBUG) + set(logging_params "") + else() + set(logging_params OUTPUT_QUIET) + endif() + + hunter_gate_status_debug("Run generate") + + # Need to add toolchain file too. + # Otherwise on Visual Studio + MDD this will fail with error: + # "Could not find an appropriate version of the Windows 10 SDK installed on this machine" + if(EXISTS "${CMAKE_TOOLCHAIN_FILE}") + get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE) + set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}") + else() + # 'toolchain_arg' can't be empty + set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=") + endif() + + string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make) + if(no_make) + set(make_arg "") + else() + # Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM + set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}") + endif() + + execute_process( + COMMAND + "${CMAKE_COMMAND}" + "-H${dir}" + "-B${build_dir}" + "-G${CMAKE_GENERATOR}" + "${toolchain_arg}" + ${make_arg} + WORKING_DIRECTORY "${dir}" + RESULT_VARIABLE download_result + ${logging_params} + ) + + if(NOT download_result EQUAL 0) + hunter_gate_internal_error( + "Configure project failed." + "To reproduce the error run: ${CMAKE_COMMAND} -H${dir} -B${build_dir} -G${CMAKE_GENERATOR} ${toolchain_arg} ${make_arg}" + "In directory ${dir}" + ) + endif() + + hunter_gate_status_print( + "Initializing Hunter workspace (${HUNTER_GATE_SHA1})" + " ${HUNTER_GATE_URL}" + " -> ${dir}" + ) + execute_process( + COMMAND "${CMAKE_COMMAND}" --build "${build_dir}" + WORKING_DIRECTORY "${dir}" + RESULT_VARIABLE download_result + ${logging_params} + ) + + if(NOT download_result EQUAL 0) + hunter_gate_internal_error("Build project failed") + endif() + + file(REMOVE_RECURSE "${build_dir}") + file(REMOVE_RECURSE "${cmakelists}") + + file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}") + file(WRITE "${done_location}" "DONE") + + hunter_gate_status_debug("Finished") +endfunction() + +# Must be a macro so master file 'cmake/Hunter' can +# apply all variables easily just by 'include' command +# (otherwise PARENT_SCOPE magic needed) +macro(HunterGate) + if(HUNTER_GATE_DONE) + # variable HUNTER_GATE_DONE set explicitly for external project + # (see `hunter_download`) + set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) + endif() + + # First HunterGate command will init Hunter, others will be ignored + get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET) + + if(NOT HUNTER_ENABLED) + # Empty function to avoid error "unknown function" + function(hunter_add_package) + endfunction() + + set( + _hunter_gate_disabled_mode_dir + "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode" + ) + if(EXISTS "${_hunter_gate_disabled_mode_dir}") + hunter_gate_status_debug( + "Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}" + ) + list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}") + endif() + elseif(_hunter_gate_done) + hunter_gate_status_debug("Secondary HunterGate (use old settings)") + hunter_gate_self( + "${HUNTER_CACHED_ROOT}" + "${HUNTER_VERSION}" + "${HUNTER_SHA1}" + _hunter_self + ) + include("${_hunter_self}/cmake/Hunter") + else() + set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") + + string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name) + if(_have_project_name) + hunter_gate_fatal_error( + "Please set HunterGate *before* 'project' command. " + "Detected project: ${PROJECT_NAME}" + ERROR_PAGE "error.huntergate.before.project" + ) + endif() + + cmake_parse_arguments( + HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV} + ) + + string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1) + string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url) + string( + COMPARE + NOTEQUAL + "${HUNTER_GATE_UNPARSED_ARGUMENTS}" + "" + _have_unparsed + ) + string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global) + string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath) + + if(_have_unparsed) + hunter_gate_user_error( + "HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}" + ) + endif() + if(_empty_sha1) + hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory") + endif() + if(_empty_url) + hunter_gate_user_error("URL suboption of HunterGate is mandatory") + endif() + if(_have_global) + if(HUNTER_GATE_LOCAL) + hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)") + endif() + if(_have_filepath) + hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)") + endif() + endif() + if(HUNTER_GATE_LOCAL) + if(_have_global) + hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)") + endif() + if(_have_filepath) + hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)") + endif() + endif() + if(_have_filepath) + if(_have_global) + hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)") + endif() + if(HUNTER_GATE_LOCAL) + hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)") + endif() + endif() + + hunter_gate_detect_root() # set HUNTER_GATE_ROOT + + # Beautify path, fix probable problems with windows path slashes + get_filename_component( + HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE + ) + hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}") + if(NOT HUNTER_ALLOW_SPACES_IN_PATH) + string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces) + if(NOT _contain_spaces EQUAL -1) + hunter_gate_fatal_error( + "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces." + "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error" + "(Use at your own risk!)" + ERROR_PAGE "error.spaces.in.hunter.root" + ) + endif() + endif() + + string( + REGEX + MATCH + "[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*" + HUNTER_GATE_VERSION + "${HUNTER_GATE_URL}" + ) + string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty) + if(_is_empty) + set(HUNTER_GATE_VERSION "unknown") + endif() + + hunter_gate_self( + "${HUNTER_GATE_ROOT}" + "${HUNTER_GATE_VERSION}" + "${HUNTER_GATE_SHA1}" + _hunter_self + ) + + set(_master_location "${_hunter_self}/cmake/Hunter") + if(EXISTS "${HUNTER_GATE_ROOT}/cmake/Hunter") + # Hunter downloaded manually (e.g. by 'git clone') + set(_unused "xxxxxxxxxx") + set(HUNTER_GATE_SHA1 "${_unused}") + set(HUNTER_GATE_VERSION "${_unused}") + else() + get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE) + set(_done_location "${_archive_id_location}/DONE") + set(_sha1_location "${_archive_id_location}/SHA1") + + # Check Hunter already downloaded by HunterGate + if(NOT EXISTS "${_done_location}") + hunter_gate_download("${_archive_id_location}") + endif() + + if(NOT EXISTS "${_done_location}") + hunter_gate_internal_error("hunter_gate_download failed") + endif() + + if(NOT EXISTS "${_sha1_location}") + hunter_gate_internal_error("${_sha1_location} not found") + endif() + file(READ "${_sha1_location}" _sha1_value) + string(COMPARE EQUAL "${_sha1_value}" "${HUNTER_GATE_SHA1}" _is_equal) + if(NOT _is_equal) + hunter_gate_internal_error( + "Short SHA1 collision:" + " ${_sha1_value} (from ${_sha1_location})" + " ${HUNTER_GATE_SHA1} (HunterGate)" + ) + endif() + if(NOT EXISTS "${_master_location}") + hunter_gate_user_error( + "Master file not found:" + " ${_master_location}" + "try to update Hunter/HunterGate" + ) + endif() + endif() + include("${_master_location}") + set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) + endif() +endmacro() diff --git a/cmake/wasmedge-config.cmake b/cmake/wasmedge-config.cmake new file mode 100644 index 000000000000..ae0427992a8b --- /dev/null +++ b/cmake/wasmedge-config.cmake @@ -0,0 +1,13 @@ + +add_library(WasmEdge::WasmEdge STATIC IMPORTED) +target_include_directories(WasmEdge::WasmEdge INTERFACE "${WASMEDGE_ROOT}/include") +target_link_libraries(WasmEdge::WasmEdge INTERFACE curses) +set(WASMEDGE_LIB "${WASMEDGE_ROOT}/lib/libwasmedge.a") +set(WASMEDGE_LIB_DEBUG "${WASMEDGE_ROOT}/lib/libwasmedged.a") +if(NOT EXISTS "${WASMEDGE_LIB}") + set(WASMEDGE_LIB "${WASMEDGE_LIB_DEBUG}") +endif() +set_property(TARGET WasmEdge::WasmEdge PROPERTY IMPORTED_LOCATION "${WASMEDGE_LIB}") +if(EXISTS "${WASMEDGE_LIB_DEBUG}") + set_property(TARGET WasmEdge::WasmEdge PROPERTY IMPORTED_LOCATION_DEBUG "${WASMEDGE_LIB_DEBUG}") +endif() diff --git a/lib/api/CMakeLists.txt b/lib/api/CMakeLists.txt index 5e8e46e11a2b..9ad7e285a9fc 100644 --- a/lib/api/CMakeLists.txt +++ b/lib/api/CMakeLists.txt @@ -163,38 +163,46 @@ if(WASMEDGE_BUILD_STATIC_LIB) wasmedge_add_static_lib_component_command(wasmedgeAOT) endif() + if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") + set(WASMEDGE_LIBRARY_NAME "libwasmedged.a") + else() + set(WASMEDGE_LIBRARY_NAME "libwasmedge.a") + endif() + if(CMAKE_AR_NAME STREQUAL "libtool") - add_custom_command(OUTPUT "libwasmedge.a" - COMMAND ${CMAKE_AR} -static -o libwasmedge.a ${WASMEDGE_STATIC_LIB_LIBTOOL_FILES} $ + add_custom_command(OUTPUT "${WASMEDGE_LIBRARY_NAME}" + COMMAND ${CMAKE_AR} -static -o "${WASMEDGE_LIBRARY_NAME}" ${WASMEDGE_STATIC_LIB_LIBTOOL_FILES} $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${WASMEDGE_STATIC_LIB_DEPS} wasmedgeCAPI ) else() - add_custom_command(OUTPUT "libwasmedge.a" + add_custom_command(OUTPUT "${WASMEDGE_LIBRARY_NAME}" ${WASMEDGE_STATIC_LIB_AR_CMDS} ${WASMEDGE_STATIC_LLVM_LIB_AR_CMDS} - COMMAND ${CMAKE_AR} -qcs libwasmedge.a $ objs/*/*.o + COMMAND ${CMAKE_AR} -qcs "${WASMEDGE_LIBRARY_NAME}" $ objs/*/*.o COMMAND ${CMAKE_COMMAND} -E remove_directory objs WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${WASMEDGE_STATIC_LIB_DEPS} wasmedgeCAPI ) endif() - add_custom_target(wasmedge_static_target ALL DEPENDS "libwasmedge.a") + add_custom_target(wasmedge_static_target ALL DEPENDS "${WASMEDGE_LIBRARY_NAME}") add_library(wasmedge_static STATIC IMPORTED GLOBAL) add_dependencies(wasmedge_static wasmedge_static_target) set_target_properties(wasmedge_static PROPERTIES - IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libwasmedge.a" - INTERFACE_INCLUDE_DIRECTORIES ${PROJECT_BINARY_DIR}/include/api + IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${WASMEDGE_LIBRARY_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${PROJECT_BINARY_DIR}/include/api" ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libwasmedge.a + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${WASMEDGE_LIBRARY_NAME}" DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES ${WASMEDGE_CAPI_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wasmedge ) + install(FILES ${PROJECT_SOURCE_DIR}/cmake/wasmedge-config.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wasmedge) endif() diff --git a/lib/loader/CMakeLists.txt b/lib/loader/CMakeLists.txt index e6aef48569bb..c763ae34d3ae 100644 --- a/lib/loader/CMakeLists.txt +++ b/lib/loader/CMakeLists.txt @@ -26,7 +26,7 @@ wasmedge_add_library(wasmedgeLoader ast/component/sort.cpp ast/component/instance.cpp ast/component/alias.cpp - ast/component/type.cpp + ast/component/component_type.cpp ast/component/canonical.cpp ast/component/start.cpp ast/component/import_export.cpp diff --git a/lib/loader/ast/component/component_type.cpp b/lib/loader/ast/component/component_type.cpp new file mode 100644 index 000000000000..bcf73fffd515 --- /dev/null +++ b/lib/loader/ast/component/component_type.cpp @@ -0,0 +1,3 @@ +// "libwasmedge.a" is merged from objects extracted from libraries. +// "ar" can't extract duplicate "type.cpp.o" from "libwasmedgeLoader.a". +#include "./type.cpp" From f6ad5800f12be31823fdc8bfb1d07c60c3d23c9c Mon Sep 17 00:00:00 2001 From: turuslan Date: Thu, 1 Feb 2024 10:12:43 +0300 Subject: [PATCH 2/8] [qdrvm] data segment --- include/api/wasmedge/wasmedge.h | 26 ++++++++++++++++++++++++++ include/executor/executor.h | 3 +++ lib/api/wasmedge.cpp | 31 +++++++++++++++++++++++++++++++ lib/executor/instantiate/data.cpp | 11 +++++++++++ 4 files changed, 71 insertions(+) diff --git a/include/api/wasmedge/wasmedge.h b/include/api/wasmedge/wasmedge.h index f32471640efe..caa01edbc761 100644 --- a/include/api/wasmedge/wasmedge.h +++ b/include/api/wasmedge/wasmedge.h @@ -4067,6 +4067,32 @@ WasmEdge_ExecutorExperimentalRegisterPostHostFunction( WasmEdge_ExecutorContext *Cxt, void *Data, void (*Func)(void *)); // <<<<<<<< WasmEdge Experimental Functions <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +// >>>>>>>> [qdrvm] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + +typedef struct WasmEdge_DataSegment { + uint32_t Offset; + const uint8_t *Data; + uint32_t Length; +} WasmEdge_DataSegment; + +/// List the data section of the AST module. +/// +/// If the `Segments` buffer length is smaller than the result of the data +/// section size, the overflowed return values will be discarded. +/// +/// \param Cxt the WasmEdge_ASTModuleContext. +/// \param [out] Segments the data segment buffer. Can be NULL if data segments +/// are not needed. +/// \param Len the buffer length. +/// +/// \returns actual data segment list size. +WASMEDGE_CAPI_EXPORT extern uint32_t WasmEdge_ASTModuleListDataSegments( + const WasmEdge_ASTModuleContext *Cxt, WasmEdge_DataSegment *Segments, + const uint32_t Len); + +// <<<<<<<< [qdrvm] <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + #ifdef __cplusplus } /// extern "C" #endif diff --git a/include/executor/executor.h b/include/executor/executor.h index 1107313a5282..cd6b3d3d5f7e 100644 --- a/include/executor/executor.h +++ b/include/executor/executor.h @@ -187,6 +187,9 @@ class Executor { atomicNotifyAll(); } + // [qdrvm] + Expect dataSegmentOffset(Runtime::StackManager &StackMgr, const AST::DataSegment &DataSeg); + private: /// Run Wasm bytecode expression for initialization. Expect runExpression(Runtime::StackManager &StackMgr, diff --git a/lib/api/wasmedge.cpp b/lib/api/wasmedge.cpp index a94d487118f2..abcde5bd376c 100644 --- a/lib/api/wasmedge.cpp +++ b/lib/api/wasmedge.cpp @@ -3282,6 +3282,37 @@ WASMEDGE_CAPI_EXPORT void WasmEdge_ExecutorExperimentalRegisterPostHostFunction( } // <<<<<<<< WasmEdge Experimental Functions <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +// >>>>>>>> [qdrvm] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + +WASMEDGE_CAPI_EXPORT uint32_t WasmEdge_ASTModuleListDataSegments( + const WasmEdge_ASTModuleContext *Cxt, WasmEdge_DataSegment *Segments, + const uint32_t Len) { + if (!Cxt) { + return 0; + } + const auto &DataSegSpan = fromASTModCxt(Cxt)->getDataSection().getContent(); + WasmEdge::Configure Conf; + WasmEdge::Executor::Executor Executor{Conf}; + WasmEdge::Runtime::StackManager StackMgr; + uint32_t I = 0; + for (const auto &DataSeg : DataSegSpan) { + auto Offset = Executor.dataSegmentOffset(StackMgr, DataSeg); + if (!Offset) { + return 0; + } + if (I < Len) { + Segments[I].Offset = Offset.value(); + Segments[I].Data = DataSeg.getData().data(); + Segments[I].Length = DataSeg.getData().size(); + } + ++I; + } + return DataSegSpan.size(); +} + +// <<<<<<<< [qdrvm] <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + #ifdef __cplusplus } // extern "C" #endif diff --git a/lib/executor/instantiate/data.cpp b/lib/executor/instantiate/data.cpp index 8903dc2babc8..3e1d6ec13b63 100644 --- a/lib/executor/instantiate/data.cpp +++ b/lib/executor/instantiate/data.cpp @@ -94,5 +94,16 @@ Expect Executor::initMemory(Runtime::StackManager &StackMgr, return {}; } +Expect Executor::dataSegmentOffset(Runtime::StackManager &StackMgr, const AST::DataSegment &DataSeg) { + if (DataSeg.getMode() == AST::DataSegment::DataMode::Active) { + if (auto Res = runExpression(StackMgr, DataSeg.getExpr().getInstrs()); + unlikely(!Res)) { + return Unexpect(Res); + } + return StackMgr.pop().get(); + } + return 0; +} + } // namespace Executor } // namespace WasmEdge From 54039306d52f2eb437bd6e1a5cba60cda8c0aad9 Mon Sep 17 00:00:00 2001 From: turuslan Date: Thu, 1 Feb 2024 11:09:34 +0300 Subject: [PATCH 3/8] [qdrvm] thread local --- include/executor/executor.h | 18 ++++++++++++++++++ lib/executor/helper.cpp | 2 ++ 2 files changed, 20 insertions(+) diff --git a/include/executor/executor.h b/include/executor/executor.h index cd6b3d3d5f7e..ed7eed61e20a 100644 --- a/include/executor/executor.h +++ b/include/executor/executor.h @@ -754,6 +754,24 @@ class Executor { std::atomic_uint32_t *StopToken; }; + struct SavedThreadLocal { + SavedThreadLocal() : SavedThis(This), SavedCurrentStack(CurrentStack), SavedExecutionContext(ExecutionContext) { + } + + SavedThreadLocal(const SavedThreadLocal &) = delete; + SavedThreadLocal(SavedThreadLocal &&) = delete; + + ~SavedThreadLocal() { + This = SavedThis; + CurrentStack = SavedCurrentStack; + ExecutionContext = SavedExecutionContext; + } + + Executor *SavedThis; + Runtime::StackManager *SavedCurrentStack; + ExecutionContextStruct SavedExecutionContext; + }; + /// Pointer to current object. static thread_local Executor *This; /// Stack for passing into compiled functions diff --git a/lib/executor/helper.cpp b/lib/executor/helper.cpp index ec3ce4d6b2cd..3e5a02a47166 100644 --- a/lib/executor/helper.cpp +++ b/lib/executor/helper.cpp @@ -115,6 +115,8 @@ Executor::enterFunction(Runtime::StackManager &StackMgr, Span Args = StackMgr.getTopSpan(ArgsN); std::vector Rets(RetsN); + SavedThreadLocal SavedThreadLocal; + { // Prepare the execution context. auto *ModInst = From f45887ebfc3f617ceae047d68ea79d2f72d0bf07 Mon Sep 17 00:00:00 2001 From: turuslan Date: Thu, 1 Feb 2024 15:29:12 +0300 Subject: [PATCH 4/8] [qdrvm] fix hunter Signed-off-by: turuslan --- cmake/Helper.cmake | 34 ++++++++++++++++++---------------- cmake/wasmedge-config.cmake | 3 +++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake index 2b447ab23978..a738ce80617b 100644 --- a/cmake/Helper.cmake +++ b/cmake/Helper.cmake @@ -251,22 +251,24 @@ if((WASMEDGE_LINK_LLVM_STATIC OR WASMEDGE_BUILD_STATIC_LIB) AND WASMEDGE_BUILD_A list(APPEND WASMEDGE_LLVM_LINK_SHARED_COMPONENTS rt ) - if(WASMEDGE_BUILD_STATIC_LIB) - # Static library will forcefully turn off the LTO. - # Therefore, libz and libtinfo can be statically linked. - find_package(ZLIB REQUIRED) - get_filename_component(ZLIB_PATH "${ZLIB_LIBRARIES}" DIRECTORY) - list(APPEND WASMEDGE_LLVM_LINK_STATIC_COMPONENTS ${ZLIB_PATH}/libz.a) - if(NOT WASMEDGE_DISABLE_LIBTINFO) - list(APPEND WASMEDGE_LLVM_LINK_STATIC_COMPONENTS ${ZLIB_PATH}/libtinfo.a) - endif() - else() - # If not build static lib, dynamic link libz and libtinfo. - list(APPEND WASMEDGE_LLVM_LINK_SHARED_COMPONENTS - z - ) - if(NOT WASMEDGE_DISABLE_LIBTINFO) - list(APPEND WASMEDGE_LLVM_LINK_SHARED_COMPONENTS tinfo) + if(WASMEDGE_PLUGIN_ZLIB) + if(WASMEDGE_BUILD_STATIC_LIB) + # Static library will forcefully turn off the LTO. + # Therefore, libz and libtinfo can be statically linked. + find_package(ZLIB REQUIRED) + get_filename_component(ZLIB_PATH "${ZLIB_LIBRARIES}" DIRECTORY) + list(APPEND WASMEDGE_LLVM_LINK_STATIC_COMPONENTS ${ZLIB_PATH}/libz.a) + if(NOT WASMEDGE_DISABLE_LIBTINFO) + list(APPEND WASMEDGE_LLVM_LINK_STATIC_COMPONENTS ${ZLIB_PATH}/libtinfo.a) + endif() + else() + # If not build static lib, dynamic link libz and libtinfo. + list(APPEND WASMEDGE_LLVM_LINK_SHARED_COMPONENTS + z + ) + if(NOT WASMEDGE_DISABLE_LIBTINFO) + list(APPEND WASMEDGE_LLVM_LINK_SHARED_COMPONENTS tinfo) + endif() endif() endif() endif() diff --git a/cmake/wasmedge-config.cmake b/cmake/wasmedge-config.cmake index ae0427992a8b..b410c53b00bb 100644 --- a/cmake/wasmedge-config.cmake +++ b/cmake/wasmedge-config.cmake @@ -2,6 +2,9 @@ add_library(WasmEdge::WasmEdge STATIC IMPORTED) target_include_directories(WasmEdge::WasmEdge INTERFACE "${WASMEDGE_ROOT}/include") target_link_libraries(WasmEdge::WasmEdge INTERFACE curses) +if(APPLE) + target_link_libraries(WasmEdge::WasmEdge INTERFACE xar) +endif() set(WASMEDGE_LIB "${WASMEDGE_ROOT}/lib/libwasmedge.a") set(WASMEDGE_LIB_DEBUG "${WASMEDGE_ROOT}/lib/libwasmedged.a") if(NOT EXISTS "${WASMEDGE_LIB}") From 3a04e9fe228a5d807e4a9ead17c172f619c3645d Mon Sep 17 00:00:00 2001 From: kamilsa Date: Mon, 5 Feb 2024 12:15:42 +0600 Subject: [PATCH 5/8] Update llvm and lld to 17.0.6 --- CMakeLists.txt | 4 ++-- cmake/Hunter/config.cmake | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f275201b575..26d1daa77702 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ endif() include(cmake/HunterGate.cmake) HunterGate( - URL https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm1.zip - SHA1 8c0faf2b0d643a97e00dd0520d66fe2faaf5e573 + URL https://github.com/qdrvm/hunter/archive/e092ffe31bbc178249604845aaef8384c60547a8.zip + SHA1 e21a9e965611587af2452657e6bc6e0be99d3be0 LOCAL ) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 2654aaa0078e..74f03e5dd569 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -1,6 +1,20 @@ +set(ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") + +if(ARCHITECTURE MATCHES "^(aarch64.*|AARCH64.*|arm.*|ARM.*)") + set(ARCHITECTURE AArch64) +elseif(ARCHITECTURE MATCHES "^(x86_64.*|AMD64.*|i386.*|i686.*)") + set(ARCHITECTURE X86) +elseif(ARCHITECTURE MATCHES "^(riscv.*)") + set(ARCHITECTURE RISCV) +else() + message(WARNING "Unknown architecture: ${ARCHITECTURE}, using all architectures to build LLVM") + set(ARCHITECTURE AArch64;X86;RISCV) +endif() hunter_config( LLVM - VERSION 16.0.1 - CMAKE_ARGS LLVM_ENABLE_PROJECTS=compiler-rt + VERSION 17.0.6 + CMAKE_ARGS + LLVM_ENABLE_PROJECTS=lld;clang + LLVM_TARGETS_TO_BUILD=${ARCHITECTURE};BPF ) From ebe8eba826994c7306ad4d72b95ee0c90c5635c7 Mon Sep 17 00:00:00 2001 From: kamilsa Date: Tue, 6 Feb 2024 12:19:42 +0600 Subject: [PATCH 6/8] Update llvm and lld to 17.0.6, reduce llvm targets --- CMakeLists.txt | 4 ++-- cmake/Hunter/config.cmake | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26d1daa77702..96257ea564b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ endif() include(cmake/HunterGate.cmake) HunterGate( - URL https://github.com/qdrvm/hunter/archive/e092ffe31bbc178249604845aaef8384c60547a8.zip - SHA1 e21a9e965611587af2452657e6bc6e0be99d3be0 + URL https://github.com/qdrvm/hunter/archive/b6c44ccfd5d9d0e87628737303084b4cfa9e200e.zip + SHA1 cecd3a154449c1b39fcf5dfaf1bed2c6bce0f67a LOCAL ) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 74f03e5dd569..684d9615017b 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -1,3 +1,4 @@ +## Identify native architecture to reduce amount of targets to build set(ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") if(ARCHITECTURE MATCHES "^(aarch64.*|AARCH64.*|arm.*|ARM.*)") @@ -14,7 +15,7 @@ endif() hunter_config( LLVM VERSION 17.0.6 - CMAKE_ARGS + CMAKE_ARGS # inspired by https://github.com/WasmEdge/WasmEdge/blob/5e8556afa5a71f3d3ef9615334ecf1a9d4d0f1e8/utils/docker/Dockerfile.manylinux2014_x86_64#L57 LLVM_ENABLE_PROJECTS=lld;clang LLVM_TARGETS_TO_BUILD=${ARCHITECTURE};BPF ) From 38769c13dd82bac3b329ec10431d477344f7aedd Mon Sep 17 00:00:00 2001 From: turuslan Date: Wed, 7 Feb 2024 13:09:10 +0300 Subject: [PATCH 7/8] disable signal handling Signed-off-by: turuslan --- lib/system/fault.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/system/fault.cpp b/lib/system/fault.cpp index 673ce8aa1dd2..2d0a39764e06 100644 --- a/lib/system/fault.cpp +++ b/lib/system/fault.cpp @@ -47,18 +47,19 @@ thread_local Fault *localHandler = nullptr; } void enableHandler() noexcept { + [[maybe_unused]] struct sigaction Action {}; Action.sa_sigaction = &signalHandler; Action.sa_flags = SA_SIGINFO; - sigaction(SIGFPE, &Action, nullptr); - sigaction(SIGBUS, &Action, nullptr); - sigaction(SIGSEGV, &Action, nullptr); + // sigaction(SIGFPE, &Action, nullptr); + // sigaction(SIGBUS, &Action, nullptr); + // sigaction(SIGSEGV, &Action, nullptr); } void disableHandler() noexcept { - std::signal(SIGFPE, SIG_DFL); - std::signal(SIGBUS, SIG_DFL); - std::signal(SIGSEGV, SIG_DFL); + // std::signal(SIGFPE, SIG_DFL); + // std::signal(SIGBUS, SIG_DFL); + // std::signal(SIGSEGV, SIG_DFL); } #elif WASMEDGE_OS_WINDOWS From 44451ccaad914fe0b890ae0966dc878cd18fb798 Mon Sep 17 00:00:00 2001 From: turuslan Date: Mon, 19 Feb 2024 12:43:49 +0300 Subject: [PATCH 8/8] rename wasm file Signed-off-by: turuslan --- lib/aot/compiler.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/aot/compiler.cpp b/lib/aot/compiler.cpp index 57196583df3a..1e2e8a1665ac 100644 --- a/lib/aot/compiler.cpp +++ b/lib/aot/compiler.cpp @@ -5468,7 +5468,13 @@ Expect outputWasmLibrary(const std::filesystem::path &OutputPath, spdlog::info("output start"); - std::ofstream OS(OutputPath, std::ios_base::binary); + std::filesystem::path OutputPathTmp(OutputPath); + OutputPathTmp.replace_extension("%%%%%%%%%%.wasm"); + OutputPathTmp = createTemp(OutputPathTmp); + if (OutputPathTmp.empty()) { + return WasmEdge::Unexpect(WasmEdge::ErrCode::Value::IllegalPath); + } + std::ofstream OS(OutputPathTmp, std::ios_base::binary); if (!OS) { spdlog::error("output failed."); return Unexpect(ErrCode::Value::IllegalPath); @@ -5481,6 +5487,7 @@ Expect outputWasmLibrary(const std::filesystem::path &OutputPath, std::error_code Error; std::filesystem::remove(SharedObjectName, Error); + std::filesystem::rename(OutputPathTmp, OutputPath); return {}; }